diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index dd538c7..58942db 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -18,11 +18,9 @@
             <option value="$PROJECT_DIR$/core/ui" />
             <option value="$PROJECT_DIR$/core/utils" />
             <option value="$PROJECT_DIR$/data" />
-            <option value="$PROJECT_DIR$/data/article" />
-            <option value="$PROJECT_DIR$/data/user" />
+            <option value="$PROJECT_DIR$/data/main" />
             <option value="$PROJECT_DIR$/domain" />
-            <option value="$PROJECT_DIR$/domain/article" />
-            <option value="$PROJECT_DIR$/domain/user" />
+            <option value="$PROJECT_DIR$/domain/main" />
             <option value="$PROJECT_DIR$/feature" />
             <option value="$PROJECT_DIR$/feature/home" />
             <option value="$PROJECT_DIR$/feature/onboarding" />
diff --git a/README.MD b/README.MD
index 933ff7f..f9311d2 100644
--- a/README.MD
+++ b/README.MD
@@ -134,6 +134,10 @@ We use [Clean Architecture](#inspiration-material), to a very large extend. Our
 
 ![Q42-CA](https://user-images.githubusercontent.com/2270625/216325003-8629f40a-c46c-43e6-ba1e-342dfb524ff9.png)
 
+Note that the image shows separate modules per feature for domain and data (ie. data:user and domain:user). It is recommended for larger projects
+to make this separation, but for smaller projects, it might be too much overhead. Therefore, this template starts with a single module for domain and data: domain:main 
+and data:main. Decide with your team whether you want to split these modules up.
+
 #### Clean Architecture layers
 
 - _UI_ with Jetpack Compose
diff --git a/app/build.gradle b/app/build.gradle
index e2f9763..b7ccef0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,8 +72,8 @@ dependencies {
     implementation(project(":core:navigation"))
     implementation(project(":feature:home"))
     implementation(project(":feature:onboarding"))
-    implementation(project(":domain:user"))  // needed for di
-    implementation(project(":data:user"))  // needed for di
+    implementation(project(":domain:main"))  // needed for di
+    implementation(project(":data:main"))  // needed for di
     implementation(project(":core:network")) // needed for di
     implementation(libs.composeDestinations)
 
diff --git a/data/article/build.gradle b/data/article/build.gradle
deleted file mode 100644
index 467f228..0000000
--- a/data/article/build.gradle
+++ /dev/null
@@ -1,9 +0,0 @@
-plugins {
-    id "com.android.library"
-}
-
-apply from: "$rootDir/build.module.library.gradle"
-
-android {
-    namespace = "nl.q42.template.data.article"
-}
\ No newline at end of file
diff --git a/data/article/.gitignore b/data/main/.gitignore
similarity index 100%
rename from data/article/.gitignore
rename to data/main/.gitignore
diff --git a/data/user/build.gradle b/data/main/build.gradle
similarity index 87%
rename from data/user/build.gradle
rename to data/main/build.gradle
index b79cfbf..4619146 100644
--- a/data/user/build.gradle
+++ b/data/main/build.gradle
@@ -10,7 +10,7 @@ android {
 }
 
 dependencies {
-    implementation project(':domain:user')
+    implementation project(':domain:main')
     implementation project(':core:network')
     implementation project(':core:actionresult')
 }
diff --git a/data/article/proguard-rules.pro b/data/main/proguard-rules.pro
similarity index 100%
rename from data/article/proguard-rules.pro
rename to data/main/proguard-rules.pro
diff --git a/data/article/src/main/AndroidManifest.xml b/data/main/src/main/AndroidManifest.xml
similarity index 100%
rename from data/article/src/main/AndroidManifest.xml
rename to data/main/src/main/AndroidManifest.xml
diff --git a/data/user/src/main/kotlin/nl/q42/template/data/user/UserRepositoryImpl.kt b/data/main/src/main/kotlin/nl/q42/template/data/main/UserRepositoryImpl.kt
similarity index 76%
rename from data/user/src/main/kotlin/nl/q42/template/data/user/UserRepositoryImpl.kt
rename to data/main/src/main/kotlin/nl/q42/template/data/main/UserRepositoryImpl.kt
index d0debb8..ef11529 100644
--- a/data/user/src/main/kotlin/nl/q42/template/data/user/UserRepositoryImpl.kt
+++ b/data/main/src/main/kotlin/nl/q42/template/data/main/UserRepositoryImpl.kt
@@ -1,15 +1,15 @@
-package nl.q42.template.data.user
+package nl.q42.template.data.main
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import nl.q42.template.actionresult.domain.ActionResult
 import nl.q42.template.actionresult.domain.getDataOrNull
 import nl.q42.template.actionresult.domain.map
-import nl.q42.template.data.user.local.UserLocalDataSource
-import nl.q42.template.data.user.local.model.mapToUser
-import nl.q42.template.data.user.remote.UserRemoteDataSource
-import nl.q42.template.domain.user.model.User
-import nl.q42.template.domain.user.repo.UserRepository
+import nl.q42.template.data.main.local.UserLocalDataSource
+import nl.q42.template.data.main.local.model.mapToUser
+import nl.q42.template.data.main.remote.UserRemoteDataSource
+import nl.q42.template.domain.main.model.User
+import nl.q42.template.domain.main.repo.UserRepository
 import javax.inject.Inject
 
 internal class UserRepositoryImpl @Inject constructor(
diff --git a/data/user/src/main/kotlin/nl/q42/template/data/user/di/UserDataModule.kt b/data/main/src/main/kotlin/nl/q42/template/data/main/di/MainDataModule.kt
similarity index 75%
rename from data/user/src/main/kotlin/nl/q42/template/data/user/di/UserDataModule.kt
rename to data/main/src/main/kotlin/nl/q42/template/data/main/di/MainDataModule.kt
index dc05f57..9bab4e6 100644
--- a/data/user/src/main/kotlin/nl/q42/template/data/user/di/UserDataModule.kt
+++ b/data/main/src/main/kotlin/nl/q42/template/data/main/di/MainDataModule.kt
@@ -1,13 +1,13 @@
-package nl.q42.template.data.user.di
+package nl.q42.template.data.main.di
 
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import nl.q42.template.data.user.UserRepositoryImpl
-import nl.q42.template.data.user.remote.UserApi
-import nl.q42.template.domain.user.repo.UserRepository
+import nl.q42.template.data.main.UserRepositoryImpl
+import nl.q42.template.data.main.remote.UserApi
+import nl.q42.template.domain.main.repo.UserRepository
 import retrofit2.Retrofit
 import javax.inject.Singleton
 
diff --git a/data/user/src/main/kotlin/nl/q42/template/data/user/local/UserLocalDataSource.kt b/data/main/src/main/kotlin/nl/q42/template/data/main/local/UserLocalDataSource.kt
similarity index 86%
rename from data/user/src/main/kotlin/nl/q42/template/data/user/local/UserLocalDataSource.kt
rename to data/main/src/main/kotlin/nl/q42/template/data/main/local/UserLocalDataSource.kt
index 8d070da..b8707fe 100644
--- a/data/user/src/main/kotlin/nl/q42/template/data/user/local/UserLocalDataSource.kt
+++ b/data/main/src/main/kotlin/nl/q42/template/data/main/local/UserLocalDataSource.kt
@@ -1,9 +1,9 @@
-package nl.q42.template.data.user.local
+package nl.q42.template.data.main.local
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
-import nl.q42.template.data.user.local.model.UserEntity
+import nl.q42.template.data.main.local.model.UserEntity
 import javax.inject.Inject
 
 internal class UserLocalDataSource @Inject constructor() {
diff --git a/data/main/src/main/kotlin/nl/q42/template/data/main/local/model/UserEntity.kt b/data/main/src/main/kotlin/nl/q42/template/data/main/local/model/UserEntity.kt
new file mode 100644
index 0000000..65dbc4a
--- /dev/null
+++ b/data/main/src/main/kotlin/nl/q42/template/data/main/local/model/UserEntity.kt
@@ -0,0 +1,8 @@
+package nl.q42.template.data.main.local.model
+
+import nl.q42.template.domain.main.model.EmailAddress
+import nl.q42.template.domain.main.model.User
+
+internal data class UserEntity(val email: String)
+
+internal fun UserEntity.mapToUser() = User(email = EmailAddress(email))
diff --git a/data/main/src/main/kotlin/nl/q42/template/data/main/mapper/UserEntityMapper.kt b/data/main/src/main/kotlin/nl/q42/template/data/main/mapper/UserEntityMapper.kt
new file mode 100644
index 0000000..89b60fc
--- /dev/null
+++ b/data/main/src/main/kotlin/nl/q42/template/data/main/mapper/UserEntityMapper.kt
@@ -0,0 +1,6 @@
+package nl.q42.template.data.main.mapper
+
+import nl.q42.template.data.main.local.model.UserEntity
+import nl.q42.template.data.main.remote.model.UserDTO
+
+internal fun UserDTO.mapToEntity() = UserEntity(email = args.email)
diff --git a/data/user/src/main/kotlin/nl/q42/template/data/user/remote/UserApi.kt b/data/main/src/main/kotlin/nl/q42/template/data/main/remote/UserApi.kt
similarity index 82%
rename from data/user/src/main/kotlin/nl/q42/template/data/user/remote/UserApi.kt
rename to data/main/src/main/kotlin/nl/q42/template/data/main/remote/UserApi.kt
index 2b9d745..29add4c 100644
--- a/data/user/src/main/kotlin/nl/q42/template/data/user/remote/UserApi.kt
+++ b/data/main/src/main/kotlin/nl/q42/template/data/main/remote/UserApi.kt
@@ -1,8 +1,8 @@
-package nl.q42.template.data.user.remote
+package nl.q42.template.data.main.remote
 
 import com.haroldadmin.cnradapter.NetworkResponse
 import nl.q42.template.actionresult.data.ApiErrorResponse
-import nl.q42.template.data.user.remote.model.UserDTO
+import nl.q42.template.data.main.remote.model.UserDTO
 import retrofit2.http.GET
 import retrofit2.http.Query
 
diff --git a/data/user/src/main/kotlin/nl/q42/template/data/user/remote/UserRemoteDataSource.kt b/data/main/src/main/kotlin/nl/q42/template/data/main/remote/UserRemoteDataSource.kt
similarity index 75%
rename from data/user/src/main/kotlin/nl/q42/template/data/user/remote/UserRemoteDataSource.kt
rename to data/main/src/main/kotlin/nl/q42/template/data/main/remote/UserRemoteDataSource.kt
index b7eab65..eb8960b 100644
--- a/data/user/src/main/kotlin/nl/q42/template/data/user/remote/UserRemoteDataSource.kt
+++ b/data/main/src/main/kotlin/nl/q42/template/data/main/remote/UserRemoteDataSource.kt
@@ -1,13 +1,13 @@
-package nl.q42.template.data.user.remote
+package nl.q42.template.data.main.remote
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import nl.q42.template.actionresult.data.mapToActionResult
 import nl.q42.template.actionresult.domain.ActionResult
 import nl.q42.template.actionresult.domain.map
-import nl.q42.template.data.user.local.model.UserEntity
-import nl.q42.template.data.user.mapper.mapToEntity
-import nl.q42.template.data.user.remote.model.UserDTO
+import nl.q42.template.data.main.local.model.UserEntity
+import nl.q42.template.data.main.mapper.mapToEntity
+import nl.q42.template.data.main.remote.model.UserDTO
 import javax.inject.Inject
 
 internal class UserRemoteDataSource @Inject constructor(
diff --git a/data/user/src/main/kotlin/nl/q42/template/data/user/remote/model/UserDTO.kt b/data/main/src/main/kotlin/nl/q42/template/data/main/remote/model/UserDTO.kt
similarity index 88%
rename from data/user/src/main/kotlin/nl/q42/template/data/user/remote/model/UserDTO.kt
rename to data/main/src/main/kotlin/nl/q42/template/data/main/remote/model/UserDTO.kt
index 24c06df..8f1d5b6 100644
--- a/data/user/src/main/kotlin/nl/q42/template/data/user/remote/model/UserDTO.kt
+++ b/data/main/src/main/kotlin/nl/q42/template/data/main/remote/model/UserDTO.kt
@@ -1,4 +1,4 @@
-package nl.q42.template.data.user.remote.model
+package nl.q42.template.data.main.remote.model
 
 import kotlinx.serialization.Serializable
 
diff --git a/data/user/src/main/kotlin/nl/q42/template/data/user/local/model/UserEntity.kt b/data/user/src/main/kotlin/nl/q42/template/data/user/local/model/UserEntity.kt
deleted file mode 100644
index a97eb26..0000000
--- a/data/user/src/main/kotlin/nl/q42/template/data/user/local/model/UserEntity.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package nl.q42.template.data.user.local.model
-
-import nl.q42.template.domain.user.model.EmailAddress
-import nl.q42.template.domain.user.model.User
-
-internal data class UserEntity(val email: String)
-
-internal fun UserEntity.mapToUser() = User(email = EmailAddress(email))
diff --git a/data/user/src/main/kotlin/nl/q42/template/data/user/mapper/UserEntityMapper.kt b/data/user/src/main/kotlin/nl/q42/template/data/user/mapper/UserEntityMapper.kt
deleted file mode 100644
index bdc882a..0000000
--- a/data/user/src/main/kotlin/nl/q42/template/data/user/mapper/UserEntityMapper.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package nl.q42.template.data.user.mapper
-
-import nl.q42.template.data.user.local.model.UserEntity
-import nl.q42.template.data.user.remote.model.UserDTO
-
-internal fun UserDTO.mapToEntity() = UserEntity(email = args.email)
diff --git a/domain/article/.gitignore b/domain/article/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/domain/article/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/domain/article/build.gradle b/domain/article/build.gradle
deleted file mode 100644
index e43dd8b..0000000
--- a/domain/article/build.gradle
+++ /dev/null
@@ -1,8 +0,0 @@
-plugins {
-    id "com.android.library"
-}
-apply from: "$rootDir/build.module.library.gradle"
-
-android {
-    namespace = "nl.q42.template.domain.article"
-}
\ No newline at end of file
diff --git a/domain/article/proguard-rules.pro b/domain/article/proguard-rules.pro
deleted file mode 100644
index 481bb43..0000000
--- a/domain/article/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/domain/article/src/main/AndroidManifest.xml b/domain/article/src/main/AndroidManifest.xml
deleted file mode 100644
index 78c3e85..0000000
--- a/domain/article/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest></manifest>
diff --git a/data/user/.gitignore b/domain/main/.gitignore
similarity index 100%
rename from data/user/.gitignore
rename to domain/main/.gitignore
diff --git a/domain/user/build.gradle b/domain/main/build.gradle
similarity index 100%
rename from domain/user/build.gradle
rename to domain/main/build.gradle
diff --git a/data/user/proguard-rules.pro b/domain/main/proguard-rules.pro
similarity index 100%
rename from data/user/proguard-rules.pro
rename to domain/main/proguard-rules.pro
diff --git a/data/user/src/main/AndroidManifest.xml b/domain/main/src/main/AndroidManifest.xml
similarity index 100%
rename from data/user/src/main/AndroidManifest.xml
rename to domain/main/src/main/AndroidManifest.xml
diff --git a/domain/user/src/main/kotlin/nl/q42/template/domain/user/model/User.kt b/domain/main/src/main/kotlin/nl/q42/template/domain/main/model/User.kt
similarity index 70%
rename from domain/user/src/main/kotlin/nl/q42/template/domain/user/model/User.kt
rename to domain/main/src/main/kotlin/nl/q42/template/domain/main/model/User.kt
index 6ee80b8..60d50c3 100644
--- a/domain/user/src/main/kotlin/nl/q42/template/domain/user/model/User.kt
+++ b/domain/main/src/main/kotlin/nl/q42/template/domain/main/model/User.kt
@@ -1,4 +1,4 @@
-package nl.q42.template.domain.user.model
+package nl.q42.template.domain.main.model
 
 @JvmInline
 value class EmailAddress(val value: String)
diff --git a/domain/user/src/main/kotlin/nl/q42/template/domain/user/repo/UserRepository.kt b/domain/main/src/main/kotlin/nl/q42/template/domain/main/repo/UserRepository.kt
similarity index 60%
rename from domain/user/src/main/kotlin/nl/q42/template/domain/user/repo/UserRepository.kt
rename to domain/main/src/main/kotlin/nl/q42/template/domain/main/repo/UserRepository.kt
index 24f28fc..d1e9d05 100644
--- a/domain/user/src/main/kotlin/nl/q42/template/domain/user/repo/UserRepository.kt
+++ b/domain/main/src/main/kotlin/nl/q42/template/domain/main/repo/UserRepository.kt
@@ -1,9 +1,8 @@
-package nl.q42.template.domain.user.repo
+package nl.q42.template.domain.main.repo
 
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
 import nl.q42.template.actionresult.domain.ActionResult
-import nl.q42.template.domain.user.model.User
+import nl.q42.template.domain.main.model.User
 
 interface UserRepository {
     suspend fun fetchUser(): ActionResult<Unit>
diff --git a/domain/user/src/main/kotlin/nl/q42/template/domain/user/usecase/FetchUserUseCase.kt b/domain/main/src/main/kotlin/nl/q42/template/domain/main/usecase/FetchUserUseCase.kt
similarity index 83%
rename from domain/user/src/main/kotlin/nl/q42/template/domain/user/usecase/FetchUserUseCase.kt
rename to domain/main/src/main/kotlin/nl/q42/template/domain/main/usecase/FetchUserUseCase.kt
index b6e82a4..20d52ad 100644
--- a/domain/user/src/main/kotlin/nl/q42/template/domain/user/usecase/FetchUserUseCase.kt
+++ b/domain/main/src/main/kotlin/nl/q42/template/domain/main/usecase/FetchUserUseCase.kt
@@ -1,9 +1,9 @@
-package nl.q42.template.domain.user.usecase
+package nl.q42.template.domain.main.usecase
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import nl.q42.template.actionresult.domain.ActionResult
-import nl.q42.template.domain.user.repo.UserRepository
+import nl.q42.template.domain.main.repo.UserRepository
 import javax.inject.Inject
 
 // A UseCase models an action so the name should begin with a verb. For Flows, use: GetSomethingFlowUseCase
diff --git a/domain/user/src/main/kotlin/nl/q42/template/domain/user/usecase/GetUserFlowUseCase.kt b/domain/main/src/main/kotlin/nl/q42/template/domain/main/usecase/GetUserFlowUseCase.kt
similarity index 71%
rename from domain/user/src/main/kotlin/nl/q42/template/domain/user/usecase/GetUserFlowUseCase.kt
rename to domain/main/src/main/kotlin/nl/q42/template/domain/main/usecase/GetUserFlowUseCase.kt
index 39aade9..f225243 100644
--- a/domain/user/src/main/kotlin/nl/q42/template/domain/user/usecase/GetUserFlowUseCase.kt
+++ b/domain/main/src/main/kotlin/nl/q42/template/domain/main/usecase/GetUserFlowUseCase.kt
@@ -1,10 +1,10 @@
-package nl.q42.template.domain.user.usecase
+package nl.q42.template.domain.main.usecase
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOn
-import nl.q42.template.domain.user.model.User
-import nl.q42.template.domain.user.repo.UserRepository
+import nl.q42.template.domain.main.model.User
+import nl.q42.template.domain.main.repo.UserRepository
 import javax.inject.Inject
 
 class GetUserFlowUseCase @Inject constructor(private val userRepository: UserRepository) {
diff --git a/domain/user/.gitignore b/domain/user/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/domain/user/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/domain/user/proguard-rules.pro b/domain/user/proguard-rules.pro
deleted file mode 100644
index 481bb43..0000000
--- a/domain/user/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/domain/user/src/main/AndroidManifest.xml b/domain/user/src/main/AndroidManifest.xml
deleted file mode 100644
index 78c3e85..0000000
--- a/domain/user/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest></manifest>
diff --git a/feature/home/build.gradle b/feature/home/build.gradle
index b6b840e..246e4d5 100644
--- a/feature/home/build.gradle
+++ b/feature/home/build.gradle
@@ -17,7 +17,7 @@ android {
     }
 }
 dependencies {
-    implementation project(':domain:user')
+    implementation project(':domain:main')
     implementation project(':core:ui')
     implementation project(':core:actionresult')
     implementation project(':core:navigation')
diff --git a/feature/home/src/main/kotlin/nl/q42/template/home/main/presentation/HomeViewModel.kt b/feature/home/src/main/kotlin/nl/q42/template/home/main/presentation/HomeViewModel.kt
index 06e083b..eb221bd 100644
--- a/feature/home/src/main/kotlin/nl/q42/template/home/main/presentation/HomeViewModel.kt
+++ b/feature/home/src/main/kotlin/nl/q42/template/home/main/presentation/HomeViewModel.kt
@@ -13,8 +13,8 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import nl.q42.template.actionresult.data.handleAction
-import nl.q42.template.domain.user.usecase.FetchUserUseCase
-import nl.q42.template.domain.user.usecase.GetUserFlowUseCase
+import nl.q42.template.domain.main.usecase.FetchUserUseCase
+import nl.q42.template.domain.main.usecase.GetUserFlowUseCase
 import nl.q42.template.feature.home.R
 import nl.q42.template.home.destinations.HomeSecondScreenDestination
 import nl.q42.template.navigation.AppGraphRoutes
diff --git a/feature/home/src/test/kotlin/nl/q42/template/home/main/presentation/HomeViewModelTest.kt b/feature/home/src/test/kotlin/nl/q42/template/home/main/presentation/HomeViewModelTest.kt
index 8c282f4..7d41930 100644
--- a/feature/home/src/test/kotlin/nl/q42/template/home/main/presentation/HomeViewModelTest.kt
+++ b/feature/home/src/test/kotlin/nl/q42/template/home/main/presentation/HomeViewModelTest.kt
@@ -8,8 +8,8 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.runTest
 import nl.q42.template.actionresult.domain.ActionResult
-import nl.q42.template.domain.user.usecase.FetchUserUseCase
-import nl.q42.template.domain.user.usecase.GetUserFlowUseCase
+import nl.q42.template.domain.main.usecase.FetchUserUseCase
+import nl.q42.template.domain.main.usecase.GetUserFlowUseCase
 import nl.q42.template.presentation.home.MainDispatcherRule
 import org.junit.Rule
 import org.junit.Test
diff --git a/feature/onboarding/build.gradle b/feature/onboarding/build.gradle
index f5ff132..8362935 100644
--- a/feature/onboarding/build.gradle
+++ b/feature/onboarding/build.gradle
@@ -17,7 +17,7 @@ android {
     }
 }
 dependencies {
-    implementation project(':domain:user')
+    implementation project(':domain:main')
     implementation project(':core:ui')
     implementation project(':core:actionresult')
     implementation project(':core:navigation')
diff --git a/settings.gradle b/settings.gradle
index f58cf71..ce487ca 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,10 +15,8 @@ dependencyResolutionManagement {
 }
 rootProject.name = "Template.Android"
 include ":app"
-include ":data:user"
-include ":data:article"
-include ":domain:user"
-include ":domain:article"
+include ':data:main'
+include ':domain:main'
 include ":feature:home"
 include ":feature:onboarding"
 include ":core:network"