diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
index 8a2da5583..ca2936090 100644
--- a/androidApp/build.gradle.kts
+++ b/androidApp/build.gradle.kts
@@ -165,17 +165,17 @@ val gmsImplementation by configurations
 val hmsImplementation by configurations
 val fossImplementation by configurations
 dependencies {
-    gmsImplementation(project(":core:platform-services:inject-kmp"))
-    hmsImplementation(project(":core:platform-services:inject-kmp"))
-    fossImplementation(project(":core:platform-services:inject-kmp"))
-    implementation(project(":feature:account-kmp"))
-    implementation(project(":feature:auth-kmp"))
-    implementation(project(":feature:details-kmp"))
-    implementation(project(":feature:feed-kmp"))
-    implementation(project(":feature:gallery-kmp"))
-    implementation(project(":feature:search-kmp"))
-    implementation(project(":feature:settings-kmp"))
-    implementation(project(":feature:debug-kmp"))
+    gmsImplementation(project(":core:platform-services:inject"))
+    hmsImplementation(project(":core:platform-services:inject"))
+    fossImplementation(project(":core:platform-services:inject"))
+    implementation(project(":feature:account"))
+    implementation(project(":feature:auth"))
+    implementation(project(":feature:details"))
+    implementation(project(":feature:feed"))
+    implementation(project(":feature:gallery"))
+    implementation(project(":feature:search"))
+    implementation(project(":feature:settings"))
+    implementation(project(":feature:debug"))
     implementation(libs.bundles.kotlin.reflect.android)
     implementation(libs.bundles.koin.compose.work.android)
     testImplementation(libs.bundles.junit.android)
diff --git a/androidApp/src/main/kotlin/org/michaelbel/movies/App.kt b/androidApp/src/main/kotlin/org/michaelbel/movies/App.kt
index 8e34dabd8..8e0c87e95 100644
--- a/androidApp/src/main/kotlin/org/michaelbel/movies/App.kt
+++ b/androidApp/src/main/kotlin/org/michaelbel/movies/App.kt
@@ -8,7 +8,7 @@ import org.koin.android.ext.koin.androidLogger
 import org.koin.androidx.workmanager.factory.KoinWorkerFactory
 import org.koin.androidx.workmanager.koin.workManagerFactory
 import org.koin.core.context.startKoin
-import org.michaelbel.movies.common_kmp.BuildConfig
+import org.michaelbel.movies.common.BuildConfig
 import org.michaelbel.movies.crashlytics.CrashlyticsTree
 import org.michaelbel.movies.di.appKoinModule
 import org.michaelbel.movies.platform.app.AppService
diff --git a/core/analytics-kmp/.gitignore b/core/analytics/.gitignore
similarity index 100%
rename from core/analytics-kmp/.gitignore
rename to core/analytics/.gitignore
diff --git a/core/analytics-kmp/build.gradle.kts b/core/analytics/build.gradle.kts
similarity index 93%
rename from core/analytics-kmp/build.gradle.kts
rename to core/analytics/build.gradle.kts
index 59dbde8c2..05b6c3dde 100644
--- a/core/analytics-kmp/build.gradle.kts
+++ b/core/analytics/build.gradle.kts
@@ -15,7 +15,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(project(":core:platform-services:interactor-kmp"))
+            implementation(project(":core:platform-services:interactor"))
             implementation(libs.bundles.koin.common)
         }
         androidMain.dependencies {
@@ -25,7 +25,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.analytics_kmp"
+    namespace = "org.michaelbel.movies.analytics"
 
     defaultConfig {
         minSdk = libs.versions.min.sdk.get().toInt()
diff --git a/core/analytics-kmp/src/androidMain/kotlin/org/michaelbel/movies/analytics/impl/MoviesAnalyticsImpl.kt b/core/analytics/src/androidMain/kotlin/org/michaelbel/movies/analytics/impl/MoviesAnalyticsImpl.kt
similarity index 100%
rename from core/analytics-kmp/src/androidMain/kotlin/org/michaelbel/movies/analytics/impl/MoviesAnalyticsImpl.kt
rename to core/analytics/src/androidMain/kotlin/org/michaelbel/movies/analytics/impl/MoviesAnalyticsImpl.kt
diff --git a/core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/MoviesAnalytics.kt b/core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/MoviesAnalytics.kt
similarity index 100%
rename from core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/MoviesAnalytics.kt
rename to core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/MoviesAnalytics.kt
diff --git a/core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/constants/MoviesEvents.kt b/core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/constants/MoviesEvents.kt
similarity index 100%
rename from core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/constants/MoviesEvents.kt
rename to core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/constants/MoviesEvents.kt
diff --git a/core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/constants/MoviesParams.kt b/core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/constants/MoviesParams.kt
similarity index 100%
rename from core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/constants/MoviesParams.kt
rename to core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/constants/MoviesParams.kt
diff --git a/core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/di/MoviesAnalyticsKoinModule.kt b/core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/di/MoviesAnalyticsKoinModule.kt
similarity index 100%
rename from core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/di/MoviesAnalyticsKoinModule.kt
rename to core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/di/MoviesAnalyticsKoinModule.kt
diff --git a/core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/ChangeDynamicColorsEvent.kt b/core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/ChangeDynamicColorsEvent.kt
similarity index 100%
rename from core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/ChangeDynamicColorsEvent.kt
rename to core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/ChangeDynamicColorsEvent.kt
diff --git a/core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/SelectFeedViewEvent.kt b/core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/SelectFeedViewEvent.kt
similarity index 100%
rename from core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/SelectFeedViewEvent.kt
rename to core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/SelectFeedViewEvent.kt
diff --git a/core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/SelectLanguageEvent.kt b/core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/SelectLanguageEvent.kt
similarity index 100%
rename from core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/SelectLanguageEvent.kt
rename to core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/SelectLanguageEvent.kt
diff --git a/core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/SelectMovieListEvent.kt b/core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/SelectMovieListEvent.kt
similarity index 100%
rename from core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/SelectMovieListEvent.kt
rename to core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/SelectMovieListEvent.kt
diff --git a/core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/SelectThemeEvent.kt b/core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/SelectThemeEvent.kt
similarity index 100%
rename from core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/SelectThemeEvent.kt
rename to core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/event/SelectThemeEvent.kt
diff --git a/core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/impl/MoviesAnalyticsImpl.kt b/core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/impl/MoviesAnalyticsImpl.kt
similarity index 100%
rename from core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/impl/MoviesAnalyticsImpl.kt
rename to core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/impl/MoviesAnalyticsImpl.kt
diff --git a/core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/model/BaseEvent.kt b/core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/model/BaseEvent.kt
similarity index 100%
rename from core/analytics-kmp/src/commonMain/kotlin/org/michaelbel/movies/analytics/model/BaseEvent.kt
rename to core/analytics/src/commonMain/kotlin/org/michaelbel/movies/analytics/model/BaseEvent.kt
diff --git a/core/analytics-kmp/src/desktopMain/kotlin/org/michaelbel/movies/analytics/impl/MoviesAnalyticsImpl.kt b/core/analytics/src/desktopMain/kotlin/org/michaelbel/movies/analytics/impl/MoviesAnalyticsImpl.kt
similarity index 100%
rename from core/analytics-kmp/src/desktopMain/kotlin/org/michaelbel/movies/analytics/impl/MoviesAnalyticsImpl.kt
rename to core/analytics/src/desktopMain/kotlin/org/michaelbel/movies/analytics/impl/MoviesAnalyticsImpl.kt
diff --git a/core/common-kmp/.gitignore b/core/common/.gitignore
similarity index 100%
rename from core/common-kmp/.gitignore
rename to core/common/.gitignore
diff --git a/core/common-kmp/build.gradle.kts b/core/common/build.gradle.kts
similarity index 97%
rename from core/common-kmp/build.gradle.kts
rename to core/common/build.gradle.kts
index aed4b8bef..d0e1ae7ae 100644
--- a/core/common-kmp/build.gradle.kts
+++ b/core/common/build.gradle.kts
@@ -39,7 +39,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.common_kmp"
+    namespace = "org.michaelbel.movies.common"
     sourceSets["main"].res.srcDirs("src/androidMain/res")
 
     defaultConfig {
diff --git a/core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/biometric/BiometricController.kt b/core/common/src/androidMain/kotlin/org/michaelbel/movies/common/biometric/BiometricController.kt
similarity index 100%
rename from core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/biometric/BiometricController.kt
rename to core/common/src/androidMain/kotlin/org/michaelbel/movies/common/biometric/BiometricController.kt
diff --git a/core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/biometric/BiometricListener.kt b/core/common/src/androidMain/kotlin/org/michaelbel/movies/common/biometric/BiometricListener.kt
similarity index 100%
rename from core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/biometric/BiometricListener.kt
rename to core/common/src/androidMain/kotlin/org/michaelbel/movies/common/biometric/BiometricListener.kt
diff --git a/core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/biometric/di/BiometricKoinModule.kt b/core/common/src/androidMain/kotlin/org/michaelbel/movies/common/biometric/di/BiometricKoinModule.kt
similarity index 100%
rename from core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/biometric/di/BiometricKoinModule.kt
rename to core/common/src/androidMain/kotlin/org/michaelbel/movies/common/biometric/di/BiometricKoinModule.kt
diff --git a/core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/biometric/impl/BiometricControllerImpl.kt b/core/common/src/androidMain/kotlin/org/michaelbel/movies/common/biometric/impl/BiometricControllerImpl.kt
similarity index 98%
rename from core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/biometric/impl/BiometricControllerImpl.kt
rename to core/common/src/androidMain/kotlin/org/michaelbel/movies/common/biometric/impl/BiometricControllerImpl.kt
index 4bc439e3c..32f8575f6 100644
--- a/core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/biometric/impl/BiometricControllerImpl.kt
+++ b/core/common/src/androidMain/kotlin/org/michaelbel/movies/common/biometric/impl/BiometricControllerImpl.kt
@@ -9,7 +9,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 import org.michaelbel.movies.common.biometric.BiometricController
 import org.michaelbel.movies.common.biometric.BiometricListener
-import org.michaelbel.movies.common_kmp.R
+import org.michaelbel.movies.common.R
 
 internal class BiometricControllerImpl(
     private val context: Context
diff --git a/core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/browser/Browser.kt b/core/common/src/androidMain/kotlin/org/michaelbel/movies/common/browser/Browser.kt
similarity index 100%
rename from core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/browser/Browser.kt
rename to core/common/src/androidMain/kotlin/org/michaelbel/movies/common/browser/Browser.kt
diff --git a/core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/FlowKtx.kt b/core/common/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/FlowKtx.kt
similarity index 100%
rename from core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/FlowKtx.kt
rename to core/common/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/FlowKtx.kt
diff --git a/core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/IntentKtx.kt b/core/common/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/IntentKtx.kt
similarity index 100%
rename from core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/IntentKtx.kt
rename to core/common/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/IntentKtx.kt
diff --git a/core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/LogKtx.kt b/core/common/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/LogKtx.kt
similarity index 72%
rename from core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/LogKtx.kt
rename to core/common/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/LogKtx.kt
index ebf81fba1..0fb3f8753 100644
--- a/core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/LogKtx.kt
+++ b/core/common/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/LogKtx.kt
@@ -1,6 +1,6 @@
 package org.michaelbel.movies.common.ktx
 
-import org.michaelbel.movies.common_kmp.BuildConfig
+import org.michaelbel.movies.common.BuildConfig
 
 fun printlnDebug(message: String) {
     if (BuildConfig.DEBUG) {
diff --git a/core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/NotificationManagerKtx.kt b/core/common/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/NotificationManagerKtx.kt
similarity index 100%
rename from core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/NotificationManagerKtx.kt
rename to core/common/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/NotificationManagerKtx.kt
diff --git a/core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/PermissionKtx.kt b/core/common/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/PermissionKtx.kt
similarity index 100%
rename from core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/PermissionKtx.kt
rename to core/common/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/PermissionKtx.kt
diff --git a/core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/SavedStateHandleKtx.kt b/core/common/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/SavedStateHandleKtx.kt
similarity index 100%
rename from core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/SavedStateHandleKtx.kt
rename to core/common/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/SavedStateHandleKtx.kt
diff --git a/core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/TimeKtx.kt b/core/common/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/TimeKtx.kt
similarity index 100%
rename from core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/TimeKtx.kt
rename to core/common/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/TimeKtx.kt
diff --git a/core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/UriKtx.kt b/core/common/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/UriKtx.kt
similarity index 100%
rename from core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/UriKtx.kt
rename to core/common/src/androidMain/kotlin/org/michaelbel/movies/common/ktx/UriKtx.kt
diff --git a/core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/log/Logger.kt b/core/common/src/androidMain/kotlin/org/michaelbel/movies/common/log/Logger.kt
similarity index 100%
rename from core/common-kmp/src/androidMain/kotlin/org/michaelbel/movies/common/log/Logger.kt
rename to core/common/src/androidMain/kotlin/org/michaelbel/movies/common/log/Logger.kt
diff --git a/core/common-kmp/src/androidMain/res/values-ru/strings.xml b/core/common/src/androidMain/res/values-ru/strings.xml
similarity index 100%
rename from core/common-kmp/src/androidMain/res/values-ru/strings.xml
rename to core/common/src/androidMain/res/values-ru/strings.xml
diff --git a/core/common-kmp/src/androidMain/res/values/strings.xml b/core/common/src/androidMain/res/values/strings.xml
similarity index 100%
rename from core/common-kmp/src/androidMain/res/values/strings.xml
rename to core/common/src/androidMain/res/values/strings.xml
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/RepoConfig.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/RepoConfig.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/RepoConfig.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/RepoConfig.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/SealedString.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/SealedString.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/SealedString.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/SealedString.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/ThemeData.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/ThemeData.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/ThemeData.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/ThemeData.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/appearance/FeedView.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/appearance/FeedView.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/appearance/FeedView.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/appearance/FeedView.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/config/RemoteParams.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/config/RemoteParams.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/config/RemoteParams.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/config/RemoteParams.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/dispatchers/MoviesDispatchers.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/dispatchers/MoviesDispatchers.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/dispatchers/MoviesDispatchers.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/dispatchers/MoviesDispatchers.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/dispatchers/di/DispatchersKoinModule.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/dispatchers/di/DispatchersKoinModule.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/dispatchers/di/DispatchersKoinModule.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/dispatchers/di/DispatchersKoinModule.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/dispatchers/impl/MoviesDispatchersImpl.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/dispatchers/impl/MoviesDispatchersImpl.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/dispatchers/impl/MoviesDispatchersImpl.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/dispatchers/impl/MoviesDispatchersImpl.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/AccountDetailsException.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/AccountDetailsException.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/AccountDetailsException.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/AccountDetailsException.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/ApiKeyNotNullException.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/ApiKeyNotNullException.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/ApiKeyNotNullException.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/ApiKeyNotNullException.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/CreateRequestTokenException.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/CreateRequestTokenException.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/CreateRequestTokenException.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/CreateRequestTokenException.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/CreateSessionException.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/CreateSessionException.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/CreateSessionException.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/CreateSessionException.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/CreateSessionWithLoginException.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/CreateSessionWithLoginException.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/CreateSessionWithLoginException.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/CreateSessionWithLoginException.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/DeleteSessionException.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/DeleteSessionException.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/DeleteSessionException.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/DeleteSessionException.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/InvalidFeedViewException.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/InvalidFeedViewException.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/InvalidFeedViewException.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/InvalidFeedViewException.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/InvalidGenderException.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/InvalidGenderException.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/InvalidGenderException.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/InvalidGenderException.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/InvalidMovieListException.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/InvalidMovieListException.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/InvalidMovieListException.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/InvalidMovieListException.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/InvalidThemeException.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/InvalidThemeException.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/InvalidThemeException.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/InvalidThemeException.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/MovieDetailsException.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/MovieDetailsException.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/MovieDetailsException.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/MovieDetailsException.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/MoviesUpcomingException.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/MoviesUpcomingException.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/MoviesUpcomingException.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/MoviesUpcomingException.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/PageEmptyException.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/PageEmptyException.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/PageEmptyException.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/exceptions/PageEmptyException.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/gender/GrammaticalGender.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/gender/GrammaticalGender.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/gender/GrammaticalGender.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/gender/GrammaticalGender.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/list/MovieList.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/list/MovieList.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/list/MovieList.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/list/MovieList.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/log/Logger.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/log/Logger.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/log/Logger.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/log/Logger.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/theme/AppTheme.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/theme/AppTheme.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/theme/AppTheme.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/theme/AppTheme.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/version/AppVersionData.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/version/AppVersionData.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/version/AppVersionData.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/version/AppVersionData.kt
diff --git a/core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/viewmodel/BaseViewModel.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/viewmodel/BaseViewModel.kt
similarity index 100%
rename from core/common-kmp/src/commonMain/kotlin/org/michaelbel/movies/common/viewmodel/BaseViewModel.kt
rename to core/common/src/commonMain/kotlin/org/michaelbel/movies/common/viewmodel/BaseViewModel.kt
diff --git a/core/common-kmp/src/desktopMain/kotlin/org/michaelbel/movies/common/browser/Browser.kt b/core/common/src/desktopMain/kotlin/org/michaelbel/movies/common/browser/Browser.kt
similarity index 100%
rename from core/common-kmp/src/desktopMain/kotlin/org/michaelbel/movies/common/browser/Browser.kt
rename to core/common/src/desktopMain/kotlin/org/michaelbel/movies/common/browser/Browser.kt
diff --git a/core/common-kmp/src/desktopMain/kotlin/org/michaelbel/movies/common/log/Logger.kt b/core/common/src/desktopMain/kotlin/org/michaelbel/movies/common/log/Logger.kt
similarity index 100%
rename from core/common-kmp/src/desktopMain/kotlin/org/michaelbel/movies/common/log/Logger.kt
rename to core/common/src/desktopMain/kotlin/org/michaelbel/movies/common/log/Logger.kt
diff --git a/core/common-kmp/src/desktopMain/res/values-ru/strings.xml b/core/common/src/desktopMain/res/values-ru/strings.xml
similarity index 100%
rename from core/common-kmp/src/desktopMain/res/values-ru/strings.xml
rename to core/common/src/desktopMain/res/values-ru/strings.xml
diff --git a/core/common-kmp/src/desktopMain/res/values/strings.xml b/core/common/src/desktopMain/res/values/strings.xml
similarity index 100%
rename from core/common-kmp/src/desktopMain/res/values/strings.xml
rename to core/common/src/desktopMain/res/values/strings.xml
diff --git a/core/debug-kmp/.gitignore b/core/debug/.gitignore
similarity index 100%
rename from core/debug-kmp/.gitignore
rename to core/debug/.gitignore
diff --git a/core/debug-kmp/build.gradle.kts b/core/debug/build.gradle.kts
similarity index 96%
rename from core/debug-kmp/build.gradle.kts
rename to core/debug/build.gradle.kts
index eb16c64e7..5cd7d4e4e 100644
--- a/core/debug-kmp/build.gradle.kts
+++ b/core/debug/build.gradle.kts
@@ -28,7 +28,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.debug_kmp"
+    namespace = "org.michaelbel.movies.debug"
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     sourceSets["main"].res.srcDirs("src/androidMain/res")
 
diff --git a/core/debug-kmp/src/androidMain/AndroidManifest.xml b/core/debug/src/androidMain/AndroidManifest.xml
similarity index 100%
rename from core/debug-kmp/src/androidMain/AndroidManifest.xml
rename to core/debug/src/androidMain/AndroidManifest.xml
diff --git a/core/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/DebugActivity.kt b/core/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/DebugActivity.kt
similarity index 100%
rename from core/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/DebugActivity.kt
rename to core/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/DebugActivity.kt
diff --git a/core/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/DebugViewModel.kt b/core/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/DebugViewModel.kt
similarity index 100%
rename from core/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/DebugViewModel.kt
rename to core/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/DebugViewModel.kt
diff --git a/core/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/di/DebugKoinModule.kt b/core/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/di/DebugKoinModule.kt
similarity index 100%
rename from core/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/di/DebugKoinModule.kt
rename to core/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/di/DebugKoinModule.kt
diff --git a/core/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/di/DebugNotificationClientKoinModule.kt b/core/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/di/DebugNotificationClientKoinModule.kt
similarity index 100%
rename from core/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/di/DebugNotificationClientKoinModule.kt
rename to core/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/di/DebugNotificationClientKoinModule.kt
diff --git a/core/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/notification/DebugNotificationClient.kt b/core/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/notification/DebugNotificationClient.kt
similarity index 98%
rename from core/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/notification/DebugNotificationClient.kt
rename to core/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/notification/DebugNotificationClient.kt
index 8b532ec3e..456ff0fca 100644
--- a/core/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/notification/DebugNotificationClient.kt
+++ b/core/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/notification/DebugNotificationClient.kt
@@ -13,7 +13,7 @@ import androidx.core.app.NotificationManagerCompat
 import org.michaelbel.movies.common.ktx.isPostNotificationsPermissionGranted
 import org.michaelbel.movies.common.ktx.notificationManager
 import org.michaelbel.movies.debug.DebugActivity
-import org.michaelbel.movies.debug_kmp.R
+import org.michaelbel.movies.debug.R
 import org.michaelbel.movies.ui.icons.MoviesAndroidIcons
 
 class DebugNotificationClient(
diff --git a/core/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugActivityContent.kt b/core/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugActivityContent.kt
similarity index 99%
rename from core/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugActivityContent.kt
rename to core/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugActivityContent.kt
index 5bc9b67ae..be6d99d7f 100644
--- a/core/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugActivityContent.kt
+++ b/core/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugActivityContent.kt
@@ -30,7 +30,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.koin.androidx.compose.koinViewModel
 import org.michaelbel.movies.common.ktx.appSettingsIntent
 import org.michaelbel.movies.debug.DebugViewModel
-import org.michaelbel.movies.debug_kmp.R
+import org.michaelbel.movies.debug.R
 import org.michaelbel.movies.ui.icons.MoviesAndroidIcons
 import org.michaelbel.movies.ui.theme.MoviesTheme
 
diff --git a/core/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugToolbar.kt b/core/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugToolbar.kt
similarity index 97%
rename from core/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugToolbar.kt
rename to core/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugToolbar.kt
index ee9c69a85..60b644fd1 100644
--- a/core/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugToolbar.kt
+++ b/core/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugToolbar.kt
@@ -12,7 +12,7 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import org.michaelbel.movies.debug_kmp.R
+import org.michaelbel.movies.debug.R
 import org.michaelbel.movies.ui.compose.iconbutton.CloseIcon
 import org.michaelbel.movies.ui.ktx.displayCutoutWindowInsets
 
diff --git a/core/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/SettingItem.kt b/core/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/SettingItem.kt
similarity index 100%
rename from core/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/SettingItem.kt
rename to core/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/SettingItem.kt
diff --git a/core/debug-kmp/src/androidMain/res/values-ru/strings.xml b/core/debug/src/androidMain/res/values-ru/strings.xml
similarity index 100%
rename from core/debug-kmp/src/androidMain/res/values-ru/strings.xml
rename to core/debug/src/androidMain/res/values-ru/strings.xml
diff --git a/core/debug-kmp/src/androidMain/res/values/strings.xml b/core/debug/src/androidMain/res/values/strings.xml
similarity index 100%
rename from core/debug-kmp/src/androidMain/res/values/strings.xml
rename to core/debug/src/androidMain/res/values/strings.xml
diff --git a/core/interactor-kmp/.gitignore b/core/interactor/.gitignore
similarity index 100%
rename from core/interactor-kmp/.gitignore
rename to core/interactor/.gitignore
diff --git a/core/interactor-kmp/build.gradle.kts b/core/interactor/build.gradle.kts
similarity index 88%
rename from core/interactor-kmp/build.gradle.kts
rename to core/interactor/build.gradle.kts
index f02621eb5..1e2caa9a1 100644
--- a/core/interactor-kmp/build.gradle.kts
+++ b/core/interactor/build.gradle.kts
@@ -16,8 +16,8 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(project(":core:analytics-kmp"))
-            api(project(":core:repository-kmp"))
+            api(project(":core:analytics"))
+            api(project(":core:repository"))
             implementation(compose.runtime)
             implementation(compose.runtimeSaveable)
             implementation(libs.bundles.kotlinx.coroutines.common)
@@ -31,7 +31,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.interactor_kmp"
+    namespace = "org.michaelbel.movies.interactor"
 
     defaultConfig {
         minSdk = libs.versions.min.sdk.get().toInt()
diff --git a/core/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/interactor/impl/LocaleInteractorImpl.kt b/core/interactor/src/androidMain/kotlin/org/michaelbel/movies/interactor/impl/LocaleInteractorImpl.kt
similarity index 100%
rename from core/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/interactor/impl/LocaleInteractorImpl.kt
rename to core/interactor/src/androidMain/kotlin/org/michaelbel/movies/interactor/impl/LocaleInteractorImpl.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/AccountInteractor.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/AccountInteractor.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/AccountInteractor.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/AccountInteractor.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/AuthenticationInteractor.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/AuthenticationInteractor.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/AuthenticationInteractor.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/AuthenticationInteractor.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/ImageInteractor.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/ImageInteractor.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/ImageInteractor.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/ImageInteractor.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/Interactor.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/Interactor.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/Interactor.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/Interactor.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/LocaleInteractor.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/LocaleInteractor.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/LocaleInteractor.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/LocaleInteractor.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/MovieInteractor.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/MovieInteractor.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/MovieInteractor.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/MovieInteractor.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/NotificationInteractor.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/NotificationInteractor.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/NotificationInteractor.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/NotificationInteractor.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/SearchInteractor.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/SearchInteractor.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/SearchInteractor.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/SearchInteractor.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/SettingsInteractor.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/SettingsInteractor.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/SettingsInteractor.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/SettingsInteractor.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/SuggestionInteractor.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/SuggestionInteractor.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/SuggestionInteractor.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/SuggestionInteractor.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/di/InteractorKoinModule.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/di/InteractorKoinModule.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/di/InteractorKoinModule.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/di/InteractorKoinModule.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/entity/AppLanguage.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/entity/AppLanguage.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/entity/AppLanguage.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/entity/AppLanguage.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/entity/Password.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/entity/Password.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/entity/Password.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/entity/Password.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/entity/Username.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/entity/Username.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/entity/Username.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/entity/Username.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/exception/InvalidLocaleException.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/exception/InvalidLocaleException.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/exception/InvalidLocaleException.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/exception/InvalidLocaleException.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/AccountInteractorImpl.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/AccountInteractorImpl.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/AccountInteractorImpl.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/AccountInteractorImpl.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/AuthenticationInteractorImpl.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/AuthenticationInteractorImpl.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/AuthenticationInteractorImpl.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/AuthenticationInteractorImpl.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/ImageInteractorImpl.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/ImageInteractorImpl.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/ImageInteractorImpl.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/ImageInteractorImpl.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/LocaleInteractorImpl.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/LocaleInteractorImpl.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/LocaleInteractorImpl.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/LocaleInteractorImpl.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/MovieInteractorImpl.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/MovieInteractorImpl.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/MovieInteractorImpl.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/MovieInteractorImpl.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/NotificationInteractorImpl.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/NotificationInteractorImpl.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/NotificationInteractorImpl.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/NotificationInteractorImpl.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/SearchInteractorImpl.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/SearchInteractorImpl.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/SearchInteractorImpl.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/SearchInteractorImpl.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/SettingsInteractorImpl.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/SettingsInteractorImpl.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/SettingsInteractorImpl.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/SettingsInteractorImpl.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/SuggestionInteractorImpl.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/SuggestionInteractorImpl.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/SuggestionInteractorImpl.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/impl/SuggestionInteractorImpl.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/ktx/MovieListKtx.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/ktx/MovieListKtx.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/ktx/MovieListKtx.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/ktx/MovieListKtx.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/ktx/PasswordKtx.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/ktx/PasswordKtx.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/ktx/PasswordKtx.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/ktx/PasswordKtx.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/ktx/UsernameKtx.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/ktx/UsernameKtx.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/ktx/UsernameKtx.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/ktx/UsernameKtx.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/remote/FeedMoviesRemoteMediator.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/remote/FeedMoviesRemoteMediator.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/remote/FeedMoviesRemoteMediator.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/remote/FeedMoviesRemoteMediator.kt
diff --git a/core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/remote/SearchMoviesRemoteMediator.kt b/core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/remote/SearchMoviesRemoteMediator.kt
similarity index 100%
rename from core/interactor-kmp/src/commonMain/kotlin/org/michaelbel/movies/interactor/remote/SearchMoviesRemoteMediator.kt
rename to core/interactor/src/commonMain/kotlin/org/michaelbel/movies/interactor/remote/SearchMoviesRemoteMediator.kt
diff --git a/core/interactor-kmp/src/desktopMain/kotlin/org/michaelbel/movies/interactor/impl/LocaleInteractorImpl.kt b/core/interactor/src/desktopMain/kotlin/org/michaelbel/movies/interactor/impl/LocaleInteractorImpl.kt
similarity index 100%
rename from core/interactor-kmp/src/desktopMain/kotlin/org/michaelbel/movies/interactor/impl/LocaleInteractorImpl.kt
rename to core/interactor/src/desktopMain/kotlin/org/michaelbel/movies/interactor/impl/LocaleInteractorImpl.kt
diff --git a/core/navigation-kmp/.gitignore b/core/navigation/.gitignore
similarity index 100%
rename from core/navigation-kmp/.gitignore
rename to core/navigation/.gitignore
diff --git a/core/navigation-kmp/build.gradle.kts b/core/navigation/build.gradle.kts
similarity index 94%
rename from core/navigation-kmp/build.gradle.kts
rename to core/navigation/build.gradle.kts
index 38e66c8e7..52883f1be 100644
--- a/core/navigation-kmp/build.gradle.kts
+++ b/core/navigation/build.gradle.kts
@@ -25,7 +25,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.navigation_kmp"
+    namespace = "org.michaelbel.movies.navigation"
 
     defaultConfig {
         minSdk = libs.versions.min.sdk.get().toInt()
diff --git a/core/navigation-kmp/src/androidMain/kotlin/org/michaelbel/movies/navigation/ktx/NavHostControllerKtx.kt b/core/navigation/src/androidMain/kotlin/org/michaelbel/movies/navigation/ktx/NavHostControllerKtx.kt
similarity index 100%
rename from core/navigation-kmp/src/androidMain/kotlin/org/michaelbel/movies/navigation/ktx/NavHostControllerKtx.kt
rename to core/navigation/src/androidMain/kotlin/org/michaelbel/movies/navigation/ktx/NavHostControllerKtx.kt
diff --git a/core/navigation-kmp/src/commonMain/kotlin/org/michaelbel/movies/navigation/MoviesNavigationDestination.kt b/core/navigation/src/commonMain/kotlin/org/michaelbel/movies/navigation/MoviesNavigationDestination.kt
similarity index 100%
rename from core/navigation-kmp/src/commonMain/kotlin/org/michaelbel/movies/navigation/MoviesNavigationDestination.kt
rename to core/navigation/src/commonMain/kotlin/org/michaelbel/movies/navigation/MoviesNavigationDestination.kt
diff --git a/core/network-kmp/.gitignore b/core/network/.gitignore
similarity index 100%
rename from core/network-kmp/.gitignore
rename to core/network/.gitignore
diff --git a/core/network-kmp/build.gradle.kts b/core/network/build.gradle.kts
similarity index 97%
rename from core/network-kmp/build.gradle.kts
rename to core/network/build.gradle.kts
index df1c611e9..28769abc7 100644
--- a/core/network-kmp/build.gradle.kts
+++ b/core/network/build.gradle.kts
@@ -38,7 +38,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.network_kmp"
+    namespace = "org.michaelbel.movies.network"
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
 
     defaultConfig {
diff --git a/core/network-kmp/src/androidMain/AndroidManifest.xml b/core/network/src/androidMain/AndroidManifest.xml
similarity index 100%
rename from core/network-kmp/src/androidMain/AndroidManifest.xml
rename to core/network/src/androidMain/AndroidManifest.xml
diff --git a/core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/chucker/ChuckerKoinModule.kt b/core/network/src/androidMain/kotlin/org/michaelbel/movies/network/chucker/ChuckerKoinModule.kt
similarity index 100%
rename from core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/chucker/ChuckerKoinModule.kt
rename to core/network/src/androidMain/kotlin/org/michaelbel/movies/network/chucker/ChuckerKoinModule.kt
diff --git a/core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/config/TmdbConfig.kt b/core/network/src/androidMain/kotlin/org/michaelbel/movies/network/config/TmdbConfig.kt
similarity index 79%
rename from core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/config/TmdbConfig.kt
rename to core/network/src/androidMain/kotlin/org/michaelbel/movies/network/config/TmdbConfig.kt
index 6b0a668f2..7bdaed375 100644
--- a/core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/config/TmdbConfig.kt
+++ b/core/network/src/androidMain/kotlin/org/michaelbel/movies/network/config/TmdbConfig.kt
@@ -1,6 +1,6 @@
 package org.michaelbel.movies.network.config
 
-import org.michaelbel.movies.network_kmp.BuildConfig
+import org.michaelbel.movies.network.BuildConfig
 
 private val tmdbApiKey: String
     get() = BuildConfig.TMDB_API_KEY
diff --git a/core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/connectivity/NetworkManager.kt b/core/network/src/androidMain/kotlin/org/michaelbel/movies/network/connectivity/NetworkManager.kt
similarity index 100%
rename from core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/connectivity/NetworkManager.kt
rename to core/network/src/androidMain/kotlin/org/michaelbel/movies/network/connectivity/NetworkManager.kt
diff --git a/core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/connectivity/di/ConnectivityKoinModule.kt b/core/network/src/androidMain/kotlin/org/michaelbel/movies/network/connectivity/di/ConnectivityKoinModule.kt
similarity index 100%
rename from core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/connectivity/di/ConnectivityKoinModule.kt
rename to core/network/src/androidMain/kotlin/org/michaelbel/movies/network/connectivity/di/ConnectivityKoinModule.kt
diff --git a/core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/connectivity/di/NetworkManagerKoinModule.kt b/core/network/src/androidMain/kotlin/org/michaelbel/movies/network/connectivity/di/NetworkManagerKoinModule.kt
similarity index 100%
rename from core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/connectivity/di/NetworkManagerKoinModule.kt
rename to core/network/src/androidMain/kotlin/org/michaelbel/movies/network/connectivity/di/NetworkManagerKoinModule.kt
diff --git a/core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/flaker/FlakerInitializer.kt b/core/network/src/androidMain/kotlin/org/michaelbel/movies/network/flaker/FlakerInitializer.kt
similarity index 100%
rename from core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/flaker/FlakerInitializer.kt
rename to core/network/src/androidMain/kotlin/org/michaelbel/movies/network/flaker/FlakerInitializer.kt
diff --git a/core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/flaker/di/FlakerKoinModule.kt b/core/network/src/androidMain/kotlin/org/michaelbel/movies/network/flaker/di/FlakerKoinModule.kt
similarity index 100%
rename from core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/flaker/di/FlakerKoinModule.kt
rename to core/network/src/androidMain/kotlin/org/michaelbel/movies/network/flaker/di/FlakerKoinModule.kt
diff --git a/core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorKoinModule.kt b/core/network/src/androidMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorKoinModule.kt
similarity index 100%
rename from core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorKoinModule.kt
rename to core/network/src/androidMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorKoinModule.kt
diff --git a/core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/okhttp/di/OkhttpKoinModule.kt b/core/network/src/androidMain/kotlin/org/michaelbel/movies/network/okhttp/di/OkhttpKoinModule.kt
similarity index 97%
rename from core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/okhttp/di/OkhttpKoinModule.kt
rename to core/network/src/androidMain/kotlin/org/michaelbel/movies/network/okhttp/di/OkhttpKoinModule.kt
index 2da8609d4..d0562e63c 100644
--- a/core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/okhttp/di/OkhttpKoinModule.kt
+++ b/core/network/src/androidMain/kotlin/org/michaelbel/movies/network/okhttp/di/OkhttpKoinModule.kt
@@ -10,7 +10,7 @@ import org.koin.dsl.module
 import org.michaelbel.movies.network.chucker.chuckerKoinModule
 import org.michaelbel.movies.network.flaker.di.flakerKoinModule
 import org.michaelbel.movies.network.okhttp.interceptor.ApikeyInterceptor
-import org.michaelbel.movies.network_kmp.BuildConfig
+import org.michaelbel.movies.network.BuildConfig
 import java.util.concurrent.TimeUnit
 
 const val HTTP_CACHE_SIZE_BYTES = 1024 * 1024 * 50
diff --git a/core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/okhttp/interceptor/ApikeyInterceptor.kt b/core/network/src/androidMain/kotlin/org/michaelbel/movies/network/okhttp/interceptor/ApikeyInterceptor.kt
similarity index 100%
rename from core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/okhttp/interceptor/ApikeyInterceptor.kt
rename to core/network/src/androidMain/kotlin/org/michaelbel/movies/network/okhttp/interceptor/ApikeyInterceptor.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/AccountNetworkService.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/AccountNetworkService.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/AccountNetworkService.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/AccountNetworkService.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/AuthenticationNetworkService.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/AuthenticationNetworkService.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/AuthenticationNetworkService.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/AuthenticationNetworkService.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/MovieNetworkService.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/MovieNetworkService.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/MovieNetworkService.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/MovieNetworkService.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/SearchNetworkService.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/SearchNetworkService.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/SearchNetworkService.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/SearchNetworkService.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/config/GravatarConfig.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/config/GravatarConfig.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/config/GravatarConfig.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/config/GravatarConfig.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/config/ScreenState.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/config/ScreenState.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/config/ScreenState.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/config/ScreenState.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/config/TmdbConfig.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/config/TmdbConfig.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/config/TmdbConfig.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/config/TmdbConfig.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/config/TmdbConstants.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/config/TmdbConstants.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/config/TmdbConstants.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/config/TmdbConstants.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/config/TmdbImage.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/config/TmdbImage.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/config/TmdbImage.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/config/TmdbImage.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/connectivity/NetworkManager.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/connectivity/NetworkManager.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/connectivity/NetworkManager.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/connectivity/NetworkManager.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/connectivity/NetworkStatus.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/connectivity/NetworkStatus.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/connectivity/NetworkStatus.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/connectivity/NetworkStatus.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/connectivity/ktx/NetworkStatusKtx.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/connectivity/ktx/NetworkStatusKtx.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/connectivity/ktx/NetworkStatusKtx.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/connectivity/ktx/NetworkStatusKtx.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/di/NetworkKoinModule.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/di/NetworkKoinModule.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/di/NetworkKoinModule.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/di/NetworkKoinModule.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/KtorAccountService.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/KtorAccountService.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/KtorAccountService.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/KtorAccountService.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/KtorAuthenticationService.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/KtorAuthenticationService.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/KtorAuthenticationService.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/KtorAuthenticationService.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/KtorMovieService.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/KtorMovieService.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/KtorMovieService.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/KtorMovieService.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/KtorSearchService.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/KtorSearchService.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/KtorSearchService.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/KtorSearchService.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorKoinModule.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorKoinModule.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorKoinModule.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorKoinModule.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorNetworkKoinModule.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorNetworkKoinModule.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorNetworkKoinModule.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorNetworkKoinModule.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/ktx/ResultKtx.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/ktx/ResultKtx.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/ktx/ResultKtx.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/ktx/ResultKtx.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/ktx/ScreenStateKtx.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/ktx/ScreenStateKtx.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/ktx/ScreenStateKtx.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/ktx/ScreenStateKtx.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Account.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Account.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Account.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Account.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Avatar.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Avatar.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Avatar.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Avatar.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Cast.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Cast.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Cast.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Cast.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Collection.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Collection.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Collection.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Collection.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Company.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Company.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Company.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Company.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Country.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Country.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Country.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Country.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/CreditsResponse.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/CreditsResponse.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/CreditsResponse.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/CreditsResponse.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Crew.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Crew.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Crew.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Crew.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Dates.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Dates.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Dates.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Dates.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/DeletedSession.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/DeletedSession.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/DeletedSession.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/DeletedSession.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Fave.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Fave.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Fave.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Fave.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Genre.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Genre.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Genre.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Genre.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/GenresResponse.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/GenresResponse.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/GenresResponse.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/GenresResponse.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/GrAvatar.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/GrAvatar.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/GrAvatar.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/GrAvatar.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/GuestSession.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/GuestSession.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/GuestSession.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/GuestSession.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Image.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Image.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Image.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Image.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/ImagesResponse.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/ImagesResponse.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/ImagesResponse.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/ImagesResponse.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Keyword.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Keyword.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Keyword.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Keyword.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/KeywordsResponse.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/KeywordsResponse.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/KeywordsResponse.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/KeywordsResponse.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Language.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Language.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Language.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Language.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Mark.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Mark.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Mark.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Mark.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Movie.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Movie.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Movie.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Movie.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/MovieResponse.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/MovieResponse.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/MovieResponse.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/MovieResponse.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Network.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Network.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Network.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Network.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Person.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Person.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Person.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Person.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Rated.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Rated.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Rated.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Rated.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/RequestToken.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/RequestToken.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/RequestToken.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/RequestToken.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Result.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Result.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Result.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Result.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Review.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Review.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Review.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Review.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Session.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Session.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Session.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Session.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/SessionRequest.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/SessionRequest.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/SessionRequest.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/SessionRequest.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/TmdbAvatar.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/TmdbAvatar.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/TmdbAvatar.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/TmdbAvatar.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Token.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Token.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Token.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Token.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Username.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Username.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Username.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Username.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Video.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Video.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Video.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Video.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Watch.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Watch.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/Watch.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/Watch.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/BackdropSize.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/BackdropSize.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/BackdropSize.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/BackdropSize.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/LogoSize.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/LogoSize.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/LogoSize.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/LogoSize.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/PosterSize.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/PosterSize.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/PosterSize.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/PosterSize.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/ProfileSize.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/ProfileSize.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/ProfileSize.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/ProfileSize.kt
diff --git a/core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/StillSize.kt b/core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/StillSize.kt
similarity index 100%
rename from core/network-kmp/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/StillSize.kt
rename to core/network/src/commonMain/kotlin/org/michaelbel/movies/network/model/image/StillSize.kt
diff --git a/core/network-kmp/src/desktopMain/kotlin/org/michaelbel/movies/network/config/TmdbConfig.kt b/core/network/src/desktopMain/kotlin/org/michaelbel/movies/network/config/TmdbConfig.kt
similarity index 100%
rename from core/network-kmp/src/desktopMain/kotlin/org/michaelbel/movies/network/config/TmdbConfig.kt
rename to core/network/src/desktopMain/kotlin/org/michaelbel/movies/network/config/TmdbConfig.kt
diff --git a/core/network-kmp/src/desktopMain/kotlin/org/michaelbel/movies/network/connectivity/NetworkManager.kt b/core/network/src/desktopMain/kotlin/org/michaelbel/movies/network/connectivity/NetworkManager.kt
similarity index 100%
rename from core/network-kmp/src/desktopMain/kotlin/org/michaelbel/movies/network/connectivity/NetworkManager.kt
rename to core/network/src/desktopMain/kotlin/org/michaelbel/movies/network/connectivity/NetworkManager.kt
diff --git a/core/network-kmp/src/desktopMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorKoinModule.kt b/core/network/src/desktopMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorKoinModule.kt
similarity index 100%
rename from core/network-kmp/src/desktopMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorKoinModule.kt
rename to core/network/src/desktopMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorKoinModule.kt
diff --git a/core/notifications-kmp/.gitignore b/core/notifications/.gitignore
similarity index 100%
rename from core/notifications-kmp/.gitignore
rename to core/notifications/.gitignore
diff --git a/core/notifications-kmp/build.gradle.kts b/core/notifications/build.gradle.kts
similarity index 85%
rename from core/notifications-kmp/build.gradle.kts
rename to core/notifications/build.gradle.kts
index b437339a5..a8926c622 100644
--- a/core/notifications-kmp/build.gradle.kts
+++ b/core/notifications/build.gradle.kts
@@ -15,8 +15,8 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(project(":core:interactor-kmp"))
-            implementation(project(":core:ui-kmp"))
+            implementation(project(":core:interactor"))
+            implementation(project(":core:ui"))
             implementation(libs.bundles.koin.common)
         }
         androidMain.dependencies {
@@ -26,7 +26,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.notifications_kmp"
+    namespace = "org.michaelbel.movies.notifications"
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     sourceSets["main"].res.srcDirs("src/androidMain/res")
 
diff --git a/core/notifications-kmp/src/androidMain/AndroidManifest.xml b/core/notifications/src/androidMain/AndroidManifest.xml
similarity index 100%
rename from core/notifications-kmp/src/androidMain/AndroidManifest.xml
rename to core/notifications/src/androidMain/AndroidManifest.xml
diff --git a/core/notifications-kmp/src/androidMain/kotlin/org/michaelbel/movies/notifications/NotificationClient.kt b/core/notifications/src/androidMain/kotlin/org/michaelbel/movies/notifications/NotificationClient.kt
similarity index 99%
rename from core/notifications-kmp/src/androidMain/kotlin/org/michaelbel/movies/notifications/NotificationClient.kt
rename to core/notifications/src/androidMain/kotlin/org/michaelbel/movies/notifications/NotificationClient.kt
index a798c419f..f41b7b1fe 100644
--- a/core/notifications-kmp/src/androidMain/kotlin/org/michaelbel/movies/notifications/NotificationClient.kt
+++ b/core/notifications/src/androidMain/kotlin/org/michaelbel/movies/notifications/NotificationClient.kt
@@ -18,7 +18,7 @@ import org.michaelbel.movies.common.ktx.isTimePasses
 import org.michaelbel.movies.common.ktx.notificationManager
 import org.michaelbel.movies.interactor.Interactor
 import org.michaelbel.movies.notifications.model.MoviesPush
-import org.michaelbel.movies.notifications_kmp.R
+import org.michaelbel.movies.notifications.R
 import org.michaelbel.movies.ui.icons.MoviesAndroidIcons
 import java.util.concurrent.TimeUnit
 
diff --git a/core/notifications-kmp/src/androidMain/kotlin/org/michaelbel/movies/notifications/di/notificationClientKoinModule.kt b/core/notifications/src/androidMain/kotlin/org/michaelbel/movies/notifications/di/notificationClientKoinModule.kt
similarity index 100%
rename from core/notifications-kmp/src/androidMain/kotlin/org/michaelbel/movies/notifications/di/notificationClientKoinModule.kt
rename to core/notifications/src/androidMain/kotlin/org/michaelbel/movies/notifications/di/notificationClientKoinModule.kt
diff --git a/core/notifications-kmp/src/androidMain/kotlin/org/michaelbel/movies/notifications/model/MoviesPush.kt b/core/notifications/src/androidMain/kotlin/org/michaelbel/movies/notifications/model/MoviesPush.kt
similarity index 100%
rename from core/notifications-kmp/src/androidMain/kotlin/org/michaelbel/movies/notifications/model/MoviesPush.kt
rename to core/notifications/src/androidMain/kotlin/org/michaelbel/movies/notifications/model/MoviesPush.kt
diff --git a/core/notifications-kmp/src/androidMain/res/drawable/ic_movie_filter_24.xml b/core/notifications/src/androidMain/res/drawable/ic_movie_filter_24.xml
similarity index 100%
rename from core/notifications-kmp/src/androidMain/res/drawable/ic_movie_filter_24.xml
rename to core/notifications/src/androidMain/res/drawable/ic_movie_filter_24.xml
diff --git a/core/notifications-kmp/src/androidMain/res/values-ru/strings.xml b/core/notifications/src/androidMain/res/values-ru/strings.xml
similarity index 100%
rename from core/notifications-kmp/src/androidMain/res/values-ru/strings.xml
rename to core/notifications/src/androidMain/res/values-ru/strings.xml
diff --git a/core/notifications-kmp/src/androidMain/res/values/strings.xml b/core/notifications/src/androidMain/res/values/strings.xml
similarity index 100%
rename from core/notifications-kmp/src/androidMain/res/values/strings.xml
rename to core/notifications/src/androidMain/res/values/strings.xml
diff --git a/core/persistence-kmp/.gitignore b/core/persistence/.gitignore
similarity index 100%
rename from core/persistence-kmp/.gitignore
rename to core/persistence/.gitignore
diff --git a/core/persistence-kmp/build.gradle.kts b/core/persistence/build.gradle.kts
similarity index 90%
rename from core/persistence-kmp/build.gradle.kts
rename to core/persistence/build.gradle.kts
index dd80d364d..923e9a19b 100644
--- a/core/persistence-kmp/build.gradle.kts
+++ b/core/persistence/build.gradle.kts
@@ -16,8 +16,8 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(project(":core:common-kmp"))
-            api(project(":core:network-kmp"))
+            api(project(":core:common"))
+            api(project(":core:network"))
             implementation(libs.bundles.datastore.common)
             implementation(libs.bundles.paging.common)
             implementation(libs.bundles.koin.common)
@@ -36,7 +36,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.persistence_kmp"
+    namespace = "org.michaelbel.movies.persistence"
 
     defaultConfig {
         minSdk = libs.versions.min.sdk.get().toInt()
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/AccountPersistence.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/AccountPersistence.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/AccountPersistence.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/AccountPersistence.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ImagePersistence.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ImagePersistence.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ImagePersistence.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ImagePersistence.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/MoviePersistence.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/MoviePersistence.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/MoviePersistence.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/MoviePersistence.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/MoviesDatabase.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/MoviesDatabase.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/MoviesDatabase.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/MoviesDatabase.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/PagingKeyPersistence.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/PagingKeyPersistence.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/PagingKeyPersistence.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/PagingKeyPersistence.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/SuggestionPersistence.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/SuggestionPersistence.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/SuggestionPersistence.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/SuggestionPersistence.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/converter/CalendarConverter.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/converter/CalendarConverter.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/converter/CalendarConverter.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/converter/CalendarConverter.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/AccountDao.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/AccountDao.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/AccountDao.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/AccountDao.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/ImageDao.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/ImageDao.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/ImageDao.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/ImageDao.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/MovieDao.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/MovieDao.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/MovieDao.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/MovieDao.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/PagingKeyDao.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/PagingKeyDao.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/PagingKeyDao.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/PagingKeyDao.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/SuggestionDao.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/SuggestionDao.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/SuggestionDao.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/dao/SuggestionDao.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/db/AppDatabase.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/db/AppDatabase.kt
similarity index 97%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/db/AppDatabase.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/db/AppDatabase.kt
index 143a88070..adb861043 100644
--- a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/db/AppDatabase.kt
+++ b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/db/AppDatabase.kt
@@ -16,7 +16,7 @@ import org.michaelbel.movies.persistence.database.entity.ImageDb
 import org.michaelbel.movies.persistence.database.entity.MovieDb
 import org.michaelbel.movies.persistence.database.entity.PagingKeyDb
 import org.michaelbel.movies.persistence.database.entity.SuggestionDb
-import org.michaelbel.movies.persistence_kmp.BuildConfig
+import org.michaelbel.movies.persistence.BuildConfig
 
 /**
  * The Room database for this app.
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/DaoKoinModule.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/DaoKoinModule.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/DaoKoinModule.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/DaoKoinModule.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/DatabaseKoinModule.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/DatabaseKoinModule.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/DatabaseKoinModule.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/DatabaseKoinModule.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/MoviesDatabaseKoinModule.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/MoviesDatabaseKoinModule.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/MoviesDatabaseKoinModule.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/MoviesDatabaseKoinModule.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/PersistenceKoinModule.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/PersistenceKoinModule.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/PersistenceKoinModule.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/di/PersistenceKoinModule.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/AccountDb.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/AccountDb.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/AccountDb.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/AccountDb.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/ImageDb.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/ImageDb.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/ImageDb.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/ImageDb.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/MovieDb.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/MovieDb.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/MovieDb.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/MovieDb.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/PagingKeyDb.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/PagingKeyDb.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/PagingKeyDb.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/PagingKeyDb.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/SuggestionDb.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/SuggestionDb.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/SuggestionDb.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/entity/SuggestionDb.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/AccountPojoKtx.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/AccountPojoKtx.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/AccountPojoKtx.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/AccountPojoKtx.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/ImagePojoKtx.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/ImagePojoKtx.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/ImagePojoKtx.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/ImagePojoKtx.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/MoviePojoKtx.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/MoviePojoKtx.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/MoviePojoKtx.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/MoviePojoKtx.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/PagingKeyPojoKtx.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/PagingKeyPojoKtx.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/PagingKeyPojoKtx.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/PagingKeyPojoKtx.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/SuggestionPojoKtx.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/SuggestionPojoKtx.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/SuggestionPojoKtx.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/database/ktx/SuggestionPojoKtx.kt
diff --git a/core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/datastore/di/DataStoreKoinModule.kt b/core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/datastore/di/DataStoreKoinModule.kt
similarity index 100%
rename from core/persistence-kmp/src/androidMain/kotlin/org/michaelbel/movies/persistence/datastore/di/DataStoreKoinModule.kt
rename to core/persistence/src/androidMain/kotlin/org/michaelbel/movies/persistence/datastore/di/DataStoreKoinModule.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/AccountPersistence.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/AccountPersistence.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/AccountPersistence.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/AccountPersistence.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ImagePersistence.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ImagePersistence.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ImagePersistence.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ImagePersistence.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/MoviePersistence.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/MoviePersistence.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/MoviePersistence.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/MoviePersistence.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/MoviesDatabase.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/MoviesDatabase.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/MoviesDatabase.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/MoviesDatabase.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/PagingKeyPersistence.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/PagingKeyPersistence.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/PagingKeyPersistence.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/PagingKeyPersistence.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/SuggestionPersistence.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/SuggestionPersistence.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/SuggestionPersistence.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/SuggestionPersistence.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/di/DaoKoinModule.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/di/DaoKoinModule.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/di/DaoKoinModule.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/di/DaoKoinModule.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/di/DatabaseKoinModule.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/di/DatabaseKoinModule.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/di/DatabaseKoinModule.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/di/DatabaseKoinModule.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/di/MoviesDatabaseKoinModule.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/di/MoviesDatabaseKoinModule.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/di/MoviesDatabaseKoinModule.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/di/MoviesDatabaseKoinModule.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/di/PersistenceKoinModule.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/di/PersistenceKoinModule.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/di/PersistenceKoinModule.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/di/PersistenceKoinModule.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/AccountPojo.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/AccountPojo.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/AccountPojo.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/AccountPojo.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/ImagePojo.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/ImagePojo.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/ImagePojo.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/ImagePojo.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/ImageType.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/ImageType.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/ImageType.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/ImageType.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/MoviePojo.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/MoviePojo.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/MoviePojo.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/MoviePojo.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/PagingKeyPojo.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/PagingKeyPojo.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/PagingKeyPojo.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/PagingKeyPojo.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/SuggestionPojo.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/SuggestionPojo.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/SuggestionPojo.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/SuggestionPojo.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/mini/MovieDbMini.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/mini/MovieDbMini.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/mini/MovieDbMini.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/entity/mini/MovieDbMini.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/AccountKtx.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/AccountKtx.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/AccountKtx.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/AccountKtx.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/CommonAccountPojoKtx.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/CommonAccountPojoKtx.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/CommonAccountPojoKtx.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/CommonAccountPojoKtx.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/CommonImagePojoKtx.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/CommonImagePojoKtx.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/CommonImagePojoKtx.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/CommonImagePojoKtx.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/CommonMoviePojoKtx.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/CommonMoviePojoKtx.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/CommonMoviePojoKtx.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/CommonMoviePojoKtx.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/ImageKtx.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/ImageKtx.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/ImageKtx.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/ImageKtx.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/MovieKtx.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/MovieKtx.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/MovieKtx.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/MovieKtx.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/MovieResponseKtx.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/MovieResponseKtx.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/MovieResponseKtx.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/ktx/MovieResponseKtx.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/datastore/DataStoreName.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/datastore/DataStoreName.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/datastore/DataStoreName.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/datastore/DataStoreName.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/datastore/MoviesPreferences.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/datastore/MoviesPreferences.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/datastore/MoviesPreferences.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/datastore/MoviesPreferences.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/datastore/di/DataStoreKoinModule.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/datastore/di/DataStoreKoinModule.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/datastore/di/DataStoreKoinModule.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/datastore/di/DataStoreKoinModule.kt
diff --git a/core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/datastore/di/MoviesPreferencesKoinModule.kt b/core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/datastore/di/MoviesPreferencesKoinModule.kt
similarity index 100%
rename from core/persistence-kmp/src/commonMain/kotlin/org/michaelbel/movies/persistence/datastore/di/MoviesPreferencesKoinModule.kt
rename to core/persistence/src/commonMain/kotlin/org/michaelbel/movies/persistence/datastore/di/MoviesPreferencesKoinModule.kt
diff --git a/core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/AccountPersistence.kt b/core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/AccountPersistence.kt
similarity index 100%
rename from core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/AccountPersistence.kt
rename to core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/AccountPersistence.kt
diff --git a/core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/ImagePersistence.kt b/core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/ImagePersistence.kt
similarity index 100%
rename from core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/ImagePersistence.kt
rename to core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/ImagePersistence.kt
diff --git a/core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/MoviePersistence.kt b/core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/MoviePersistence.kt
similarity index 100%
rename from core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/MoviePersistence.kt
rename to core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/MoviePersistence.kt
diff --git a/core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/MoviesDatabase.kt b/core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/MoviesDatabase.kt
similarity index 100%
rename from core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/MoviesDatabase.kt
rename to core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/MoviesDatabase.kt
diff --git a/core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/PagingKeyPersistence.kt b/core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/PagingKeyPersistence.kt
similarity index 100%
rename from core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/PagingKeyPersistence.kt
rename to core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/PagingKeyPersistence.kt
diff --git a/core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/SuggestionPersistence.kt b/core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/SuggestionPersistence.kt
similarity index 100%
rename from core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/SuggestionPersistence.kt
rename to core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/SuggestionPersistence.kt
diff --git a/core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/di/DaoKoinModule.kt b/core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/di/DaoKoinModule.kt
similarity index 100%
rename from core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/di/DaoKoinModule.kt
rename to core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/di/DaoKoinModule.kt
diff --git a/core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/di/DatabaseKoinModule.kt b/core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/di/DatabaseKoinModule.kt
similarity index 100%
rename from core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/di/DatabaseKoinModule.kt
rename to core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/di/DatabaseKoinModule.kt
diff --git a/core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/di/MoviesDatabaseKoinModule.kt b/core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/di/MoviesDatabaseKoinModule.kt
similarity index 100%
rename from core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/di/MoviesDatabaseKoinModule.kt
rename to core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/di/MoviesDatabaseKoinModule.kt
diff --git a/core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/di/PersistenceKoinModule.kt b/core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/di/PersistenceKoinModule.kt
similarity index 100%
rename from core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/di/PersistenceKoinModule.kt
rename to core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/database/di/PersistenceKoinModule.kt
diff --git a/core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/datastore/di/DataStoreKoinModule.kt b/core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/datastore/di/DataStoreKoinModule.kt
similarity index 100%
rename from core/persistence-kmp/src/desktopMain/kotlin/org/michaelbel/movies/persistence/datastore/di/DataStoreKoinModule.kt
rename to core/persistence/src/desktopMain/kotlin/org/michaelbel/movies/persistence/datastore/di/DataStoreKoinModule.kt
diff --git a/core/platform-services/foss-kmp/.gitignore b/core/platform-services/foss/.gitignore
similarity index 100%
rename from core/platform-services/foss-kmp/.gitignore
rename to core/platform-services/foss/.gitignore
diff --git a/core/platform-services/hms-kmp/build.gradle.kts b/core/platform-services/foss/build.gradle.kts
similarity index 92%
rename from core/platform-services/hms-kmp/build.gradle.kts
rename to core/platform-services/foss/build.gradle.kts
index 85b844378..35864d23d 100644
--- a/core/platform-services/hms-kmp/build.gradle.kts
+++ b/core/platform-services/foss/build.gradle.kts
@@ -15,7 +15,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(project(":core:platform-services:interactor-kmp"))
+            implementation(project(":core:platform-services:interactor"))
             implementation(libs.bundles.kotlinx.coroutines.common)
             implementation(libs.bundles.koin.common)
         }
@@ -23,7 +23,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.platform.hms_kmp"
+    namespace = "org.michaelbel.movies.platform.foss"
 
     defaultConfig {
         minSdk = libs.versions.min.sdk.get().toInt()
diff --git a/core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt b/core/platform-services/foss/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt
similarity index 100%
rename from core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt
rename to core/platform-services/foss/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt
diff --git a/core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/analytics/AnalyticsServiceImpl.kt b/core/platform-services/foss/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/analytics/AnalyticsServiceImpl.kt
similarity index 100%
rename from core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/analytics/AnalyticsServiceImpl.kt
rename to core/platform-services/foss/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/analytics/AnalyticsServiceImpl.kt
diff --git a/core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/app/AppServiceImpl.kt b/core/platform-services/foss/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/app/AppServiceImpl.kt
similarity index 100%
rename from core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/app/AppServiceImpl.kt
rename to core/platform-services/foss/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/app/AppServiceImpl.kt
diff --git a/core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/config/ConfigServiceImpl.kt b/core/platform-services/foss/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/config/ConfigServiceImpl.kt
similarity index 100%
rename from core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/config/ConfigServiceImpl.kt
rename to core/platform-services/foss/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/config/ConfigServiceImpl.kt
diff --git a/core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/crashlytics/CrashlyticsServiceImpl.kt b/core/platform-services/foss/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/crashlytics/CrashlyticsServiceImpl.kt
similarity index 100%
rename from core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/crashlytics/CrashlyticsServiceImpl.kt
rename to core/platform-services/foss/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/crashlytics/CrashlyticsServiceImpl.kt
diff --git a/core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/MessagingServiceImpl.kt b/core/platform-services/foss/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/MessagingServiceImpl.kt
similarity index 100%
rename from core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/MessagingServiceImpl.kt
rename to core/platform-services/foss/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/MessagingServiceImpl.kt
diff --git a/core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/review/ReviewServiceImpl.kt b/core/platform-services/foss/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/review/ReviewServiceImpl.kt
similarity index 100%
rename from core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/review/ReviewServiceImpl.kt
rename to core/platform-services/foss/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/review/ReviewServiceImpl.kt
diff --git a/core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/UpdateServiceImpl.kt b/core/platform-services/foss/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/UpdateServiceImpl.kt
similarity index 100%
rename from core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/UpdateServiceImpl.kt
rename to core/platform-services/foss/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/UpdateServiceImpl.kt
diff --git a/core/platform-services/gms-kmp/.gitignore b/core/platform-services/gms/.gitignore
similarity index 100%
rename from core/platform-services/gms-kmp/.gitignore
rename to core/platform-services/gms/.gitignore
diff --git a/core/platform-services/gms-kmp/build.gradle.kts b/core/platform-services/gms/build.gradle.kts
similarity index 89%
rename from core/platform-services/gms-kmp/build.gradle.kts
rename to core/platform-services/gms/build.gradle.kts
index 7860fb56d..9d0446834 100644
--- a/core/platform-services/gms-kmp/build.gradle.kts
+++ b/core/platform-services/gms/build.gradle.kts
@@ -15,8 +15,8 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(project(":core:platform-services:interactor-kmp"))
-            implementation(project(":core:notifications-kmp"))
+            implementation(project(":core:platform-services:interactor"))
+            implementation(project(":core:notifications"))
             implementation(libs.bundles.koin.common)
         }
         androidMain.dependencies {
@@ -29,7 +29,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.platform.gms_kmp"
+    namespace = "org.michaelbel.movies.platform.gms"
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
 
     defaultConfig {
diff --git a/core/platform-services/gms-kmp/src/androidMain/AndroidManifest.xml b/core/platform-services/gms/src/androidMain/AndroidManifest.xml
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/AndroidManifest.xml
rename to core/platform-services/gms/src/androidMain/AndroidManifest.xml
diff --git a/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/FirebaseKoinModule.kt b/core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/FirebaseKoinModule.kt
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/FirebaseKoinModule.kt
rename to core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/FirebaseKoinModule.kt
diff --git a/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/GoogleApiKoinModule.kt b/core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/GoogleApiKoinModule.kt
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/GoogleApiKoinModule.kt
rename to core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/GoogleApiKoinModule.kt
diff --git a/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt b/core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt
rename to core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt
diff --git a/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlayKoinModule.kt b/core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlayKoinModule.kt
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlayKoinModule.kt
rename to core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlayKoinModule.kt
diff --git a/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/analytics/AnalyticsServiceImpl.kt b/core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/analytics/AnalyticsServiceImpl.kt
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/analytics/AnalyticsServiceImpl.kt
rename to core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/analytics/AnalyticsServiceImpl.kt
diff --git a/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/app/AppServiceImpl.kt b/core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/app/AppServiceImpl.kt
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/app/AppServiceImpl.kt
rename to core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/app/AppServiceImpl.kt
diff --git a/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/config/ConfigServiceImpl.kt b/core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/config/ConfigServiceImpl.kt
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/config/ConfigServiceImpl.kt
rename to core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/config/ConfigServiceImpl.kt
diff --git a/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/crashlytics/CrashlyticsServiceImpl.kt b/core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/crashlytics/CrashlyticsServiceImpl.kt
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/crashlytics/CrashlyticsServiceImpl.kt
rename to core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/crashlytics/CrashlyticsServiceImpl.kt
diff --git a/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/MessagingServiceImpl.kt b/core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/MessagingServiceImpl.kt
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/MessagingServiceImpl.kt
rename to core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/MessagingServiceImpl.kt
diff --git a/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/ktx/RemoteMessageKtx.kt b/core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/ktx/RemoteMessageKtx.kt
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/ktx/RemoteMessageKtx.kt
rename to core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/ktx/RemoteMessageKtx.kt
diff --git a/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/service/MoviesMessagingService.kt b/core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/service/MoviesMessagingService.kt
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/service/MoviesMessagingService.kt
rename to core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/service/MoviesMessagingService.kt
diff --git a/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/review/ReviewServiceImpl.kt b/core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/review/ReviewServiceImpl.kt
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/review/ReviewServiceImpl.kt
rename to core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/review/ReviewServiceImpl.kt
diff --git a/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/InAppUpdate.kt b/core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/InAppUpdate.kt
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/InAppUpdate.kt
rename to core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/InAppUpdate.kt
diff --git a/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/UpdateServiceImpl.kt b/core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/UpdateServiceImpl.kt
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/UpdateServiceImpl.kt
rename to core/platform-services/gms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/UpdateServiceImpl.kt
diff --git a/core/platform-services/gms-kmp/src/androidMain/res/drawable/ic_movie_filter_24.xml b/core/platform-services/gms/src/androidMain/res/drawable/ic_movie_filter_24.xml
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/res/drawable/ic_movie_filter_24.xml
rename to core/platform-services/gms/src/androidMain/res/drawable/ic_movie_filter_24.xml
diff --git a/core/platform-services/gms-kmp/src/androidMain/res/values-night/colors.xml b/core/platform-services/gms/src/androidMain/res/values-night/colors.xml
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/res/values-night/colors.xml
rename to core/platform-services/gms/src/androidMain/res/values-night/colors.xml
diff --git a/core/platform-services/gms-kmp/src/androidMain/res/values-ru/strings.xml b/core/platform-services/gms/src/androidMain/res/values-ru/strings.xml
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/res/values-ru/strings.xml
rename to core/platform-services/gms/src/androidMain/res/values-ru/strings.xml
diff --git a/core/platform-services/gms-kmp/src/androidMain/res/values/colors.xml b/core/platform-services/gms/src/androidMain/res/values/colors.xml
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/res/values/colors.xml
rename to core/platform-services/gms/src/androidMain/res/values/colors.xml
diff --git a/core/platform-services/gms-kmp/src/androidMain/res/values/strings.xml b/core/platform-services/gms/src/androidMain/res/values/strings.xml
similarity index 100%
rename from core/platform-services/gms-kmp/src/androidMain/res/values/strings.xml
rename to core/platform-services/gms/src/androidMain/res/values/strings.xml
diff --git a/core/platform-services/hms-kmp/.gitignore b/core/platform-services/hms/.gitignore
similarity index 100%
rename from core/platform-services/hms-kmp/.gitignore
rename to core/platform-services/hms/.gitignore
diff --git a/core/platform-services/foss-kmp/build.gradle.kts b/core/platform-services/hms/build.gradle.kts
similarity index 92%
rename from core/platform-services/foss-kmp/build.gradle.kts
rename to core/platform-services/hms/build.gradle.kts
index 92ced2a26..6bf5dfbad 100644
--- a/core/platform-services/foss-kmp/build.gradle.kts
+++ b/core/platform-services/hms/build.gradle.kts
@@ -15,7 +15,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(project(":core:platform-services:interactor-kmp"))
+            implementation(project(":core:platform-services:interactor"))
             implementation(libs.bundles.kotlinx.coroutines.common)
             implementation(libs.bundles.koin.common)
         }
@@ -23,7 +23,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.platform.foss_kmp"
+    namespace = "org.michaelbel.movies.platform.hms"
 
     defaultConfig {
         minSdk = libs.versions.min.sdk.get().toInt()
diff --git a/core/platform-services/hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt b/core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt
similarity index 100%
rename from core/platform-services/hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt
rename to core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt
diff --git a/core/platform-services/hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/analytics/AnalyticsServiceImpl.kt b/core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/analytics/AnalyticsServiceImpl.kt
similarity index 100%
rename from core/platform-services/hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/analytics/AnalyticsServiceImpl.kt
rename to core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/analytics/AnalyticsServiceImpl.kt
diff --git a/core/platform-services/hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/app/AppServiceImpl.kt b/core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/app/AppServiceImpl.kt
similarity index 100%
rename from core/platform-services/hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/app/AppServiceImpl.kt
rename to core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/app/AppServiceImpl.kt
diff --git a/core/platform-services/hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/config/ConfigServiceImpl.kt b/core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/config/ConfigServiceImpl.kt
similarity index 100%
rename from core/platform-services/hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/config/ConfigServiceImpl.kt
rename to core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/config/ConfigServiceImpl.kt
diff --git a/core/platform-services/hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/crashlytics/CrashlyticsServiceImpl.kt b/core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/crashlytics/CrashlyticsServiceImpl.kt
similarity index 100%
rename from core/platform-services/hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/crashlytics/CrashlyticsServiceImpl.kt
rename to core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/crashlytics/CrashlyticsServiceImpl.kt
diff --git a/core/platform-services/hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/MessagingServiceImpl.kt b/core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/MessagingServiceImpl.kt
similarity index 100%
rename from core/platform-services/hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/MessagingServiceImpl.kt
rename to core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/messaging/MessagingServiceImpl.kt
diff --git a/core/platform-services/hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/review/ReviewServiceImpl.kt b/core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/review/ReviewServiceImpl.kt
similarity index 100%
rename from core/platform-services/hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/review/ReviewServiceImpl.kt
rename to core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/review/ReviewServiceImpl.kt
diff --git a/core/platform-services/hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/UpdateServiceImpl.kt b/core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/UpdateServiceImpl.kt
similarity index 100%
rename from core/platform-services/hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/UpdateServiceImpl.kt
rename to core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/UpdateServiceImpl.kt
diff --git a/core/platform-services/inject-kmp/.gitignore b/core/platform-services/inject/.gitignore
similarity index 100%
rename from core/platform-services/inject-kmp/.gitignore
rename to core/platform-services/inject/.gitignore
diff --git a/core/platform-services/inject-kmp/build.gradle.kts b/core/platform-services/inject/build.gradle.kts
similarity index 86%
rename from core/platform-services/inject-kmp/build.gradle.kts
rename to core/platform-services/inject/build.gradle.kts
index 7e047f897..b1599b8e6 100644
--- a/core/platform-services/inject-kmp/build.gradle.kts
+++ b/core/platform-services/inject/build.gradle.kts
@@ -15,7 +15,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(project(":core:platform-services:interactor-kmp"))
+            implementation(project(":core:platform-services:interactor"))
             implementation(libs.bundles.koin.common)
         }
         androidMain.dependencies {
@@ -25,7 +25,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.platform.inject_kmp"
+    namespace = "org.michaelbel.movies.platform.inject"
     flavorDimensions += "version"
 
     defaultConfig {
@@ -58,8 +58,8 @@ android {
     val hmsImplementation by configurations
     val fossImplementation by configurations
     dependencies {
-        gmsImplementation(project(":core:platform-services:gms-kmp"))
-        hmsImplementation(project(":core:platform-services:hms-kmp"))
-        fossImplementation(project(":core:platform-services:foss-kmp"))
+        gmsImplementation(project(":core:platform-services:gms"))
+        hmsImplementation(project(":core:platform-services:hms"))
+        fossImplementation(project(":core:platform-services:foss"))
     }
 }
\ No newline at end of file
diff --git a/core/platform-services/inject-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/inject/FlavorServiceKtorModule.kt b/core/platform-services/inject/src/androidMain/kotlin/org/michaelbel/movies/platform/inject/FlavorServiceKtorModule.kt
similarity index 100%
rename from core/platform-services/inject-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/inject/FlavorServiceKtorModule.kt
rename to core/platform-services/inject/src/androidMain/kotlin/org/michaelbel/movies/platform/inject/FlavorServiceKtorModule.kt
diff --git a/core/platform-services/interactor-kmp/.gitignore b/core/platform-services/interactor/.gitignore
similarity index 100%
rename from core/platform-services/interactor-kmp/.gitignore
rename to core/platform-services/interactor/.gitignore
diff --git a/core/platform-services/interactor-kmp/build.gradle.kts b/core/platform-services/interactor/build.gradle.kts
similarity index 92%
rename from core/platform-services/interactor-kmp/build.gradle.kts
rename to core/platform-services/interactor/build.gradle.kts
index 6bfd32d81..6936e0cc3 100644
--- a/core/platform-services/interactor-kmp/build.gradle.kts
+++ b/core/platform-services/interactor/build.gradle.kts
@@ -21,7 +21,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.platform.interactor_kmp"
+    namespace = "org.michaelbel.movies.platform.interactor"
 
     defaultConfig {
         minSdk = libs.versions.min.sdk.get().toInt()
diff --git a/core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/Flavor.kt b/core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/Flavor.kt
similarity index 100%
rename from core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/Flavor.kt
rename to core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/Flavor.kt
diff --git a/core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/analytics/AnalyticsService.kt b/core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/analytics/AnalyticsService.kt
similarity index 100%
rename from core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/analytics/AnalyticsService.kt
rename to core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/analytics/AnalyticsService.kt
diff --git a/core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/app/AppService.kt b/core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/app/AppService.kt
similarity index 100%
rename from core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/app/AppService.kt
rename to core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/app/AppService.kt
diff --git a/core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/config/ConfigService.kt b/core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/config/ConfigService.kt
similarity index 100%
rename from core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/config/ConfigService.kt
rename to core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/config/ConfigService.kt
diff --git a/core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/crashlytics/CrashlyticsService.kt b/core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/crashlytics/CrashlyticsService.kt
similarity index 100%
rename from core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/crashlytics/CrashlyticsService.kt
rename to core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/crashlytics/CrashlyticsService.kt
diff --git a/core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/messaging/MessagingService.kt b/core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/messaging/MessagingService.kt
similarity index 100%
rename from core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/messaging/MessagingService.kt
rename to core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/messaging/MessagingService.kt
diff --git a/core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/messaging/TokenListener.kt b/core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/messaging/TokenListener.kt
similarity index 100%
rename from core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/messaging/TokenListener.kt
rename to core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/messaging/TokenListener.kt
diff --git a/core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/review/ReviewService.kt b/core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/review/ReviewService.kt
similarity index 100%
rename from core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/review/ReviewService.kt
rename to core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/review/ReviewService.kt
diff --git a/core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/update/UpdateListener.kt b/core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/update/UpdateListener.kt
similarity index 100%
rename from core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/update/UpdateListener.kt
rename to core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/update/UpdateListener.kt
diff --git a/core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/update/UpdateService.kt b/core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/update/UpdateService.kt
similarity index 100%
rename from core/platform-services/interactor-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/update/UpdateService.kt
rename to core/platform-services/interactor/src/androidMain/kotlin/org/michaelbel/movies/platform/update/UpdateService.kt
diff --git a/core/repository-kmp/.gitignore b/core/repository/.gitignore
similarity index 100%
rename from core/repository-kmp/.gitignore
rename to core/repository/.gitignore
diff --git a/core/repository-kmp/build.gradle.kts b/core/repository/build.gradle.kts
similarity index 90%
rename from core/repository-kmp/build.gradle.kts
rename to core/repository/build.gradle.kts
index 3b562ebfd..d662c1f76 100644
--- a/core/repository-kmp/build.gradle.kts
+++ b/core/repository/build.gradle.kts
@@ -15,7 +15,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(project(":core:persistence-kmp"))
+            api(project(":core:persistence"))
             implementation(libs.bundles.kotlinx.coroutines.common)
             implementation(libs.bundles.paging.common)
             implementation(libs.bundles.koin.common)
@@ -27,7 +27,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.repository_kmp"
+    namespace = "org.michaelbel.movies.repository"
 
     defaultConfig {
         minSdk = libs.versions.min.sdk.get().toInt()
diff --git a/core/repository-kmp/src/androidMain/kotlin/org/michaelbel/movies/repository/ktx/BuildKtx.kt b/core/repository/src/androidMain/kotlin/org/michaelbel/movies/repository/ktx/BuildKtx.kt
similarity index 100%
rename from core/repository-kmp/src/androidMain/kotlin/org/michaelbel/movies/repository/ktx/BuildKtx.kt
rename to core/repository/src/androidMain/kotlin/org/michaelbel/movies/repository/ktx/BuildKtx.kt
diff --git a/core/repository-kmp/src/androidMain/kotlin/org/michaelbel/movies/repository/ktx/ExceptionKtx.kt b/core/repository/src/androidMain/kotlin/org/michaelbel/movies/repository/ktx/ExceptionKtx.kt
similarity index 100%
rename from core/repository-kmp/src/androidMain/kotlin/org/michaelbel/movies/repository/ktx/ExceptionKtx.kt
rename to core/repository/src/androidMain/kotlin/org/michaelbel/movies/repository/ktx/ExceptionKtx.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/AccountRepository.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/AccountRepository.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/AccountRepository.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/AccountRepository.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/AuthenticationRepository.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/AuthenticationRepository.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/AuthenticationRepository.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/AuthenticationRepository.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/ImageRepository.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/ImageRepository.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/ImageRepository.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/ImageRepository.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/MovieRepository.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/MovieRepository.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/MovieRepository.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/MovieRepository.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/NotificationRepository.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/NotificationRepository.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/NotificationRepository.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/NotificationRepository.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/PagingKeyRepository.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/PagingKeyRepository.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/PagingKeyRepository.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/PagingKeyRepository.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/SearchRepository.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/SearchRepository.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/SearchRepository.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/SearchRepository.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/SettingsRepository.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/SettingsRepository.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/SettingsRepository.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/SettingsRepository.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/SuggestionRepository.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/SuggestionRepository.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/SuggestionRepository.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/SuggestionRepository.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/di/RepositoryKoinModule.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/di/RepositoryKoinModule.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/di/RepositoryKoinModule.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/di/RepositoryKoinModule.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/AccountRepositoryImpl.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/AccountRepositoryImpl.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/AccountRepositoryImpl.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/AccountRepositoryImpl.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/AuthenticationRepositoryImpl.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/AuthenticationRepositoryImpl.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/AuthenticationRepositoryImpl.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/AuthenticationRepositoryImpl.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/ImageRepositoryImpl.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/ImageRepositoryImpl.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/ImageRepositoryImpl.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/ImageRepositoryImpl.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/MovieRepositoryImpl.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/MovieRepositoryImpl.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/MovieRepositoryImpl.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/MovieRepositoryImpl.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/NotificationRepositoryImpl.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/NotificationRepositoryImpl.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/NotificationRepositoryImpl.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/NotificationRepositoryImpl.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/PagingKeyRepositoryImpl.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/PagingKeyRepositoryImpl.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/PagingKeyRepositoryImpl.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/PagingKeyRepositoryImpl.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/SearchRepositoryImpl.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/SearchRepositoryImpl.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/SearchRepositoryImpl.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/SearchRepositoryImpl.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/SettingsRepositoryImpl.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/SettingsRepositoryImpl.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/SettingsRepositoryImpl.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/SettingsRepositoryImpl.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/SuggestionRepositoryImpl.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/SuggestionRepositoryImpl.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/SuggestionRepositoryImpl.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/impl/SuggestionRepositoryImpl.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/ktx/BuildKtx.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/ktx/BuildKtx.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/ktx/BuildKtx.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/ktx/BuildKtx.kt
diff --git a/core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/ktx/ExceptionKtx.kt b/core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/ktx/ExceptionKtx.kt
similarity index 100%
rename from core/repository-kmp/src/commonMain/kotlin/org/michaelbel/movies/repository/ktx/ExceptionKtx.kt
rename to core/repository/src/commonMain/kotlin/org/michaelbel/movies/repository/ktx/ExceptionKtx.kt
diff --git a/core/repository-kmp/src/desktopMain/kotlin/org/michaelbel/movies/repository/ktx/BuildKtx.kt b/core/repository/src/desktopMain/kotlin/org/michaelbel/movies/repository/ktx/BuildKtx.kt
similarity index 100%
rename from core/repository-kmp/src/desktopMain/kotlin/org/michaelbel/movies/repository/ktx/BuildKtx.kt
rename to core/repository/src/desktopMain/kotlin/org/michaelbel/movies/repository/ktx/BuildKtx.kt
diff --git a/core/repository-kmp/src/desktopMain/kotlin/org/michaelbel/movies/repository/ktx/ExceptionKtx.kt b/core/repository/src/desktopMain/kotlin/org/michaelbel/movies/repository/ktx/ExceptionKtx.kt
similarity index 100%
rename from core/repository-kmp/src/desktopMain/kotlin/org/michaelbel/movies/repository/ktx/ExceptionKtx.kt
rename to core/repository/src/desktopMain/kotlin/org/michaelbel/movies/repository/ktx/ExceptionKtx.kt
diff --git a/core/ui-kmp/build/generated/compose/resourceGenerator/kotlin/movies/core/ui_kmp/generated/resources/Res.kt b/core/ui-kmp/build/generated/compose/resourceGenerator/kotlin/movies/core/ui_kmp/generated/resources/Res.kt
deleted file mode 100644
index 579bdb01e..000000000
--- a/core/ui-kmp/build/generated/compose/resourceGenerator/kotlin/movies/core/ui_kmp/generated/resources/Res.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-@file:OptIn(
-  org.jetbrains.compose.resources.InternalResourceApi::class,
-  org.jetbrains.compose.resources.ExperimentalResourceApi::class,
-)
-
-package movies.core.ui_kmp.generated.resources
-
-import kotlin.ByteArray
-import kotlin.OptIn
-import kotlin.String
-import org.jetbrains.compose.resources.ExperimentalResourceApi
-import org.jetbrains.compose.resources.readResourceBytes
-
-@ExperimentalResourceApi
-internal object Res {
-  /**
-   * Reads the content of the resource file at the specified path and returns it as a byte array.
-   *
-   * Example: `val bytes = Res.readBytes("files/key.bin")`
-   *
-   * @param path The path of the file to read in the compose resource's directory.
-   * @return The content of the file as a byte array.
-   */
-  public suspend fun readBytes(path: String): ByteArray = readResourceBytes(path)
-
-  public object drawable
-
-  public object string
-
-  public object font
-}
diff --git a/core/ui-kmp/.gitignore b/core/ui/.gitignore
similarity index 100%
rename from core/ui-kmp/.gitignore
rename to core/ui/.gitignore
diff --git a/core/ui-kmp/build.gradle.kts b/core/ui/build.gradle.kts
similarity index 95%
rename from core/ui-kmp/build.gradle.kts
rename to core/ui/build.gradle.kts
index e5fc2a3c0..0c4973a4e 100644
--- a/core/ui-kmp/build.gradle.kts
+++ b/core/ui/build.gradle.kts
@@ -22,7 +22,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(project(":core:persistence-kmp"))
+            implementation(project(":core:persistence"))
             implementation(libs.bundles.paging.common)
             implementation(libs.bundles.constraintlayout.common)
             implementation(libs.bundles.coil.common)
@@ -48,7 +48,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.ui_kmp"
+    namespace = "org.michaelbel.movies.ui"
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     sourceSets["main"].res.srcDirs("src/androidMain/res")
 
diff --git a/core/ui-kmp/src/androidMain/AndroidManifest.xml b/core/ui/src/androidMain/AndroidManifest.xml
similarity index 100%
rename from core/ui-kmp/src/androidMain/AndroidManifest.xml
rename to core/ui/src/androidMain/AndroidManifest.xml
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/accessibility/MoviesContentDescription.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/accessibility/MoviesContentDescription.kt
similarity index 93%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/accessibility/MoviesContentDescription.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/accessibility/MoviesContentDescription.kt
index 60f90c4d3..aa89ec3b9 100644
--- a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/accessibility/MoviesContentDescription.kt
+++ b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/accessibility/MoviesContentDescription.kt
@@ -1,7 +1,7 @@
 package org.michaelbel.movies.ui.accessibility
 
 import androidx.annotation.StringRes
-import org.michaelbel.movies.ui_kmp.R
+import org.michaelbel.movies.ui.R
 
 object MoviesContentDescription {
     @StringRes val AccountIcon = R.string.content_description_account_icon
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/appicon/MoviesAlias.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/appicon/MoviesAlias.kt
similarity index 98%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/appicon/MoviesAlias.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/appicon/MoviesAlias.kt
index af4333553..e04a133e1 100644
--- a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/appicon/MoviesAlias.kt
+++ b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/appicon/MoviesAlias.kt
@@ -4,7 +4,7 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.pm.PackageManager
 import androidx.annotation.DrawableRes
-import org.michaelbel.movies.ui_kmp.R
+import org.michaelbel.movies.ui.R
 
 private fun Context.componentName(iconAlias: IconAlias): ComponentName {
     return ComponentName(packageName, "org.michaelbel.movies.${iconAlias.key}")
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/NotificationBottomSheet.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/NotificationBottomSheet.kt
similarity index 99%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/NotificationBottomSheet.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/NotificationBottomSheet.kt
index 9335cbed4..179f600a3 100644
--- a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/NotificationBottomSheet.kt
+++ b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/NotificationBottomSheet.kt
@@ -47,7 +47,7 @@ import org.michaelbel.movies.ui.icons.MoviesIcons
 import org.michaelbel.movies.ui.ktx.appNotificationSettingsIntent
 import org.michaelbel.movies.ui.preview.DevicePreviews
 import org.michaelbel.movies.ui.theme.MoviesTheme
-import org.michaelbel.movies.ui_kmp.R
+import org.michaelbel.movies.ui.R
 
 @Composable
 fun NotificationBottomSheet(
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/VoiceIcon.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/VoiceIcon.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/VoiceIcon.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/VoiceIcon.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/movie/MovieColumn.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/movie/MovieColumn.kt
similarity index 99%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/movie/MovieColumn.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/movie/MovieColumn.kt
index ef06e856a..c2f084aa4 100644
--- a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/movie/MovieColumn.kt
+++ b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/movie/MovieColumn.kt
@@ -33,7 +33,7 @@ import org.michaelbel.movies.ui.ktx.isErrorOrEmpty
 import org.michaelbel.movies.ui.preview.DevicePreviews
 import org.michaelbel.movies.ui.preview.provider.MoviePreviewParameterProvider
 import org.michaelbel.movies.ui.theme.MoviesTheme
-import org.michaelbel.movies.ui_kmp.R
+import org.michaelbel.movies.ui.R
 
 @Composable
 internal fun MovieColumn(
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/movie/MovieRow.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/movie/MovieRow.kt
similarity index 99%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/movie/MovieRow.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/movie/MovieRow.kt
index bf857699f..c1791445b 100644
--- a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/movie/MovieRow.kt
+++ b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/movie/MovieRow.kt
@@ -33,7 +33,7 @@ import org.michaelbel.movies.ui.ktx.isErrorOrEmpty
 import org.michaelbel.movies.ui.preview.DevicePreviews
 import org.michaelbel.movies.ui.preview.provider.MoviePreviewParameterProvider
 import org.michaelbel.movies.ui.theme.MoviesTheme
-import org.michaelbel.movies.ui_kmp.R
+import org.michaelbel.movies.ui.R
 
 @Composable
 internal fun MovieRow(
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageContent.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageContent.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageContent.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageContent.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageFailure.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageFailure.kt
similarity index 98%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageFailure.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageFailure.kt
index aad2eac95..2f053d52d 100644
--- a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageFailure.kt
+++ b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageFailure.kt
@@ -30,7 +30,7 @@ import org.michaelbel.movies.ui.accessibility.MoviesContentDescription
 import org.michaelbel.movies.ui.icons.MoviesIcons
 import org.michaelbel.movies.ui.preview.DevicePreviews
 import org.michaelbel.movies.ui.theme.MoviesTheme
-import org.michaelbel.movies.ui_kmp.R
+import org.michaelbel.movies.ui.R
 
 @Composable
 fun PageFailure(
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageLoading.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageLoading.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageLoading.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageLoading.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/icons/MoviesAndroidIcons.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/icons/MoviesAndroidIcons.kt
similarity index 93%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/icons/MoviesAndroidIcons.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/icons/MoviesAndroidIcons.kt
index 7b54dce77..51f51d33a 100644
--- a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/icons/MoviesAndroidIcons.kt
+++ b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/icons/MoviesAndroidIcons.kt
@@ -2,7 +2,7 @@ package org.michaelbel.movies.ui.icons
 
 import androidx.annotation.DrawableRes
 import androidx.compose.ui.graphics.vector.ImageVector
-import org.michaelbel.movies.ui_kmp.R
+import org.michaelbel.movies.ui.R
 
 /**
  * Movies icons. Material icons are [ImageVector]s, custom icons are drawable resource IDs.
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/ActivityKtx.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/ActivityKtx.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/ActivityKtx.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/ActivityKtx.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/AndroidConfigurationKtx.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/AndroidConfigurationKtx.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/AndroidConfigurationKtx.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/AndroidConfigurationKtx.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/AsyncImagePainterStateKtx.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/AsyncImagePainterStateKtx.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/AsyncImagePainterStateKtx.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/AsyncImagePainterStateKtx.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/ComposableKtx.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/ComposableKtx.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/ComposableKtx.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/ComposableKtx.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/ConfigurationKtx.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/ConfigurationKtx.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/ConfigurationKtx.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/ConfigurationKtx.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/LazyPagingItemsKtx.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/LazyPagingItemsKtx.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/LazyPagingItemsKtx.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/LazyPagingItemsKtx.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/SettingsKtx.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/SettingsKtx.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/SettingsKtx.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/SettingsKtx.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/WindowInsetsKtx.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/WindowInsetsKtx.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/WindowInsetsKtx.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/WindowInsetsKtx.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/WindowKtx.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/WindowKtx.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/WindowKtx.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/ktx/WindowKtx.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/lifecycle/OnLifecycleEvent.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/lifecycle/OnLifecycleEvent.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/lifecycle/OnLifecycleEvent.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/lifecycle/OnLifecycleEvent.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/placeholder/Placeholder.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/placeholder/Placeholder.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/placeholder/Placeholder.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/placeholder/Placeholder.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/placeholder/PlaceholderHightlight.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/placeholder/PlaceholderHightlight.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/placeholder/PlaceholderHightlight.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/placeholder/PlaceholderHightlight.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/placeholder/material3/Placeholder.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/placeholder/material3/Placeholder.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/placeholder/material3/Placeholder.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/placeholder/material3/Placeholder.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/placeholder/material3/PlaceholderHighlight.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/placeholder/material3/PlaceholderHighlight.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/placeholder/material3/PlaceholderHighlight.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/placeholder/material3/PlaceholderHighlight.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceLandscapePreview.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceLandscapePreview.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceLandscapePreview.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceLandscapePreview.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceLandscapePreviews.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceLandscapePreviews.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceLandscapePreviews.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceLandscapePreviews.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DevicePreviews.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DevicePreviews.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DevicePreviews.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DevicePreviews.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceUserLandscapePreviews.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceUserLandscapePreviews.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceUserLandscapePreviews.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceUserLandscapePreviews.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceUserPreviews.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceUserPreviews.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceUserPreviews.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceUserPreviews.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/AccountPreviewParameterProvider.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/AccountPreviewParameterProvider.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/AccountPreviewParameterProvider.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/AccountPreviewParameterProvider.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/AppearancePreviewParameterProvider.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/AppearancePreviewParameterProvider.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/AppearancePreviewParameterProvider.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/AppearancePreviewParameterProvider.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/BooleanPreviewParameterProvider.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/BooleanPreviewParameterProvider.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/BooleanPreviewParameterProvider.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/BooleanPreviewParameterProvider.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/IconAliasPreviewParameterProvider.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/IconAliasPreviewParameterProvider.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/IconAliasPreviewParameterProvider.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/IconAliasPreviewParameterProvider.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/MovieDbPreviewParameterProvider.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/MovieDbPreviewParameterProvider.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/MovieDbPreviewParameterProvider.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/MovieDbPreviewParameterProvider.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/MovieListPreviewParameterProvider.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/MovieListPreviewParameterProvider.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/MovieListPreviewParameterProvider.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/MovieListPreviewParameterProvider.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/MoviePreviewParameterProvider.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/MoviePreviewParameterProvider.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/MoviePreviewParameterProvider.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/MoviePreviewParameterProvider.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/SuggestionDbPreviewParameterProvider.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/SuggestionDbPreviewParameterProvider.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/SuggestionDbPreviewParameterProvider.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/SuggestionDbPreviewParameterProvider.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/ThemePreviewParameterProvider.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/ThemePreviewParameterProvider.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/ThemePreviewParameterProvider.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/ThemePreviewParameterProvider.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/TitlePreviewParameterProvider.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/TitlePreviewParameterProvider.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/TitlePreviewParameterProvider.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/TitlePreviewParameterProvider.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/VersionPreviewParameterProvider.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/VersionPreviewParameterProvider.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/VersionPreviewParameterProvider.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/provider/VersionPreviewParameterProvider.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/shortcuts/MoviesShortcuts.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/shortcuts/MoviesShortcuts.kt
similarity index 97%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/shortcuts/MoviesShortcuts.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/shortcuts/MoviesShortcuts.kt
index 6bcbae62d..f63681fc5 100644
--- a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/shortcuts/MoviesShortcuts.kt
+++ b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/shortcuts/MoviesShortcuts.kt
@@ -8,7 +8,7 @@ import androidx.core.graphics.drawable.IconCompat
 import androidx.core.net.toUri
 import org.michaelbel.movies.ui.appicon.shortcutSearchIconRes
 import org.michaelbel.movies.ui.appicon.shortcutSettingsIconRes
-import org.michaelbel.movies.ui_kmp.R
+import org.michaelbel.movies.ui.R
 
 private const val SEARCH_SHORTCUT_ID = "searchShortcutId"
 private const val SETTINGS_SHORTCUT_ID = "settingsShortcutId"
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/theme/Theme.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/theme/Theme.kt
similarity index 100%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/theme/Theme.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/theme/Theme.kt
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/theme/Type.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/theme/Type.kt
similarity index 95%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/theme/Type.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/theme/Type.kt
index e85f7602a..10f7fc1d3 100644
--- a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/theme/Type.kt
+++ b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/theme/Type.kt
@@ -4,7 +4,7 @@ import androidx.compose.material3.Typography
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
-import org.michaelbel.movies.ui_kmp.R
+import org.michaelbel.movies.ui.R
 
 private val OpenSans = FontFamily(
     Font(R.font.open_sans),
diff --git a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/tile/MoviesTileService.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/tile/MoviesTileService.kt
similarity index 97%
rename from core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/tile/MoviesTileService.kt
rename to core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/tile/MoviesTileService.kt
index 7dba98d65..6e0586900 100644
--- a/core/ui-kmp/src/androidMain/kotlin/org/michaelbel/movies/ui/tile/MoviesTileService.kt
+++ b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/tile/MoviesTileService.kt
@@ -15,7 +15,7 @@ import android.service.quicksettings.TileService
 import android.widget.Toast
 import androidx.annotation.RequiresApi
 import org.michaelbel.movies.ui.icons.MoviesAndroidIcons
-import org.michaelbel.movies.ui_kmp.R
+import org.michaelbel.movies.ui.R
 
 @RequiresApi(24)
 class MoviesTileService: TileService() {
diff --git a/core/ui-kmp/src/androidMain/res/values-night-v23/themes.xml b/core/ui/src/androidMain/res/values-night-v23/themes.xml
similarity index 100%
rename from core/ui-kmp/src/androidMain/res/values-night-v23/themes.xml
rename to core/ui/src/androidMain/res/values-night-v23/themes.xml
diff --git a/core/ui-kmp/src/androidMain/res/values-night-v27/themes.xml b/core/ui/src/androidMain/res/values-night-v27/themes.xml
similarity index 100%
rename from core/ui-kmp/src/androidMain/res/values-night-v27/themes.xml
rename to core/ui/src/androidMain/res/values-night-v27/themes.xml
diff --git a/core/ui-kmp/src/androidMain/res/values-night/colors.xml b/core/ui/src/androidMain/res/values-night/colors.xml
similarity index 100%
rename from core/ui-kmp/src/androidMain/res/values-night/colors.xml
rename to core/ui/src/androidMain/res/values-night/colors.xml
diff --git a/core/ui-kmp/src/androidMain/res/values-night/themes.xml b/core/ui/src/androidMain/res/values-night/themes.xml
similarity index 100%
rename from core/ui-kmp/src/androidMain/res/values-night/themes.xml
rename to core/ui/src/androidMain/res/values-night/themes.xml
diff --git a/core/ui-kmp/src/androidMain/res/values-ru/content_description.xml b/core/ui/src/androidMain/res/values-ru/content_description.xml
similarity index 100%
rename from core/ui-kmp/src/androidMain/res/values-ru/content_description.xml
rename to core/ui/src/androidMain/res/values-ru/content_description.xml
diff --git a/core/ui-kmp/src/androidMain/res/values-ru/strings.xml b/core/ui/src/androidMain/res/values-ru/strings.xml
similarity index 100%
rename from core/ui-kmp/src/androidMain/res/values-ru/strings.xml
rename to core/ui/src/androidMain/res/values-ru/strings.xml
diff --git a/core/ui-kmp/src/androidMain/res/values-v23/themes.xml b/core/ui/src/androidMain/res/values-v23/themes.xml
similarity index 100%
rename from core/ui-kmp/src/androidMain/res/values-v23/themes.xml
rename to core/ui/src/androidMain/res/values-v23/themes.xml
diff --git a/core/ui-kmp/src/androidMain/res/values-v27/themes.xml b/core/ui/src/androidMain/res/values-v27/themes.xml
similarity index 100%
rename from core/ui-kmp/src/androidMain/res/values-v27/themes.xml
rename to core/ui/src/androidMain/res/values-v27/themes.xml
diff --git a/core/ui-kmp/src/androidMain/res/values/colors.xml b/core/ui/src/androidMain/res/values/colors.xml
similarity index 100%
rename from core/ui-kmp/src/androidMain/res/values/colors.xml
rename to core/ui/src/androidMain/res/values/colors.xml
diff --git a/core/ui-kmp/src/androidMain/res/values/content_description.xml b/core/ui/src/androidMain/res/values/content_description.xml
similarity index 100%
rename from core/ui-kmp/src/androidMain/res/values/content_description.xml
rename to core/ui/src/androidMain/res/values/content_description.xml
diff --git a/core/ui-kmp/src/androidMain/res/values/font_certs.xml b/core/ui/src/androidMain/res/values/font_certs.xml
similarity index 100%
rename from core/ui-kmp/src/androidMain/res/values/font_certs.xml
rename to core/ui/src/androidMain/res/values/font_certs.xml
diff --git a/core/ui-kmp/src/androidMain/res/values/preloaded_fonts.xml b/core/ui/src/androidMain/res/values/preloaded_fonts.xml
similarity index 100%
rename from core/ui-kmp/src/androidMain/res/values/preloaded_fonts.xml
rename to core/ui/src/androidMain/res/values/preloaded_fonts.xml
diff --git a/core/ui-kmp/src/androidMain/res/values/strings.xml b/core/ui/src/androidMain/res/values/strings.xml
similarity index 100%
rename from core/ui-kmp/src/androidMain/res/values/strings.xml
rename to core/ui/src/androidMain/res/values/strings.xml
diff --git a/core/ui-kmp/src/androidMain/res/values/themes.xml b/core/ui/src/androidMain/res/values/themes.xml
similarity index 100%
rename from core/ui-kmp/src/androidMain/res/values/themes.xml
rename to core/ui/src/androidMain/res/values/themes.xml
diff --git a/core/ui-kmp/src/commonMain/composeResources/drawable/ic_18_up_rating_outline_24.xml b/core/ui/src/commonMain/composeResources/drawable/ic_18_up_rating_outline_24.xml
similarity index 100%
rename from core/ui-kmp/src/commonMain/composeResources/drawable/ic_18_up_rating_outline_24.xml
rename to core/ui/src/commonMain/composeResources/drawable/ic_18_up_rating_outline_24.xml
diff --git a/core/ui-kmp/src/commonMain/composeResources/drawable/ic_file_download_24.xml b/core/ui/src/commonMain/composeResources/drawable/ic_file_download_24.xml
similarity index 100%
rename from core/ui-kmp/src/commonMain/composeResources/drawable/ic_file_download_24.xml
rename to core/ui/src/commonMain/composeResources/drawable/ic_file_download_24.xml
diff --git a/core/ui-kmp/src/commonMain/composeResources/drawable/ic_launcher_icon_amoled.xml b/core/ui/src/commonMain/composeResources/drawable/ic_launcher_icon_amoled.xml
similarity index 100%
rename from core/ui-kmp/src/commonMain/composeResources/drawable/ic_launcher_icon_amoled.xml
rename to core/ui/src/commonMain/composeResources/drawable/ic_launcher_icon_amoled.xml
diff --git a/core/ui-kmp/src/commonMain/composeResources/drawable/ic_launcher_icon_brown.xml b/core/ui/src/commonMain/composeResources/drawable/ic_launcher_icon_brown.xml
similarity index 100%
rename from core/ui-kmp/src/commonMain/composeResources/drawable/ic_launcher_icon_brown.xml
rename to core/ui/src/commonMain/composeResources/drawable/ic_launcher_icon_brown.xml
diff --git a/core/ui-kmp/src/commonMain/composeResources/drawable/ic_launcher_icon_purple.xml b/core/ui/src/commonMain/composeResources/drawable/ic_launcher_icon_purple.xml
similarity index 100%
rename from core/ui-kmp/src/commonMain/composeResources/drawable/ic_launcher_icon_purple.xml
rename to core/ui/src/commonMain/composeResources/drawable/ic_launcher_icon_purple.xml
diff --git a/core/ui-kmp/src/commonMain/composeResources/drawable/ic_launcher_icon_red.xml b/core/ui/src/commonMain/composeResources/drawable/ic_launcher_icon_red.xml
similarity index 100%
rename from core/ui-kmp/src/commonMain/composeResources/drawable/ic_launcher_icon_red.xml
rename to core/ui/src/commonMain/composeResources/drawable/ic_launcher_icon_red.xml
diff --git a/core/ui-kmp/src/commonMain/composeResources/drawable/ic_movie_filter_24.xml b/core/ui/src/commonMain/composeResources/drawable/ic_movie_filter_24.xml
similarity index 100%
rename from core/ui-kmp/src/commonMain/composeResources/drawable/ic_movie_filter_24.xml
rename to core/ui/src/commonMain/composeResources/drawable/ic_movie_filter_24.xml
diff --git a/core/ui-kmp/src/commonMain/composeResources/drawable/ic_settings_account_box_24.xml b/core/ui/src/commonMain/composeResources/drawable/ic_settings_account_box_24.xml
similarity index 100%
rename from core/ui-kmp/src/commonMain/composeResources/drawable/ic_settings_account_box_24.xml
rename to core/ui/src/commonMain/composeResources/drawable/ic_settings_account_box_24.xml
diff --git a/core/ui-kmp/src/commonMain/composeResources/drawable/ic_settings_cinematic_blur_24.xml b/core/ui/src/commonMain/composeResources/drawable/ic_settings_cinematic_blur_24.xml
similarity index 100%
rename from core/ui-kmp/src/commonMain/composeResources/drawable/ic_settings_cinematic_blur_24.xml
rename to core/ui/src/commonMain/composeResources/drawable/ic_settings_cinematic_blur_24.xml
diff --git a/core/ui-kmp/src/commonMain/composeResources/drawable/ic_tmdb_logo.png b/core/ui/src/commonMain/composeResources/drawable/ic_tmdb_logo.png
similarity index 100%
rename from core/ui-kmp/src/commonMain/composeResources/drawable/ic_tmdb_logo.png
rename to core/ui/src/commonMain/composeResources/drawable/ic_tmdb_logo.png
diff --git a/core/ui-kmp/src/commonMain/composeResources/values-ru/strings.xml b/core/ui/src/commonMain/composeResources/values-ru/strings.xml
similarity index 100%
rename from core/ui-kmp/src/commonMain/composeResources/values-ru/strings.xml
rename to core/ui/src/commonMain/composeResources/values-ru/strings.xml
diff --git a/core/ui-kmp/src/commonMain/composeResources/values/strings.xml b/core/ui/src/commonMain/composeResources/values/strings.xml
similarity index 100%
rename from core/ui-kmp/src/commonMain/composeResources/values/strings.xml
rename to core/ui/src/commonMain/composeResources/values/strings.xml
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/accessibility/MoviesContentDescriptionCommon.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/accessibility/MoviesContentDescriptionCommon.kt
similarity index 50%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/accessibility/MoviesContentDescriptionCommon.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/accessibility/MoviesContentDescriptionCommon.kt
index ab7f2644d..eba080cf3 100644
--- a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/accessibility/MoviesContentDescriptionCommon.kt
+++ b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/accessibility/MoviesContentDescriptionCommon.kt
@@ -2,23 +2,23 @@
 
 package org.michaelbel.movies.ui.accessibility
 
-import movies.core.ui_kmp.generated.resources.Res
-import movies.core.ui_kmp.generated.resources.content_description_account_avatar_image
-import movies.core.ui_kmp.generated.resources.content_description_account_icon
-import movies.core.ui_kmp.generated.resources.content_description_adult_icon
-import movies.core.ui_kmp.generated.resources.content_description_app_icon
-import movies.core.ui_kmp.generated.resources.content_description_appearance_icon
-import movies.core.ui_kmp.generated.resources.content_description_back_icon
-import movies.core.ui_kmp.generated.resources.content_description_close_icon
-import movies.core.ui_kmp.generated.resources.content_description_download_icon
-import movies.core.ui_kmp.generated.resources.content_description_movie_details_image
-import movies.core.ui_kmp.generated.resources.content_description_password_icon
-import movies.core.ui_kmp.generated.resources.content_description_password_off_icon
-import movies.core.ui_kmp.generated.resources.content_description_search_icon
-import movies.core.ui_kmp.generated.resources.content_description_settings_icon
-import movies.core.ui_kmp.generated.resources.content_description_share_icon
-import movies.core.ui_kmp.generated.resources.content_description_user_location_icon
-import movies.core.ui_kmp.generated.resources.content_description_voice_icon
+import movies.core.ui.generated.resources.Res
+import movies.core.ui.generated.resources.content_description_account_avatar_image
+import movies.core.ui.generated.resources.content_description_account_icon
+import movies.core.ui.generated.resources.content_description_adult_icon
+import movies.core.ui.generated.resources.content_description_app_icon
+import movies.core.ui.generated.resources.content_description_appearance_icon
+import movies.core.ui.generated.resources.content_description_back_icon
+import movies.core.ui.generated.resources.content_description_close_icon
+import movies.core.ui.generated.resources.content_description_download_icon
+import movies.core.ui.generated.resources.content_description_movie_details_image
+import movies.core.ui.generated.resources.content_description_password_icon
+import movies.core.ui.generated.resources.content_description_password_off_icon
+import movies.core.ui.generated.resources.content_description_search_icon
+import movies.core.ui.generated.resources.content_description_settings_icon
+import movies.core.ui.generated.resources.content_description_share_icon
+import movies.core.ui.generated.resources.content_description_user_location_icon
+import movies.core.ui.generated.resources.content_description_voice_icon
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 
 object MoviesContentDescriptionCommon {
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/appicon/IconAlias.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/appicon/IconAlias.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/appicon/IconAlias.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/appicon/IconAlias.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/color/ColorSpec.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/color/ColorSpec.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/color/ColorSpec.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/color/ColorSpec.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/color/PaletteStyle.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/color/PaletteStyle.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/color/PaletteStyle.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/color/PaletteStyle.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/color/TonalPalettes.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/color/TonalPalettes.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/color/TonalPalettes.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/color/TonalPalettes.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/color/hct/Cam16.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/color/hct/Cam16.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/color/hct/Cam16.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/color/hct/Cam16.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/color/hct/Hct.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/color/hct/Hct.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/color/hct/Hct.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/color/hct/Hct.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/color/hct/HctSolver.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/color/hct/HctSolver.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/color/hct/HctSolver.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/color/hct/HctSolver.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/color/hct/ViewingConditions.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/color/hct/ViewingConditions.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/color/hct/ViewingConditions.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/color/hct/ViewingConditions.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/color/utils/ColorUtils.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/color/utils/ColorUtils.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/color/utils/ColorUtils.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/color/utils/ColorUtils.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/color/utils/MathUtils.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/color/utils/MathUtils.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/color/utils/MathUtils.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/color/utils/MathUtils.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/AccountAvatar.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/AccountAvatar.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/AccountAvatar.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/AccountAvatar.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/ApiKeyBox.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/ApiKeyBox.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/ApiKeyBox.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/ApiKeyBox.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/SwitchCheckIcon.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/SwitchCheckIcon.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/SwitchCheckIcon.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/SwitchCheckIcon.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/BackIcon.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/BackIcon.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/BackIcon.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/BackIcon.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/CloseIcon.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/CloseIcon.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/CloseIcon.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/CloseIcon.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/DownloadIcon.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/DownloadIcon.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/DownloadIcon.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/DownloadIcon.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/PasswordIcon.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/PasswordIcon.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/PasswordIcon.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/PasswordIcon.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/SearchIcon.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/SearchIcon.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/SearchIcon.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/SearchIcon.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/SettingsIcon.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/SettingsIcon.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/SettingsIcon.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/SettingsIcon.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/ShareIcon.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/ShareIcon.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/ShareIcon.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/ShareIcon.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/page/PagingFailureBox.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/page/PagingFailureBox.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/page/PagingFailureBox.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/page/PagingFailureBox.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/page/PagingLoadingBox.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/page/PagingLoadingBox.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/page/PagingLoadingBox.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/page/PagingLoadingBox.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/Cat.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/Cat.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/Cat.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/Cat.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/Github.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/Github.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/Github.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/Github.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/GooglePlay.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/GooglePlay.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/GooglePlay.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/GooglePlay.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/MoviesIcons.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/MoviesIcons.kt
similarity index 83%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/MoviesIcons.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/MoviesIcons.kt
index 83c23d805..01e0290e3 100644
--- a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/MoviesIcons.kt
+++ b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/MoviesIcons.kt
@@ -30,17 +30,17 @@ import androidx.compose.material.icons.outlined.Visibility
 import androidx.compose.material.icons.outlined.VisibilityOff
 import androidx.compose.material.icons.outlined.Widgets
 import androidx.compose.ui.graphics.vector.ImageVector
-import movies.core.ui_kmp.generated.resources.Res
-import movies.core.ui_kmp.generated.resources.ic_18_up_rating_outline_24
-import movies.core.ui_kmp.generated.resources.ic_file_download_24
-import movies.core.ui_kmp.generated.resources.ic_launcher_icon_amoled
-import movies.core.ui_kmp.generated.resources.ic_launcher_icon_brown
-import movies.core.ui_kmp.generated.resources.ic_launcher_icon_purple
-import movies.core.ui_kmp.generated.resources.ic_launcher_icon_red
-import movies.core.ui_kmp.generated.resources.ic_movie_filter_24
-import movies.core.ui_kmp.generated.resources.ic_settings_account_box_24
-import movies.core.ui_kmp.generated.resources.ic_settings_cinematic_blur_24
-import movies.core.ui_kmp.generated.resources.ic_tmdb_logo
+import movies.core.ui.generated.resources.Res
+import movies.core.ui.generated.resources.ic_18_up_rating_outline_24
+import movies.core.ui.generated.resources.ic_file_download_24
+import movies.core.ui.generated.resources.ic_launcher_icon_amoled
+import movies.core.ui.generated.resources.ic_launcher_icon_brown
+import movies.core.ui.generated.resources.ic_launcher_icon_purple
+import movies.core.ui.generated.resources.ic_launcher_icon_red
+import movies.core.ui.generated.resources.ic_movie_filter_24
+import movies.core.ui.generated.resources.ic_settings_account_box_24
+import movies.core.ui.generated.resources.ic_settings_cinematic_blur_24
+import movies.core.ui.generated.resources.ic_tmdb_logo
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 
 /**
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/ThemeLightDark.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/ThemeLightDark.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/ThemeLightDark.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/icons/ThemeLightDark.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/AccountPojoKtx.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/AccountPojoKtx.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/AccountPojoKtx.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/AccountPojoKtx.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/CommonConfigurationKtx.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/CommonConfigurationKtx.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/CommonConfigurationKtx.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/CommonConfigurationKtx.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/ConfigurationKtx.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/ConfigurationKtx.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/ConfigurationKtx.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/ConfigurationKtx.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/ModifierKtx.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/ModifierKtx.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/ModifierKtx.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/ModifierKtx.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/WindowInsetsKtx.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/WindowInsetsKtx.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/WindowInsetsKtx.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/ktx/WindowInsetsKtx.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/pagerindicator/PagerIndicator.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/pagerindicator/PagerIndicator.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/pagerindicator/PagerIndicator.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/pagerindicator/PagerIndicator.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/pagerindicator/PagerTab.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/pagerindicator/PagerTab.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/pagerindicator/PagerTab.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/pagerindicator/PagerTab.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/strings/MoviesStrings.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/strings/MoviesStrings.kt
similarity index 50%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/strings/MoviesStrings.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/strings/MoviesStrings.kt
index c1563fb09..5f3f4bba5 100644
--- a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/strings/MoviesStrings.kt
+++ b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/strings/MoviesStrings.kt
@@ -3,118 +3,118 @@
 package org.michaelbel.movies.ui.strings
 
 import androidx.compose.runtime.Composable
-import movies.core.ui_kmp.generated.resources.Res
-import movies.core.ui_kmp.generated.resources.account_logout
-import movies.core.ui_kmp.generated.resources.account_title
-import movies.core.ui_kmp.generated.resources.appwidget_configure
-import movies.core.ui_kmp.generated.resources.appwidget_configure_soon
-import movies.core.ui_kmp.generated.resources.appwidget_description
-import movies.core.ui_kmp.generated.resources.appwidget_failure_empty
-import movies.core.ui_kmp.generated.resources.appwidget_pinned_message
-import movies.core.ui_kmp.generated.resources.appwidget_title
-import movies.core.ui_kmp.generated.resources.auth_error_while_create_request_token
-import movies.core.ui_kmp.generated.resources.auth_error_while_create_session
-import movies.core.ui_kmp.generated.resources.auth_error_while_create_session_with_login
-import movies.core.ui_kmp.generated.resources.auth_error_while_loading_account_details
-import movies.core.ui_kmp.generated.resources.auth_label_password
-import movies.core.ui_kmp.generated.resources.auth_label_username
-import movies.core.ui_kmp.generated.resources.auth_login
-import movies.core.ui_kmp.generated.resources.auth_privacy_policy
-import movies.core.ui_kmp.generated.resources.auth_reset_password
-import movies.core.ui_kmp.generated.resources.auth_sign_in
-import movies.core.ui_kmp.generated.resources.auth_sign_up
-import movies.core.ui_kmp.generated.resources.auth_terms_of_use
-import movies.core.ui_kmp.generated.resources.auth_title
-import movies.core.ui_kmp.generated.resources.details_error_loading
-import movies.core.ui_kmp.generated.resources.details_title
-import movies.core.ui_kmp.generated.resources.error_api_key_null
-import movies.core.ui_kmp.generated.resources.error_check_internet_connectivity
-import movies.core.ui_kmp.generated.resources.error_loading
-import movies.core.ui_kmp.generated.resources.feed_auth_failure
-import movies.core.ui_kmp.generated.resources.feed_error_empty
-import movies.core.ui_kmp.generated.resources.feed_title_now_playing
-import movies.core.ui_kmp.generated.resources.feed_title_popular
-import movies.core.ui_kmp.generated.resources.feed_title_top_rated
-import movies.core.ui_kmp.generated.resources.feed_title_upcoming
-import movies.core.ui_kmp.generated.resources.gallery_action_open
-import movies.core.ui_kmp.generated.resources.gallery_backdrop
-import movies.core.ui_kmp.generated.resources.gallery_downloading_image
-import movies.core.ui_kmp.generated.resources.gallery_failure
-import movies.core.ui_kmp.generated.resources.gallery_image_of
-import movies.core.ui_kmp.generated.resources.gallery_logo
-import movies.core.ui_kmp.generated.resources.gallery_poster
-import movies.core.ui_kmp.generated.resources.gallery_success
-import movies.core.ui_kmp.generated.resources.language_code
-import movies.core.ui_kmp.generated.resources.no_image
-import movies.core.ui_kmp.generated.resources.notification_continue
-import movies.core.ui_kmp.generated.resources.notification_enable_subtitle
-import movies.core.ui_kmp.generated.resources.notification_enable_title
-import movies.core.ui_kmp.generated.resources.notification_go_to_settings
-import movies.core.ui_kmp.generated.resources.retry
-import movies.core.ui_kmp.generated.resources.search_clear
-import movies.core.ui_kmp.generated.resources.settings_action_cancel
-import movies.core.ui_kmp.generated.resources.settings_action_go
-import movies.core.ui_kmp.generated.resources.settings_app_debug
-import movies.core.ui_kmp.generated.resources.settings_app_launcher_icon
-import movies.core.ui_kmp.generated.resources.settings_app_launcher_icon_amoled
-import movies.core.ui_kmp.generated.resources.settings_app_launcher_icon_brown
-import movies.core.ui_kmp.generated.resources.settings_app_launcher_icon_changed_to
-import movies.core.ui_kmp.generated.resources.settings_app_launcher_icon_purple
-import movies.core.ui_kmp.generated.resources.settings_app_launcher_icon_red
-import movies.core.ui_kmp.generated.resources.settings_app_version_code
-import movies.core.ui_kmp.generated.resources.settings_app_version_name
-import movies.core.ui_kmp.generated.resources.settings_app_widget
-import movies.core.ui_kmp.generated.resources.settings_app_widget_description
-import movies.core.ui_kmp.generated.resources.settings_appearance
-import movies.core.ui_kmp.generated.resources.settings_appearance_grid
-import movies.core.ui_kmp.generated.resources.settings_appearance_list
-import movies.core.ui_kmp.generated.resources.settings_biometric_added
-import movies.core.ui_kmp.generated.resources.settings_biometric_not_added
-import movies.core.ui_kmp.generated.resources.settings_dynamic_colors
-import movies.core.ui_kmp.generated.resources.settings_dynamic_colors_description
-import movies.core.ui_kmp.generated.resources.settings_error_app_from_google_play
-import movies.core.ui_kmp.generated.resources.settings_error_play_services_not_available
-import movies.core.ui_kmp.generated.resources.settings_gender
-import movies.core.ui_kmp.generated.resources.settings_gender_feminine
-import movies.core.ui_kmp.generated.resources.settings_gender_masculine
-import movies.core.ui_kmp.generated.resources.settings_gender_neutral
-import movies.core.ui_kmp.generated.resources.settings_gender_not_specified
-import movies.core.ui_kmp.generated.resources.settings_github
-import movies.core.ui_kmp.generated.resources.settings_github_description
-import movies.core.ui_kmp.generated.resources.settings_language
-import movies.core.ui_kmp.generated.resources.settings_language_en
-import movies.core.ui_kmp.generated.resources.settings_language_ru
-import movies.core.ui_kmp.generated.resources.settings_lock_app
-import movies.core.ui_kmp.generated.resources.settings_movie_list
-import movies.core.ui_kmp.generated.resources.settings_movie_list_now_playing
-import movies.core.ui_kmp.generated.resources.settings_movie_list_popular
-import movies.core.ui_kmp.generated.resources.settings_movie_list_top_rated
-import movies.core.ui_kmp.generated.resources.settings_movie_list_upcoming
-import movies.core.ui_kmp.generated.resources.settings_palette_colors
-import movies.core.ui_kmp.generated.resources.settings_post_notifications
-import movies.core.ui_kmp.generated.resources.settings_post_notifications_denied
-import movies.core.ui_kmp.generated.resources.settings_post_notifications_granted
-import movies.core.ui_kmp.generated.resources.settings_post_notifications_should_request
-import movies.core.ui_kmp.generated.resources.settings_review
-import movies.core.ui_kmp.generated.resources.settings_review_description
-import movies.core.ui_kmp.generated.resources.settings_screenshots
-import movies.core.ui_kmp.generated.resources.settings_screenshots_description
-import movies.core.ui_kmp.generated.resources.settings_theme
-import movies.core.ui_kmp.generated.resources.settings_theme_amoled
-import movies.core.ui_kmp.generated.resources.settings_theme_dark
-import movies.core.ui_kmp.generated.resources.settings_theme_light
-import movies.core.ui_kmp.generated.resources.settings_theme_system
-import movies.core.ui_kmp.generated.resources.settings_tile
-import movies.core.ui_kmp.generated.resources.settings_tile_description
-import movies.core.ui_kmp.generated.resources.settings_tile_error_already_added
-import movies.core.ui_kmp.generated.resources.settings_title
-import movies.core.ui_kmp.generated.resources.settings_update
-import movies.core.ui_kmp.generated.resources.settings_update_description
-import movies.core.ui_kmp.generated.resources.share_via
-import movies.core.ui_kmp.generated.resources.shortcuts_search_title
-import movies.core.ui_kmp.generated.resources.shortcuts_settings_title
-import movies.core.ui_kmp.generated.resources.tile_added
-import movies.core.ui_kmp.generated.resources.tile_title
+import movies.core.ui.generated.resources.Res
+import movies.core.ui.generated.resources.account_logout
+import movies.core.ui.generated.resources.account_title
+import movies.core.ui.generated.resources.appwidget_configure
+import movies.core.ui.generated.resources.appwidget_configure_soon
+import movies.core.ui.generated.resources.appwidget_description
+import movies.core.ui.generated.resources.appwidget_failure_empty
+import movies.core.ui.generated.resources.appwidget_pinned_message
+import movies.core.ui.generated.resources.appwidget_title
+import movies.core.ui.generated.resources.auth_error_while_create_request_token
+import movies.core.ui.generated.resources.auth_error_while_create_session
+import movies.core.ui.generated.resources.auth_error_while_create_session_with_login
+import movies.core.ui.generated.resources.auth_error_while_loading_account_details
+import movies.core.ui.generated.resources.auth_label_password
+import movies.core.ui.generated.resources.auth_label_username
+import movies.core.ui.generated.resources.auth_login
+import movies.core.ui.generated.resources.auth_privacy_policy
+import movies.core.ui.generated.resources.auth_reset_password
+import movies.core.ui.generated.resources.auth_sign_in
+import movies.core.ui.generated.resources.auth_sign_up
+import movies.core.ui.generated.resources.auth_terms_of_use
+import movies.core.ui.generated.resources.auth_title
+import movies.core.ui.generated.resources.details_error_loading
+import movies.core.ui.generated.resources.details_title
+import movies.core.ui.generated.resources.error_api_key_null
+import movies.core.ui.generated.resources.error_check_internet_connectivity
+import movies.core.ui.generated.resources.error_loading
+import movies.core.ui.generated.resources.feed_auth_failure
+import movies.core.ui.generated.resources.feed_error_empty
+import movies.core.ui.generated.resources.feed_title_now_playing
+import movies.core.ui.generated.resources.feed_title_popular
+import movies.core.ui.generated.resources.feed_title_top_rated
+import movies.core.ui.generated.resources.feed_title_upcoming
+import movies.core.ui.generated.resources.gallery_action_open
+import movies.core.ui.generated.resources.gallery_backdrop
+import movies.core.ui.generated.resources.gallery_downloading_image
+import movies.core.ui.generated.resources.gallery_failure
+import movies.core.ui.generated.resources.gallery_image_of
+import movies.core.ui.generated.resources.gallery_logo
+import movies.core.ui.generated.resources.gallery_poster
+import movies.core.ui.generated.resources.gallery_success
+import movies.core.ui.generated.resources.language_code
+import movies.core.ui.generated.resources.no_image
+import movies.core.ui.generated.resources.notification_continue
+import movies.core.ui.generated.resources.notification_enable_subtitle
+import movies.core.ui.generated.resources.notification_enable_title
+import movies.core.ui.generated.resources.notification_go_to_settings
+import movies.core.ui.generated.resources.retry
+import movies.core.ui.generated.resources.search_clear
+import movies.core.ui.generated.resources.settings_action_cancel
+import movies.core.ui.generated.resources.settings_action_go
+import movies.core.ui.generated.resources.settings_app_debug
+import movies.core.ui.generated.resources.settings_app_launcher_icon
+import movies.core.ui.generated.resources.settings_app_launcher_icon_amoled
+import movies.core.ui.generated.resources.settings_app_launcher_icon_brown
+import movies.core.ui.generated.resources.settings_app_launcher_icon_changed_to
+import movies.core.ui.generated.resources.settings_app_launcher_icon_purple
+import movies.core.ui.generated.resources.settings_app_launcher_icon_red
+import movies.core.ui.generated.resources.settings_app_version_code
+import movies.core.ui.generated.resources.settings_app_version_name
+import movies.core.ui.generated.resources.settings_app_widget
+import movies.core.ui.generated.resources.settings_app_widget_description
+import movies.core.ui.generated.resources.settings_appearance
+import movies.core.ui.generated.resources.settings_appearance_grid
+import movies.core.ui.generated.resources.settings_appearance_list
+import movies.core.ui.generated.resources.settings_biometric_added
+import movies.core.ui.generated.resources.settings_biometric_not_added
+import movies.core.ui.generated.resources.settings_dynamic_colors
+import movies.core.ui.generated.resources.settings_dynamic_colors_description
+import movies.core.ui.generated.resources.settings_error_app_from_google_play
+import movies.core.ui.generated.resources.settings_error_play_services_not_available
+import movies.core.ui.generated.resources.settings_gender
+import movies.core.ui.generated.resources.settings_gender_feminine
+import movies.core.ui.generated.resources.settings_gender_masculine
+import movies.core.ui.generated.resources.settings_gender_neutral
+import movies.core.ui.generated.resources.settings_gender_not_specified
+import movies.core.ui.generated.resources.settings_github
+import movies.core.ui.generated.resources.settings_github_description
+import movies.core.ui.generated.resources.settings_language
+import movies.core.ui.generated.resources.settings_language_en
+import movies.core.ui.generated.resources.settings_language_ru
+import movies.core.ui.generated.resources.settings_lock_app
+import movies.core.ui.generated.resources.settings_movie_list
+import movies.core.ui.generated.resources.settings_movie_list_now_playing
+import movies.core.ui.generated.resources.settings_movie_list_popular
+import movies.core.ui.generated.resources.settings_movie_list_top_rated
+import movies.core.ui.generated.resources.settings_movie_list_upcoming
+import movies.core.ui.generated.resources.settings_palette_colors
+import movies.core.ui.generated.resources.settings_post_notifications
+import movies.core.ui.generated.resources.settings_post_notifications_denied
+import movies.core.ui.generated.resources.settings_post_notifications_granted
+import movies.core.ui.generated.resources.settings_post_notifications_should_request
+import movies.core.ui.generated.resources.settings_review
+import movies.core.ui.generated.resources.settings_review_description
+import movies.core.ui.generated.resources.settings_screenshots
+import movies.core.ui.generated.resources.settings_screenshots_description
+import movies.core.ui.generated.resources.settings_theme
+import movies.core.ui.generated.resources.settings_theme_amoled
+import movies.core.ui.generated.resources.settings_theme_dark
+import movies.core.ui.generated.resources.settings_theme_light
+import movies.core.ui.generated.resources.settings_theme_system
+import movies.core.ui.generated.resources.settings_tile
+import movies.core.ui.generated.resources.settings_tile_description
+import movies.core.ui.generated.resources.settings_tile_error_already_added
+import movies.core.ui.generated.resources.settings_title
+import movies.core.ui.generated.resources.settings_update
+import movies.core.ui.generated.resources.settings_update_description
+import movies.core.ui.generated.resources.share_via
+import movies.core.ui.generated.resources.shortcuts_search_title
+import movies.core.ui.generated.resources.shortcuts_settings_title
+import movies.core.ui.generated.resources.tile_added
+import movies.core.ui.generated.resources.tile_title
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.stringResource
 
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/Colors.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/Colors.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/Colors.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/Colors.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/Shape.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/Shape.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/Shape.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/Shape.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/Theme.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/Theme.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/Theme.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/Theme.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/model/ComposeTheme.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/model/ComposeTheme.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/model/ComposeTheme.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/model/ComposeTheme.kt
diff --git a/core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/provider/MoviesRippleTheme.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/provider/MoviesRippleTheme.kt
similarity index 100%
rename from core/ui-kmp/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/provider/MoviesRippleTheme.kt
rename to core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/theme/provider/MoviesRippleTheme.kt
diff --git a/core/ui-kmp/src/desktopMain/kotlin/org/michaelbel/movies/ui/ktx/ConfigurationKtx.kt b/core/ui/src/desktopMain/kotlin/org/michaelbel/movies/ui/ktx/ConfigurationKtx.kt
similarity index 100%
rename from core/ui-kmp/src/desktopMain/kotlin/org/michaelbel/movies/ui/ktx/ConfigurationKtx.kt
rename to core/ui/src/desktopMain/kotlin/org/michaelbel/movies/ui/ktx/ConfigurationKtx.kt
diff --git a/core/ui-kmp/src/desktopMain/kotlin/org/michaelbel/movies/ui/ktx/WindowInsetsKtx.kt b/core/ui/src/desktopMain/kotlin/org/michaelbel/movies/ui/ktx/WindowInsetsKtx.kt
similarity index 100%
rename from core/ui-kmp/src/desktopMain/kotlin/org/michaelbel/movies/ui/ktx/WindowInsetsKtx.kt
rename to core/ui/src/desktopMain/kotlin/org/michaelbel/movies/ui/ktx/WindowInsetsKtx.kt
diff --git a/core/ui-kmp/src/desktopMain/kotlin/org/michaelbel/movies/ui/theme/Theme.kt b/core/ui/src/desktopMain/kotlin/org/michaelbel/movies/ui/theme/Theme.kt
similarity index 100%
rename from core/ui-kmp/src/desktopMain/kotlin/org/michaelbel/movies/ui/theme/Theme.kt
rename to core/ui/src/desktopMain/kotlin/org/michaelbel/movies/ui/theme/Theme.kt
diff --git a/core/ui-kmp/src/main/res/drawable/ic_18_up_rating_outline_24.xml b/core/ui/src/main/res/drawable/ic_18_up_rating_outline_24.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_18_up_rating_outline_24.xml
rename to core/ui/src/main/res/drawable/ic_18_up_rating_outline_24.xml
diff --git a/core/ui-kmp/src/main/res/drawable/ic_file_download_24.xml b/core/ui/src/main/res/drawable/ic_file_download_24.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_file_download_24.xml
rename to core/ui/src/main/res/drawable/ic_file_download_24.xml
diff --git a/core/ui-kmp/src/main/res/drawable/ic_launcher_icon_amoled.xml b/core/ui/src/main/res/drawable/ic_launcher_icon_amoled.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_launcher_icon_amoled.xml
rename to core/ui/src/main/res/drawable/ic_launcher_icon_amoled.xml
diff --git a/core/ui-kmp/src/main/res/drawable/ic_launcher_icon_brown.xml b/core/ui/src/main/res/drawable/ic_launcher_icon_brown.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_launcher_icon_brown.xml
rename to core/ui/src/main/res/drawable/ic_launcher_icon_brown.xml
diff --git a/core/ui-kmp/src/main/res/drawable/ic_launcher_icon_purple.xml b/core/ui/src/main/res/drawable/ic_launcher_icon_purple.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_launcher_icon_purple.xml
rename to core/ui/src/main/res/drawable/ic_launcher_icon_purple.xml
diff --git a/core/ui-kmp/src/main/res/drawable/ic_launcher_icon_red.xml b/core/ui/src/main/res/drawable/ic_launcher_icon_red.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_launcher_icon_red.xml
rename to core/ui/src/main/res/drawable/ic_launcher_icon_red.xml
diff --git a/core/ui-kmp/src/main/res/drawable/ic_movie_filter_24.xml b/core/ui/src/main/res/drawable/ic_movie_filter_24.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_movie_filter_24.xml
rename to core/ui/src/main/res/drawable/ic_movie_filter_24.xml
diff --git a/core/ui-kmp/src/main/res/drawable/ic_settings_account_box_24.xml b/core/ui/src/main/res/drawable/ic_settings_account_box_24.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_settings_account_box_24.xml
rename to core/ui/src/main/res/drawable/ic_settings_account_box_24.xml
diff --git a/core/ui-kmp/src/main/res/drawable/ic_settings_cinematic_blur_24.xml b/core/ui/src/main/res/drawable/ic_settings_cinematic_blur_24.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_settings_cinematic_blur_24.xml
rename to core/ui/src/main/res/drawable/ic_settings_cinematic_blur_24.xml
diff --git a/core/ui-kmp/src/main/res/drawable/ic_shortcut_search_amoled_48.xml b/core/ui/src/main/res/drawable/ic_shortcut_search_amoled_48.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_shortcut_search_amoled_48.xml
rename to core/ui/src/main/res/drawable/ic_shortcut_search_amoled_48.xml
diff --git a/core/ui-kmp/src/main/res/drawable/ic_shortcut_search_brown_48.xml b/core/ui/src/main/res/drawable/ic_shortcut_search_brown_48.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_shortcut_search_brown_48.xml
rename to core/ui/src/main/res/drawable/ic_shortcut_search_brown_48.xml
diff --git a/core/ui-kmp/src/main/res/drawable/ic_shortcut_search_purple_48.xml b/core/ui/src/main/res/drawable/ic_shortcut_search_purple_48.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_shortcut_search_purple_48.xml
rename to core/ui/src/main/res/drawable/ic_shortcut_search_purple_48.xml
diff --git a/core/ui-kmp/src/main/res/drawable/ic_shortcut_search_red_48.xml b/core/ui/src/main/res/drawable/ic_shortcut_search_red_48.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_shortcut_search_red_48.xml
rename to core/ui/src/main/res/drawable/ic_shortcut_search_red_48.xml
diff --git a/core/ui-kmp/src/main/res/drawable/ic_shortcut_settings_amoled_48.xml b/core/ui/src/main/res/drawable/ic_shortcut_settings_amoled_48.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_shortcut_settings_amoled_48.xml
rename to core/ui/src/main/res/drawable/ic_shortcut_settings_amoled_48.xml
diff --git a/core/ui-kmp/src/main/res/drawable/ic_shortcut_settings_brown_48.xml b/core/ui/src/main/res/drawable/ic_shortcut_settings_brown_48.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_shortcut_settings_brown_48.xml
rename to core/ui/src/main/res/drawable/ic_shortcut_settings_brown_48.xml
diff --git a/core/ui-kmp/src/main/res/drawable/ic_shortcut_settings_purple_48.xml b/core/ui/src/main/res/drawable/ic_shortcut_settings_purple_48.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_shortcut_settings_purple_48.xml
rename to core/ui/src/main/res/drawable/ic_shortcut_settings_purple_48.xml
diff --git a/core/ui-kmp/src/main/res/drawable/ic_shortcut_settings_red_48.xml b/core/ui/src/main/res/drawable/ic_shortcut_settings_red_48.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_shortcut_settings_red_48.xml
rename to core/ui/src/main/res/drawable/ic_shortcut_settings_red_48.xml
diff --git a/core/ui-kmp/src/main/res/drawable/ic_splash_screen_animated_icon.xml b/core/ui/src/main/res/drawable/ic_splash_screen_animated_icon.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_splash_screen_animated_icon.xml
rename to core/ui/src/main/res/drawable/ic_splash_screen_animated_icon.xml
diff --git a/core/ui-kmp/src/main/res/drawable/ic_splash_screen_branding_image.xml b/core/ui/src/main/res/drawable/ic_splash_screen_branding_image.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_splash_screen_branding_image.xml
rename to core/ui/src/main/res/drawable/ic_splash_screen_branding_image.xml
diff --git a/core/ui-kmp/src/main/res/drawable/ic_tmdb_logo.png b/core/ui/src/main/res/drawable/ic_tmdb_logo.png
similarity index 100%
rename from core/ui-kmp/src/main/res/drawable/ic_tmdb_logo.png
rename to core/ui/src/main/res/drawable/ic_tmdb_logo.png
diff --git a/core/ui-kmp/src/main/res/font/open_sans.xml b/core/ui/src/main/res/font/open_sans.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/font/open_sans.xml
rename to core/ui/src/main/res/font/open_sans.xml
diff --git a/core/ui-kmp/src/main/res/font/open_sans_bold.xml b/core/ui/src/main/res/font/open_sans_bold.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/font/open_sans_bold.xml
rename to core/ui/src/main/res/font/open_sans_bold.xml
diff --git a/core/ui-kmp/src/main/res/font/open_sans_bold_italic.xml b/core/ui/src/main/res/font/open_sans_bold_italic.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/font/open_sans_bold_italic.xml
rename to core/ui/src/main/res/font/open_sans_bold_italic.xml
diff --git a/core/ui-kmp/src/main/res/font/open_sans_condensed_bold.xml b/core/ui/src/main/res/font/open_sans_condensed_bold.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/font/open_sans_condensed_bold.xml
rename to core/ui/src/main/res/font/open_sans_condensed_bold.xml
diff --git a/core/ui-kmp/src/main/res/font/open_sans_condensed_light.xml b/core/ui/src/main/res/font/open_sans_condensed_light.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/font/open_sans_condensed_light.xml
rename to core/ui/src/main/res/font/open_sans_condensed_light.xml
diff --git a/core/ui-kmp/src/main/res/font/open_sans_condensed_light_italic.xml b/core/ui/src/main/res/font/open_sans_condensed_light_italic.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/font/open_sans_condensed_light_italic.xml
rename to core/ui/src/main/res/font/open_sans_condensed_light_italic.xml
diff --git a/core/ui-kmp/src/main/res/font/open_sans_extrabold.xml b/core/ui/src/main/res/font/open_sans_extrabold.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/font/open_sans_extrabold.xml
rename to core/ui/src/main/res/font/open_sans_extrabold.xml
diff --git a/core/ui-kmp/src/main/res/font/open_sans_extrabold_italic.xml b/core/ui/src/main/res/font/open_sans_extrabold_italic.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/font/open_sans_extrabold_italic.xml
rename to core/ui/src/main/res/font/open_sans_extrabold_italic.xml
diff --git a/core/ui-kmp/src/main/res/font/open_sans_italic.xml b/core/ui/src/main/res/font/open_sans_italic.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/font/open_sans_italic.xml
rename to core/ui/src/main/res/font/open_sans_italic.xml
diff --git a/core/ui-kmp/src/main/res/font/open_sans_light.xml b/core/ui/src/main/res/font/open_sans_light.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/font/open_sans_light.xml
rename to core/ui/src/main/res/font/open_sans_light.xml
diff --git a/core/ui-kmp/src/main/res/font/open_sans_light_italic.xml b/core/ui/src/main/res/font/open_sans_light_italic.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/font/open_sans_light_italic.xml
rename to core/ui/src/main/res/font/open_sans_light_italic.xml
diff --git a/core/ui-kmp/src/main/res/font/open_sans_semibold.xml b/core/ui/src/main/res/font/open_sans_semibold.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/font/open_sans_semibold.xml
rename to core/ui/src/main/res/font/open_sans_semibold.xml
diff --git a/core/ui-kmp/src/main/res/font/open_sans_semibold_italic.xml b/core/ui/src/main/res/font/open_sans_semibold_italic.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/font/open_sans_semibold_italic.xml
rename to core/ui/src/main/res/font/open_sans_semibold_italic.xml
diff --git a/core/ui-kmp/src/main/res/mipmap-anydpi-v26/ic_launcher_amoled.xml b/core/ui/src/main/res/mipmap-anydpi-v26/ic_launcher_amoled.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-anydpi-v26/ic_launcher_amoled.xml
rename to core/ui/src/main/res/mipmap-anydpi-v26/ic_launcher_amoled.xml
diff --git a/core/ui-kmp/src/main/res/mipmap-anydpi-v26/ic_launcher_brown.xml b/core/ui/src/main/res/mipmap-anydpi-v26/ic_launcher_brown.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-anydpi-v26/ic_launcher_brown.xml
rename to core/ui/src/main/res/mipmap-anydpi-v26/ic_launcher_brown.xml
diff --git a/core/ui-kmp/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml b/core/ui/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml
rename to core/ui/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml
diff --git a/core/ui-kmp/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml b/core/ui/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml
rename to core/ui/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml
diff --git a/core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_amoled.png b/core/ui/src/main/res/mipmap-hdpi/ic_launcher_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_amoled.png
rename to core/ui/src/main/res/mipmap-hdpi/ic_launcher_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_background_amoled.png b/core/ui/src/main/res/mipmap-hdpi/ic_launcher_background_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_background_amoled.png
rename to core/ui/src/main/res/mipmap-hdpi/ic_launcher_background_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_background_brown.png b/core/ui/src/main/res/mipmap-hdpi/ic_launcher_background_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_background_brown.png
rename to core/ui/src/main/res/mipmap-hdpi/ic_launcher_background_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_background_purple.png b/core/ui/src/main/res/mipmap-hdpi/ic_launcher_background_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_background_purple.png
rename to core/ui/src/main/res/mipmap-hdpi/ic_launcher_background_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_background_red.png b/core/ui/src/main/res/mipmap-hdpi/ic_launcher_background_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_background_red.png
rename to core/ui/src/main/res/mipmap-hdpi/ic_launcher_background_red.png
diff --git a/core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_brown.png b/core/ui/src/main/res/mipmap-hdpi/ic_launcher_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_brown.png
rename to core/ui/src/main/res/mipmap-hdpi/ic_launcher_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_foreground_amoled.png b/core/ui/src/main/res/mipmap-hdpi/ic_launcher_foreground_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_foreground_amoled.png
rename to core/ui/src/main/res/mipmap-hdpi/ic_launcher_foreground_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_foreground_brown.png b/core/ui/src/main/res/mipmap-hdpi/ic_launcher_foreground_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_foreground_brown.png
rename to core/ui/src/main/res/mipmap-hdpi/ic_launcher_foreground_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_foreground_purple.png b/core/ui/src/main/res/mipmap-hdpi/ic_launcher_foreground_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_foreground_purple.png
rename to core/ui/src/main/res/mipmap-hdpi/ic_launcher_foreground_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_foreground_red.png b/core/ui/src/main/res/mipmap-hdpi/ic_launcher_foreground_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_foreground_red.png
rename to core/ui/src/main/res/mipmap-hdpi/ic_launcher_foreground_red.png
diff --git a/core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_monochrome_amoled.png b/core/ui/src/main/res/mipmap-hdpi/ic_launcher_monochrome_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_monochrome_amoled.png
rename to core/ui/src/main/res/mipmap-hdpi/ic_launcher_monochrome_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_monochrome_brown.png b/core/ui/src/main/res/mipmap-hdpi/ic_launcher_monochrome_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_monochrome_brown.png
rename to core/ui/src/main/res/mipmap-hdpi/ic_launcher_monochrome_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_monochrome_purple.png b/core/ui/src/main/res/mipmap-hdpi/ic_launcher_monochrome_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_monochrome_purple.png
rename to core/ui/src/main/res/mipmap-hdpi/ic_launcher_monochrome_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_monochrome_red.png b/core/ui/src/main/res/mipmap-hdpi/ic_launcher_monochrome_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_monochrome_red.png
rename to core/ui/src/main/res/mipmap-hdpi/ic_launcher_monochrome_red.png
diff --git a/core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_purple.png b/core/ui/src/main/res/mipmap-hdpi/ic_launcher_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_purple.png
rename to core/ui/src/main/res/mipmap-hdpi/ic_launcher_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_red.png b/core/ui/src/main/res/mipmap-hdpi/ic_launcher_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-hdpi/ic_launcher_red.png
rename to core/ui/src/main/res/mipmap-hdpi/ic_launcher_red.png
diff --git a/core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_amoled.png b/core/ui/src/main/res/mipmap-mdpi/ic_launcher_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_amoled.png
rename to core/ui/src/main/res/mipmap-mdpi/ic_launcher_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_background_amoled.png b/core/ui/src/main/res/mipmap-mdpi/ic_launcher_background_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_background_amoled.png
rename to core/ui/src/main/res/mipmap-mdpi/ic_launcher_background_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_background_brown.png b/core/ui/src/main/res/mipmap-mdpi/ic_launcher_background_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_background_brown.png
rename to core/ui/src/main/res/mipmap-mdpi/ic_launcher_background_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_background_purple.png b/core/ui/src/main/res/mipmap-mdpi/ic_launcher_background_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_background_purple.png
rename to core/ui/src/main/res/mipmap-mdpi/ic_launcher_background_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_background_red.png b/core/ui/src/main/res/mipmap-mdpi/ic_launcher_background_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_background_red.png
rename to core/ui/src/main/res/mipmap-mdpi/ic_launcher_background_red.png
diff --git a/core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_brown.png b/core/ui/src/main/res/mipmap-mdpi/ic_launcher_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_brown.png
rename to core/ui/src/main/res/mipmap-mdpi/ic_launcher_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_foreground_amoled.png b/core/ui/src/main/res/mipmap-mdpi/ic_launcher_foreground_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_foreground_amoled.png
rename to core/ui/src/main/res/mipmap-mdpi/ic_launcher_foreground_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_foreground_brown.png b/core/ui/src/main/res/mipmap-mdpi/ic_launcher_foreground_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_foreground_brown.png
rename to core/ui/src/main/res/mipmap-mdpi/ic_launcher_foreground_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_foreground_purple.png b/core/ui/src/main/res/mipmap-mdpi/ic_launcher_foreground_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_foreground_purple.png
rename to core/ui/src/main/res/mipmap-mdpi/ic_launcher_foreground_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_foreground_red.png b/core/ui/src/main/res/mipmap-mdpi/ic_launcher_foreground_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_foreground_red.png
rename to core/ui/src/main/res/mipmap-mdpi/ic_launcher_foreground_red.png
diff --git a/core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_monochrome_amoled.png b/core/ui/src/main/res/mipmap-mdpi/ic_launcher_monochrome_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_monochrome_amoled.png
rename to core/ui/src/main/res/mipmap-mdpi/ic_launcher_monochrome_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_monochrome_brown.png b/core/ui/src/main/res/mipmap-mdpi/ic_launcher_monochrome_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_monochrome_brown.png
rename to core/ui/src/main/res/mipmap-mdpi/ic_launcher_monochrome_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_monochrome_purple.png b/core/ui/src/main/res/mipmap-mdpi/ic_launcher_monochrome_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_monochrome_purple.png
rename to core/ui/src/main/res/mipmap-mdpi/ic_launcher_monochrome_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_monochrome_red.png b/core/ui/src/main/res/mipmap-mdpi/ic_launcher_monochrome_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_monochrome_red.png
rename to core/ui/src/main/res/mipmap-mdpi/ic_launcher_monochrome_red.png
diff --git a/core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_purple.png b/core/ui/src/main/res/mipmap-mdpi/ic_launcher_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_purple.png
rename to core/ui/src/main/res/mipmap-mdpi/ic_launcher_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_red.png b/core/ui/src/main/res/mipmap-mdpi/ic_launcher_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-mdpi/ic_launcher_red.png
rename to core/ui/src/main/res/mipmap-mdpi/ic_launcher_red.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_amoled.png b/core/ui/src/main/res/mipmap-xhdpi/ic_launcher_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_amoled.png
rename to core/ui/src/main/res/mipmap-xhdpi/ic_launcher_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_background_amoled.png b/core/ui/src/main/res/mipmap-xhdpi/ic_launcher_background_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_background_amoled.png
rename to core/ui/src/main/res/mipmap-xhdpi/ic_launcher_background_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_background_brown.png b/core/ui/src/main/res/mipmap-xhdpi/ic_launcher_background_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_background_brown.png
rename to core/ui/src/main/res/mipmap-xhdpi/ic_launcher_background_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_background_purple.png b/core/ui/src/main/res/mipmap-xhdpi/ic_launcher_background_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_background_purple.png
rename to core/ui/src/main/res/mipmap-xhdpi/ic_launcher_background_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_background_red.png b/core/ui/src/main/res/mipmap-xhdpi/ic_launcher_background_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_background_red.png
rename to core/ui/src/main/res/mipmap-xhdpi/ic_launcher_background_red.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_brown.png b/core/ui/src/main/res/mipmap-xhdpi/ic_launcher_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_brown.png
rename to core/ui/src/main/res/mipmap-xhdpi/ic_launcher_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_foreground_amoled.png b/core/ui/src/main/res/mipmap-xhdpi/ic_launcher_foreground_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_foreground_amoled.png
rename to core/ui/src/main/res/mipmap-xhdpi/ic_launcher_foreground_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_foreground_brown.png b/core/ui/src/main/res/mipmap-xhdpi/ic_launcher_foreground_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_foreground_brown.png
rename to core/ui/src/main/res/mipmap-xhdpi/ic_launcher_foreground_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_foreground_purple.png b/core/ui/src/main/res/mipmap-xhdpi/ic_launcher_foreground_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_foreground_purple.png
rename to core/ui/src/main/res/mipmap-xhdpi/ic_launcher_foreground_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_foreground_red.png b/core/ui/src/main/res/mipmap-xhdpi/ic_launcher_foreground_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_foreground_red.png
rename to core/ui/src/main/res/mipmap-xhdpi/ic_launcher_foreground_red.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_monochrome_amoled.png b/core/ui/src/main/res/mipmap-xhdpi/ic_launcher_monochrome_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_monochrome_amoled.png
rename to core/ui/src/main/res/mipmap-xhdpi/ic_launcher_monochrome_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_monochrome_brown.png b/core/ui/src/main/res/mipmap-xhdpi/ic_launcher_monochrome_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_monochrome_brown.png
rename to core/ui/src/main/res/mipmap-xhdpi/ic_launcher_monochrome_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_monochrome_purple.png b/core/ui/src/main/res/mipmap-xhdpi/ic_launcher_monochrome_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_monochrome_purple.png
rename to core/ui/src/main/res/mipmap-xhdpi/ic_launcher_monochrome_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_monochrome_red.png b/core/ui/src/main/res/mipmap-xhdpi/ic_launcher_monochrome_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_monochrome_red.png
rename to core/ui/src/main/res/mipmap-xhdpi/ic_launcher_monochrome_red.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_purple.png b/core/ui/src/main/res/mipmap-xhdpi/ic_launcher_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_purple.png
rename to core/ui/src/main/res/mipmap-xhdpi/ic_launcher_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_red.png b/core/ui/src/main/res/mipmap-xhdpi/ic_launcher_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xhdpi/ic_launcher_red.png
rename to core/ui/src/main/res/mipmap-xhdpi/ic_launcher_red.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_amoled.png b/core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_amoled.png
rename to core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_background_amoled.png b/core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_background_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_background_amoled.png
rename to core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_background_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_background_brown.png b/core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_background_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_background_brown.png
rename to core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_background_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_background_purple.png b/core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_background_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_background_purple.png
rename to core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_background_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_background_red.png b/core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_background_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_background_red.png
rename to core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_background_red.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png b/core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png
rename to core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_amoled.png b/core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_amoled.png
rename to core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_brown.png b/core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_brown.png
rename to core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_purple.png b/core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_purple.png
rename to core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_red.png b/core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_red.png
rename to core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_red.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome_amoled.png b/core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome_amoled.png
rename to core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome_brown.png b/core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome_brown.png
rename to core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome_purple.png b/core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome_purple.png
rename to core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome_red.png b/core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome_red.png
rename to core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome_red.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png b/core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png
rename to core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_red.png b/core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxhdpi/ic_launcher_red.png
rename to core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_red.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_amoled.png b/core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_amoled.png
rename to core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_background_amoled.png b/core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_background_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_background_amoled.png
rename to core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_background_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_background_brown.png b/core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_background_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_background_brown.png
rename to core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_background_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_background_purple.png b/core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_background_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_background_purple.png
rename to core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_background_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_background_red.png b/core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_background_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_background_red.png
rename to core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_background_red.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png b/core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png
rename to core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_amoled.png b/core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_amoled.png
rename to core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_brown.png b/core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_brown.png
rename to core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_purple.png b/core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_purple.png
rename to core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_red.png b/core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_red.png
rename to core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_red.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome_amoled.png b/core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome_amoled.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome_amoled.png
rename to core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome_amoled.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome_brown.png b/core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome_brown.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome_brown.png
rename to core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome_brown.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome_purple.png b/core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome_purple.png
rename to core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome_red.png b/core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome_red.png
rename to core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome_red.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png b/core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png
rename to core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png
diff --git a/core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png b/core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png
similarity index 100%
rename from core/ui-kmp/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png
rename to core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png
diff --git a/core/widget-kmp/.gitignore b/core/widget/.gitignore
similarity index 100%
rename from core/widget-kmp/.gitignore
rename to core/widget/.gitignore
diff --git a/core/widget-kmp/build.gradle.kts b/core/widget/build.gradle.kts
similarity index 86%
rename from core/widget-kmp/build.gradle.kts
rename to core/widget/build.gradle.kts
index a3a47e3b0..a8c67fa79 100644
--- a/core/widget-kmp/build.gradle.kts
+++ b/core/widget/build.gradle.kts
@@ -16,9 +16,9 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(project(":core:interactor-kmp"))
-            implementation(project(":core:ui-kmp"))
-            implementation(project(":core:work-kmp"))
+            implementation(project(":core:interactor"))
+            implementation(project(":core:ui"))
+            implementation(project(":core:work"))
             implementation(libs.bundles.kotlinx.serialization.common)
             implementation(libs.bundles.datastore.common)
             implementation(libs.bundles.koin.common)
@@ -32,7 +32,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.widget_kmp"
+    namespace = "org.michaelbel.movies.widget"
     sourceSets["main"].res.srcDirs("src/androidMain/res")
 
     defaultConfig {
diff --git a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/MoviesGlanceWidget.kt b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/MoviesGlanceWidget.kt
similarity index 100%
rename from core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/MoviesGlanceWidget.kt
rename to core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/MoviesGlanceWidget.kt
diff --git a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/MoviesGlanceWidgetContent.kt b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/MoviesGlanceWidgetContent.kt
similarity index 99%
rename from core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/MoviesGlanceWidgetContent.kt
rename to core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/MoviesGlanceWidgetContent.kt
index 9d9099e15..489c2495b 100644
--- a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/MoviesGlanceWidgetContent.kt
+++ b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/MoviesGlanceWidgetContent.kt
@@ -32,7 +32,7 @@ import org.michaelbel.movies.widget.ktx.stringResource
 import org.michaelbel.movies.widget.theme.GlanceTheme
 import org.michaelbel.movies.widget.work.MoviesUpdateWidgetAction
 import org.michaelbel.movies.widget.work.MoviesWidgetState
-import org.michaelbel.movies.widget_kmp.R
+import org.michaelbel.movies.widget.R
 
 @Composable
 internal fun MoviesGlanceWidgetContent(
diff --git a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/MoviesGlanceWidgetReceiver.kt b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/MoviesGlanceWidgetReceiver.kt
similarity index 100%
rename from core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/MoviesGlanceWidgetReceiver.kt
rename to core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/MoviesGlanceWidgetReceiver.kt
diff --git a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetConfigureActivity.kt b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetConfigureActivity.kt
similarity index 100%
rename from core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetConfigureActivity.kt
rename to core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetConfigureActivity.kt
diff --git a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetConfigureActivityContent.kt b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetConfigureActivityContent.kt
similarity index 98%
rename from core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetConfigureActivityContent.kt
rename to core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetConfigureActivityContent.kt
index 2ad336a19..8d177c3c1 100644
--- a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetConfigureActivityContent.kt
+++ b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetConfigureActivityContent.kt
@@ -26,7 +26,7 @@ import org.koin.androidx.compose.koinViewModel
 import org.michaelbel.movies.ui.compose.iconbutton.CloseIcon
 import org.michaelbel.movies.ui.ktx.displayCutoutWindowInsets
 import org.michaelbel.movies.ui.theme.MoviesTheme
-import org.michaelbel.movies.widget_kmp.R
+import org.michaelbel.movies.widget.R
 
 @Composable
 internal fun AppWidgetConfigureActivityContent(
diff --git a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetConfigureViewModel.kt b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetConfigureViewModel.kt
similarity index 100%
rename from core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetConfigureViewModel.kt
rename to core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetConfigureViewModel.kt
diff --git a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetPinnedReceiver.kt b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetPinnedReceiver.kt
similarity index 90%
rename from core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetPinnedReceiver.kt
rename to core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetPinnedReceiver.kt
index 38cd1b289..05aa91159 100644
--- a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetPinnedReceiver.kt
+++ b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/configure/AppWidgetPinnedReceiver.kt
@@ -4,7 +4,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.widget.Toast
-import org.michaelbel.movies.widget_kmp.R
+import org.michaelbel.movies.widget.R
 
 class AppWidgetPinnedReceiver: BroadcastReceiver() {
 
diff --git a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/di/GlanceKoinModule.kt b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/di/GlanceKoinModule.kt
similarity index 100%
rename from core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/di/GlanceKoinModule.kt
rename to core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/di/GlanceKoinModule.kt
diff --git a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/entity/MovieData.kt b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/entity/MovieData.kt
similarity index 100%
rename from core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/entity/MovieData.kt
rename to core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/entity/MovieData.kt
diff --git a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/ktx/AppWidgetProviderInfoKtx.kt b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/ktx/AppWidgetProviderInfoKtx.kt
similarity index 100%
rename from core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/ktx/AppWidgetProviderInfoKtx.kt
rename to core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/ktx/AppWidgetProviderInfoKtx.kt
diff --git a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/ktx/GlanceKtx.kt b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/ktx/GlanceKtx.kt
similarity index 100%
rename from core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/ktx/GlanceKtx.kt
rename to core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/ktx/GlanceKtx.kt
diff --git a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/ktx/MovieDbMiniKtx.kt b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/ktx/MovieDbMiniKtx.kt
similarity index 100%
rename from core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/ktx/MovieDbMiniKtx.kt
rename to core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/ktx/MovieDbMiniKtx.kt
diff --git a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/theme/Colors.kt b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/theme/Colors.kt
similarity index 98%
rename from core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/theme/Colors.kt
rename to core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/theme/Colors.kt
index 01030b0dc..d60af58f3 100644
--- a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/theme/Colors.kt
+++ b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/theme/Colors.kt
@@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.glance.unit.ColorProvider
-import org.michaelbel.movies.widget_kmp.R
+import org.michaelbel.movies.widget.R
 
 internal data class ColorProviders(
     val primary: ColorProvider,
diff --git a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/theme/Theme.kt b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/theme/Theme.kt
similarity index 100%
rename from core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/theme/Theme.kt
rename to core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/theme/Theme.kt
diff --git a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/work/MoviesGlanceStateDefinition.kt b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/work/MoviesGlanceStateDefinition.kt
similarity index 100%
rename from core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/work/MoviesGlanceStateDefinition.kt
rename to core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/work/MoviesGlanceStateDefinition.kt
diff --git a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/work/MoviesGlanceWidgetWorker.kt b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/work/MoviesGlanceWidgetWorker.kt
similarity index 98%
rename from core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/work/MoviesGlanceWidgetWorker.kt
rename to core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/work/MoviesGlanceWidgetWorker.kt
index 192137c68..d2d5b1359 100644
--- a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/work/MoviesGlanceWidgetWorker.kt
+++ b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/work/MoviesGlanceWidgetWorker.kt
@@ -14,7 +14,7 @@ import org.michaelbel.movies.interactor.Interactor
 import org.michaelbel.movies.persistence.database.entity.mini.MovieDbMini
 import org.michaelbel.movies.widget.MoviesGlanceWidget
 import org.michaelbel.movies.widget.ktx.mapToMovieData
-import org.michaelbel.movies.widget_kmp.R
+import org.michaelbel.movies.widget.R
 import java.time.Duration
 
 internal class MoviesGlanceWidgetWorker(
diff --git a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/work/MoviesUpdateWidgetAction.kt b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/work/MoviesUpdateWidgetAction.kt
similarity index 100%
rename from core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/work/MoviesUpdateWidgetAction.kt
rename to core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/work/MoviesUpdateWidgetAction.kt
diff --git a/core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/work/MoviesWidgetState.kt b/core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/work/MoviesWidgetState.kt
similarity index 100%
rename from core/widget-kmp/src/androidMain/kotlin/org/michaelbel/movies/widget/work/MoviesWidgetState.kt
rename to core/widget/src/androidMain/kotlin/org/michaelbel/movies/widget/work/MoviesWidgetState.kt
diff --git a/core/widget-kmp/src/androidMain/res/drawable/app_widget_background.xml b/core/widget/src/androidMain/res/drawable/app_widget_background.xml
similarity index 100%
rename from core/widget-kmp/src/androidMain/res/drawable/app_widget_background.xml
rename to core/widget/src/androidMain/res/drawable/app_widget_background.xml
diff --git a/core/widget-kmp/src/androidMain/res/drawable/app_widget_inner_view_background.xml b/core/widget/src/androidMain/res/drawable/app_widget_inner_view_background.xml
similarity index 100%
rename from core/widget-kmp/src/androidMain/res/drawable/app_widget_inner_view_background.xml
rename to core/widget/src/androidMain/res/drawable/app_widget_inner_view_background.xml
diff --git a/core/widget-kmp/src/androidMain/res/layout/widget_loading.xml b/core/widget/src/androidMain/res/layout/widget_loading.xml
similarity index 100%
rename from core/widget-kmp/src/androidMain/res/layout/widget_loading.xml
rename to core/widget/src/androidMain/res/layout/widget_loading.xml
diff --git a/core/widget-kmp/src/androidMain/res/layout/widget_preview.xml b/core/widget/src/androidMain/res/layout/widget_preview.xml
similarity index 100%
rename from core/widget-kmp/src/androidMain/res/layout/widget_preview.xml
rename to core/widget/src/androidMain/res/layout/widget_preview.xml
diff --git a/core/widget-kmp/src/androidMain/res/values-night-v31/glance_colors.xml b/core/widget/src/androidMain/res/values-night-v31/glance_colors.xml
similarity index 100%
rename from core/widget-kmp/src/androidMain/res/values-night-v31/glance_colors.xml
rename to core/widget/src/androidMain/res/values-night-v31/glance_colors.xml
diff --git a/core/widget-kmp/src/androidMain/res/values-night/glance_colors.xml b/core/widget/src/androidMain/res/values-night/glance_colors.xml
similarity index 100%
rename from core/widget-kmp/src/androidMain/res/values-night/glance_colors.xml
rename to core/widget/src/androidMain/res/values-night/glance_colors.xml
diff --git a/core/widget-kmp/src/androidMain/res/values-ru/strings.xml b/core/widget/src/androidMain/res/values-ru/strings.xml
similarity index 100%
rename from core/widget-kmp/src/androidMain/res/values-ru/strings.xml
rename to core/widget/src/androidMain/res/values-ru/strings.xml
diff --git a/core/widget-kmp/src/androidMain/res/values-v31/glance_colors.xml b/core/widget/src/androidMain/res/values-v31/glance_colors.xml
similarity index 100%
rename from core/widget-kmp/src/androidMain/res/values-v31/glance_colors.xml
rename to core/widget/src/androidMain/res/values-v31/glance_colors.xml
diff --git a/core/widget-kmp/src/androidMain/res/values-v31/styles.xml b/core/widget/src/androidMain/res/values-v31/styles.xml
similarity index 100%
rename from core/widget-kmp/src/androidMain/res/values-v31/styles.xml
rename to core/widget/src/androidMain/res/values-v31/styles.xml
diff --git a/core/widget-kmp/src/androidMain/res/values-v31/themes.xml b/core/widget/src/androidMain/res/values-v31/themes.xml
similarity index 100%
rename from core/widget-kmp/src/androidMain/res/values-v31/themes.xml
rename to core/widget/src/androidMain/res/values-v31/themes.xml
diff --git a/core/widget-kmp/src/androidMain/res/values/attrs.xml b/core/widget/src/androidMain/res/values/attrs.xml
similarity index 100%
rename from core/widget-kmp/src/androidMain/res/values/attrs.xml
rename to core/widget/src/androidMain/res/values/attrs.xml
diff --git a/core/widget-kmp/src/androidMain/res/values/glance_colors.xml b/core/widget/src/androidMain/res/values/glance_colors.xml
similarity index 100%
rename from core/widget-kmp/src/androidMain/res/values/glance_colors.xml
rename to core/widget/src/androidMain/res/values/glance_colors.xml
diff --git a/core/widget-kmp/src/androidMain/res/values/strings.xml b/core/widget/src/androidMain/res/values/strings.xml
similarity index 100%
rename from core/widget-kmp/src/androidMain/res/values/strings.xml
rename to core/widget/src/androidMain/res/values/strings.xml
diff --git a/core/widget-kmp/src/androidMain/res/values/styles.xml b/core/widget/src/androidMain/res/values/styles.xml
similarity index 100%
rename from core/widget-kmp/src/androidMain/res/values/styles.xml
rename to core/widget/src/androidMain/res/values/styles.xml
diff --git a/core/widget-kmp/src/androidMain/res/values/themes.xml b/core/widget/src/androidMain/res/values/themes.xml
similarity index 100%
rename from core/widget-kmp/src/androidMain/res/values/themes.xml
rename to core/widget/src/androidMain/res/values/themes.xml
diff --git a/core/widget-kmp/src/androidMain/res/xml/movies_appwidget_provider.xml b/core/widget/src/androidMain/res/xml/movies_appwidget_provider.xml
similarity index 100%
rename from core/widget-kmp/src/androidMain/res/xml/movies_appwidget_provider.xml
rename to core/widget/src/androidMain/res/xml/movies_appwidget_provider.xml
diff --git a/core/work-kmp/.gitignore b/core/work/.gitignore
similarity index 100%
rename from core/work-kmp/.gitignore
rename to core/work/.gitignore
diff --git a/core/work-kmp/build.gradle.kts b/core/work/build.gradle.kts
similarity index 86%
rename from core/work-kmp/build.gradle.kts
rename to core/work/build.gradle.kts
index 72670c476..08fff4fbb 100644
--- a/core/work-kmp/build.gradle.kts
+++ b/core/work/build.gradle.kts
@@ -15,8 +15,8 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(project(":core:interactor-kmp"))
-            implementation(project(":core:notifications-kmp"))
+            implementation(project(":core:interactor"))
+            implementation(project(":core:notifications"))
             implementation(libs.bundles.kotlinx.serialization.common)
             implementation(libs.bundles.paging.common)
             implementation(libs.bundles.koin.common)
@@ -29,7 +29,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.work_kmp"
+    namespace = "org.michaelbel.movies.work"
 
     defaultConfig {
         minSdk = libs.versions.min.sdk.get().toInt()
diff --git a/core/work-kmp/src/androidMain/kotlin/org/michaelbel/movies/work/AccountUpdateWorker.kt b/core/work/src/androidMain/kotlin/org/michaelbel/movies/work/AccountUpdateWorker.kt
similarity index 100%
rename from core/work-kmp/src/androidMain/kotlin/org/michaelbel/movies/work/AccountUpdateWorker.kt
rename to core/work/src/androidMain/kotlin/org/michaelbel/movies/work/AccountUpdateWorker.kt
diff --git a/core/work-kmp/src/androidMain/kotlin/org/michaelbel/movies/work/DownloadImageWorker.kt b/core/work/src/androidMain/kotlin/org/michaelbel/movies/work/DownloadImageWorker.kt
similarity index 100%
rename from core/work-kmp/src/androidMain/kotlin/org/michaelbel/movies/work/DownloadImageWorker.kt
rename to core/work/src/androidMain/kotlin/org/michaelbel/movies/work/DownloadImageWorker.kt
diff --git a/core/work-kmp/src/androidMain/kotlin/org/michaelbel/movies/work/MoviesDatabaseWorker.kt b/core/work/src/androidMain/kotlin/org/michaelbel/movies/work/MoviesDatabaseWorker.kt
similarity index 100%
rename from core/work-kmp/src/androidMain/kotlin/org/michaelbel/movies/work/MoviesDatabaseWorker.kt
rename to core/work/src/androidMain/kotlin/org/michaelbel/movies/work/MoviesDatabaseWorker.kt
diff --git a/core/work-kmp/src/androidMain/kotlin/org/michaelbel/movies/work/di/WorkKoinModule.kt b/core/work/src/androidMain/kotlin/org/michaelbel/movies/work/di/WorkKoinModule.kt
similarity index 100%
rename from core/work-kmp/src/androidMain/kotlin/org/michaelbel/movies/work/di/WorkKoinModule.kt
rename to core/work/src/androidMain/kotlin/org/michaelbel/movies/work/di/WorkKoinModule.kt
diff --git a/desktopApp/build.gradle.kts b/desktopApp/build.gradle.kts
index 72e120701..47f6adc83 100755
--- a/desktopApp/build.gradle.kts
+++ b/desktopApp/build.gradle.kts
@@ -10,13 +10,13 @@ kotlin {
 
     sourceSets {
         jvmMain.dependencies {
-            implementation(project(":feature:account-kmp"))
-            implementation(project(":feature:auth-kmp"))
-            implementation(project(":feature:details-kmp"))
-            implementation(project(":feature:feed-kmp"))
-            implementation(project(":feature:gallery-kmp"))
-            implementation(project(":feature:search-kmp"))
-            implementation(project(":feature:settings-kmp"))
+            implementation(project(":feature:account"))
+            implementation(project(":feature:auth"))
+            implementation(project(":feature:details"))
+            implementation(project(":feature:feed"))
+            implementation(project(":feature:gallery"))
+            implementation(project(":feature:search"))
+            implementation(project(":feature:settings"))
             implementation(compose.desktop.currentOs)
             implementation(compose.desktop.common)
             implementation(compose.runtime)
diff --git a/feature/account-impl-kmp/.gitignore b/feature/account-impl/.gitignore
similarity index 100%
rename from feature/account-impl-kmp/.gitignore
rename to feature/account-impl/.gitignore
diff --git a/feature/account-impl-kmp/build.gradle.kts b/feature/account-impl/build.gradle.kts
similarity index 88%
rename from feature/account-impl-kmp/build.gradle.kts
rename to feature/account-impl/build.gradle.kts
index ab7067a9d..e6d857ce2 100644
--- a/feature/account-impl-kmp/build.gradle.kts
+++ b/feature/account-impl/build.gradle.kts
@@ -22,10 +22,10 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(project(":core:navigation-kmp"))
-            api(project(":core:ui-kmp"))
-            api(project(":core:common-kmp"))
-            api(project(":core:interactor-kmp"))
+            api(project(":core:navigation"))
+            api(project(":core:ui"))
+            api(project(":core:common"))
+            api(project(":core:interactor"))
             implementation(compose.components.resources)
             implementation(compose.foundation)
             implementation(compose.material3)
@@ -41,7 +41,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.account_impl_kmp"
+    namespace = "org.michaelbel.movies.account_impl"
 
     defaultConfig {
         minSdk = libs.versions.min.sdk.get().toInt()
diff --git a/feature/account-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/account/di/AccountKoinModule.kt b/feature/account-impl/src/androidMain/kotlin/org/michaelbel/movies/account/di/AccountKoinModule.kt
similarity index 100%
rename from feature/account-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/account/di/AccountKoinModule.kt
rename to feature/account-impl/src/androidMain/kotlin/org/michaelbel/movies/account/di/AccountKoinModule.kt
diff --git a/feature/account-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/account/ui/AccountRoute.kt b/feature/account-impl/src/androidMain/kotlin/org/michaelbel/movies/account/ui/AccountRoute.kt
similarity index 100%
rename from feature/account-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/account/ui/AccountRoute.kt
rename to feature/account-impl/src/androidMain/kotlin/org/michaelbel/movies/account/ui/AccountRoute.kt
diff --git a/feature/account-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/account/AccountViewModel.kt b/feature/account-impl/src/commonMain/kotlin/org/michaelbel/movies/account/AccountViewModel.kt
similarity index 100%
rename from feature/account-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/account/AccountViewModel.kt
rename to feature/account-impl/src/commonMain/kotlin/org/michaelbel/movies/account/AccountViewModel.kt
diff --git a/feature/account-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/account/ui/AccountCountryBox.kt b/feature/account-impl/src/commonMain/kotlin/org/michaelbel/movies/account/ui/AccountCountryBox.kt
similarity index 100%
rename from feature/account-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/account/ui/AccountCountryBox.kt
rename to feature/account-impl/src/commonMain/kotlin/org/michaelbel/movies/account/ui/AccountCountryBox.kt
diff --git a/feature/account-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/account/ui/AccountScreenContent.kt b/feature/account-impl/src/commonMain/kotlin/org/michaelbel/movies/account/ui/AccountScreenContent.kt
similarity index 100%
rename from feature/account-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/account/ui/AccountScreenContent.kt
rename to feature/account-impl/src/commonMain/kotlin/org/michaelbel/movies/account/ui/AccountScreenContent.kt
diff --git a/feature/account-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/account/ui/AccountToolbar.kt b/feature/account-impl/src/commonMain/kotlin/org/michaelbel/movies/account/ui/AccountToolbar.kt
similarity index 100%
rename from feature/account-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/account/ui/AccountToolbar.kt
rename to feature/account-impl/src/commonMain/kotlin/org/michaelbel/movies/account/ui/AccountToolbar.kt
diff --git a/feature/account-impl-kmp/src/desktopMain/kotlin/org/michaelbel/movies/account/ui/AccountRoute.kt b/feature/account-impl/src/desktopMain/kotlin/org/michaelbel/movies/account/ui/AccountRoute.kt
similarity index 100%
rename from feature/account-impl-kmp/src/desktopMain/kotlin/org/michaelbel/movies/account/ui/AccountRoute.kt
rename to feature/account-impl/src/desktopMain/kotlin/org/michaelbel/movies/account/ui/AccountRoute.kt
diff --git a/feature/account-kmp/.gitignore b/feature/account/.gitignore
similarity index 100%
rename from feature/account-kmp/.gitignore
rename to feature/account/.gitignore
diff --git a/feature/account-kmp/build.gradle.kts b/feature/account/build.gradle.kts
similarity index 90%
rename from feature/account-kmp/build.gradle.kts
rename to feature/account/build.gradle.kts
index a6061d0d8..bdc46538a 100644
--- a/feature/account-kmp/build.gradle.kts
+++ b/feature/account/build.gradle.kts
@@ -16,7 +16,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(project(":feature:account-impl-kmp"))
+            api(project(":feature:account-impl"))
         }
         val desktopMain by getting
         desktopMain.dependencies {
@@ -26,7 +26,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.account_kmp"
+    namespace = "org.michaelbel.movies.account"
 
     defaultConfig {
         minSdk = libs.versions.min.sdk.get().toInt()
diff --git a/feature/account-kmp/src/androidMain/kotlin/org/michaelbel/movies/account/AccountNavigation.kt b/feature/account/src/androidMain/kotlin/org/michaelbel/movies/account/AccountNavigation.kt
similarity index 100%
rename from feature/account-kmp/src/androidMain/kotlin/org/michaelbel/movies/account/AccountNavigation.kt
rename to feature/account/src/androidMain/kotlin/org/michaelbel/movies/account/AccountNavigation.kt
diff --git a/feature/account-kmp/src/commonMain/kotlin/org/michaelbel/movies/account/AccountDestination.kt b/feature/account/src/commonMain/kotlin/org/michaelbel/movies/account/AccountDestination.kt
similarity index 100%
rename from feature/account-kmp/src/commonMain/kotlin/org/michaelbel/movies/account/AccountDestination.kt
rename to feature/account/src/commonMain/kotlin/org/michaelbel/movies/account/AccountDestination.kt
diff --git a/feature/account-kmp/src/desktopMain/kotlin/org/michaelbel/movies/account/AccountNavigation.kt b/feature/account/src/desktopMain/kotlin/org/michaelbel/movies/account/AccountNavigation.kt
similarity index 100%
rename from feature/account-kmp/src/desktopMain/kotlin/org/michaelbel/movies/account/AccountNavigation.kt
rename to feature/account/src/desktopMain/kotlin/org/michaelbel/movies/account/AccountNavigation.kt
diff --git a/feature/auth-impl-kmp/.gitignore b/feature/auth-impl/.gitignore
similarity index 100%
rename from feature/auth-impl-kmp/.gitignore
rename to feature/auth-impl/.gitignore
diff --git a/feature/auth-impl-kmp/build.gradle.kts b/feature/auth-impl/build.gradle.kts
similarity index 87%
rename from feature/auth-impl-kmp/build.gradle.kts
rename to feature/auth-impl/build.gradle.kts
index c1d7c193e..66edd2905 100644
--- a/feature/auth-impl-kmp/build.gradle.kts
+++ b/feature/auth-impl/build.gradle.kts
@@ -22,10 +22,10 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(project(":core:navigation-kmp"))
-            api(project(":core:ui-kmp"))
-            api(project(":core:common-kmp"))
-            api(project(":core:interactor-kmp"))
+            api(project(":core:navigation"))
+            api(project(":core:ui"))
+            api(project(":core:common"))
+            api(project(":core:interactor"))
             implementation(compose.components.resources)
             implementation(compose.material3)
             implementation(libs.bundles.constraintlayout.common)
@@ -38,7 +38,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.auth_impl_kmp"
+    namespace = "org.michaelbel.movies.auth_impl"
 
     defaultConfig {
         minSdk = libs.versions.min.sdk.get().toInt()
diff --git a/feature/auth-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/auth/AuthViewModel.kt b/feature/auth-impl/src/androidMain/kotlin/org/michaelbel/movies/auth/AuthViewModel.kt
similarity index 100%
rename from feature/auth-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/auth/AuthViewModel.kt
rename to feature/auth-impl/src/androidMain/kotlin/org/michaelbel/movies/auth/AuthViewModel.kt
diff --git a/feature/auth-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/auth/di/AuthKoinModule.kt b/feature/auth-impl/src/androidMain/kotlin/org/michaelbel/movies/auth/di/AuthKoinModule.kt
similarity index 100%
rename from feature/auth-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/auth/di/AuthKoinModule.kt
rename to feature/auth-impl/src/androidMain/kotlin/org/michaelbel/movies/auth/di/AuthKoinModule.kt
diff --git a/feature/auth-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/auth/ui/AuthRoute.kt b/feature/auth-impl/src/androidMain/kotlin/org/michaelbel/movies/auth/ui/AuthRoute.kt
similarity index 100%
rename from feature/auth-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/auth/ui/AuthRoute.kt
rename to feature/auth-impl/src/androidMain/kotlin/org/michaelbel/movies/auth/ui/AuthRoute.kt
diff --git a/feature/auth-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/auth/ktx/ThrowableKtx.kt b/feature/auth-impl/src/commonMain/kotlin/org/michaelbel/movies/auth/ktx/ThrowableKtx.kt
similarity index 100%
rename from feature/auth-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/auth/ktx/ThrowableKtx.kt
rename to feature/auth-impl/src/commonMain/kotlin/org/michaelbel/movies/auth/ktx/ThrowableKtx.kt
diff --git a/feature/auth-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/auth/ui/AuthLinksBox.kt b/feature/auth-impl/src/commonMain/kotlin/org/michaelbel/movies/auth/ui/AuthLinksBox.kt
similarity index 100%
rename from feature/auth-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/auth/ui/AuthLinksBox.kt
rename to feature/auth-impl/src/commonMain/kotlin/org/michaelbel/movies/auth/ui/AuthLinksBox.kt
diff --git a/feature/auth-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/auth/ui/AuthScreenContent.kt b/feature/auth-impl/src/commonMain/kotlin/org/michaelbel/movies/auth/ui/AuthScreenContent.kt
similarity index 100%
rename from feature/auth-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/auth/ui/AuthScreenContent.kt
rename to feature/auth-impl/src/commonMain/kotlin/org/michaelbel/movies/auth/ui/AuthScreenContent.kt
diff --git a/feature/auth-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/auth/ui/AuthToolbar.kt b/feature/auth-impl/src/commonMain/kotlin/org/michaelbel/movies/auth/ui/AuthToolbar.kt
similarity index 100%
rename from feature/auth-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/auth/ui/AuthToolbar.kt
rename to feature/auth-impl/src/commonMain/kotlin/org/michaelbel/movies/auth/ui/AuthToolbar.kt
diff --git a/feature/auth-impl-kmp/src/desktopMain/kotlin/org/michaelbel/movies/auth/ui/AuthRoute.kt b/feature/auth-impl/src/desktopMain/kotlin/org/michaelbel/movies/auth/ui/AuthRoute.kt
similarity index 100%
rename from feature/auth-impl-kmp/src/desktopMain/kotlin/org/michaelbel/movies/auth/ui/AuthRoute.kt
rename to feature/auth-impl/src/desktopMain/kotlin/org/michaelbel/movies/auth/ui/AuthRoute.kt
diff --git a/feature/auth-kmp/.gitignore b/feature/auth/.gitignore
similarity index 100%
rename from feature/auth-kmp/.gitignore
rename to feature/auth/.gitignore
diff --git a/feature/auth-kmp/build.gradle.kts b/feature/auth/build.gradle.kts
similarity index 91%
rename from feature/auth-kmp/build.gradle.kts
rename to feature/auth/build.gradle.kts
index 560437ffb..d0b6637c9 100644
--- a/feature/auth-kmp/build.gradle.kts
+++ b/feature/auth/build.gradle.kts
@@ -16,7 +16,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(project(":feature:auth-impl-kmp"))
+            api(project(":feature:auth-impl"))
         }
         val desktopMain by getting
         desktopMain.dependencies {
@@ -27,7 +27,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.auth_kmp"
+    namespace = "org.michaelbel.movies.auth"
 
     defaultConfig {
         minSdk = libs.versions.min.sdk.get().toInt()
diff --git a/feature/auth-kmp/src/androidMain/kotlin/org/michaelbel/movies/auth/AuthNavigation.kt b/feature/auth/src/androidMain/kotlin/org/michaelbel/movies/auth/AuthNavigation.kt
similarity index 100%
rename from feature/auth-kmp/src/androidMain/kotlin/org/michaelbel/movies/auth/AuthNavigation.kt
rename to feature/auth/src/androidMain/kotlin/org/michaelbel/movies/auth/AuthNavigation.kt
diff --git a/feature/auth-kmp/src/commonMain/kotlin/org/michaelbel/movies/auth/AuthDestination.kt b/feature/auth/src/commonMain/kotlin/org/michaelbel/movies/auth/AuthDestination.kt
similarity index 100%
rename from feature/auth-kmp/src/commonMain/kotlin/org/michaelbel/movies/auth/AuthDestination.kt
rename to feature/auth/src/commonMain/kotlin/org/michaelbel/movies/auth/AuthDestination.kt
diff --git a/feature/auth-kmp/src/desktopMain/kotlin/org/michaelbel/movies/auth/AuthNavigation.kt b/feature/auth/src/desktopMain/kotlin/org/michaelbel/movies/auth/AuthNavigation.kt
similarity index 100%
rename from feature/auth-kmp/src/desktopMain/kotlin/org/michaelbel/movies/auth/AuthNavigation.kt
rename to feature/auth/src/desktopMain/kotlin/org/michaelbel/movies/auth/AuthNavigation.kt
diff --git a/feature/debug-impl-kmp/.gitignore b/feature/debug-impl/.gitignore
similarity index 100%
rename from feature/debug-impl-kmp/.gitignore
rename to feature/debug-impl/.gitignore
diff --git a/feature/debug-impl-kmp/build.gradle.kts b/feature/debug-impl/build.gradle.kts
similarity index 82%
rename from feature/debug-impl-kmp/build.gradle.kts
rename to feature/debug-impl/build.gradle.kts
index 1002e6747..e87ba0e7b 100644
--- a/feature/debug-impl-kmp/build.gradle.kts
+++ b/feature/debug-impl/build.gradle.kts
@@ -18,17 +18,17 @@ kotlin {
             implementation(libs.bundles.koin.common)
         }
         androidMain.dependencies {
-            api(project(":core:common-kmp"))
-            api(project(":core:ui-kmp"))
-            implementation(project(":core:interactor-kmp"))
-            implementation(project(":core:navigation-kmp"))
+            api(project(":core:common"))
+            api(project(":core:ui"))
+            implementation(project(":core:interactor"))
+            implementation(project(":core:navigation"))
             implementation(libs.bundles.koin.compose.android)
         }
     }
 }
 
 android {
-    namespace = "org.michaelbel.movies.debug_impl_kmp"
+    namespace = "org.michaelbel.movies.debug_impl"
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     sourceSets["main"].res.srcDirs("src/androidMain/res")
 
diff --git a/feature/debug-impl-kmp/src/androidMain/AndroidManifest.xml b/feature/debug-impl/src/androidMain/AndroidManifest.xml
similarity index 100%
rename from feature/debug-impl-kmp/src/androidMain/AndroidManifest.xml
rename to feature/debug-impl/src/androidMain/AndroidManifest.xml
diff --git a/feature/debug-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/DebugActivity.kt b/feature/debug-impl/src/androidMain/kotlin/org/michaelbel/movies/debug/DebugActivity.kt
similarity index 100%
rename from feature/debug-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/DebugActivity.kt
rename to feature/debug-impl/src/androidMain/kotlin/org/michaelbel/movies/debug/DebugActivity.kt
diff --git a/feature/debug-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/DebugViewModel.kt b/feature/debug-impl/src/androidMain/kotlin/org/michaelbel/movies/debug/DebugViewModel.kt
similarity index 100%
rename from feature/debug-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/DebugViewModel.kt
rename to feature/debug-impl/src/androidMain/kotlin/org/michaelbel/movies/debug/DebugViewModel.kt
diff --git a/feature/debug-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/di/DebugKoinModule.kt b/feature/debug-impl/src/androidMain/kotlin/org/michaelbel/movies/debug/di/DebugKoinModule.kt
similarity index 100%
rename from feature/debug-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/di/DebugKoinModule.kt
rename to feature/debug-impl/src/androidMain/kotlin/org/michaelbel/movies/debug/di/DebugKoinModule.kt
diff --git a/feature/debug-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugActivityContent.kt b/feature/debug-impl/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugActivityContent.kt
similarity index 98%
rename from feature/debug-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugActivityContent.kt
rename to feature/debug-impl/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugActivityContent.kt
index c7da00148..b7ace174d 100644
--- a/feature/debug-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugActivityContent.kt
+++ b/feature/debug-impl/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugActivityContent.kt
@@ -30,7 +30,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.koin.androidx.compose.koinViewModel
 import org.michaelbel.movies.common.ktx.appSettingsIntent
 import org.michaelbel.movies.debug.DebugViewModel
-import org.michaelbel.movies.debug_impl_kmp.R
+import org.michaelbel.movies.debug_impl.R
 import org.michaelbel.movies.ui.icons.MoviesAndroidIcons
 import org.michaelbel.movies.ui.theme.MoviesTheme
 
diff --git a/feature/debug-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugToolbar.kt b/feature/debug-impl/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugToolbar.kt
similarity index 97%
rename from feature/debug-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugToolbar.kt
rename to feature/debug-impl/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugToolbar.kt
index 5c87aee34..cb0096408 100644
--- a/feature/debug-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugToolbar.kt
+++ b/feature/debug-impl/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/DebugToolbar.kt
@@ -12,7 +12,7 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import org.michaelbel.movies.debug_impl_kmp.R
+import org.michaelbel.movies.debug_impl.R
 import org.michaelbel.movies.ui.compose.iconbutton.CloseIcon
 import org.michaelbel.movies.ui.ktx.displayCutoutWindowInsets
 
diff --git a/feature/debug-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/SettingItem.kt b/feature/debug-impl/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/SettingItem.kt
similarity index 100%
rename from feature/debug-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/SettingItem.kt
rename to feature/debug-impl/src/androidMain/kotlin/org/michaelbel/movies/debug/ui/SettingItem.kt
diff --git a/feature/debug-impl-kmp/src/androidMain/res/values-ru/strings.xml b/feature/debug-impl/src/androidMain/res/values-ru/strings.xml
similarity index 100%
rename from feature/debug-impl-kmp/src/androidMain/res/values-ru/strings.xml
rename to feature/debug-impl/src/androidMain/res/values-ru/strings.xml
diff --git a/feature/debug-impl-kmp/src/androidMain/res/values/strings.xml b/feature/debug-impl/src/androidMain/res/values/strings.xml
similarity index 100%
rename from feature/debug-impl-kmp/src/androidMain/res/values/strings.xml
rename to feature/debug-impl/src/androidMain/res/values/strings.xml
diff --git a/feature/debug-kmp/.gitignore b/feature/debug/.gitignore
similarity index 100%
rename from feature/debug-kmp/.gitignore
rename to feature/debug/.gitignore
diff --git a/feature/debug-kmp/build.gradle.kts b/feature/debug/build.gradle.kts
similarity index 92%
rename from feature/debug-kmp/build.gradle.kts
rename to feature/debug/build.gradle.kts
index 2ea920fea..06cf01a68 100644
--- a/feature/debug-kmp/build.gradle.kts
+++ b/feature/debug/build.gradle.kts
@@ -15,7 +15,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(project(":feature:debug-impl-kmp"))
+            api(project(":feature:debug-impl"))
             implementation(libs.bundles.koin.common)
         }
         androidMain.dependencies {
@@ -25,7 +25,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.debug_kmp"
+    namespace = "org.michaelbel.movies.debug"
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     sourceSets["main"].res.srcDirs("src/androidMain/res")
 
diff --git a/feature/debug-kmp/src/androidMain/AndroidManifest.xml b/feature/debug/src/androidMain/AndroidManifest.xml
similarity index 100%
rename from feature/debug-kmp/src/androidMain/AndroidManifest.xml
rename to feature/debug/src/androidMain/AndroidManifest.xml
diff --git a/feature/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/di/DebugNotificationClientKoinModule.kt b/feature/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/di/DebugNotificationClientKoinModule.kt
similarity index 100%
rename from feature/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/di/DebugNotificationClientKoinModule.kt
rename to feature/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/di/DebugNotificationClientKoinModule.kt
diff --git a/feature/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/notification/DebugNotificationClient.kt b/feature/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/notification/DebugNotificationClient.kt
similarity index 98%
rename from feature/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/notification/DebugNotificationClient.kt
rename to feature/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/notification/DebugNotificationClient.kt
index 8b532ec3e..456ff0fca 100644
--- a/feature/debug-kmp/src/androidMain/kotlin/org/michaelbel/movies/debug/notification/DebugNotificationClient.kt
+++ b/feature/debug/src/androidMain/kotlin/org/michaelbel/movies/debug/notification/DebugNotificationClient.kt
@@ -13,7 +13,7 @@ import androidx.core.app.NotificationManagerCompat
 import org.michaelbel.movies.common.ktx.isPostNotificationsPermissionGranted
 import org.michaelbel.movies.common.ktx.notificationManager
 import org.michaelbel.movies.debug.DebugActivity
-import org.michaelbel.movies.debug_kmp.R
+import org.michaelbel.movies.debug.R
 import org.michaelbel.movies.ui.icons.MoviesAndroidIcons
 
 class DebugNotificationClient(
diff --git a/feature/debug-kmp/src/androidMain/res/values-ru/strings.xml b/feature/debug/src/androidMain/res/values-ru/strings.xml
similarity index 100%
rename from feature/debug-kmp/src/androidMain/res/values-ru/strings.xml
rename to feature/debug/src/androidMain/res/values-ru/strings.xml
diff --git a/feature/debug-kmp/src/androidMain/res/values/strings.xml b/feature/debug/src/androidMain/res/values/strings.xml
similarity index 100%
rename from feature/debug-kmp/src/androidMain/res/values/strings.xml
rename to feature/debug/src/androidMain/res/values/strings.xml
diff --git a/feature/details-impl-kmp/.gitignore b/feature/details-impl/.gitignore
similarity index 100%
rename from feature/details-impl-kmp/.gitignore
rename to feature/details-impl/.gitignore
diff --git a/feature/details-impl-kmp/build.gradle.kts b/feature/details-impl/build.gradle.kts
similarity index 87%
rename from feature/details-impl-kmp/build.gradle.kts
rename to feature/details-impl/build.gradle.kts
index 2f7ef0060..8d11e0d73 100644
--- a/feature/details-impl-kmp/build.gradle.kts
+++ b/feature/details-impl/build.gradle.kts
@@ -22,10 +22,10 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(project(":core:navigation-kmp"))
-            api(project(":core:ui-kmp"))
-            api(project(":core:common-kmp"))
-            api(project(":core:interactor-kmp"))
+            api(project(":core:navigation"))
+            api(project(":core:ui"))
+            api(project(":core:common"))
+            api(project(":core:interactor"))
             implementation(compose.components.resources)
             implementation(compose.material3)
             implementation(libs.bundles.constraintlayout.common)
@@ -38,7 +38,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.details_impl_kmp"
+    namespace = "org.michaelbel.movies.details_impl"
     sourceSets["main"].res.srcDirs("src/androidMain/res")
 
     defaultConfig {
diff --git a/feature/details-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/details/DetailsViewModel.kt b/feature/details-impl/src/androidMain/kotlin/org/michaelbel/movies/details/DetailsViewModel.kt
similarity index 100%
rename from feature/details-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/details/DetailsViewModel.kt
rename to feature/details-impl/src/androidMain/kotlin/org/michaelbel/movies/details/DetailsViewModel.kt
diff --git a/feature/details-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/details/di/DetailsKoinModule.kt b/feature/details-impl/src/androidMain/kotlin/org/michaelbel/movies/details/di/DetailsKoinModule.kt
similarity index 100%
rename from feature/details-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/details/di/DetailsKoinModule.kt
rename to feature/details-impl/src/androidMain/kotlin/org/michaelbel/movies/details/di/DetailsKoinModule.kt
diff --git a/feature/details-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/details/ui/DetailsContent.kt b/feature/details-impl/src/androidMain/kotlin/org/michaelbel/movies/details/ui/DetailsContent.kt
similarity index 100%
rename from feature/details-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/details/ui/DetailsContent.kt
rename to feature/details-impl/src/androidMain/kotlin/org/michaelbel/movies/details/ui/DetailsContent.kt
diff --git a/feature/details-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/details/ui/DetailsLoading.kt b/feature/details-impl/src/androidMain/kotlin/org/michaelbel/movies/details/ui/DetailsLoading.kt
similarity index 100%
rename from feature/details-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/details/ui/DetailsLoading.kt
rename to feature/details-impl/src/androidMain/kotlin/org/michaelbel/movies/details/ui/DetailsLoading.kt
diff --git a/feature/details-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/details/ui/DetailsRoute.kt b/feature/details-impl/src/androidMain/kotlin/org/michaelbel/movies/details/ui/DetailsRoute.kt
similarity index 100%
rename from feature/details-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/details/ui/DetailsRoute.kt
rename to feature/details-impl/src/androidMain/kotlin/org/michaelbel/movies/details/ui/DetailsRoute.kt
diff --git a/feature/details-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/details/ui/DetailsScreenContent.kt b/feature/details-impl/src/androidMain/kotlin/org/michaelbel/movies/details/ui/DetailsScreenContent.kt
similarity index 100%
rename from feature/details-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/details/ui/DetailsScreenContent.kt
rename to feature/details-impl/src/androidMain/kotlin/org/michaelbel/movies/details/ui/DetailsScreenContent.kt
diff --git a/feature/details-impl-kmp/src/androidMain/res/values-ru/strings.xml b/feature/details-impl/src/androidMain/res/values-ru/strings.xml
similarity index 100%
rename from feature/details-impl-kmp/src/androidMain/res/values-ru/strings.xml
rename to feature/details-impl/src/androidMain/res/values-ru/strings.xml
diff --git a/feature/details-impl-kmp/src/androidMain/res/values/strings.xml b/feature/details-impl/src/androidMain/res/values/strings.xml
similarity index 100%
rename from feature/details-impl-kmp/src/androidMain/res/values/strings.xml
rename to feature/details-impl/src/androidMain/res/values/strings.xml
diff --git a/feature/details-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/details/ktx/ScreenStateKtx.kt b/feature/details-impl/src/commonMain/kotlin/org/michaelbel/movies/details/ktx/ScreenStateKtx.kt
similarity index 100%
rename from feature/details-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/details/ktx/ScreenStateKtx.kt
rename to feature/details-impl/src/commonMain/kotlin/org/michaelbel/movies/details/ktx/ScreenStateKtx.kt
diff --git a/feature/details-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/details/ui/DetailsFailure.kt b/feature/details-impl/src/commonMain/kotlin/org/michaelbel/movies/details/ui/DetailsFailure.kt
similarity index 100%
rename from feature/details-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/details/ui/DetailsFailure.kt
rename to feature/details-impl/src/commonMain/kotlin/org/michaelbel/movies/details/ui/DetailsFailure.kt
diff --git a/feature/details-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/details/ui/DetailsToolbar.kt b/feature/details-impl/src/commonMain/kotlin/org/michaelbel/movies/details/ui/DetailsToolbar.kt
similarity index 100%
rename from feature/details-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/details/ui/DetailsToolbar.kt
rename to feature/details-impl/src/commonMain/kotlin/org/michaelbel/movies/details/ui/DetailsToolbar.kt
diff --git a/feature/details-kmp/.gitignore b/feature/details/.gitignore
similarity index 100%
rename from feature/details-kmp/.gitignore
rename to feature/details/.gitignore
diff --git a/feature/feed-kmp/build.gradle.kts b/feature/details/build.gradle.kts
similarity index 91%
rename from feature/feed-kmp/build.gradle.kts
rename to feature/details/build.gradle.kts
index 822d07ff6..18d7b74f9 100644
--- a/feature/feed-kmp/build.gradle.kts
+++ b/feature/details/build.gradle.kts
@@ -16,7 +16,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(project(":feature:feed-impl-kmp"))
+            api(project(":feature:details-impl"))
         }
         val desktopMain by getting
         desktopMain.dependencies {
@@ -27,7 +27,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.feed_kmp"
+    namespace = "org.michaelbel.movies.details"
 
     defaultConfig {
         minSdk = libs.versions.min.sdk.get().toInt()
diff --git a/feature/details-kmp/src/androidMain/kotlin/org/michaelbel/movies/details/DetailsNavigation.kt b/feature/details/src/androidMain/kotlin/org/michaelbel/movies/details/DetailsNavigation.kt
similarity index 100%
rename from feature/details-kmp/src/androidMain/kotlin/org/michaelbel/movies/details/DetailsNavigation.kt
rename to feature/details/src/androidMain/kotlin/org/michaelbel/movies/details/DetailsNavigation.kt
diff --git a/feature/details-kmp/src/commonMain/kotlin/org/michaelbel/movies/details/DetailsDestination.kt b/feature/details/src/commonMain/kotlin/org/michaelbel/movies/details/DetailsDestination.kt
similarity index 100%
rename from feature/details-kmp/src/commonMain/kotlin/org/michaelbel/movies/details/DetailsDestination.kt
rename to feature/details/src/commonMain/kotlin/org/michaelbel/movies/details/DetailsDestination.kt
diff --git a/feature/details-kmp/src/desktopMain/kotlin/org/michaelbel/movies/details/DetailsNavigation.kt b/feature/details/src/desktopMain/kotlin/org/michaelbel/movies/details/DetailsNavigation.kt
similarity index 100%
rename from feature/details-kmp/src/desktopMain/kotlin/org/michaelbel/movies/details/DetailsNavigation.kt
rename to feature/details/src/desktopMain/kotlin/org/michaelbel/movies/details/DetailsNavigation.kt
diff --git a/feature/feed-impl-kmp/.gitignore b/feature/feed-impl/.gitignore
similarity index 100%
rename from feature/feed-impl-kmp/.gitignore
rename to feature/feed-impl/.gitignore
diff --git a/feature/feed-impl-kmp/build.gradle.kts b/feature/feed-impl/build.gradle.kts
similarity index 83%
rename from feature/feed-impl-kmp/build.gradle.kts
rename to feature/feed-impl/build.gradle.kts
index 6b79fb77e..86075146a 100644
--- a/feature/feed-impl-kmp/build.gradle.kts
+++ b/feature/feed-impl/build.gradle.kts
@@ -22,12 +22,12 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(project(":core:navigation-kmp"))
-            api(project(":core:platform-services:interactor-kmp"))
-            api(project(":core:ui-kmp"))
-            api(project(":core:common-kmp"))
-            api(project(":core:interactor-kmp"))
-            implementation(project(":core:notifications-kmp"))
+            api(project(":core:navigation"))
+            api(project(":core:platform-services:interactor"))
+            api(project(":core:ui"))
+            api(project(":core:common"))
+            api(project(":core:interactor"))
+            implementation(project(":core:notifications"))
             implementation(libs.bundles.paging.common)
             implementation(libs.bundles.constraintlayout.common)
             implementation(libs.bundles.koin.common)
@@ -46,7 +46,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.feed_impl_kmp"
+    namespace = "org.michaelbel.movies.feed_impl"
     sourceSets["main"].res.srcDirs("src/androidMain/res")
 
     defaultConfig {
diff --git a/feature/feed-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/FeedViewModel.kt b/feature/feed-impl/src/androidMain/kotlin/org/michaelbel/movies/feed/FeedViewModel.kt
similarity index 100%
rename from feature/feed-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/FeedViewModel.kt
rename to feature/feed-impl/src/androidMain/kotlin/org/michaelbel/movies/feed/FeedViewModel.kt
diff --git a/feature/feed-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/di/FeedKoinModule.kt b/feature/feed-impl/src/androidMain/kotlin/org/michaelbel/movies/feed/di/FeedKoinModule.kt
similarity index 100%
rename from feature/feed-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/di/FeedKoinModule.kt
rename to feature/feed-impl/src/androidMain/kotlin/org/michaelbel/movies/feed/di/FeedKoinModule.kt
diff --git a/feature/feed-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/ktx/MovieListKtx.kt b/feature/feed-impl/src/androidMain/kotlin/org/michaelbel/movies/feed/ktx/MovieListKtx.kt
similarity index 92%
rename from feature/feed-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/ktx/MovieListKtx.kt
rename to feature/feed-impl/src/androidMain/kotlin/org/michaelbel/movies/feed/ktx/MovieListKtx.kt
index eebafba31..c0a8e457c 100644
--- a/feature/feed-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/ktx/MovieListKtx.kt
+++ b/feature/feed-impl/src/androidMain/kotlin/org/michaelbel/movies/feed/ktx/MovieListKtx.kt
@@ -3,7 +3,7 @@ package org.michaelbel.movies.feed.ktx
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import org.michaelbel.movies.common.list.MovieList
-import org.michaelbel.movies.feed_impl_kmp.R
+import org.michaelbel.movies.feed_impl.R
 
 internal val MovieList.titleText: String
     @Composable get() = when (this) {
diff --git a/feature/feed-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedEmpty.kt b/feature/feed-impl/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedEmpty.kt
similarity index 98%
rename from feature/feed-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedEmpty.kt
rename to feature/feed-impl/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedEmpty.kt
index fc2125d6d..91f9503c8 100644
--- a/feature/feed-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedEmpty.kt
+++ b/feature/feed-impl/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedEmpty.kt
@@ -14,7 +14,7 @@ import androidx.compose.ui.unit.dp
 import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.constraintlayout.compose.Dimension
 import org.michaelbel.movies.common.theme.AppTheme
-import org.michaelbel.movies.feed_impl_kmp.R
+import org.michaelbel.movies.feed_impl.R
 import org.michaelbel.movies.ui.accessibility.MoviesContentDescription
 import org.michaelbel.movies.ui.icons.MoviesIcons
 import org.michaelbel.movies.ui.preview.DevicePreviews
diff --git a/feature/feed-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedRoute.kt b/feature/feed-impl/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedRoute.kt
similarity index 100%
rename from feature/feed-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedRoute.kt
rename to feature/feed-impl/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedRoute.kt
diff --git a/feature/feed-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.kt b/feature/feed-impl/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.kt
similarity index 98%
rename from feature/feed-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.kt
rename to feature/feed-impl/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.kt
index 31e8a04bb..fc3b45534 100644
--- a/feature/feed-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.kt
+++ b/feature/feed-impl/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.kt
@@ -33,7 +33,7 @@ import org.michaelbel.movies.common.exceptions.ApiKeyNotNullException
 import org.michaelbel.movies.common.exceptions.PageEmptyException
 import org.michaelbel.movies.common.list.MovieList
 import org.michaelbel.movies.feed.ktx.titleText
-import org.michaelbel.movies.feed_impl_kmp.R
+import org.michaelbel.movies.feed_impl.R
 import org.michaelbel.movies.network.connectivity.NetworkStatus
 import org.michaelbel.movies.persistence.database.entity.AccountPojo
 import org.michaelbel.movies.persistence.database.entity.MoviePojo
@@ -47,7 +47,7 @@ import org.michaelbel.movies.ui.ktx.isFailure
 import org.michaelbel.movies.ui.ktx.isLoading
 import org.michaelbel.movies.ui.ktx.refreshThrowable
 import java.net.UnknownHostException
-import org.michaelbel.movies.ui_kmp.R as UiR
+import org.michaelbel.movies.ui.R as UiR
 
 @Composable
 internal fun FeedScreenContent(
diff --git a/feature/feed-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt b/feature/feed-impl/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt
similarity index 99%
rename from feature/feed-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt
rename to feature/feed-impl/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt
index 4cccb80b0..15aa403a4 100644
--- a/feature/feed-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt
+++ b/feature/feed-impl/src/androidMain/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt
@@ -27,7 +27,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.michaelbel.movies.common.theme.AppTheme
-import org.michaelbel.movies.feed_impl_kmp.R
+import org.michaelbel.movies.feed_impl.R
 import org.michaelbel.movies.network.config.isTmdbApiKeyEmpty
 import org.michaelbel.movies.persistence.database.entity.AccountPojo
 import org.michaelbel.movies.persistence.database.ktx.isEmpty
diff --git a/feature/feed-impl-kmp/src/androidMain/res/values-ru/strings.xml b/feature/feed-impl/src/androidMain/res/values-ru/strings.xml
similarity index 100%
rename from feature/feed-impl-kmp/src/androidMain/res/values-ru/strings.xml
rename to feature/feed-impl/src/androidMain/res/values-ru/strings.xml
diff --git a/feature/feed-impl-kmp/src/androidMain/res/values/strings.xml b/feature/feed-impl/src/androidMain/res/values/strings.xml
similarity index 100%
rename from feature/feed-impl-kmp/src/androidMain/res/values/strings.xml
rename to feature/feed-impl/src/androidMain/res/values/strings.xml
diff --git a/feature/feed-impl-kmp/src/desktopMain/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.kt b/feature/feed-impl/src/desktopMain/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.kt
similarity index 100%
rename from feature/feed-impl-kmp/src/desktopMain/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.kt
rename to feature/feed-impl/src/desktopMain/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.kt
diff --git a/feature/feed-impl-kmp/src/desktopMain/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt b/feature/feed-impl/src/desktopMain/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt
similarity index 100%
rename from feature/feed-impl-kmp/src/desktopMain/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt
rename to feature/feed-impl/src/desktopMain/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt
diff --git a/feature/feed-kmp/.gitignore b/feature/feed/.gitignore
similarity index 100%
rename from feature/feed-kmp/.gitignore
rename to feature/feed/.gitignore
diff --git a/feature/search-kmp/build.gradle.kts b/feature/feed/build.gradle.kts
similarity index 91%
rename from feature/search-kmp/build.gradle.kts
rename to feature/feed/build.gradle.kts
index c36f46530..5b079f839 100644
--- a/feature/search-kmp/build.gradle.kts
+++ b/feature/feed/build.gradle.kts
@@ -16,7 +16,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(project(":feature:search-impl-kmp"))
+            api(project(":feature:feed-impl"))
         }
         val desktopMain by getting
         desktopMain.dependencies {
@@ -27,7 +27,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.search_kmp"
+    namespace = "org.michaelbel.movies.feed"
 
     defaultConfig {
         minSdk = libs.versions.min.sdk.get().toInt()
diff --git a/feature/feed-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/FeedNavigation.kt b/feature/feed/src/androidMain/kotlin/org/michaelbel/movies/feed/FeedNavigation.kt
similarity index 100%
rename from feature/feed-kmp/src/androidMain/kotlin/org/michaelbel/movies/feed/FeedNavigation.kt
rename to feature/feed/src/androidMain/kotlin/org/michaelbel/movies/feed/FeedNavigation.kt
diff --git a/feature/feed-kmp/src/commonMain/kotlin/org/michaelbel/movies/feed/FeedDestination.kt b/feature/feed/src/commonMain/kotlin/org/michaelbel/movies/feed/FeedDestination.kt
similarity index 100%
rename from feature/feed-kmp/src/commonMain/kotlin/org/michaelbel/movies/feed/FeedDestination.kt
rename to feature/feed/src/commonMain/kotlin/org/michaelbel/movies/feed/FeedDestination.kt
diff --git a/feature/feed-kmp/src/desktopMain/kotlin/org/michaelbel/movies/feed/FeedNavigation.kt b/feature/feed/src/desktopMain/kotlin/org/michaelbel/movies/feed/FeedNavigation.kt
similarity index 100%
rename from feature/feed-kmp/src/desktopMain/kotlin/org/michaelbel/movies/feed/FeedNavigation.kt
rename to feature/feed/src/desktopMain/kotlin/org/michaelbel/movies/feed/FeedNavigation.kt
diff --git a/feature/gallery-impl-kmp/.gitignore b/feature/gallery-impl/.gitignore
similarity index 100%
rename from feature/gallery-impl-kmp/.gitignore
rename to feature/gallery-impl/.gitignore
diff --git a/feature/gallery-impl-kmp/build.gradle.kts b/feature/gallery-impl/build.gradle.kts
similarity index 84%
rename from feature/gallery-impl-kmp/build.gradle.kts
rename to feature/gallery-impl/build.gradle.kts
index 9fba26936..1051245a2 100644
--- a/feature/gallery-impl-kmp/build.gradle.kts
+++ b/feature/gallery-impl/build.gradle.kts
@@ -22,11 +22,11 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(project(":core:navigation-kmp"))
-            api(project(":core:ui-kmp"))
-            api(project(":core:common-kmp"))
-            api(project(":core:interactor-kmp"))
-            api(project(":core:work-kmp"))
+            api(project(":core:navigation"))
+            api(project(":core:ui"))
+            api(project(":core:common"))
+            api(project(":core:interactor"))
+            api(project(":core:work"))
             implementation(libs.bundles.constraintlayout.common)
             implementation(libs.bundles.koin.common)
         }
@@ -37,7 +37,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.gallery_impl_kmp"
+    namespace = "org.michaelbel.movies.gallery_impl"
     sourceSets["main"].res.srcDirs("src/androidMain/res")
 
     defaultConfig {
diff --git a/feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/GalleryViewModel.kt b/feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/GalleryViewModel.kt
similarity index 98%
rename from feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/GalleryViewModel.kt
rename to feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/GalleryViewModel.kt
index 2dadc3a49..0e3a5f631 100644
--- a/feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/GalleryViewModel.kt
+++ b/feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/GalleryViewModel.kt
@@ -17,7 +17,7 @@ import kotlinx.coroutines.launch
 import org.michaelbel.movies.common.ktx.require
 import org.michaelbel.movies.common.viewmodel.BaseViewModel
 import org.michaelbel.movies.gallery.ktx.nameRes
-import org.michaelbel.movies.gallery_impl_kmp.R
+import org.michaelbel.movies.gallery_impl.R
 import org.michaelbel.movies.interactor.Interactor
 import org.michaelbel.movies.persistence.database.entity.ImagePojo
 import org.michaelbel.movies.persistence.database.ktx.original
diff --git a/feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/di/GalleryKoinModule.kt b/feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/di/GalleryKoinModule.kt
similarity index 100%
rename from feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/di/GalleryKoinModule.kt
rename to feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/di/GalleryKoinModule.kt
diff --git a/feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/ktx/ImageTypeKtx.kt b/feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/ktx/ImageTypeKtx.kt
similarity index 88%
rename from feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/ktx/ImageTypeKtx.kt
rename to feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/ktx/ImageTypeKtx.kt
index c28060297..bd02c64cc 100644
--- a/feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/ktx/ImageTypeKtx.kt
+++ b/feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/ktx/ImageTypeKtx.kt
@@ -1,7 +1,7 @@
 package org.michaelbel.movies.gallery.ktx
 
 import androidx.annotation.StringRes
-import org.michaelbel.movies.gallery_impl_kmp.R
+import org.michaelbel.movies.gallery_impl.R
 import org.michaelbel.movies.persistence.database.entity.ImageType
 
 internal val ImageType.nameRes: Int
diff --git a/feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/ui/GalleryLoading.kt b/feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/ui/GalleryLoading.kt
similarity index 100%
rename from feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/ui/GalleryLoading.kt
rename to feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/ui/GalleryLoading.kt
diff --git a/feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/ui/GalleryRoute.kt b/feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/ui/GalleryRoute.kt
similarity index 100%
rename from feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/ui/GalleryRoute.kt
rename to feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/ui/GalleryRoute.kt
diff --git a/feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/ui/GalleryScreenContent.kt b/feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/ui/GalleryScreenContent.kt
similarity index 99%
rename from feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/ui/GalleryScreenContent.kt
rename to feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/ui/GalleryScreenContent.kt
index e8ae7386c..741c5976e 100644
--- a/feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/ui/GalleryScreenContent.kt
+++ b/feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/ui/GalleryScreenContent.kt
@@ -52,7 +52,7 @@ import kotlinx.coroutines.launch
 import org.michaelbel.movies.common.theme.AppTheme
 import org.michaelbel.movies.gallery.zoomable.rememberZoomState
 import org.michaelbel.movies.gallery.zoomable.zoomable
-import org.michaelbel.movies.gallery_impl_kmp.R
+import org.michaelbel.movies.gallery_impl.R
 import org.michaelbel.movies.network.config.isNotOriginal
 import org.michaelbel.movies.persistence.database.entity.ImagePojo
 import org.michaelbel.movies.persistence.database.ktx.original
diff --git a/feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/ui/LoopHorizontalPager.kt b/feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/ui/LoopHorizontalPager.kt
similarity index 100%
rename from feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/ui/LoopHorizontalPager.kt
rename to feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/ui/LoopHorizontalPager.kt
diff --git a/feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/zoomable/ZoomState.kt b/feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/zoomable/ZoomState.kt
similarity index 100%
rename from feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/zoomable/ZoomState.kt
rename to feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/zoomable/ZoomState.kt
diff --git a/feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/zoomable/Zoomable.kt b/feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/zoomable/Zoomable.kt
similarity index 100%
rename from feature/gallery-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/zoomable/Zoomable.kt
rename to feature/gallery-impl/src/androidMain/kotlin/org/michaelbel/movies/gallery/zoomable/Zoomable.kt
diff --git a/feature/gallery-impl-kmp/src/androidMain/res/values-ru/strings.xml b/feature/gallery-impl/src/androidMain/res/values-ru/strings.xml
similarity index 100%
rename from feature/gallery-impl-kmp/src/androidMain/res/values-ru/strings.xml
rename to feature/gallery-impl/src/androidMain/res/values-ru/strings.xml
diff --git a/feature/gallery-impl-kmp/src/androidMain/res/values/strings.xml b/feature/gallery-impl/src/androidMain/res/values/strings.xml
similarity index 100%
rename from feature/gallery-impl-kmp/src/androidMain/res/values/strings.xml
rename to feature/gallery-impl/src/androidMain/res/values/strings.xml
diff --git a/feature/gallery-kmp/build.gradle.kts b/feature/gallery-kmp/build.gradle.kts
deleted file mode 100644
index 103c8daeb..000000000
--- a/feature/gallery-kmp/build.gradle.kts
+++ /dev/null
@@ -1,52 +0,0 @@
-plugins {
-    alias(libs.plugins.kotlin.multiplatform)
-    alias(libs.plugins.compose)
-    alias(libs.plugins.android.library)
-}
-
-kotlin {
-    androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = JavaVersion.VERSION_1_8.toString()
-            }
-        }
-    }
-    jvm("desktop")
-
-    sourceSets {
-        commonMain.dependencies {
-            api(project(":feature:gallery-impl-kmp"))
-        }
-        val desktopMain by getting
-        desktopMain.dependencies {
-            implementation(compose.material)
-            implementation(compose.material3)
-        }
-    }
-}
-
-android {
-    namespace = "org.michaelbel.movies.gallery_kmp"
-
-    defaultConfig {
-        minSdk = libs.versions.min.sdk.get().toInt()
-        compileSdk = libs.versions.compile.sdk.get().toInt()
-    }
-
-    buildFeatures {
-        compose = true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
-    lint {
-        quiet = true
-        abortOnError = false
-        ignoreWarnings = true
-        checkDependencies = true
-        lintConfig = file("${project.rootDir}/config/codestyle/lint.xml")
-    }
-}
\ No newline at end of file
diff --git a/feature/gallery-kmp/.gitignore b/feature/gallery/.gitignore
similarity index 100%
rename from feature/gallery-kmp/.gitignore
rename to feature/gallery/.gitignore
diff --git a/feature/details-kmp/build.gradle.kts b/feature/gallery/build.gradle.kts
similarity index 91%
rename from feature/details-kmp/build.gradle.kts
rename to feature/gallery/build.gradle.kts
index c19f87b1e..26879d33a 100644
--- a/feature/details-kmp/build.gradle.kts
+++ b/feature/gallery/build.gradle.kts
@@ -16,7 +16,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(project(":feature:details-impl-kmp"))
+            api(project(":feature:gallery-impl"))
         }
         val desktopMain by getting
         desktopMain.dependencies {
@@ -27,7 +27,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.details_kmp"
+    namespace = "org.michaelbel.movies.gallery"
 
     defaultConfig {
         minSdk = libs.versions.min.sdk.get().toInt()
diff --git a/feature/gallery-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/GalleryNavigation.kt b/feature/gallery/src/androidMain/kotlin/org/michaelbel/movies/gallery/GalleryNavigation.kt
similarity index 100%
rename from feature/gallery-kmp/src/androidMain/kotlin/org/michaelbel/movies/gallery/GalleryNavigation.kt
rename to feature/gallery/src/androidMain/kotlin/org/michaelbel/movies/gallery/GalleryNavigation.kt
diff --git a/feature/gallery-kmp/src/commonMain/kotlin/org/michaelbel/movies/gallery/GalleryDestination.kt b/feature/gallery/src/commonMain/kotlin/org/michaelbel/movies/gallery/GalleryDestination.kt
similarity index 100%
rename from feature/gallery-kmp/src/commonMain/kotlin/org/michaelbel/movies/gallery/GalleryDestination.kt
rename to feature/gallery/src/commonMain/kotlin/org/michaelbel/movies/gallery/GalleryDestination.kt
diff --git a/feature/gallery-kmp/src/desktopMain/kotlin/org/michaelbel/movies/gallery/GalleryNavigation.kt b/feature/gallery/src/desktopMain/kotlin/org/michaelbel/movies/gallery/GalleryNavigation.kt
similarity index 100%
rename from feature/gallery-kmp/src/desktopMain/kotlin/org/michaelbel/movies/gallery/GalleryNavigation.kt
rename to feature/gallery/src/desktopMain/kotlin/org/michaelbel/movies/gallery/GalleryNavigation.kt
diff --git a/feature/search-impl-kmp/.gitignore b/feature/search-impl/.gitignore
similarity index 100%
rename from feature/search-impl-kmp/.gitignore
rename to feature/search-impl/.gitignore
diff --git a/feature/search-impl-kmp/build.gradle.kts b/feature/search-impl/build.gradle.kts
similarity index 84%
rename from feature/search-impl-kmp/build.gradle.kts
rename to feature/search-impl/build.gradle.kts
index 96886dcdf..7b6b0e590 100644
--- a/feature/search-impl-kmp/build.gradle.kts
+++ b/feature/search-impl/build.gradle.kts
@@ -22,11 +22,11 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(project(":core:navigation-kmp"))
-            api(project(":core:ui-kmp"))
-            api(project(":core:common-kmp"))
-            api(project(":core:interactor-kmp"))
-            implementation(project(":core:notifications-kmp"))
+            api(project(":core:navigation"))
+            api(project(":core:ui"))
+            api(project(":core:common"))
+            api(project(":core:interactor"))
+            implementation(project(":core:notifications"))
             implementation(libs.bundles.paging.common)
             implementation(libs.bundles.constraintlayout.common)
             implementation(libs.bundles.koin.common)
@@ -38,7 +38,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.search_impl_kmp"
+    namespace = "org.michaelbel.movies.search_impl"
     sourceSets["main"].res.srcDirs("src/androidMain/res")
 
     defaultConfig {
diff --git a/feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/SearchViewModel.kt b/feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/SearchViewModel.kt
similarity index 100%
rename from feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/SearchViewModel.kt
rename to feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/SearchViewModel.kt
diff --git a/feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/di/SearchKoinModule.kt b/feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/di/SearchKoinModule.kt
similarity index 100%
rename from feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/di/SearchKoinModule.kt
rename to feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/di/SearchKoinModule.kt
diff --git a/feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchEmpty.kt b/feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchEmpty.kt
similarity index 98%
rename from feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchEmpty.kt
rename to feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchEmpty.kt
index 4c2788c3d..ffe6a015c 100644
--- a/feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchEmpty.kt
+++ b/feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchEmpty.kt
@@ -19,7 +19,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.michaelbel.movies.common.theme.AppTheme
-import org.michaelbel.movies.search_impl_kmp.R
+import org.michaelbel.movies.search_impl.R
 import org.michaelbel.movies.ui.accessibility.MoviesContentDescription
 import org.michaelbel.movies.ui.icons.MoviesIcons
 import org.michaelbel.movies.ui.preview.DevicePreviews
diff --git a/feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchHistoryHeader.kt b/feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchHistoryHeader.kt
similarity index 98%
rename from feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchHistoryHeader.kt
rename to feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchHistoryHeader.kt
index aac4974ff..ea8762a2b 100644
--- a/feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchHistoryHeader.kt
+++ b/feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchHistoryHeader.kt
@@ -15,7 +15,7 @@ import androidx.compose.ui.unit.dp
 import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.constraintlayout.compose.Dimension
 import org.michaelbel.movies.common.theme.AppTheme
-import org.michaelbel.movies.search_impl_kmp.R
+import org.michaelbel.movies.search_impl.R
 import org.michaelbel.movies.ui.preview.DevicePreviews
 import org.michaelbel.movies.ui.theme.MoviesTheme
 
diff --git "a/feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchRe\321\201entResult.kt" "b/feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchRe\321\201entResult.kt"
similarity index 100%
rename from "feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchRe\321\201entResult.kt"
rename to "feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchRe\321\201entResult.kt"
diff --git a/feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchRoute.kt b/feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchRoute.kt
similarity index 100%
rename from feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchRoute.kt
rename to feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchRoute.kt
diff --git a/feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchScreenContent.kt b/feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchScreenContent.kt
similarity index 99%
rename from feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchScreenContent.kt
rename to feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchScreenContent.kt
index 6f2a01c5a..5d9770575 100644
--- a/feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchScreenContent.kt
+++ b/feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchScreenContent.kt
@@ -45,7 +45,7 @@ import org.michaelbel.movies.ui.ktx.isFailure
 import org.michaelbel.movies.ui.ktx.isLoading
 import org.michaelbel.movies.ui.ktx.refreshThrowable
 import java.net.UnknownHostException
-import org.michaelbel.movies.ui_kmp.R as UiR
+import org.michaelbel.movies.ui.R as UiR
 
 @Composable
 internal fun SearchScreenContent(
diff --git a/feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchSuggestion.kt b/feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchSuggestion.kt
similarity index 100%
rename from feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchSuggestion.kt
rename to feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchSuggestion.kt
diff --git a/feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchToolbar.kt b/feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchToolbar.kt
similarity index 99%
rename from feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchToolbar.kt
rename to feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchToolbar.kt
index beb6e4a24..d84a33546 100644
--- a/feature/search-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchToolbar.kt
+++ b/feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchToolbar.kt
@@ -26,7 +26,7 @@ import androidx.compose.ui.unit.dp
 import org.michaelbel.movies.common.theme.AppTheme
 import org.michaelbel.movies.persistence.database.entity.MoviePojo
 import org.michaelbel.movies.persistence.database.entity.SuggestionPojo
-import org.michaelbel.movies.search_impl_kmp.R
+import org.michaelbel.movies.search_impl.R
 import org.michaelbel.movies.ui.compose.iconbutton.BackIcon
 import org.michaelbel.movies.ui.compose.iconbutton.CloseIcon
 import org.michaelbel.movies.ui.compose.iconbutton.VoiceIcon
diff --git a/feature/search-impl-kmp/src/androidMain/res/values-ru/strings.xml b/feature/search-impl/src/androidMain/res/values-ru/strings.xml
similarity index 100%
rename from feature/search-impl-kmp/src/androidMain/res/values-ru/strings.xml
rename to feature/search-impl/src/androidMain/res/values-ru/strings.xml
diff --git a/feature/search-impl-kmp/src/androidMain/res/values/strings.xml b/feature/search-impl/src/androidMain/res/values/strings.xml
similarity index 100%
rename from feature/search-impl-kmp/src/androidMain/res/values/strings.xml
rename to feature/search-impl/src/androidMain/res/values/strings.xml
diff --git a/feature/search-kmp/.gitignore b/feature/search/.gitignore
similarity index 100%
rename from feature/search-kmp/.gitignore
rename to feature/search/.gitignore
diff --git a/feature/search/build.gradle.kts b/feature/search/build.gradle.kts
new file mode 100644
index 000000000..832312b7e
--- /dev/null
+++ b/feature/search/build.gradle.kts
@@ -0,0 +1,52 @@
+plugins {
+    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.compose)
+    alias(libs.plugins.android.library)
+}
+
+kotlin {
+    androidTarget {
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = JavaVersion.VERSION_1_8.toString()
+            }
+        }
+    }
+    jvm("desktop")
+
+    sourceSets {
+        commonMain.dependencies {
+            api(project(":feature:search-impl"))
+        }
+        val desktopMain by getting
+        desktopMain.dependencies {
+            implementation(compose.material)
+            implementation(compose.material3)
+        }
+    }
+}
+
+android {
+    namespace = "org.michaelbel.movies.search"
+
+    defaultConfig {
+        minSdk = libs.versions.min.sdk.get().toInt()
+        compileSdk = libs.versions.compile.sdk.get().toInt()
+    }
+
+    buildFeatures {
+        compose = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
+    }
+
+    lint {
+        quiet = true
+        abortOnError = false
+        ignoreWarnings = true
+        checkDependencies = true
+        lintConfig = file("${project.rootDir}/config/codestyle/lint.xml")
+    }
+}
\ No newline at end of file
diff --git a/feature/search-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/SearchNavigation.kt b/feature/search/src/androidMain/kotlin/org/michaelbel/movies/search/SearchNavigation.kt
similarity index 100%
rename from feature/search-kmp/src/androidMain/kotlin/org/michaelbel/movies/search/SearchNavigation.kt
rename to feature/search/src/androidMain/kotlin/org/michaelbel/movies/search/SearchNavigation.kt
diff --git a/feature/search-kmp/src/commonMain/kotlin/org/michaelbel/movies/search/SearchDestination.kt b/feature/search/src/commonMain/kotlin/org/michaelbel/movies/search/SearchDestination.kt
similarity index 100%
rename from feature/search-kmp/src/commonMain/kotlin/org/michaelbel/movies/search/SearchDestination.kt
rename to feature/search/src/commonMain/kotlin/org/michaelbel/movies/search/SearchDestination.kt
diff --git a/feature/search-kmp/src/desktopMain/kotlin/org/michaelbel/movies/search/SearchNavigation.kt b/feature/search/src/desktopMain/kotlin/org/michaelbel/movies/search/SearchNavigation.kt
similarity index 100%
rename from feature/search-kmp/src/desktopMain/kotlin/org/michaelbel/movies/search/SearchNavigation.kt
rename to feature/search/src/desktopMain/kotlin/org/michaelbel/movies/search/SearchNavigation.kt
diff --git a/feature/settings-impl-kmp/.gitignore b/feature/settings-impl/.gitignore
similarity index 100%
rename from feature/settings-impl-kmp/.gitignore
rename to feature/settings-impl/.gitignore
diff --git a/feature/settings-impl-kmp/build.gradle.kts b/feature/settings-impl/build.gradle.kts
similarity index 84%
rename from feature/settings-impl-kmp/build.gradle.kts
rename to feature/settings-impl/build.gradle.kts
index 27115db50..6317f2a25 100644
--- a/feature/settings-impl-kmp/build.gradle.kts
+++ b/feature/settings-impl/build.gradle.kts
@@ -22,12 +22,12 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(project(":core:navigation-kmp"))
-            api(project(":core:ui-kmp"))
-            api(project(":core:common-kmp"))
-            api(project(":core:interactor-kmp"))
-            api(project(":core:widget-kmp"))
-            api(project(":core:platform-services:interactor-kmp"))
+            api(project(":core:navigation"))
+            api(project(":core:ui"))
+            api(project(":core:common"))
+            api(project(":core:interactor"))
+            api(project(":core:widget"))
+            api(project(":core:platform-services:interactor"))
             implementation(compose.components.resources)
             implementation(compose.foundation)
             implementation(compose.material3)
@@ -45,7 +45,7 @@ kotlin {
 }
 
 android {
-    namespace = "org.michaelbel.movies.settings_impl_kmp"
+    namespace = "org.michaelbel.movies.settings_impl"
     sourceSets["main"].res.srcDirs("src/androidMain/res")
 
     defaultConfig {
diff --git a/feature/settings-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/settings/SettingsViewModel.kt b/feature/settings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/SettingsViewModel.kt
similarity index 98%
rename from feature/settings-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/settings/SettingsViewModel.kt
rename to feature/settings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/SettingsViewModel.kt
index c5246b14b..db98a0980 100644
--- a/feature/settings-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/settings/SettingsViewModel.kt
+++ b/feature/settings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/SettingsViewModel.kt
@@ -24,7 +24,7 @@ import org.michaelbel.movies.platform.app.AppService
 import org.michaelbel.movies.platform.review.ReviewService
 import org.michaelbel.movies.platform.update.UpdateListener
 import org.michaelbel.movies.platform.update.UpdateService
-import org.michaelbel.movies.settings_impl_kmp.BuildConfig
+import org.michaelbel.movies.settings_impl.BuildConfig
 
 class SettingsViewModel(
     biometricController: BiometricController,
diff --git a/feature/settings-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/settings/di/SettingsKoinModule.kt b/feature/settings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/di/SettingsKoinModule.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/settings/di/SettingsKoinModule.kt
rename to feature/settings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/di/SettingsKoinModule.kt
diff --git a/feature/settings-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/settings/ktx/AppVersionDataKtx.kt b/feature/settings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/ktx/AppVersionDataKtx.kt
similarity index 93%
rename from feature/settings-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/settings/ktx/AppVersionDataKtx.kt
rename to feature/settings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/ktx/AppVersionDataKtx.kt
index 13d5f9e81..6f4aadcb1 100644
--- a/feature/settings-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/settings/ktx/AppVersionDataKtx.kt
+++ b/feature/settings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/ktx/AppVersionDataKtx.kt
@@ -6,7 +6,7 @@ import android.content.Context
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.os.Build
-import org.michaelbel.movies.settings_impl_kmp.BuildConfig
+import org.michaelbel.movies.settings_impl.BuildConfig
 
 private val Context.packageInfo: PackageInfo
     get() {
diff --git a/feature/settings-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/settings/ktx/GenderStringKtx.kt b/feature/settings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/ktx/GenderStringKtx.kt
similarity index 83%
rename from feature/settings-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/settings/ktx/GenderStringKtx.kt
rename to feature/settings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/ktx/GenderStringKtx.kt
index a332da122..89a996c51 100644
--- a/feature/settings-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/settings/ktx/GenderStringKtx.kt
+++ b/feature/settings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/ktx/GenderStringKtx.kt
@@ -2,7 +2,7 @@ package org.michaelbel.movies.settings.ktx
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import org.michaelbel.movies.settings_impl_kmp.R
+import org.michaelbel.movies.settings_impl.R
 
 internal actual val SettingsGenderText: String
     @Composable get() = stringResource(R.string.settings_gender)
\ No newline at end of file
diff --git a/feature/settings-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/settings/ktx/GrammaticalGenderKtx.kt b/feature/settings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/ktx/GrammaticalGenderKtx.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/settings/ktx/GrammaticalGenderKtx.kt
rename to feature/settings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/ktx/GrammaticalGenderKtx.kt
diff --git a/feature/settings-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/settings/model/Features.kt b/feature/settings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/model/Features.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/settings/model/Features.kt
rename to feature/settings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/model/Features.kt
diff --git a/feature/settings-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/settings/ui/SettingsRoute.kt b/feature/settings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/ui/SettingsRoute.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/androidMain/kotlin/org/michaelbel/movies/settings/ui/SettingsRoute.kt
rename to feature/settings-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/ui/SettingsRoute.kt
diff --git a/feature/settings-impl-kmp/src/androidMain/res/values-ru-feminine/strings.xml b/feature/settings-impl/src/androidMain/res/values-ru-feminine/strings.xml
similarity index 100%
rename from feature/settings-impl-kmp/src/androidMain/res/values-ru-feminine/strings.xml
rename to feature/settings-impl/src/androidMain/res/values-ru-feminine/strings.xml
diff --git a/feature/settings-impl-kmp/src/androidMain/res/values-ru-masculine/strings.xml b/feature/settings-impl/src/androidMain/res/values-ru-masculine/strings.xml
similarity index 100%
rename from feature/settings-impl-kmp/src/androidMain/res/values-ru-masculine/strings.xml
rename to feature/settings-impl/src/androidMain/res/values-ru-masculine/strings.xml
diff --git a/feature/settings-impl-kmp/src/androidMain/res/values-ru-neuter/strings.xml b/feature/settings-impl/src/androidMain/res/values-ru-neuter/strings.xml
similarity index 100%
rename from feature/settings-impl-kmp/src/androidMain/res/values-ru-neuter/strings.xml
rename to feature/settings-impl/src/androidMain/res/values-ru-neuter/strings.xml
diff --git a/feature/settings-impl-kmp/src/androidMain/res/values-ru/strings.xml b/feature/settings-impl/src/androidMain/res/values-ru/strings.xml
similarity index 100%
rename from feature/settings-impl-kmp/src/androidMain/res/values-ru/strings.xml
rename to feature/settings-impl/src/androidMain/res/values-ru/strings.xml
diff --git a/feature/settings-impl-kmp/src/androidMain/res/values/strings.xml b/feature/settings-impl/src/androidMain/res/values/strings.xml
similarity index 100%
rename from feature/settings-impl-kmp/src/androidMain/res/values/strings.xml
rename to feature/settings-impl/src/androidMain/res/values/strings.xml
diff --git a/feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ktx/GenderStringKtx.kt b/feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ktx/GenderStringKtx.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ktx/GenderStringKtx.kt
rename to feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ktx/GenderStringKtx.kt
diff --git a/feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ktx/IconAliasKtx.kt b/feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ktx/IconAliasKtx.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ktx/IconAliasKtx.kt
rename to feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ktx/IconAliasKtx.kt
diff --git a/feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ktx/SealedStringKtx.kt b/feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ktx/SealedStringKtx.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ktx/SealedStringKtx.kt
rename to feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ktx/SealedStringKtx.kt
diff --git a/feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/model/Features.kt b/feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/model/Features.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/model/Features.kt
rename to feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/model/Features.kt
diff --git a/feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/model/SettingsData.kt b/feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/model/SettingsData.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/model/SettingsData.kt
rename to feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/model/SettingsData.kt
diff --git a/feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsPaletteColorsBox.kt b/feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsPaletteColorsBox.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsPaletteColorsBox.kt
rename to feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsPaletteColorsBox.kt
diff --git a/feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsScreenContent.kt b/feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsScreenContent.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsScreenContent.kt
rename to feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsScreenContent.kt
diff --git a/feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsToolbar.kt b/feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsToolbar.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsToolbar.kt
rename to feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsToolbar.kt
diff --git a/feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsVersionBox.kt b/feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsVersionBox.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsVersionBox.kt
rename to feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/SettingsVersionBox.kt
diff --git a/feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingAppIcon.kt b/feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingAppIcon.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingAppIcon.kt
rename to feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingAppIcon.kt
diff --git a/feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingDialog.kt b/feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingDialog.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingDialog.kt
rename to feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingDialog.kt
diff --git a/feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingItem.kt b/feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingItem.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingItem.kt
rename to feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingItem.kt
diff --git a/feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingPaletteColor.kt b/feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingPaletteColor.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingPaletteColor.kt
rename to feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingPaletteColor.kt
diff --git a/feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingSwitchItem.kt b/feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingSwitchItem.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingSwitchItem.kt
rename to feature/settings-impl/src/commonMain/kotlin/org/michaelbel/movies/settings/ui/common/SettingSwitchItem.kt
diff --git a/feature/settings-impl-kmp/src/desktopMain/kotlin/org/michaelbel/movies/settings/ktx/GenderStringKtx.kt b/feature/settings-impl/src/desktopMain/kotlin/org/michaelbel/movies/settings/ktx/GenderStringKtx.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/desktopMain/kotlin/org/michaelbel/movies/settings/ktx/GenderStringKtx.kt
rename to feature/settings-impl/src/desktopMain/kotlin/org/michaelbel/movies/settings/ktx/GenderStringKtx.kt
diff --git a/feature/settings-impl-kmp/src/desktopMain/kotlin/org/michaelbel/movies/settings/model/Features.kt b/feature/settings-impl/src/desktopMain/kotlin/org/michaelbel/movies/settings/model/Features.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/desktopMain/kotlin/org/michaelbel/movies/settings/model/Features.kt
rename to feature/settings-impl/src/desktopMain/kotlin/org/michaelbel/movies/settings/model/Features.kt
diff --git a/feature/settings-impl-kmp/src/desktopMain/kotlin/org/michaelbel/movies/settings/ui/SettingsRoute.kt b/feature/settings-impl/src/desktopMain/kotlin/org/michaelbel/movies/settings/ui/SettingsRoute.kt
similarity index 100%
rename from feature/settings-impl-kmp/src/desktopMain/kotlin/org/michaelbel/movies/settings/ui/SettingsRoute.kt
rename to feature/settings-impl/src/desktopMain/kotlin/org/michaelbel/movies/settings/ui/SettingsRoute.kt
diff --git a/feature/settings-kmp/build.gradle.kts b/feature/settings-kmp/build.gradle.kts
deleted file mode 100644
index d29cc2db4..000000000
--- a/feature/settings-kmp/build.gradle.kts
+++ /dev/null
@@ -1,52 +0,0 @@
-plugins {
-    alias(libs.plugins.kotlin.multiplatform)
-    alias(libs.plugins.compose)
-    alias(libs.plugins.android.library)
-}
-
-kotlin {
-    androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = JavaVersion.VERSION_1_8.toString()
-            }
-        }
-    }
-    jvm("desktop")
-
-    sourceSets {
-        commonMain.dependencies {
-            api(project(":feature:settings-impl-kmp"))
-        }
-        val desktopMain by getting
-        desktopMain.dependencies {
-            implementation(compose.material)
-            implementation(compose.material3)
-        }
-    }
-}
-
-android {
-    namespace = "org.michaelbel.movies.settings_kmp"
-
-    defaultConfig {
-        minSdk = libs.versions.min.sdk.get().toInt()
-        compileSdk = libs.versions.compile.sdk.get().toInt()
-    }
-
-    buildFeatures {
-        compose = true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-    }
-
-    lint {
-        quiet = true
-        abortOnError = false
-        ignoreWarnings = true
-        checkDependencies = true
-        lintConfig = file("${project.rootDir}/config/codestyle/lint.xml")
-    }
-}
\ No newline at end of file
diff --git a/feature/settings-kmp/.gitignore b/feature/settings/.gitignore
similarity index 100%
rename from feature/settings-kmp/.gitignore
rename to feature/settings/.gitignore
diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts
new file mode 100644
index 000000000..cf1f81a4c
--- /dev/null
+++ b/feature/settings/build.gradle.kts
@@ -0,0 +1,52 @@
+plugins {
+    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.compose)
+    alias(libs.plugins.android.library)
+}
+
+kotlin {
+    androidTarget {
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = JavaVersion.VERSION_1_8.toString()
+            }
+        }
+    }
+    jvm("desktop")
+
+    sourceSets {
+        commonMain.dependencies {
+            api(project(":feature:settings-impl"))
+        }
+        val desktopMain by getting
+        desktopMain.dependencies {
+            implementation(compose.material)
+            implementation(compose.material3)
+        }
+    }
+}
+
+android {
+    namespace = "org.michaelbel.movies.settings"
+
+    defaultConfig {
+        minSdk = libs.versions.min.sdk.get().toInt()
+        compileSdk = libs.versions.compile.sdk.get().toInt()
+    }
+
+    buildFeatures {
+        compose = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
+    }
+
+    lint {
+        quiet = true
+        abortOnError = false
+        ignoreWarnings = true
+        checkDependencies = true
+        lintConfig = file("${project.rootDir}/config/codestyle/lint.xml")
+    }
+}
\ No newline at end of file
diff --git a/feature/settings-kmp/src/androidMain/kotlin/org/michaelbel/movies/settings/SettingsNavigation.kt b/feature/settings/src/androidMain/kotlin/org/michaelbel/movies/settings/SettingsNavigation.kt
similarity index 100%
rename from feature/settings-kmp/src/androidMain/kotlin/org/michaelbel/movies/settings/SettingsNavigation.kt
rename to feature/settings/src/androidMain/kotlin/org/michaelbel/movies/settings/SettingsNavigation.kt
diff --git a/feature/settings-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/SettingsDestination.kt b/feature/settings/src/commonMain/kotlin/org/michaelbel/movies/settings/SettingsDestination.kt
similarity index 100%
rename from feature/settings-kmp/src/commonMain/kotlin/org/michaelbel/movies/settings/SettingsDestination.kt
rename to feature/settings/src/commonMain/kotlin/org/michaelbel/movies/settings/SettingsDestination.kt
diff --git a/feature/settings-kmp/src/desktopMain/kotlin/org/michaelbel/movies/settings/SettingsNavigation.kt b/feature/settings/src/desktopMain/kotlin/org/michaelbel/movies/settings/SettingsNavigation.kt
similarity index 100%
rename from feature/settings-kmp/src/desktopMain/kotlin/org/michaelbel/movies/settings/SettingsNavigation.kt
rename to feature/settings/src/desktopMain/kotlin/org/michaelbel/movies/settings/SettingsNavigation.kt
diff --git a/instant/build.gradle.kts b/instant/build.gradle.kts
index 564ebff01..6b2423438 100644
--- a/instant/build.gradle.kts
+++ b/instant/build.gradle.kts
@@ -40,8 +40,8 @@ android {
 
 dependencies {
     implementation(project(":androidApp"))
-    implementation(project(":core:common-kmp"))
-    implementation(project(":core:ui-kmp"))
+    implementation(project(":core:common"))
+    implementation(project(":core:ui"))
     implementation(libs.bundles.appcompat.android)
     implementation(libs.bundles.compose.android)
     implementation(libs.bundles.google.services.instantapps.android)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6ca79bc6b..db0bee6ac 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -27,39 +27,39 @@ include(
     ":instant",
     ":benchmark",
 
-    ":core:platform-services:gms-kmp",
-    ":core:platform-services:hms-kmp",
-    ":core:platform-services:foss-kmp",
-    ":core:platform-services:inject-kmp",
-    ":core:platform-services:interactor-kmp",
+    ":core:platform-services:gms",
+    ":core:platform-services:hms",
+    ":core:platform-services:foss",
+    ":core:platform-services:inject",
+    ":core:platform-services:interactor",
 
-    ":core:analytics-kmp",
-    ":core:common-kmp",
-    ":core:interactor-kmp",
-    ":core:navigation-kmp",
-    ":core:network-kmp",
-    ":core:notifications-kmp",
-    ":core:persistence-kmp",
-    ":core:repository-kmp",
-    ":core:ui-kmp",
-    ":core:widget-kmp",
-    ":core:work-kmp",
+    ":core:analytics",
+    ":core:common",
+    ":core:interactor",
+    ":core:navigation",
+    ":core:network",
+    ":core:notifications",
+    ":core:persistence",
+    ":core:repository",
+    ":core:ui",
+    ":core:widget",
+    ":core:work",
 
-    ":feature:account-kmp",
-    ":feature:account-impl-kmp",
-    ":feature:auth-kmp",
-    ":feature:auth-impl-kmp",
-    ":feature:details-kmp",
-    ":feature:details-impl-kmp",
-    ":feature:feed-kmp",
-    ":feature:feed-impl-kmp",
-    ":feature:gallery-kmp",
-    ":feature:gallery-impl-kmp",
-    ":feature:search-kmp",
-    ":feature:search-impl-kmp",
-    ":feature:settings-kmp",
-    ":feature:settings-impl-kmp",
+    ":feature:account",
+    ":feature:account-impl",
+    ":feature:auth",
+    ":feature:auth-impl",
+    ":feature:details",
+    ":feature:details-impl",
+    ":feature:feed",
+    ":feature:feed-impl",
+    ":feature:gallery",
+    ":feature:gallery-impl",
+    ":feature:search",
+    ":feature:search-impl",
+    ":feature:settings",
+    ":feature:settings-impl",
 
-    ":feature:debug-kmp",
-    ":feature:debug-impl-kmp"
+    ":feature:debug",
+    ":feature:debug-impl"
 )
\ No newline at end of file