From f8d5542af58029d972aecfd997172cdf67662289 Mon Sep 17 00:00:00 2001
From: Arty Bishop <bishop.arty@gmail.com>
Date: Sat, 29 Jul 2023 10:04:26 +0100
Subject: [PATCH] Renamed base module into domain

---
 app/build.gradle                              |  4 ++--
 .../com/rtbishop/look4sat/MainContainer.kt    | 18 ++++++++--------
 .../look4sat/framework/SettingsRepo.kt        | 14 ++++++-------
 .../look4sat/framework/data/DataSource.kt     |  2 +-
 .../look4sat/framework/data/LocalStorage.kt   | 12 +++++------
 .../look4sat/framework/data/SensorSource.kt   |  4 ++--
 .../look4sat/framework/model/SatEntry.kt      |  2 +-
 .../presentation/entries/EntriesScreen.kt     |  2 +-
 .../presentation/entries/EntriesUiState.kt    |  2 +-
 .../presentation/entries/EntriesViewModel.kt  |  2 +-
 .../look4sat/presentation/map/MapData.kt      |  2 +-
 .../look4sat/presentation/map/MapScreen.kt    |  6 +++---
 .../look4sat/presentation/map/MapViewModel.kt | 16 +++++++-------
 .../presentation/passes/PassesScreen.kt       |  8 +++----
 .../presentation/passes/PassesViewModel.kt    | 12 +++++------
 .../look4sat/presentation/radar/RadarData.kt  |  2 +-
 .../presentation/radar/RadarScreen.kt         |  2 +-
 .../look4sat/presentation/radar/RadarView.kt  |  6 +++---
 .../presentation/radar/RadarViewModel.kt      | 20 +++++++++---------
 .../presentation/settings/SettingsScreen.kt   |  4 ++--
 .../presentation/settings/SettingsUiState.kt  |  2 +-
 .../settings/SettingsViewModel.kt             |  6 +++---
 {base => domain}/.gitignore                   |  0
 {base => domain}/build.gradle                 |  0
 .../look4sat/domain}/data/DataParser.kt       |  6 +++---
 .../look4sat/domain}/data/DatabaseRepo.kt     | 12 +++++------
 .../look4sat/domain}/data/IDataSource.kt      |  2 +-
 .../look4sat/domain}/data/ILocalStorage.kt    | 10 ++++-----
 .../look4sat/domain}/data/ISensorSource.kt    |  2 +-
 .../look4sat/domain}/data/SatelliteRepo.kt    | 20 +++++++++---------
 .../look4sat/domain}/data/SelectionRepo.kt    |  8 +++----
 .../look4sat/domain}/model/DataState.kt       |  2 +-
 .../rtbishop/look4sat/domain}/model/GeoPos.kt |  2 +-
 .../look4sat/domain}/model/OrbitalData.kt     |  9 ++++++--
 .../look4sat/domain}/model/SatEntry.kt        |  2 +-
 .../look4sat/domain}/model/SatItem.kt         |  2 +-
 .../look4sat/domain}/model/SatPass.kt         |  4 ++--
 .../rtbishop/look4sat/domain}/model/SatPos.kt | 18 ++++++++++------
 .../look4sat/domain}/model/SatRadio.kt        |  2 +-
 .../look4sat/domain}/model/Settings.kt        |  2 +-
 .../domain/predict}/DeepSpaceSatellite.kt     | 12 ++++++++---
 .../look4sat/domain/predict}/IDatabaseRepo.kt |  2 +-
 .../domain/predict}/ISatelliteRepo.kt         | 10 ++++-----
 .../domain/predict}/ISelectionRepo.kt         |  4 ++--
 .../look4sat/domain/predict}/ISettingsRepo.kt | 10 ++++-----
 .../domain/predict}/NearEarthSatellite.kt     | 11 +++++++---
 .../look4sat/domain/predict}/Satellite.kt     | 21 ++++++++++++++-----
 .../look4sat/domain}/utility/Extensions.kt    |  6 +++---
 .../look4sat/domain}/utility/QthConverter.kt  |  4 ++--
 .../look4sat/domain}/DataParserTest.kt        |  4 ++--
 .../look4sat/domain}/QthConverterTest.kt      |  4 ++--
 settings.gradle                               |  2 +-
 52 files changed, 187 insertions(+), 154 deletions(-)
 rename {base => domain}/.gitignore (100%)
 rename {base => domain}/build.gradle (100%)
 rename {base/src/main/java/com/rtbishop/look4sat => domain/src/main/java/com/rtbishop/look4sat/domain}/data/DataParser.kt (97%)
 rename {base/src/main/java/com/rtbishop/look4sat => domain/src/main/java/com/rtbishop/look4sat/domain}/data/DatabaseRepo.kt (93%)
 rename {base/src/main/java/com/rtbishop/look4sat => domain/src/main/java/com/rtbishop/look4sat/domain}/data/IDataSource.kt (95%)
 rename {base/src/main/java/com/rtbishop/look4sat => domain/src/main/java/com/rtbishop/look4sat/domain}/data/ILocalStorage.kt (83%)
 rename {base/src/main/java/com/rtbishop/look4sat => domain/src/main/java/com/rtbishop/look4sat/domain}/data/ISensorSource.kt (80%)
 rename {base/src/main/java/com/rtbishop/look4sat => domain/src/main/java/com/rtbishop/look4sat/domain}/data/SatelliteRepo.kt (94%)
 rename {base/src/main/java/com/rtbishop/look4sat => domain/src/main/java/com/rtbishop/look4sat/domain}/data/SelectionRepo.kt (93%)
 rename {base/src/main/java/com/rtbishop/look4sat => domain/src/main/java/com/rtbishop/look4sat/domain}/model/DataState.kt (96%)
 rename {base/src/main/java/com/rtbishop/look4sat => domain/src/main/java/com/rtbishop/look4sat/domain}/model/GeoPos.kt (95%)
 rename {base/src/main/java/com/rtbishop/look4sat => domain/src/main/java/com/rtbishop/look4sat/domain}/model/OrbitalData.kt (80%)
 rename {base/src/main/java/com/rtbishop/look4sat => domain/src/main/java/com/rtbishop/look4sat/domain}/model/SatEntry.kt (95%)
 rename {base/src/main/java/com/rtbishop/look4sat => domain/src/main/java/com/rtbishop/look4sat/domain}/model/SatItem.kt (95%)
 rename {base/src/main/java/com/rtbishop/look4sat => domain/src/main/java/com/rtbishop/look4sat/domain}/model/SatPass.kt (92%)
 rename {base/src/main/java/com/rtbishop/look4sat => domain/src/main/java/com/rtbishop/look4sat/domain}/model/SatPos.kt (85%)
 rename {base/src/main/java/com/rtbishop/look4sat => domain/src/main/java/com/rtbishop/look4sat/domain}/model/SatRadio.kt (96%)
 rename {base/src/main/java/com/rtbishop/look4sat => domain/src/main/java/com/rtbishop/look4sat/domain}/model/Settings.kt (87%)
 rename {base/src/main/java/com/rtbishop/look4sat/domain => domain/src/main/java/com/rtbishop/look4sat/domain/predict}/DeepSpaceSatellite.kt (99%)
 rename {base/src/main/java/com/rtbishop/look4sat/domain => domain/src/main/java/com/rtbishop/look4sat/domain/predict}/IDatabaseRepo.kt (95%)
 rename {base/src/main/java/com/rtbishop/look4sat/domain => domain/src/main/java/com/rtbishop/look4sat/domain/predict}/ISatelliteRepo.kt (74%)
 rename {base/src/main/java/com/rtbishop/look4sat/domain => domain/src/main/java/com/rtbishop/look4sat/domain/predict}/ISelectionRepo.kt (81%)
 rename {base/src/main/java/com/rtbishop/look4sat/domain => domain/src/main/java/com/rtbishop/look4sat/domain/predict}/ISettingsRepo.kt (95%)
 rename {base/src/main/java/com/rtbishop/look4sat/domain => domain/src/main/java/com/rtbishop/look4sat/domain/predict}/NearEarthSatellite.kt (97%)
 rename {base/src/main/java/com/rtbishop/look4sat/domain => domain/src/main/java/com/rtbishop/look4sat/domain/predict}/Satellite.kt (96%)
 rename {base/src/main/java/com/rtbishop/look4sat => domain/src/main/java/com/rtbishop/look4sat/domain}/utility/Extensions.kt (94%)
 rename {base/src/main/java/com/rtbishop/look4sat => domain/src/main/java/com/rtbishop/look4sat/domain}/utility/QthConverter.kt (96%)
 rename {base/src/test/java/com/rtbishop/look4sat => domain/src/test/java/com/rtbishop/look4sat/domain}/DataParserTest.kt (98%)
 rename {base/src/test/java/com/rtbishop/look4sat => domain/src/test/java/com/rtbishop/look4sat/domain}/QthConverterTest.kt (95%)

