diff --git a/app/build.gradle b/app/build.gradle
index 22cb6815..a44a13de 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,7 +55,7 @@ android {
 }
 
 dependencies {
-    implementation project(":core")
+    implementation project(":data")
     implementation "androidx.core:core-splashscreen:1.0.0-beta01"
     implementation "androidx.constraintlayout:constraintlayout:2.1.3"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1"
diff --git a/app/src/main/java/com/rtbishop/look4sat/injection/CoreModule.kt b/app/src/main/java/com/rtbishop/look4sat/injection/DataModule.kt
similarity index 99%
rename from app/src/main/java/com/rtbishop/look4sat/injection/CoreModule.kt
rename to app/src/main/java/com/rtbishop/look4sat/injection/DataModule.kt
index d4b8a7a5..0fa812e9 100644
--- a/app/src/main/java/com/rtbishop/look4sat/injection/CoreModule.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/injection/DataModule.kt
@@ -44,7 +44,7 @@ import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
-object CoreModule {
+object DataModule {
 
     @Provides
     @Singleton
diff --git a/core/.gitignore b/data/.gitignore
similarity index 100%
rename from core/.gitignore
rename to data/.gitignore
diff --git a/core/build.gradle b/data/build.gradle
similarity index 100%
rename from core/build.gradle
rename to data/build.gradle
diff --git a/core/src/main/java/com/rtbishop/look4sat/data/DataParser.kt b/data/src/main/java/com/rtbishop/look4sat/data/DataParser.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/data/DataParser.kt
rename to data/src/main/java/com/rtbishop/look4sat/data/DataParser.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/data/IProvider.kt b/data/src/main/java/com/rtbishop/look4sat/data/IProvider.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/data/IProvider.kt
rename to data/src/main/java/com/rtbishop/look4sat/data/IProvider.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/data/IStorage.kt b/data/src/main/java/com/rtbishop/look4sat/data/IStorage.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/data/IStorage.kt
rename to data/src/main/java/com/rtbishop/look4sat/data/IStorage.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/data/Repository.kt b/data/src/main/java/com/rtbishop/look4sat/data/Repository.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/data/Repository.kt
rename to data/src/main/java/com/rtbishop/look4sat/data/Repository.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/DataReporter.kt b/data/src/main/java/com/rtbishop/look4sat/domain/DataReporter.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/domain/DataReporter.kt
rename to data/src/main/java/com/rtbishop/look4sat/domain/DataReporter.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/Extensions.kt b/data/src/main/java/com/rtbishop/look4sat/domain/Extensions.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/domain/Extensions.kt
rename to data/src/main/java/com/rtbishop/look4sat/domain/Extensions.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/ILocationHandler.kt b/data/src/main/java/com/rtbishop/look4sat/domain/ILocationHandler.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/domain/ILocationHandler.kt
rename to data/src/main/java/com/rtbishop/look4sat/domain/ILocationHandler.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/IRepository.kt b/data/src/main/java/com/rtbishop/look4sat/domain/IRepository.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/domain/IRepository.kt
rename to data/src/main/java/com/rtbishop/look4sat/domain/IRepository.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/ISettings.kt b/data/src/main/java/com/rtbishop/look4sat/domain/ISettings.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/domain/ISettings.kt
rename to data/src/main/java/com/rtbishop/look4sat/domain/ISettings.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/QthConverter.kt b/data/src/main/java/com/rtbishop/look4sat/domain/QthConverter.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/domain/QthConverter.kt
rename to data/src/main/java/com/rtbishop/look4sat/domain/QthConverter.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/model/DataState.kt b/data/src/main/java/com/rtbishop/look4sat/domain/model/DataState.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/domain/model/DataState.kt
rename to data/src/main/java/com/rtbishop/look4sat/domain/model/DataState.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/model/SatEntry.kt b/data/src/main/java/com/rtbishop/look4sat/domain/model/SatEntry.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/domain/model/SatEntry.kt
rename to data/src/main/java/com/rtbishop/look4sat/domain/model/SatEntry.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/model/SatItem.kt b/data/src/main/java/com/rtbishop/look4sat/domain/model/SatItem.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/domain/model/SatItem.kt
rename to data/src/main/java/com/rtbishop/look4sat/domain/model/SatItem.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/model/SatRadio.kt b/data/src/main/java/com/rtbishop/look4sat/domain/model/SatRadio.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/domain/model/SatRadio.kt
rename to data/src/main/java/com/rtbishop/look4sat/domain/model/SatRadio.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/predict/DeepSpaceSat.kt b/data/src/main/java/com/rtbishop/look4sat/domain/predict/DeepSpaceSat.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/domain/predict/DeepSpaceSat.kt
rename to data/src/main/java/com/rtbishop/look4sat/domain/predict/DeepSpaceSat.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/predict/GeoPos.kt b/data/src/main/java/com/rtbishop/look4sat/domain/predict/GeoPos.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/domain/predict/GeoPos.kt
rename to data/src/main/java/com/rtbishop/look4sat/domain/predict/GeoPos.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/predict/NearEarthSat.kt b/data/src/main/java/com/rtbishop/look4sat/domain/predict/NearEarthSat.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/domain/predict/NearEarthSat.kt
rename to data/src/main/java/com/rtbishop/look4sat/domain/predict/NearEarthSat.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/predict/OrbitalData.kt b/data/src/main/java/com/rtbishop/look4sat/domain/predict/OrbitalData.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/domain/predict/OrbitalData.kt
rename to data/src/main/java/com/rtbishop/look4sat/domain/predict/OrbitalData.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/predict/Predictor.kt b/data/src/main/java/com/rtbishop/look4sat/domain/predict/Predictor.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/domain/predict/Predictor.kt
rename to data/src/main/java/com/rtbishop/look4sat/domain/predict/Predictor.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/predict/SatPass.kt b/data/src/main/java/com/rtbishop/look4sat/domain/predict/SatPass.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/domain/predict/SatPass.kt
rename to data/src/main/java/com/rtbishop/look4sat/domain/predict/SatPass.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/predict/SatPos.kt b/data/src/main/java/com/rtbishop/look4sat/domain/predict/SatPos.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/domain/predict/SatPos.kt
rename to data/src/main/java/com/rtbishop/look4sat/domain/predict/SatPos.kt
diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/predict/Satellite.kt b/data/src/main/java/com/rtbishop/look4sat/domain/predict/Satellite.kt
similarity index 100%
rename from core/src/main/java/com/rtbishop/look4sat/domain/predict/Satellite.kt
rename to data/src/main/java/com/rtbishop/look4sat/domain/predict/Satellite.kt
diff --git a/core/src/test/java/com/rtbishop/look4sat/DataParserTest.kt b/data/src/test/java/com/rtbishop/look4sat/DataParserTest.kt
similarity index 100%
rename from core/src/test/java/com/rtbishop/look4sat/DataParserTest.kt
rename to data/src/test/java/com/rtbishop/look4sat/DataParserTest.kt
diff --git a/core/src/test/java/com/rtbishop/look4sat/QthConverterTest.kt b/data/src/test/java/com/rtbishop/look4sat/QthConverterTest.kt
similarity index 100%
rename from core/src/test/java/com/rtbishop/look4sat/QthConverterTest.kt
rename to data/src/test/java/com/rtbishop/look4sat/QthConverterTest.kt
diff --git a/settings.gradle b/settings.gradle
index b766fbca..701ee240 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,4 +14,4 @@ dependencyResolutionManagement {
 }
 rootProject.name = "Look4Sat"
 include ":app"
-include ":core"
+include ":data"