diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e6284a6f2..92f2c332c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -71,7 +71,7 @@ dependencies {
 
     androidTestImplementation(project(":core-testing"))
     androidTestImplementation(project(":core-datastore-test"))
-    androidTestImplementation(project(":core-domain-test"))
+    androidTestImplementation(project(":core-data-test"))
     androidTestImplementation(project(":core-network"))
 
     implementation(libs.androidx.activity.compose)
diff --git a/core-domain-test/.gitignore b/core-data-test/.gitignore
similarity index 100%
rename from core-domain-test/.gitignore
rename to core-data-test/.gitignore
diff --git a/core-domain-test/build.gradle.kts b/core-data-test/build.gradle.kts
similarity index 97%
rename from core-domain-test/build.gradle.kts
rename to core-data-test/build.gradle.kts
index 1b80285b2..24ec632fd 100644
--- a/core-domain-test/build.gradle.kts
+++ b/core-data-test/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 dependencies {
-    api(project(":core-domain"))
+    api(project(":core-data"))
     implementation(project(":core-testing"))
 
     implementation(libs.hilt.android)
diff --git a/core-domain-test/src/main/AndroidManifest.xml b/core-data-test/src/main/AndroidManifest.xml
similarity index 63%
rename from core-domain-test/src/main/AndroidManifest.xml
rename to core-data-test/src/main/AndroidManifest.xml
index c4553d7d8..3acf58e26 100644
--- a/core-domain-test/src/main/AndroidManifest.xml
+++ b/core-data-test/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.core.domain.test">
+    package="com.google.samples.apps.nowinandroid.core.data.test">
 
 </manifest>
diff --git a/core-domain-test/src/main/java/com/google/samples/apps/nowinandroid/core/domain/test/TestDomainModule.kt b/core-data-test/src/main/java/com/google/samples/apps/nowinandroid/core/data/test/TestDataModule.kt
similarity index 61%
rename from core-domain-test/src/main/java/com/google/samples/apps/nowinandroid/core/domain/test/TestDomainModule.kt
rename to core-data-test/src/main/java/com/google/samples/apps/nowinandroid/core/data/test/TestDataModule.kt
index 7a1bfab15..3966ead2e 100644
--- a/core-domain-test/src/main/java/com/google/samples/apps/nowinandroid/core/domain/test/TestDomainModule.kt
+++ b/core-data-test/src/main/java/com/google/samples/apps/nowinandroid/core/data/test/TestDataModule.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.test
+package com.google.samples.apps.nowinandroid.core.data.test
 
-import com.google.samples.apps.nowinandroid.core.domain.di.DomainModule
-import com.google.samples.apps.nowinandroid.core.domain.repository.AuthorsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.NewsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.TopicsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.fake.FakeAuthorsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.fake.FakeNewsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.fake.FakeTopicsRepository
+import com.google.samples.apps.nowinandroid.core.data.di.DataModule
+import com.google.samples.apps.nowinandroid.core.data.repository.AuthorsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.NewsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.fake.FakeAuthorsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.fake.FakeNewsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.fake.FakeTopicsRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.components.SingletonComponent
@@ -31,9 +31,9 @@ import dagger.hilt.testing.TestInstallIn
 @Module
 @TestInstallIn(
     components = [SingletonComponent::class],
-    replaces = [DomainModule::class]
+    replaces = [DataModule::class]
 )
-interface TestDomainModule {
+interface TestDataModule {
     @Binds
     fun bindsTopicRepository(
         fakeTopicsRepository: FakeTopicsRepository
diff --git a/core-domain/.gitignore b/core-data/.gitignore
similarity index 100%
rename from core-domain/.gitignore
rename to core-data/.gitignore
diff --git a/core-domain/build.gradle.kts b/core-data/build.gradle.kts
similarity index 100%
rename from core-domain/build.gradle.kts
rename to core-data/build.gradle.kts
diff --git a/core-domain/src/main/AndroidManifest.xml b/core-data/src/main/AndroidManifest.xml
similarity index 59%
rename from core-domain/src/main/AndroidManifest.xml
rename to core-data/src/main/AndroidManifest.xml
index 448433a3d..5d2feae8e 100644
--- a/core-domain/src/main/AndroidManifest.xml
+++ b/core-data/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.core.domain">
+    package="com.google.samples.apps.nowinandroid.core.data">
 
 </manifest>
\ No newline at end of file
diff --git a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/SyncUtilities.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/SyncUtilities.kt
similarity index 98%
rename from core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/SyncUtilities.kt
rename to core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/SyncUtilities.kt
index e0b12ac9e..c4dc95dbb 100644
--- a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/SyncUtilities.kt
+++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/SyncUtilities.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain
+package com.google.samples.apps.nowinandroid.core.data
 
 import android.util.Log
 import com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersions
diff --git a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/di/DomainModule.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/di/DataModule.kt
similarity index 65%
rename from core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/di/DomainModule.kt
rename to core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/di/DataModule.kt
index 212866a33..eff0fbe10 100644
--- a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/di/DomainModule.kt
+++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/di/DataModule.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.di
+package com.google.samples.apps.nowinandroid.core.data.di
 
-import com.google.samples.apps.nowinandroid.core.domain.repository.AuthorsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.LocalAuthorsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.LocalNewsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.LocalTopicsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.NewsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.TopicsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.AuthorsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.LocalAuthorsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.LocalNewsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.LocalTopicsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.NewsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -29,7 +29,7 @@ import dagger.hilt.components.SingletonComponent
 
 @Module
 @InstallIn(SingletonComponent::class)
-interface DomainModule {
+interface DataModule {
 
     @Binds
     fun bindsTopicRepository(
diff --git a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/Author.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Author.kt
similarity index 93%
rename from core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/Author.kt
rename to core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Author.kt
index 434545fa0..4b34e1c74 100644
--- a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/Author.kt
+++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Author.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.model
+package com.google.samples.apps.nowinandroid.core.data.model
 
 import com.google.samples.apps.nowinandroid.core.database.model.AuthorEntity
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkAuthor
diff --git a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/Episode.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Episode.kt
similarity index 95%
rename from core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/Episode.kt
rename to core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Episode.kt
index b07b96861..3e7f7bec2 100644
--- a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/Episode.kt
+++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Episode.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.model
+package com.google.samples.apps.nowinandroid.core.data.model
 
 import com.google.samples.apps.nowinandroid.core.database.model.EpisodeEntity
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkEpisode
diff --git a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/NewsResource.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/NewsResource.kt
similarity index 98%
rename from core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/NewsResource.kt
rename to core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/NewsResource.kt
index be6ac50d1..630274b60 100644
--- a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/NewsResource.kt
+++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/NewsResource.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.model
+package com.google.samples.apps.nowinandroid.core.data.model
 
 import com.google.samples.apps.nowinandroid.core.database.model.AuthorEntity
 import com.google.samples.apps.nowinandroid.core.database.model.EpisodeEntity
diff --git a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/Topic.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Topic.kt
similarity index 93%
rename from core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/Topic.kt
rename to core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Topic.kt
index 803aee5e7..b9acb90a0 100644
--- a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/Topic.kt
+++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Topic.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.model
+package com.google.samples.apps.nowinandroid.core.data.model
 
 import com.google.samples.apps.nowinandroid.core.database.model.TopicEntity
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic
diff --git a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/AuthorsRepository.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/AuthorsRepository.kt
similarity index 90%
rename from core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/AuthorsRepository.kt
rename to core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/AuthorsRepository.kt
index b480c65f6..6d931d27a 100644
--- a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/AuthorsRepository.kt
+++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/AuthorsRepository.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
-import com.google.samples.apps.nowinandroid.core.domain.Syncable
+import com.google.samples.apps.nowinandroid.core.data.Syncable
 import com.google.samples.apps.nowinandroid.core.model.data.Author
 import kotlinx.coroutines.flow.Flow
 
diff --git a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/LocalAuthorsRepository.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalAuthorsRepository.kt
similarity index 91%
rename from core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/LocalAuthorsRepository.kt
rename to core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalAuthorsRepository.kt
index 911c2a399..a308c1856 100644
--- a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/LocalAuthorsRepository.kt
+++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalAuthorsRepository.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.changeListSync
+import com.google.samples.apps.nowinandroid.core.data.model.asEntity
 import com.google.samples.apps.nowinandroid.core.database.dao.AuthorDao
 import com.google.samples.apps.nowinandroid.core.database.model.AuthorEntity
 import com.google.samples.apps.nowinandroid.core.database.model.asExternalModel
 import com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersions
 import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferences
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.changeListSync
-import com.google.samples.apps.nowinandroid.core.domain.model.asEntity
 import com.google.samples.apps.nowinandroid.core.model.data.Author
 import com.google.samples.apps.nowinandroid.core.network.NiANetwork
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkAuthor
diff --git a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/LocalNewsRepository.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalNewsRepository.kt
similarity index 87%
rename from core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/LocalNewsRepository.kt
rename to core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalNewsRepository.kt
index cb746337d..11fa39962 100644
--- a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/LocalNewsRepository.kt
+++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalNewsRepository.kt
@@ -14,8 +14,16 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.changeListSync
+import com.google.samples.apps.nowinandroid.core.data.model.asEntity
+import com.google.samples.apps.nowinandroid.core.data.model.authorCrossReferences
+import com.google.samples.apps.nowinandroid.core.data.model.authorEntityShells
+import com.google.samples.apps.nowinandroid.core.data.model.episodeEntityShell
+import com.google.samples.apps.nowinandroid.core.data.model.topicCrossReferences
+import com.google.samples.apps.nowinandroid.core.data.model.topicEntityShells
 import com.google.samples.apps.nowinandroid.core.database.dao.AuthorDao
 import com.google.samples.apps.nowinandroid.core.database.dao.EpisodeDao
 import com.google.samples.apps.nowinandroid.core.database.dao.NewsResourceDao
@@ -26,14 +34,6 @@ import com.google.samples.apps.nowinandroid.core.database.model.PopulatedNewsRes
 import com.google.samples.apps.nowinandroid.core.database.model.TopicEntity
 import com.google.samples.apps.nowinandroid.core.database.model.asExternalModel
 import com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersions
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.changeListSync
-import com.google.samples.apps.nowinandroid.core.domain.model.asEntity
-import com.google.samples.apps.nowinandroid.core.domain.model.authorCrossReferences
-import com.google.samples.apps.nowinandroid.core.domain.model.authorEntityShells
-import com.google.samples.apps.nowinandroid.core.domain.model.episodeEntityShell
-import com.google.samples.apps.nowinandroid.core.domain.model.topicCrossReferences
-import com.google.samples.apps.nowinandroid.core.domain.model.topicEntityShells
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
 import com.google.samples.apps.nowinandroid.core.network.NiANetwork
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResource
diff --git a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/LocalTopicsRepository.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalTopicsRepository.kt
similarity index 91%
rename from core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/LocalTopicsRepository.kt
rename to core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalTopicsRepository.kt
index 446464add..98f20e10b 100644
--- a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/LocalTopicsRepository.kt
+++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalTopicsRepository.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.changeListSync
+import com.google.samples.apps.nowinandroid.core.data.model.asEntity
 import com.google.samples.apps.nowinandroid.core.database.dao.TopicDao
 import com.google.samples.apps.nowinandroid.core.database.model.TopicEntity
 import com.google.samples.apps.nowinandroid.core.database.model.asExternalModel
 import com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersions
 import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferences
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.changeListSync
-import com.google.samples.apps.nowinandroid.core.domain.model.asEntity
 import com.google.samples.apps.nowinandroid.core.model.data.Topic
 import com.google.samples.apps.nowinandroid.core.network.NiANetwork
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic
diff --git a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/NewsRepository.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/NewsRepository.kt
similarity index 90%
rename from core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/NewsRepository.kt
rename to core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/NewsRepository.kt
index af56e1fde..b8f2c47c8 100644
--- a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/NewsRepository.kt
+++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/NewsRepository.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
-import com.google.samples.apps.nowinandroid.core.domain.Syncable
+import com.google.samples.apps.nowinandroid.core.data.Syncable
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
 import kotlinx.coroutines.flow.Flow
 
diff --git a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/TopicsRepository.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/TopicsRepository.kt
similarity index 91%
rename from core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/TopicsRepository.kt
rename to core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/TopicsRepository.kt
index e83940818..a4d2185b1 100644
--- a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/TopicsRepository.kt
+++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/TopicsRepository.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
-import com.google.samples.apps.nowinandroid.core.domain.Syncable
+import com.google.samples.apps.nowinandroid.core.data.Syncable
 import com.google.samples.apps.nowinandroid.core.model.data.Topic
 import kotlinx.coroutines.flow.Flow
 
diff --git a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/fake/FakeAuthorsRepository.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.kt
similarity index 92%
rename from core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/fake/FakeAuthorsRepository.kt
rename to core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.kt
index 4cce0dcc5..1b4599942 100644
--- a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/fake/FakeAuthorsRepository.kt
+++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository.fake
+package com.google.samples.apps.nowinandroid.core.data.repository.fake
 
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.repository.AuthorsRepository
 import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferences
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.repository.AuthorsRepository
 import com.google.samples.apps.nowinandroid.core.model.data.Author
 import com.google.samples.apps.nowinandroid.core.network.Dispatcher
 import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO
diff --git a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/fake/FakeNewsRepository.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeNewsRepository.kt
similarity index 90%
rename from core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/fake/FakeNewsRepository.kt
rename to core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeNewsRepository.kt
index d5698ac1b..cfbd3cb98 100644
--- a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/fake/FakeNewsRepository.kt
+++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeNewsRepository.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository.fake
+package com.google.samples.apps.nowinandroid.core.data.repository.fake
 
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.model.asEntity
+import com.google.samples.apps.nowinandroid.core.data.repository.NewsRepository
 import com.google.samples.apps.nowinandroid.core.database.model.NewsResourceEntity
 import com.google.samples.apps.nowinandroid.core.database.model.asExternalModel
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.model.asEntity
-import com.google.samples.apps.nowinandroid.core.domain.repository.NewsRepository
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
 import com.google.samples.apps.nowinandroid.core.network.Dispatcher
 import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO
diff --git a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/fake/FakeTopicsRepository.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.kt
similarity index 93%
rename from core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/fake/FakeTopicsRepository.kt
rename to core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.kt
index 9f0675e8f..bc6f4e0b0 100644
--- a/core-domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/repository/fake/FakeTopicsRepository.kt
+++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository.fake
+package com.google.samples.apps.nowinandroid.core.data.repository.fake
 
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
 import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferences
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.repository.TopicsRepository
 import com.google.samples.apps.nowinandroid.core.model.data.Topic
 import com.google.samples.apps.nowinandroid.core.network.Dispatcher
 import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO
diff --git a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/model/NetworkEntityKtTest.kt b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/model/NetworkEntityKtTest.kt
similarity index 98%
rename from core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/model/NetworkEntityKtTest.kt
rename to core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/model/NetworkEntityKtTest.kt
index e8aa609e3..7957d1e87 100644
--- a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/model/NetworkEntityKtTest.kt
+++ b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/model/NetworkEntityKtTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.model
+package com.google.samples.apps.nowinandroid.core.data.model
 
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Article
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkAuthor
diff --git a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/repository/FakeNewsRepositoryTest.kt b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/FakeNewsRepositoryTest.kt
similarity index 87%
rename from core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/repository/FakeNewsRepositoryTest.kt
rename to core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/FakeNewsRepositoryTest.kt
index 024ac6c55..e11c309e5 100644
--- a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/repository/FakeNewsRepositoryTest.kt
+++ b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/FakeNewsRepositoryTest.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
-import com.google.samples.apps.nowinandroid.core.domain.repository.fake.FakeNewsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.fake.FakeNewsRepository
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.serialization.json.Json
 import org.junit.Before
diff --git a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/repository/LocalAuthorsRepositoryTest.kt b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalAuthorsRepositoryTest.kt
similarity index 92%
rename from core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/repository/LocalAuthorsRepositoryTest.kt
rename to core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalAuthorsRepositoryTest.kt
index 4a5e61e06..0bd8efe2a 100644
--- a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/repository/LocalAuthorsRepositoryTest.kt
+++ b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalAuthorsRepositoryTest.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.model.asEntity
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.CollectionType
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestAuthorDao
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestNiaNetwork
 import com.google.samples.apps.nowinandroid.core.database.dao.AuthorDao
 import com.google.samples.apps.nowinandroid.core.database.model.AuthorEntity
 import com.google.samples.apps.nowinandroid.core.database.model.asExternalModel
 import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferences
 import com.google.samples.apps.nowinandroid.core.datastore.test.testUserPreferencesDataStore
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.model.asEntity
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.CollectionType
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.TestAuthorDao
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.TestNiaNetwork
 import com.google.samples.apps.nowinandroid.core.model.data.Author
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkAuthor
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkChangeList
diff --git a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/repository/LocalNewsRepositoryTest.kt b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalNewsRepositoryTest.kt
similarity index 89%
rename from core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/repository/LocalNewsRepositoryTest.kt
rename to core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalNewsRepositoryTest.kt
index b51e9c493..0b78979f5 100644
--- a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/repository/LocalNewsRepositoryTest.kt
+++ b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalNewsRepositoryTest.kt
@@ -14,8 +14,23 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
-
+package com.google.samples.apps.nowinandroid.core.data.repository
+
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.model.asEntity
+import com.google.samples.apps.nowinandroid.core.data.model.authorCrossReferences
+import com.google.samples.apps.nowinandroid.core.data.model.authorEntityShells
+import com.google.samples.apps.nowinandroid.core.data.model.episodeEntityShell
+import com.google.samples.apps.nowinandroid.core.data.model.topicCrossReferences
+import com.google.samples.apps.nowinandroid.core.data.model.topicEntityShells
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.CollectionType
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestAuthorDao
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestEpisodeDao
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestNewsResourceDao
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestNiaNetwork
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestTopicDao
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.filteredInterestsIds
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.nonPresentInterestsIds
 import com.google.samples.apps.nowinandroid.core.database.model.AuthorEntity
 import com.google.samples.apps.nowinandroid.core.database.model.EpisodeEntity
 import com.google.samples.apps.nowinandroid.core.database.model.NewsResourceEntity
@@ -25,21 +40,6 @@ import com.google.samples.apps.nowinandroid.core.database.model.TopicEntity
 import com.google.samples.apps.nowinandroid.core.database.model.asExternalModel
 import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferences
 import com.google.samples.apps.nowinandroid.core.datastore.test.testUserPreferencesDataStore
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.model.asEntity
-import com.google.samples.apps.nowinandroid.core.domain.model.authorCrossReferences
-import com.google.samples.apps.nowinandroid.core.domain.model.authorEntityShells
-import com.google.samples.apps.nowinandroid.core.domain.model.episodeEntityShell
-import com.google.samples.apps.nowinandroid.core.domain.model.topicCrossReferences
-import com.google.samples.apps.nowinandroid.core.domain.model.topicEntityShells
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.CollectionType
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.TestAuthorDao
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.TestEpisodeDao
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.TestNewsResourceDao
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.TestNiaNetwork
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.TestTopicDao
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.filteredInterestsIds
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.nonPresentInterestsIds
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkChangeList
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResource
diff --git a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/repository/LocalTopicsRepositoryTest.kt b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalTopicsRepositoryTest.kt
similarity index 94%
rename from core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/repository/LocalTopicsRepositoryTest.kt
rename to core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalTopicsRepositoryTest.kt
index ca50a980e..71ff19ebf 100644
--- a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/repository/LocalTopicsRepositoryTest.kt
+++ b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalTopicsRepositoryTest.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.model.asEntity
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.CollectionType
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestNiaNetwork
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestTopicDao
 import com.google.samples.apps.nowinandroid.core.database.dao.TopicDao
 import com.google.samples.apps.nowinandroid.core.database.model.TopicEntity
 import com.google.samples.apps.nowinandroid.core.database.model.asExternalModel
 import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferences
 import com.google.samples.apps.nowinandroid.core.datastore.test.testUserPreferencesDataStore
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.model.asEntity
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.CollectionType
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.TestNiaNetwork
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.TestTopicDao
 import com.google.samples.apps.nowinandroid.core.model.data.Topic
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic
 import kotlinx.coroutines.flow.first
diff --git a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/repository/TestSynchronizer.kt b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/TestSynchronizer.kt
similarity index 89%
rename from core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/repository/TestSynchronizer.kt
rename to core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/TestSynchronizer.kt
index 53467569d..e997c3ca6 100644
--- a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/repository/TestSynchronizer.kt
+++ b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/TestSynchronizer.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
 import com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersions
 import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferences
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
 
 /**
  * Test synchronizer that delegates to [NiaPreferences]
diff --git a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/testdoubles/TestAuthorDao.kt b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestAuthorDao.kt
similarity index 96%
rename from core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/testdoubles/TestAuthorDao.kt
rename to core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestAuthorDao.kt
index 4b2adbbd5..6cb066c07 100644
--- a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/testdoubles/TestAuthorDao.kt
+++ b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestAuthorDao.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.testdoubles
+package com.google.samples.apps.nowinandroid.core.data.testdoubles
 
 import com.google.samples.apps.nowinandroid.core.database.dao.AuthorDao
 import com.google.samples.apps.nowinandroid.core.database.model.AuthorEntity
diff --git a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/testdoubles/TestEpisodeDao.kt b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestEpisodeDao.kt
similarity index 97%
rename from core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/testdoubles/TestEpisodeDao.kt
rename to core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestEpisodeDao.kt
index 3a1cca890..2b6e9bc7b 100644
--- a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/testdoubles/TestEpisodeDao.kt
+++ b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestEpisodeDao.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.testdoubles
+package com.google.samples.apps.nowinandroid.core.data.testdoubles
 
 import com.google.samples.apps.nowinandroid.core.database.dao.EpisodeDao
 import com.google.samples.apps.nowinandroid.core.database.model.EpisodeEntity
diff --git a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/testdoubles/TestNewsResourceDao.kt b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNewsResourceDao.kt
similarity index 98%
rename from core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/testdoubles/TestNewsResourceDao.kt
rename to core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNewsResourceDao.kt
index 82d432786..ee5b56395 100644
--- a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/testdoubles/TestNewsResourceDao.kt
+++ b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNewsResourceDao.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.testdoubles
+package com.google.samples.apps.nowinandroid.core.data.testdoubles
 
 import com.google.samples.apps.nowinandroid.core.database.dao.NewsResourceDao
 import com.google.samples.apps.nowinandroid.core.database.model.AuthorEntity
diff --git a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/testdoubles/TestNiaNetwork.kt b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetwork.kt
similarity index 98%
rename from core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/testdoubles/TestNiaNetwork.kt
rename to core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetwork.kt
index 2abfb89da..0a3a8f2af 100644
--- a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/testdoubles/TestNiaNetwork.kt
+++ b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetwork.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.testdoubles
+package com.google.samples.apps.nowinandroid.core.data.testdoubles
 
 import com.google.samples.apps.nowinandroid.core.network.NiANetwork
 import com.google.samples.apps.nowinandroid.core.network.fake.FakeDataSource
diff --git a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/testdoubles/TestTopicDao.kt b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestTopicDao.kt
similarity index 97%
rename from core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/testdoubles/TestTopicDao.kt
rename to core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestTopicDao.kt
index 9def9fd11..20eb00645 100644
--- a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/testdoubles/TestTopicDao.kt
+++ b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestTopicDao.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.testdoubles
+package com.google.samples.apps.nowinandroid.core.data.testdoubles
 
 import com.google.samples.apps.nowinandroid.core.database.dao.TopicDao
 import com.google.samples.apps.nowinandroid.core.database.model.TopicEntity
diff --git a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedEpisodeKtTest.kt b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedEpisodeKtTest.kt
similarity index 100%
rename from core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedEpisodeKtTest.kt
rename to core-data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedEpisodeKtTest.kt
diff --git a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResourceKtTest.kt b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResourceKtTest.kt
similarity index 100%
rename from core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResourceKtTest.kt
rename to core-data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResourceKtTest.kt
diff --git a/core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/database/util/NewsResourceTypeConverterTest.kt b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/database/util/NewsResourceTypeConverterTest.kt
similarity index 100%
rename from core-domain/src/test/java/com/google/samples/apps/nowinandroid/core/database/util/NewsResourceTypeConverterTest.kt
rename to core-data/src/test/java/com/google/samples/apps/nowinandroid/core/database/util/NewsResourceTypeConverterTest.kt
diff --git a/core-testing/build.gradle.kts b/core-testing/build.gradle.kts
index 35e4359d7..82238498e 100644
--- a/core-testing/build.gradle.kts
+++ b/core-testing/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 
 dependencies {
     implementation(project(":core-common"))
-    implementation(project(":core-domain"))
+    implementation(project(":core-data"))
     implementation(project(":core-model"))
 
     implementation(libs.hilt.android)
diff --git a/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestAuthorsRepository.kt b/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestAuthorsRepository.kt
index 787534387..d8ac74b39 100644
--- a/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestAuthorsRepository.kt
+++ b/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestAuthorsRepository.kt
@@ -16,8 +16,8 @@
 
 package com.google.samples.apps.nowinandroid.core.testing.repository
 
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.repository.AuthorsRepository
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.repository.AuthorsRepository
 import com.google.samples.apps.nowinandroid.core.model.data.Author
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.Flow
diff --git a/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestNewsRepository.kt b/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestNewsRepository.kt
index 4e4da22c6..86109f561 100644
--- a/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestNewsRepository.kt
+++ b/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestNewsRepository.kt
@@ -16,8 +16,8 @@
 
 package com.google.samples.apps.nowinandroid.core.testing.repository
 
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.repository.NewsRepository
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.repository.NewsRepository
 import com.google.samples.apps.nowinandroid.core.model.data.Author
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
 import com.google.samples.apps.nowinandroid.core.model.data.Topic
diff --git a/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestTopicsRepository.kt b/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestTopicsRepository.kt
index fb4dbf796..262c9687e 100644
--- a/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestTopicsRepository.kt
+++ b/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestTopicsRepository.kt
@@ -16,8 +16,8 @@
 
 package com.google.samples.apps.nowinandroid.core.testing.repository
 
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.repository.TopicsRepository
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
 import com.google.samples.apps.nowinandroid.core.model.data.Topic
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.Flow
diff --git a/feature-following/build.gradle.kts b/feature-following/build.gradle.kts
index 1c42e1bdf..409e0fb90 100644
--- a/feature-following/build.gradle.kts
+++ b/feature-following/build.gradle.kts
@@ -31,7 +31,7 @@ android {
 dependencies {
     implementation(project(":core-model"))
     implementation(project(":core-ui"))
-    implementation(project(":core-domain"))
+    implementation(project(":core-data"))
 
     testImplementation(project(":core-testing"))
     androidTestImplementation(project(":core-testing"))
diff --git a/feature-following/src/main/java/com/google/samples/apps/nowinandroid/feature/following/FollowingViewModel.kt b/feature-following/src/main/java/com/google/samples/apps/nowinandroid/feature/following/FollowingViewModel.kt
index 5568c0504..c06c3d943 100644
--- a/feature-following/src/main/java/com/google/samples/apps/nowinandroid/feature/following/FollowingViewModel.kt
+++ b/feature-following/src/main/java/com/google/samples/apps/nowinandroid/feature/following/FollowingViewModel.kt
@@ -18,8 +18,8 @@ package com.google.samples.apps.nowinandroid.feature.following
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.google.samples.apps.nowinandroid.core.domain.repository.AuthorsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.TopicsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.AuthorsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
 import com.google.samples.apps.nowinandroid.core.model.data.FollowableAuthor
 import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic
 import dagger.hilt.android.lifecycle.HiltViewModel
diff --git a/feature-foryou/build.gradle.kts b/feature-foryou/build.gradle.kts
index efaa4e4ad..e9eec2610 100644
--- a/feature-foryou/build.gradle.kts
+++ b/feature-foryou/build.gradle.kts
@@ -32,7 +32,7 @@ android {
 dependencies {
     implementation(project(":core-model"))
     implementation(project(":core-ui"))
-    implementation(project(":core-domain"))
+    implementation(project(":core-data"))
 
     testImplementation(project(":core-testing"))
     androidTestImplementation(project(":core-testing"))
diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt
index e4f5d57b2..34ed142b9 100644
--- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt
+++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt
@@ -24,9 +24,9 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi
 import androidx.lifecycle.viewmodel.compose.saveable
-import com.google.samples.apps.nowinandroid.core.domain.repository.AuthorsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.NewsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.TopicsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.AuthorsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.NewsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
 import com.google.samples.apps.nowinandroid.core.model.data.FollowableAuthor
 import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
diff --git a/feature-topic/build.gradle.kts b/feature-topic/build.gradle.kts
index 4ff7a6e5e..ff8310276 100644
--- a/feature-topic/build.gradle.kts
+++ b/feature-topic/build.gradle.kts
@@ -31,7 +31,7 @@ android {
 dependencies {
     implementation(project(":core-model"))
     implementation(project(":core-ui"))
-    implementation(project(":core-domain"))
+    implementation(project(":core-data"))
     implementation(project(":core-common"))
 
     testImplementation(project(":core-testing"))
diff --git a/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt b/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt
index e60eda9c1..bf7806a39 100644
--- a/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt
+++ b/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt
@@ -19,8 +19,8 @@ package com.google.samples.apps.nowinandroid.feature.topic
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.google.samples.apps.nowinandroid.core.domain.repository.NewsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.TopicsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.NewsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
 import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
 import com.google.samples.apps.nowinandroid.core.model.data.Topic
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ee4bafea8..dfc1db4d7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -44,8 +44,8 @@ include(":app")
 include(":app-nia-catalog")
 include(":benchmark")
 include(":core-common")
-include(":core-domain")
-include(":core-domain-test")
+include(":core-data")
+include(":core-data-test")
 include(":core-database")
 include(":core-datastore")
 include(":core-datastore-test")
diff --git a/sync/build.gradle.kts b/sync/build.gradle.kts
index e8120c4e5..531032a9f 100644
--- a/sync/build.gradle.kts
+++ b/sync/build.gradle.kts
@@ -30,7 +30,7 @@ android {
 dependencies {
     implementation(project(":core-common"))
     implementation(project(":core-model"))
-    implementation(project(":core-domain"))
+    implementation(project(":core-data"))
     implementation(project(":core-datastore"))
 
     implementation(libs.kotlinx.coroutines.android)
diff --git a/sync/src/main/java/com/google/samples/apps/nowinandroid/sync/workers/SyncWorker.kt b/sync/src/main/java/com/google/samples/apps/nowinandroid/sync/workers/SyncWorker.kt
index b76b73b09..3f03e0b17 100644
--- a/sync/src/main/java/com/google/samples/apps/nowinandroid/sync/workers/SyncWorker.kt
+++ b/sync/src/main/java/com/google/samples/apps/nowinandroid/sync/workers/SyncWorker.kt
@@ -23,12 +23,12 @@ import androidx.work.ForegroundInfo
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.OutOfQuotaPolicy
 import androidx.work.WorkerParameters
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.repository.AuthorsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.NewsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
 import com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersions
 import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferences
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.repository.AuthorsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.NewsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.TopicsRepository
 import com.google.samples.apps.nowinandroid.core.network.Dispatcher
 import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO
 import com.google.samples.apps.nowinandroid.sync.initializers.SyncConstraints