diff --git a/app/build.gradle b/app/build.gradle
index 242e27f5..0af4ebbe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ android {
         minSdk 21
         targetSdk 33
         versionCode 313
-        versionName '3.1.3'
+        versionName "3.1.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -53,7 +53,7 @@ kotlin {
 }
 
 dependencies {
-    implementation project(":base")
+    implementation project(":domain")
     // Android
     implementation "androidx.core:core-splashscreen:$splashscreen_version"
     implementation "androidx.room:room-runtime:$room_version"
diff --git a/app/src/main/java/com/rtbishop/look4sat/MainContainer.kt b/app/src/main/java/com/rtbishop/look4sat/MainContainer.kt
index 648f8438..ef60bcdf 100644
--- a/app/src/main/java/com/rtbishop/look4sat/MainContainer.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/MainContainer.kt
@@ -6,15 +6,15 @@ import android.hardware.Sensor
 import android.hardware.SensorManager
 import android.location.LocationManager
 import androidx.room.Room
-import com.rtbishop.look4sat.data.DataParser
-import com.rtbishop.look4sat.data.DatabaseRepo
-import com.rtbishop.look4sat.data.ISensorSource
-import com.rtbishop.look4sat.data.SatelliteRepo
-import com.rtbishop.look4sat.data.SelectionRepo
-import com.rtbishop.look4sat.domain.IDatabaseRepo
-import com.rtbishop.look4sat.domain.ISatelliteRepo
-import com.rtbishop.look4sat.domain.ISelectionRepo
-import com.rtbishop.look4sat.domain.ISettingsRepo
+import com.rtbishop.look4sat.domain.data.DataParser
+import com.rtbishop.look4sat.domain.data.DatabaseRepo
+import com.rtbishop.look4sat.domain.data.ISensorSource
+import com.rtbishop.look4sat.domain.data.SatelliteRepo
+import com.rtbishop.look4sat.domain.data.SelectionRepo
+import com.rtbishop.look4sat.domain.predict.IDatabaseRepo
+import com.rtbishop.look4sat.domain.predict.ISatelliteRepo
+import com.rtbishop.look4sat.domain.predict.ISelectionRepo
+import com.rtbishop.look4sat.domain.predict.ISettingsRepo
 import com.rtbishop.look4sat.framework.BluetoothReporter
 import com.rtbishop.look4sat.framework.NetworkReporter
 import com.rtbishop.look4sat.framework.SettingsRepo
diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/SettingsRepo.kt b/app/src/main/java/com/rtbishop/look4sat/framework/SettingsRepo.kt
index 0f594228..204087d9 100644
--- a/app/src/main/java/com/rtbishop/look4sat/framework/SettingsRepo.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/framework/SettingsRepo.kt
@@ -23,13 +23,13 @@ import android.location.LocationManager
 import androidx.core.content.edit
 import androidx.core.location.LocationManagerCompat
 import androidx.core.os.CancellationSignal
-import com.rtbishop.look4sat.domain.ISettingsRepo
-import com.rtbishop.look4sat.model.DatabaseState
-import com.rtbishop.look4sat.model.GeoPos
-import com.rtbishop.look4sat.model.OtherSettings
-import com.rtbishop.look4sat.model.PassesSettings
-import com.rtbishop.look4sat.utility.QthConverter
-import com.rtbishop.look4sat.utility.round
+import com.rtbishop.look4sat.domain.model.DatabaseState
+import com.rtbishop.look4sat.domain.model.GeoPos
+import com.rtbishop.look4sat.domain.model.OtherSettings
+import com.rtbishop.look4sat.domain.model.PassesSettings
+import com.rtbishop.look4sat.domain.predict.ISettingsRepo
+import com.rtbishop.look4sat.domain.utility.QthConverter
+import com.rtbishop.look4sat.domain.utility.round
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import java.util.concurrent.Executors
diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/data/DataSource.kt b/app/src/main/java/com/rtbishop/look4sat/framework/data/DataSource.kt
index a4f472a4..ae4635b7 100644
--- a/app/src/main/java/com/rtbishop/look4sat/framework/data/DataSource.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/framework/data/DataSource.kt
@@ -19,7 +19,7 @@ package com.rtbishop.look4sat.framework.data
 
 import android.content.ContentResolver
 import android.net.Uri
-import com.rtbishop.look4sat.data.IDataSource
+import com.rtbishop.look4sat.domain.data.IDataSource
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/data/LocalStorage.kt b/app/src/main/java/com/rtbishop/look4sat/framework/data/LocalStorage.kt
index 55caf0ea..6eaa5b51 100644
--- a/app/src/main/java/com/rtbishop/look4sat/framework/data/LocalStorage.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/framework/data/LocalStorage.kt
@@ -17,15 +17,15 @@
  */
 package com.rtbishop.look4sat.framework.data
 
-import com.rtbishop.look4sat.data.ILocalStorage
-import com.rtbishop.look4sat.domain.Satellite
-import com.rtbishop.look4sat.model.SatRadio
+import com.rtbishop.look4sat.domain.data.ILocalStorage
+import com.rtbishop.look4sat.domain.model.SatRadio
+import com.rtbishop.look4sat.domain.predict.Satellite
+import com.rtbishop.look4sat.domain.model.SatEntry as DomainEntry
+import com.rtbishop.look4sat.domain.model.SatItem as DomainItem
+import com.rtbishop.look4sat.domain.model.SatRadio as DomainRadio
 import com.rtbishop.look4sat.framework.model.SatEntry as FrameworkEntry
 import com.rtbishop.look4sat.framework.model.SatItem as FrameworkItem
 import com.rtbishop.look4sat.framework.model.SatRadio as FrameworkRadio
-import com.rtbishop.look4sat.model.SatEntry as DomainEntry
-import com.rtbishop.look4sat.model.SatItem as DomainItem
-import com.rtbishop.look4sat.model.SatRadio as DomainRadio
 
 class LocalStorage(private val storageDao: StorageDao) : ILocalStorage {
 
diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/data/SensorSource.kt b/app/src/main/java/com/rtbishop/look4sat/framework/data/SensorSource.kt
index 26122641..de440c70 100644
--- a/app/src/main/java/com/rtbishop/look4sat/framework/data/SensorSource.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/framework/data/SensorSource.kt
@@ -21,8 +21,8 @@ import android.hardware.Sensor
 import android.hardware.SensorEvent
 import android.hardware.SensorEventListener
 import android.hardware.SensorManager
-import com.rtbishop.look4sat.data.ISensorSource
-import com.rtbishop.look4sat.domain.RAD2DEG
+import com.rtbishop.look4sat.domain.data.ISensorSource
+import com.rtbishop.look4sat.domain.predict.RAD2DEG
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlin.math.round
diff --git a/app/src/main/java/com/rtbishop/look4sat/framework/model/SatEntry.kt b/app/src/main/java/com/rtbishop/look4sat/framework/model/SatEntry.kt
index d39b8a16..7c9f2dad 100644
--- a/app/src/main/java/com/rtbishop/look4sat/framework/model/SatEntry.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/framework/model/SatEntry.kt
@@ -19,7 +19,7 @@ package com.rtbishop.look4sat.framework.model
 
 import androidx.room.Embedded
 import androidx.room.Entity
-import com.rtbishop.look4sat.model.OrbitalData
+import com.rtbishop.look4sat.domain.model.OrbitalData
 
 @Entity(tableName = "entries", primaryKeys = ["catnum"])
 data class SatEntry(@Embedded val data: OrbitalData, var comment: String? = null)
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesScreen.kt
index 6a929530..337db202 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesScreen.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesScreen.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.rtbishop.look4sat.R
-import com.rtbishop.look4sat.model.SatItem
+import com.rtbishop.look4sat.domain.model.SatItem
 import com.rtbishop.look4sat.presentation.CardIcon
 import com.rtbishop.look4sat.presentation.CardLoadingIndicator
 import com.rtbishop.look4sat.presentation.MainTheme
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesUiState.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesUiState.kt
index 13f27d39..c65200bb 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesUiState.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesUiState.kt
@@ -1,6 +1,6 @@
 package com.rtbishop.look4sat.presentation.entries
 
-import com.rtbishop.look4sat.model.SatItem
+import com.rtbishop.look4sat.domain.model.SatItem
 
 data class EntriesUiState(
     val isLoading: Boolean,
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesViewModel.kt
index 3b7ea64c..e0f894df 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesViewModel.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/entries/EntriesViewModel.kt
@@ -24,7 +24,7 @@ import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
 import com.rtbishop.look4sat.MainApplication
-import com.rtbishop.look4sat.domain.ISelectionRepo
+import com.rtbishop.look4sat.domain.predict.ISelectionRepo
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapData.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapData.kt
index 02e20ca9..a0ecd2a6 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapData.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapData.kt
@@ -17,7 +17,7 @@
  */
 package com.rtbishop.look4sat.presentation.map
 
-import com.rtbishop.look4sat.model.GeoPos
+import com.rtbishop.look4sat.domain.model.GeoPos
 
 data class MapData(
     val catNum: Int,
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapScreen.kt
index cfd8d254..cb4121b2 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapScreen.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapScreen.kt
@@ -28,9 +28,9 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.rtbishop.look4sat.R
-import com.rtbishop.look4sat.domain.Satellite
-import com.rtbishop.look4sat.model.GeoPos
-import com.rtbishop.look4sat.model.SatPos
+import com.rtbishop.look4sat.domain.model.GeoPos
+import com.rtbishop.look4sat.domain.model.SatPos
+import com.rtbishop.look4sat.domain.predict.Satellite
 import org.osmdroid.tileprovider.tilesource.XYTileSource
 import org.osmdroid.util.GeoPoint
 import org.osmdroid.views.CustomZoomButtonsController
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapViewModel.kt
index 4b80d9cd..ed8b0c32 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapViewModel.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/map/MapViewModel.kt
@@ -23,14 +23,14 @@ import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
 import com.rtbishop.look4sat.MainApplication
-import com.rtbishop.look4sat.domain.ISatelliteRepo
-import com.rtbishop.look4sat.domain.ISettingsRepo
-import com.rtbishop.look4sat.domain.Satellite
-import com.rtbishop.look4sat.model.GeoPos
-import com.rtbishop.look4sat.model.SatPos
-import com.rtbishop.look4sat.utility.QthConverter
-import com.rtbishop.look4sat.utility.toDegrees
-import com.rtbishop.look4sat.utility.toTimerString
+import com.rtbishop.look4sat.domain.model.GeoPos
+import com.rtbishop.look4sat.domain.model.SatPos
+import com.rtbishop.look4sat.domain.predict.ISatelliteRepo
+import com.rtbishop.look4sat.domain.predict.ISettingsRepo
+import com.rtbishop.look4sat.domain.predict.Satellite
+import com.rtbishop.look4sat.domain.utility.QthConverter
+import com.rtbishop.look4sat.domain.utility.toDegrees
+import com.rtbishop.look4sat.domain.utility.toTimerString
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.delay
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.kt
index df174d03..8a194f9b 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.kt
@@ -22,10 +22,10 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.*
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.rtbishop.look4sat.R
-import com.rtbishop.look4sat.domain.NearEarthSatellite
-import com.rtbishop.look4sat.model.DataState
-import com.rtbishop.look4sat.model.OrbitalData
-import com.rtbishop.look4sat.model.SatPass
+import com.rtbishop.look4sat.domain.model.DataState
+import com.rtbishop.look4sat.domain.model.OrbitalData
+import com.rtbishop.look4sat.domain.model.SatPass
+import com.rtbishop.look4sat.domain.predict.NearEarthSatellite
 import com.rtbishop.look4sat.presentation.*
 import com.rtbishop.look4sat.presentation.dialogs.FilterDialog
 import com.rtbishop.look4sat.presentation.pullRefresh.PullRefreshIndicator
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesViewModel.kt
index 982a6a7d..1e2f9cdc 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesViewModel.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesViewModel.kt
@@ -23,12 +23,12 @@ import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
 import com.rtbishop.look4sat.MainApplication
-import com.rtbishop.look4sat.domain.ISatelliteRepo
-import com.rtbishop.look4sat.domain.ISettingsRepo
-import com.rtbishop.look4sat.model.DataState
-import com.rtbishop.look4sat.model.PassesSettings
-import com.rtbishop.look4sat.model.SatPass
-import com.rtbishop.look4sat.utility.toTimerString
+import com.rtbishop.look4sat.domain.model.DataState
+import com.rtbishop.look4sat.domain.model.PassesSettings
+import com.rtbishop.look4sat.domain.model.SatPass
+import com.rtbishop.look4sat.domain.predict.ISatelliteRepo
+import com.rtbishop.look4sat.domain.predict.ISettingsRepo
+import com.rtbishop.look4sat.domain.utility.toTimerString
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.delay
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarData.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarData.kt
index c68123b6..dde0e8c0 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarData.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarData.kt
@@ -17,6 +17,6 @@
  */
 package com.rtbishop.look4sat.presentation.radar
 
-import com.rtbishop.look4sat.model.SatPos
+import com.rtbishop.look4sat.domain.model.SatPos
 
 data class RadarData(val satPos: SatPos, val satTrack: List<SatPos> = emptyList())
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.kt
index 11bac330..f5465148 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.kt
@@ -29,7 +29,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.rtbishop.look4sat.R
-import com.rtbishop.look4sat.model.SatRadio
+import com.rtbishop.look4sat.domain.model.SatRadio
 
 @Composable
 fun RadarScreen() {
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarView.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarView.kt
index 3f257337..ae6bae5e 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarView.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarView.kt
@@ -14,9 +14,9 @@ import androidx.compose.ui.graphics.*
 import androidx.compose.ui.graphics.drawscope.*
 import androidx.compose.ui.text.*
 import androidx.compose.ui.unit.sp
-import com.rtbishop.look4sat.domain.PI_2
-import com.rtbishop.look4sat.model.SatPos
-import com.rtbishop.look4sat.utility.toRadians
+import com.rtbishop.look4sat.domain.model.SatPos
+import com.rtbishop.look4sat.domain.predict.PI_2
+import com.rtbishop.look4sat.domain.utility.toRadians
 import kotlin.math.cos
 import kotlin.math.sin
 
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarViewModel.kt
index 0f4b9c0c..68d9b52f 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarViewModel.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarViewModel.kt
@@ -28,18 +28,18 @@ import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
 import com.rtbishop.look4sat.MainApplication
-import com.rtbishop.look4sat.data.ISensorSource
-import com.rtbishop.look4sat.domain.ISatelliteRepo
-import com.rtbishop.look4sat.domain.ISettingsRepo
-import com.rtbishop.look4sat.domain.Satellite
+import com.rtbishop.look4sat.domain.data.ISensorSource
+import com.rtbishop.look4sat.domain.model.GeoPos
+import com.rtbishop.look4sat.domain.model.SatPass
+import com.rtbishop.look4sat.domain.model.SatPos
+import com.rtbishop.look4sat.domain.model.SatRadio
+import com.rtbishop.look4sat.domain.predict.ISatelliteRepo
+import com.rtbishop.look4sat.domain.predict.ISettingsRepo
+import com.rtbishop.look4sat.domain.predict.Satellite
+import com.rtbishop.look4sat.domain.utility.round
+import com.rtbishop.look4sat.domain.utility.toDegrees
 import com.rtbishop.look4sat.framework.BluetoothReporter
 import com.rtbishop.look4sat.framework.NetworkReporter
-import com.rtbishop.look4sat.model.GeoPos
-import com.rtbishop.look4sat.model.SatPass
-import com.rtbishop.look4sat.model.SatPos
-import com.rtbishop.look4sat.model.SatRadio
-import com.rtbishop.look4sat.utility.round
-import com.rtbishop.look4sat.utility.toDegrees
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.isActive
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt
index 80a0b572..45028511 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt
@@ -37,8 +37,8 @@ import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.rtbishop.look4sat.BuildConfig
 import com.rtbishop.look4sat.R
-import com.rtbishop.look4sat.model.GeoPos
-import com.rtbishop.look4sat.model.OtherSettings
+import com.rtbishop.look4sat.domain.model.GeoPos
+import com.rtbishop.look4sat.domain.model.OtherSettings
 import com.rtbishop.look4sat.presentation.CardButton
 import com.rtbishop.look4sat.presentation.MainTheme
 import com.rtbishop.look4sat.presentation.dialogs.LocatorDialog
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsUiState.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsUiState.kt
index 800dffd0..c1c2fdd9 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsUiState.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsUiState.kt
@@ -1,6 +1,6 @@
 package com.rtbishop.look4sat.presentation.settings
 
-import com.rtbishop.look4sat.model.GeoPos
+import com.rtbishop.look4sat.domain.model.GeoPos
 
 data class PositionSettings(val isUpdating: Boolean, val stationPos: GeoPos, val messageResId: Int)
 
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsViewModel.kt
index e674c4f6..37c86747 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsViewModel.kt
@@ -26,9 +26,9 @@ import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
 import com.rtbishop.look4sat.MainApplication
 import com.rtbishop.look4sat.R
-import com.rtbishop.look4sat.domain.IDatabaseRepo
-import com.rtbishop.look4sat.domain.ISettingsRepo
-import com.rtbishop.look4sat.model.OtherSettings
+import com.rtbishop.look4sat.domain.model.OtherSettings
+import com.rtbishop.look4sat.domain.predict.IDatabaseRepo
+import com.rtbishop.look4sat.domain.predict.ISettingsRepo
 import kotlinx.coroutines.launch
 
 class SettingsViewModel(
diff --git a/base/.gitignore b/domain/.gitignore
similarity index 100%
rename from base/.gitignore
rename to domain/.gitignore
diff --git a/base/build.gradle b/domain/build.gradle
similarity index 100%
rename from base/build.gradle
rename to domain/build.gradle
diff --git a/base/src/main/java/com/rtbishop/look4sat/data/DataParser.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/data/DataParser.kt
similarity index 97%
rename from base/src/main/java/com/rtbishop/look4sat/data/DataParser.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/data/DataParser.kt
index 62388ad6..21f4161d 100644
--- a/base/src/main/java/com/rtbishop/look4sat/data/DataParser.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/data/DataParser.kt
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.data
+package com.rtbishop.look4sat.domain.data
 
-import com.rtbishop.look4sat.model.OrbitalData
-import com.rtbishop.look4sat.model.SatRadio
+import com.rtbishop.look4sat.domain.model.OrbitalData
+import com.rtbishop.look4sat.domain.model.SatRadio
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import org.json.JSONArray
diff --git a/base/src/main/java/com/rtbishop/look4sat/data/DatabaseRepo.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/data/DatabaseRepo.kt
similarity index 93%
rename from base/src/main/java/com/rtbishop/look4sat/data/DatabaseRepo.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/data/DatabaseRepo.kt
index a3a656fa..63c4503e 100644
--- a/base/src/main/java/com/rtbishop/look4sat/data/DatabaseRepo.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/data/DatabaseRepo.kt
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.data
+package com.rtbishop.look4sat.domain.data
 
-import com.rtbishop.look4sat.domain.IDatabaseRepo
-import com.rtbishop.look4sat.domain.ISettingsRepo
-import com.rtbishop.look4sat.model.DatabaseState
-import com.rtbishop.look4sat.model.SatEntry
-import com.rtbishop.look4sat.model.SatRadio
+import com.rtbishop.look4sat.domain.model.DatabaseState
+import com.rtbishop.look4sat.domain.model.SatEntry
+import com.rtbishop.look4sat.domain.model.SatRadio
+import com.rtbishop.look4sat.domain.predict.IDatabaseRepo
+import com.rtbishop.look4sat.domain.predict.ISettingsRepo
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.async
 import kotlinx.coroutines.withContext
diff --git a/base/src/main/java/com/rtbishop/look4sat/data/IDataSource.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/data/IDataSource.kt
similarity index 95%
rename from base/src/main/java/com/rtbishop/look4sat/data/IDataSource.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/data/IDataSource.kt
index 4a34237e..d5b97c32 100644
--- a/base/src/main/java/com/rtbishop/look4sat/data/IDataSource.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/data/IDataSource.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.data
+package com.rtbishop.look4sat.domain.data
 
 import java.io.InputStream
 
diff --git a/base/src/main/java/com/rtbishop/look4sat/data/ILocalStorage.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/data/ILocalStorage.kt
similarity index 83%
rename from base/src/main/java/com/rtbishop/look4sat/data/ILocalStorage.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/data/ILocalStorage.kt
index 0be3378e..1b0f5034 100644
--- a/base/src/main/java/com/rtbishop/look4sat/data/ILocalStorage.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/data/ILocalStorage.kt
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.data
+package com.rtbishop.look4sat.domain.data
 
-import com.rtbishop.look4sat.domain.Satellite
-import com.rtbishop.look4sat.model.SatEntry
-import com.rtbishop.look4sat.model.SatItem
-import com.rtbishop.look4sat.model.SatRadio
+import com.rtbishop.look4sat.domain.model.SatEntry
+import com.rtbishop.look4sat.domain.model.SatItem
+import com.rtbishop.look4sat.domain.model.SatRadio
+import com.rtbishop.look4sat.domain.predict.Satellite
 
 interface ILocalStorage {
 
diff --git a/base/src/main/java/com/rtbishop/look4sat/data/ISensorSource.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/data/ISensorSource.kt
similarity index 80%
rename from base/src/main/java/com/rtbishop/look4sat/data/ISensorSource.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/data/ISensorSource.kt
index 30b64b09..d7d5b7b3 100644
--- a/base/src/main/java/com/rtbishop/look4sat/data/ISensorSource.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/data/ISensorSource.kt
@@ -1,4 +1,4 @@
-package com.rtbishop.look4sat.data
+package com.rtbishop.look4sat.domain.data
 
 import kotlinx.coroutines.flow.StateFlow
 
diff --git a/base/src/main/java/com/rtbishop/look4sat/data/SatelliteRepo.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/data/SatelliteRepo.kt
similarity index 94%
rename from base/src/main/java/com/rtbishop/look4sat/data/SatelliteRepo.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/data/SatelliteRepo.kt
index 7ae59c75..2dace970 100644
--- a/base/src/main/java/com/rtbishop/look4sat/data/SatelliteRepo.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/data/SatelliteRepo.kt
@@ -15,17 +15,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.data
+package com.rtbishop.look4sat.domain.data
 
-import com.rtbishop.look4sat.domain.ISatelliteRepo
-import com.rtbishop.look4sat.domain.ISettingsRepo
-import com.rtbishop.look4sat.domain.Satellite
-import com.rtbishop.look4sat.model.GeoPos
-import com.rtbishop.look4sat.model.SatPass
-import com.rtbishop.look4sat.model.SatPos
-import com.rtbishop.look4sat.model.SatRadio
-import com.rtbishop.look4sat.utility.round
-import com.rtbishop.look4sat.utility.toDegrees
+import com.rtbishop.look4sat.domain.model.GeoPos
+import com.rtbishop.look4sat.domain.model.SatPass
+import com.rtbishop.look4sat.domain.model.SatPos
+import com.rtbishop.look4sat.domain.model.SatRadio
+import com.rtbishop.look4sat.domain.predict.ISatelliteRepo
+import com.rtbishop.look4sat.domain.predict.ISettingsRepo
+import com.rtbishop.look4sat.domain.predict.Satellite
+import com.rtbishop.look4sat.domain.utility.round
+import com.rtbishop.look4sat.domain.utility.toDegrees
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
diff --git a/base/src/main/java/com/rtbishop/look4sat/data/SelectionRepo.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/data/SelectionRepo.kt
similarity index 93%
rename from base/src/main/java/com/rtbishop/look4sat/data/SelectionRepo.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/data/SelectionRepo.kt
index 5b1182ec..6ad093b8 100644
--- a/base/src/main/java/com/rtbishop/look4sat/data/SelectionRepo.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/data/SelectionRepo.kt
@@ -1,8 +1,8 @@
-package com.rtbishop.look4sat.data
+package com.rtbishop.look4sat.domain.data
 
-import com.rtbishop.look4sat.domain.ISelectionRepo
-import com.rtbishop.look4sat.domain.ISettingsRepo
-import com.rtbishop.look4sat.model.SatItem
+import com.rtbishop.look4sat.domain.model.SatItem
+import com.rtbishop.look4sat.domain.predict.ISelectionRepo
+import com.rtbishop.look4sat.domain.predict.ISettingsRepo
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/base/src/main/java/com/rtbishop/look4sat/model/DataState.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/model/DataState.kt
similarity index 96%
rename from base/src/main/java/com/rtbishop/look4sat/model/DataState.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/model/DataState.kt
index 125daa75..0530c885 100644
--- a/base/src/main/java/com/rtbishop/look4sat/model/DataState.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/model/DataState.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.model
+package com.rtbishop.look4sat.domain.model
 
 sealed class DataState<out T> {
     data class Success<out T>(val data: T) : DataState<T>()
diff --git a/base/src/main/java/com/rtbishop/look4sat/model/GeoPos.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/model/GeoPos.kt
similarity index 95%
rename from base/src/main/java/com/rtbishop/look4sat/model/GeoPos.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/model/GeoPos.kt
index 131327c6..02c2f8b7 100644
--- a/base/src/main/java/com/rtbishop/look4sat/model/GeoPos.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/model/GeoPos.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.model
+package com.rtbishop.look4sat.domain.model
 
 data class GeoPos(
     val latitude: Double,
diff --git a/base/src/main/java/com/rtbishop/look4sat/model/OrbitalData.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/model/OrbitalData.kt
similarity index 80%
rename from base/src/main/java/com/rtbishop/look4sat/model/OrbitalData.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/model/OrbitalData.kt
index c92528fb..c4393ea1 100644
--- a/base/src/main/java/com/rtbishop/look4sat/model/OrbitalData.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/model/OrbitalData.kt
@@ -15,9 +15,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.model
+package com.rtbishop.look4sat.domain.model
 
-import com.rtbishop.look4sat.domain.*
+import com.rtbishop.look4sat.domain.predict.DEG2RAD
+import com.rtbishop.look4sat.domain.predict.DeepSpaceSatellite
+import com.rtbishop.look4sat.domain.predict.MIN_PER_DAY
+import com.rtbishop.look4sat.domain.predict.NearEarthSatellite
+import com.rtbishop.look4sat.domain.predict.Satellite
+import com.rtbishop.look4sat.domain.predict.TWO_PI
 
 data class OrbitalData(
     val name: String,
diff --git a/base/src/main/java/com/rtbishop/look4sat/model/SatEntry.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/model/SatEntry.kt
similarity index 95%
rename from base/src/main/java/com/rtbishop/look4sat/model/SatEntry.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/model/SatEntry.kt
index 4c4fac3b..c0740813 100644
--- a/base/src/main/java/com/rtbishop/look4sat/model/SatEntry.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/model/SatEntry.kt
@@ -15,6 +15,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.model
+package com.rtbishop.look4sat.domain.model
 
 data class SatEntry(val data: OrbitalData, var comment: String? = null)
diff --git a/base/src/main/java/com/rtbishop/look4sat/model/SatItem.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/model/SatItem.kt
similarity index 95%
rename from base/src/main/java/com/rtbishop/look4sat/model/SatItem.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/model/SatItem.kt
index 1c163b97..cc202c86 100644
--- a/base/src/main/java/com/rtbishop/look4sat/model/SatItem.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/model/SatItem.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.model
+package com.rtbishop.look4sat.domain.model
 
 data class SatItem(
     val catnum: Int,
diff --git a/base/src/main/java/com/rtbishop/look4sat/model/SatPass.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/model/SatPass.kt
similarity index 92%
rename from base/src/main/java/com/rtbishop/look4sat/model/SatPass.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/model/SatPass.kt
index d5573a91..db1557d1 100644
--- a/base/src/main/java/com/rtbishop/look4sat/model/SatPass.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/model/SatPass.kt
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.model
+package com.rtbishop.look4sat.domain.model
 
-import com.rtbishop.look4sat.domain.Satellite
+import com.rtbishop.look4sat.domain.predict.Satellite
 
 data class SatPass(
     val aosTime: Long = 0L,
diff --git a/base/src/main/java/com/rtbishop/look4sat/model/SatPos.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/model/SatPos.kt
similarity index 85%
rename from base/src/main/java/com/rtbishop/look4sat/model/SatPos.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/model/SatPos.kt
index 36ca0c3b..40b414b9 100644
--- a/base/src/main/java/com/rtbishop/look4sat/model/SatPos.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/model/SatPos.kt
@@ -15,13 +15,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.model
+package com.rtbishop.look4sat.domain.model
 
-import com.rtbishop.look4sat.domain.DEG2RAD
-import com.rtbishop.look4sat.domain.EARTH_RADIUS
-import com.rtbishop.look4sat.domain.RAD2DEG
-import com.rtbishop.look4sat.domain.SPEED_OF_LIGHT
-import kotlin.math.*
+import com.rtbishop.look4sat.domain.predict.DEG2RAD
+import com.rtbishop.look4sat.domain.predict.EARTH_RADIUS
+import com.rtbishop.look4sat.domain.predict.RAD2DEG
+import com.rtbishop.look4sat.domain.predict.SPEED_OF_LIGHT
+import kotlin.math.acos
+import kotlin.math.asin
+import kotlin.math.atan2
+import kotlin.math.cos
+import kotlin.math.pow
+import kotlin.math.sin
+import kotlin.math.sqrt
 
 data class SatPos(
     var azimuth: Double = 0.0,
diff --git a/base/src/main/java/com/rtbishop/look4sat/model/SatRadio.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/model/SatRadio.kt
similarity index 96%
rename from base/src/main/java/com/rtbishop/look4sat/model/SatRadio.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/model/SatRadio.kt
index 734aacad..250e42d4 100644
--- a/base/src/main/java/com/rtbishop/look4sat/model/SatRadio.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/model/SatRadio.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.model
+package com.rtbishop.look4sat.domain.model
 
 data class SatRadio(
     val uuid: String,
diff --git a/base/src/main/java/com/rtbishop/look4sat/model/Settings.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/model/Settings.kt
similarity index 87%
rename from base/src/main/java/com/rtbishop/look4sat/model/Settings.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/model/Settings.kt
index 45800c44..9de940c2 100644
--- a/base/src/main/java/com/rtbishop/look4sat/model/Settings.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/model/Settings.kt
@@ -1,4 +1,4 @@
-package com.rtbishop.look4sat.model
+package com.rtbishop.look4sat.domain.model
 
 data class DatabaseState(val entriesTotal: Int, val radiosTotal: Int, val timestamp: Long)
 
diff --git a/base/src/main/java/com/rtbishop/look4sat/domain/DeepSpaceSatellite.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/DeepSpaceSatellite.kt
similarity index 99%
rename from base/src/main/java/com/rtbishop/look4sat/domain/DeepSpaceSatellite.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/predict/DeepSpaceSatellite.kt
index 8f4b9899..bfc0138d 100644
--- a/base/src/main/java/com/rtbishop/look4sat/domain/DeepSpaceSatellite.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/DeepSpaceSatellite.kt
@@ -15,10 +15,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.domain
+package com.rtbishop.look4sat.domain.predict
 
-import com.rtbishop.look4sat.model.OrbitalData
-import kotlin.math.*
+import com.rtbishop.look4sat.domain.model.OrbitalData
+import kotlin.math.abs
+import kotlin.math.atan2
+import kotlin.math.cos
+import kotlin.math.floor
+import kotlin.math.pow
+import kotlin.math.sin
+import kotlin.math.sqrt
 
 class DeepSpaceSatellite(data: OrbitalData) : Satellite(data) {
 
diff --git a/base/src/main/java/com/rtbishop/look4sat/domain/IDatabaseRepo.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/IDatabaseRepo.kt
similarity index 95%
rename from base/src/main/java/com/rtbishop/look4sat/domain/IDatabaseRepo.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/predict/IDatabaseRepo.kt
index 6485c577..5e465383 100644
--- a/base/src/main/java/com/rtbishop/look4sat/domain/IDatabaseRepo.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/IDatabaseRepo.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.domain
+package com.rtbishop.look4sat.domain.predict
 
 interface IDatabaseRepo {
 
diff --git a/base/src/main/java/com/rtbishop/look4sat/domain/ISatelliteRepo.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/ISatelliteRepo.kt
similarity index 74%
rename from base/src/main/java/com/rtbishop/look4sat/domain/ISatelliteRepo.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/predict/ISatelliteRepo.kt
index 554421aa..944cc5cf 100644
--- a/base/src/main/java/com/rtbishop/look4sat/domain/ISatelliteRepo.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/ISatelliteRepo.kt
@@ -1,9 +1,9 @@
-package com.rtbishop.look4sat.domain
+package com.rtbishop.look4sat.domain.predict
 
-import com.rtbishop.look4sat.model.GeoPos
-import com.rtbishop.look4sat.model.SatPass
-import com.rtbishop.look4sat.model.SatPos
-import com.rtbishop.look4sat.model.SatRadio
+import com.rtbishop.look4sat.domain.model.GeoPos
+import com.rtbishop.look4sat.domain.model.SatPass
+import com.rtbishop.look4sat.domain.model.SatPos
+import com.rtbishop.look4sat.domain.model.SatRadio
 import kotlinx.coroutines.flow.StateFlow
 
 interface ISatelliteRepo {
diff --git a/base/src/main/java/com/rtbishop/look4sat/domain/ISelectionRepo.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/ISelectionRepo.kt
similarity index 81%
rename from base/src/main/java/com/rtbishop/look4sat/domain/ISelectionRepo.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/predict/ISelectionRepo.kt
index 6c70b5c1..a57f52d0 100644
--- a/base/src/main/java/com/rtbishop/look4sat/domain/ISelectionRepo.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/ISelectionRepo.kt
@@ -1,6 +1,6 @@
-package com.rtbishop.look4sat.domain
+package com.rtbishop.look4sat.domain.predict
 
-import com.rtbishop.look4sat.model.SatItem
+import com.rtbishop.look4sat.domain.model.SatItem
 import kotlinx.coroutines.flow.Flow
 
 interface ISelectionRepo {
diff --git a/base/src/main/java/com/rtbishop/look4sat/domain/ISettingsRepo.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/ISettingsRepo.kt
similarity index 95%
rename from base/src/main/java/com/rtbishop/look4sat/domain/ISettingsRepo.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/predict/ISettingsRepo.kt
index 43413c4d..b8ff60f1 100644
--- a/base/src/main/java/com/rtbishop/look4sat/domain/ISettingsRepo.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/ISettingsRepo.kt
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.domain
+package com.rtbishop.look4sat.domain.predict
 
-import com.rtbishop.look4sat.model.DatabaseState
-import com.rtbishop.look4sat.model.GeoPos
-import com.rtbishop.look4sat.model.OtherSettings
-import com.rtbishop.look4sat.model.PassesSettings
+import com.rtbishop.look4sat.domain.model.DatabaseState
+import com.rtbishop.look4sat.domain.model.GeoPos
+import com.rtbishop.look4sat.domain.model.OtherSettings
+import com.rtbishop.look4sat.domain.model.PassesSettings
 import kotlinx.coroutines.flow.StateFlow
 
 interface ISettingsRepo {
diff --git a/base/src/main/java/com/rtbishop/look4sat/domain/NearEarthSatellite.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/NearEarthSatellite.kt
similarity index 97%
rename from base/src/main/java/com/rtbishop/look4sat/domain/NearEarthSatellite.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/predict/NearEarthSatellite.kt
index 15610e29..f324a318 100644
--- a/base/src/main/java/com/rtbishop/look4sat/domain/NearEarthSatellite.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/NearEarthSatellite.kt
@@ -15,10 +15,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.domain
+package com.rtbishop.look4sat.domain.predict
 
-import com.rtbishop.look4sat.model.OrbitalData
-import kotlin.math.*
+import com.rtbishop.look4sat.domain.model.OrbitalData
+import kotlin.math.abs
+import kotlin.math.atan2
+import kotlin.math.cos
+import kotlin.math.pow
+import kotlin.math.sin
+import kotlin.math.sqrt
 
 class NearEarthSatellite(data: OrbitalData) : Satellite(data) {
 
diff --git a/base/src/main/java/com/rtbishop/look4sat/domain/Satellite.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/Satellite.kt
similarity index 96%
rename from base/src/main/java/com/rtbishop/look4sat/domain/Satellite.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/predict/Satellite.kt
index dc1f8283..fe4392f5 100644
--- a/base/src/main/java/com/rtbishop/look4sat/domain/Satellite.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/predict/Satellite.kt
@@ -15,12 +15,23 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.domain
+package com.rtbishop.look4sat.domain.predict
 
-import com.rtbishop.look4sat.model.GeoPos
-import com.rtbishop.look4sat.model.OrbitalData
-import com.rtbishop.look4sat.model.SatPos
-import kotlin.math.*
+import com.rtbishop.look4sat.domain.model.GeoPos
+import com.rtbishop.look4sat.domain.model.OrbitalData
+import com.rtbishop.look4sat.domain.model.SatPos
+import kotlin.math.abs
+import kotlin.math.acos
+import kotlin.math.asin
+import kotlin.math.atan
+import kotlin.math.atan2
+import kotlin.math.cos
+import kotlin.math.exp
+import kotlin.math.floor
+import kotlin.math.ln
+import kotlin.math.pow
+import kotlin.math.sin
+import kotlin.math.sqrt
 
 const val ASTRONOMICAL_UNIT = 1.49597870691E8
 const val DEG2RAD = 0.017453292519943295
diff --git a/base/src/main/java/com/rtbishop/look4sat/utility/Extensions.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/utility/Extensions.kt
similarity index 94%
rename from base/src/main/java/com/rtbishop/look4sat/utility/Extensions.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/utility/Extensions.kt
index e5844c69..c40fc2e4 100644
--- a/base/src/main/java/com/rtbishop/look4sat/utility/Extensions.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/utility/Extensions.kt
@@ -15,10 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.utility
+package com.rtbishop.look4sat.domain.utility
 
-import com.rtbishop.look4sat.domain.DEG2RAD
-import com.rtbishop.look4sat.domain.RAD2DEG
+import com.rtbishop.look4sat.domain.predict.DEG2RAD
+import com.rtbishop.look4sat.domain.predict.RAD2DEG
 import java.util.concurrent.TimeUnit
 
 fun Long.toTimerString(): String {
diff --git a/base/src/main/java/com/rtbishop/look4sat/utility/QthConverter.kt b/domain/src/main/java/com/rtbishop/look4sat/domain/utility/QthConverter.kt
similarity index 96%
rename from base/src/main/java/com/rtbishop/look4sat/utility/QthConverter.kt
rename to domain/src/main/java/com/rtbishop/look4sat/domain/utility/QthConverter.kt
index 650f50f3..ce6a7811 100644
--- a/base/src/main/java/com/rtbishop/look4sat/utility/QthConverter.kt
+++ b/domain/src/main/java/com/rtbishop/look4sat/domain/utility/QthConverter.kt
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat.utility
+package com.rtbishop.look4sat.domain.utility
 
-import com.rtbishop.look4sat.model.GeoPos
+import com.rtbishop.look4sat.domain.model.GeoPos
 
 object QthConverter {
 
diff --git a/base/src/test/java/com/rtbishop/look4sat/DataParserTest.kt b/domain/src/test/java/com/rtbishop/look4sat/domain/DataParserTest.kt
similarity index 98%
rename from base/src/test/java/com/rtbishop/look4sat/DataParserTest.kt
rename to domain/src/test/java/com/rtbishop/look4sat/domain/DataParserTest.kt
index c49833e6..65aa1575 100644
--- a/base/src/test/java/com/rtbishop/look4sat/DataParserTest.kt
+++ b/domain/src/test/java/com/rtbishop/look4sat/domain/DataParserTest.kt
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat
+package com.rtbishop.look4sat.domain
 
-import com.rtbishop.look4sat.data.DataParser
+import com.rtbishop.look4sat.domain.data.DataParser
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.runTest
diff --git a/base/src/test/java/com/rtbishop/look4sat/QthConverterTest.kt b/domain/src/test/java/com/rtbishop/look4sat/domain/QthConverterTest.kt
similarity index 95%
rename from base/src/test/java/com/rtbishop/look4sat/QthConverterTest.kt
rename to domain/src/test/java/com/rtbishop/look4sat/domain/QthConverterTest.kt
index e5f0317d..0090a0bb 100644
--- a/base/src/test/java/com/rtbishop/look4sat/QthConverterTest.kt
+++ b/domain/src/test/java/com/rtbishop/look4sat/domain/QthConverterTest.kt
@@ -15,9 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.rtbishop.look4sat
+package com.rtbishop.look4sat.domain
 
-import com.rtbishop.look4sat.utility.QthConverter
+import com.rtbishop.look4sat.domain.utility.QthConverter
 import org.junit.Test
 
 class QthConverterTest {
diff --git a/settings.gradle b/settings.gradle
index ff2dc4be..076288fc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,4 +14,4 @@ dependencyResolutionManagement {
 }
 rootProject.name = "Look4Sat"
 include ":app"
-include ":base"
+include ":domain"