Update project

michaelbel · Apr 11, 2024 · eb50175 · eb50175
1 parent ddbf5f4
commit eb50175
Show file tree

Hide file tree

Showing 793 changed files with 436 additions and 467 deletions.
diff --git 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
@@ -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 → core/analytics/.gitignore b/core/analytics-kmp/.gitignore → core/analytics/.gitignore
diff --git a/core/analytics-kmp/build.gradle.kts → core/analytics/build.gradle.kts b/core/analytics-kmp/build.gradle.kts → 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/...ies/analytics/impl/MoviesAnalyticsImpl.kt → ...ies/analytics/impl/MoviesAnalyticsImpl.kt b/...ies/analytics/impl/MoviesAnalyticsImpl.kt → ...ies/analytics/impl/MoviesAnalyticsImpl.kt
diff --git a/...elbel/movies/analytics/MoviesAnalytics.kt → ...elbel/movies/analytics/MoviesAnalytics.kt b/...elbel/movies/analytics/MoviesAnalytics.kt → ...elbel/movies/analytics/MoviesAnalytics.kt
diff --git a/...ovies/analytics/constants/MoviesEvents.kt → ...ovies/analytics/constants/MoviesEvents.kt b/...ovies/analytics/constants/MoviesEvents.kt → ...ovies/analytics/constants/MoviesEvents.kt
diff --git a/...ovies/analytics/constants/MoviesParams.kt → ...ovies/analytics/constants/MoviesParams.kt b/...ovies/analytics/constants/MoviesParams.kt → ...ovies/analytics/constants/MoviesParams.kt
diff --git a/...analytics/di/MoviesAnalyticsKoinModule.kt → ...analytics/di/MoviesAnalyticsKoinModule.kt b/...analytics/di/MoviesAnalyticsKoinModule.kt → ...analytics/di/MoviesAnalyticsKoinModule.kt
diff --git a/...alytics/event/ChangeDynamicColorsEvent.kt → ...alytics/event/ChangeDynamicColorsEvent.kt b/...alytics/event/ChangeDynamicColorsEvent.kt → ...alytics/event/ChangeDynamicColorsEvent.kt
diff --git a/...es/analytics/event/SelectFeedViewEvent.kt → ...es/analytics/event/SelectFeedViewEvent.kt b/...es/analytics/event/SelectFeedViewEvent.kt → ...es/analytics/event/SelectFeedViewEvent.kt
diff --git a/...es/analytics/event/SelectLanguageEvent.kt → ...es/analytics/event/SelectLanguageEvent.kt b/...es/analytics/event/SelectLanguageEvent.kt → ...es/analytics/event/SelectLanguageEvent.kt
diff --git a/...s/analytics/event/SelectMovieListEvent.kt → ...s/analytics/event/SelectMovieListEvent.kt b/...s/analytics/event/SelectMovieListEvent.kt → ...s/analytics/event/SelectMovieListEvent.kt
diff --git a/...ovies/analytics/event/SelectThemeEvent.kt → ...ovies/analytics/event/SelectThemeEvent.kt b/...ovies/analytics/event/SelectThemeEvent.kt → ...ovies/analytics/event/SelectThemeEvent.kt
diff --git a/...ies/analytics/impl/MoviesAnalyticsImpl.kt → ...ies/analytics/impl/MoviesAnalyticsImpl.kt b/...ies/analytics/impl/MoviesAnalyticsImpl.kt → ...ies/analytics/impl/MoviesAnalyticsImpl.kt
diff --git a/...elbel/movies/analytics/model/BaseEvent.kt → ...elbel/movies/analytics/model/BaseEvent.kt b/...elbel/movies/analytics/model/BaseEvent.kt → ...elbel/movies/analytics/model/BaseEvent.kt
diff --git a/...ies/analytics/impl/MoviesAnalyticsImpl.kt → ...ies/analytics/impl/MoviesAnalyticsImpl.kt b/...ies/analytics/impl/MoviesAnalyticsImpl.kt → ...ies/analytics/impl/MoviesAnalyticsImpl.kt
diff --git a/core/common-kmp/.gitignore → core/common/.gitignore b/core/common-kmp/.gitignore → core/common/.gitignore
diff --git a/core/common-kmp/build.gradle.kts → core/common/build.gradle.kts b/core/common-kmp/build.gradle.kts → 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/...s/common/biometric/BiometricController.kt → ...s/common/biometric/BiometricController.kt b/...s/common/biometric/BiometricController.kt → ...s/common/biometric/BiometricController.kt
diff --git a/...ies/common/biometric/BiometricListener.kt → ...ies/common/biometric/BiometricListener.kt b/...ies/common/biometric/BiometricListener.kt → ...ies/common/biometric/BiometricListener.kt
diff --git a/...ommon/biometric/di/BiometricKoinModule.kt → ...ommon/biometric/di/BiometricKoinModule.kt b/...ommon/biometric/di/BiometricKoinModule.kt → ...ommon/biometric/di/BiometricKoinModule.kt
diff --git a/...biometric/impl/BiometricControllerImpl.kt → ...biometric/impl/BiometricControllerImpl.kt b/...biometric/impl/BiometricControllerImpl.kt → ...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/...chaelbel/movies/common/browser/Browser.kt → ...chaelbel/movies/common/browser/Browser.kt b/...chaelbel/movies/common/browser/Browser.kt → ...chaelbel/movies/common/browser/Browser.kt
diff --git a/...g/michaelbel/movies/common/ktx/FlowKtx.kt → ...g/michaelbel/movies/common/ktx/FlowKtx.kt b/...g/michaelbel/movies/common/ktx/FlowKtx.kt → ...g/michaelbel/movies/common/ktx/FlowKtx.kt
diff --git a/...michaelbel/movies/common/ktx/IntentKtx.kt → ...michaelbel/movies/common/ktx/IntentKtx.kt b/...michaelbel/movies/common/ktx/IntentKtx.kt → ...michaelbel/movies/common/ktx/IntentKtx.kt
diff --git a/...rg/michaelbel/movies/common/ktx/LogKtx.kt → ...rg/michaelbel/movies/common/ktx/LogKtx.kt b/...rg/michaelbel/movies/common/ktx/LogKtx.kt → ...rg/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/...vies/common/ktx/NotificationManagerKtx.kt → ...vies/common/ktx/NotificationManagerKtx.kt b/...vies/common/ktx/NotificationManagerKtx.kt → ...vies/common/ktx/NotificationManagerKtx.kt
diff --git a/...aelbel/movies/common/ktx/PermissionKtx.kt → ...aelbel/movies/common/ktx/PermissionKtx.kt b/...aelbel/movies/common/ktx/PermissionKtx.kt → ...aelbel/movies/common/ktx/PermissionKtx.kt
diff --git a/.../movies/common/ktx/SavedStateHandleKtx.kt → .../movies/common/ktx/SavedStateHandleKtx.kt b/.../movies/common/ktx/SavedStateHandleKtx.kt → .../movies/common/ktx/SavedStateHandleKtx.kt
diff --git a/...g/michaelbel/movies/common/ktx/TimeKtx.kt → ...g/michaelbel/movies/common/ktx/TimeKtx.kt b/...g/michaelbel/movies/common/ktx/TimeKtx.kt → ...g/michaelbel/movies/common/ktx/TimeKtx.kt
diff --git a/...rg/michaelbel/movies/common/ktx/UriKtx.kt → ...rg/michaelbel/movies/common/ktx/UriKtx.kt b/...rg/michaelbel/movies/common/ktx/UriKtx.kt → ...rg/michaelbel/movies/common/ktx/UriKtx.kt
diff --git a/...rg/michaelbel/movies/common/log/Logger.kt → ...rg/michaelbel/movies/common/log/Logger.kt b/...rg/michaelbel/movies/common/log/Logger.kt → ...rg/michaelbel/movies/common/log/Logger.kt
diff --git a/...src/androidMain/res/values-ru/strings.xml → ...src/androidMain/res/values-ru/strings.xml b/...src/androidMain/res/values-ru/strings.xml → ...src/androidMain/res/values-ru/strings.xml
diff --git a/...mp/src/androidMain/res/values/strings.xml → ...on/src/androidMain/res/values/strings.xml b/...mp/src/androidMain/res/values/strings.xml → ...on/src/androidMain/res/values/strings.xml
diff --git a/...rg/michaelbel/movies/common/RepoConfig.kt → ...rg/michaelbel/movies/common/RepoConfig.kt b/...rg/michaelbel/movies/common/RepoConfig.kt → ...rg/michaelbel/movies/common/RepoConfig.kt
diff --git a/.../michaelbel/movies/common/SealedString.kt → .../michaelbel/movies/common/SealedString.kt b/.../michaelbel/movies/common/SealedString.kt → .../michaelbel/movies/common/SealedString.kt
diff --git a/...org/michaelbel/movies/common/ThemeData.kt → ...org/michaelbel/movies/common/ThemeData.kt b/...org/michaelbel/movies/common/ThemeData.kt → ...org/michaelbel/movies/common/ThemeData.kt
diff --git a/...lbel/movies/common/appearance/FeedView.kt → ...lbel/movies/common/appearance/FeedView.kt b/...lbel/movies/common/appearance/FeedView.kt → ...lbel/movies/common/appearance/FeedView.kt
diff --git a/...lbel/movies/common/config/RemoteParams.kt → ...lbel/movies/common/config/RemoteParams.kt b/...lbel/movies/common/config/RemoteParams.kt → ...lbel/movies/common/config/RemoteParams.kt
diff --git a/...s/common/dispatchers/MoviesDispatchers.kt → ...s/common/dispatchers/MoviesDispatchers.kt b/...s/common/dispatchers/MoviesDispatchers.kt → ...s/common/dispatchers/MoviesDispatchers.kt
diff --git a/...n/dispatchers/di/DispatchersKoinModule.kt → ...n/dispatchers/di/DispatchersKoinModule.kt b/...n/dispatchers/di/DispatchersKoinModule.kt → ...n/dispatchers/di/DispatchersKoinModule.kt
diff --git a/...dispatchers/impl/MoviesDispatchersImpl.kt → ...dispatchers/impl/MoviesDispatchersImpl.kt b/...dispatchers/impl/MoviesDispatchersImpl.kt → ...dispatchers/impl/MoviesDispatchersImpl.kt
diff --git a/...mon/exceptions/AccountDetailsException.kt → ...mon/exceptions/AccountDetailsException.kt b/...mon/exceptions/AccountDetailsException.kt → ...mon/exceptions/AccountDetailsException.kt
diff --git a/...mmon/exceptions/ApiKeyNotNullException.kt → ...mmon/exceptions/ApiKeyNotNullException.kt b/...mmon/exceptions/ApiKeyNotNullException.kt → ...mmon/exceptions/ApiKeyNotNullException.kt
diff --git a/...exceptions/CreateRequestTokenException.kt → ...exceptions/CreateRequestTokenException.kt b/...exceptions/CreateRequestTokenException.kt → ...exceptions/CreateRequestTokenException.kt
diff --git a/...mmon/exceptions/CreateSessionException.kt → ...mmon/exceptions/CreateSessionException.kt b/...mmon/exceptions/CreateSessionException.kt → ...mmon/exceptions/CreateSessionException.kt
diff --git a/...ptions/CreateSessionWithLoginException.kt → ...ptions/CreateSessionWithLoginException.kt b/...ptions/CreateSessionWithLoginException.kt → ...ptions/CreateSessionWithLoginException.kt
diff --git a/...mmon/exceptions/DeleteSessionException.kt → ...mmon/exceptions/DeleteSessionException.kt b/...mmon/exceptions/DeleteSessionException.kt → ...mmon/exceptions/DeleteSessionException.kt
diff --git a/...on/exceptions/InvalidFeedViewException.kt → ...on/exceptions/InvalidFeedViewException.kt b/...on/exceptions/InvalidFeedViewException.kt → ...on/exceptions/InvalidFeedViewException.kt
diff --git a/...mmon/exceptions/InvalidGenderException.kt → ...mmon/exceptions/InvalidGenderException.kt b/...mmon/exceptions/InvalidGenderException.kt → ...mmon/exceptions/InvalidGenderException.kt
diff --git a/...n/exceptions/InvalidMovieListException.kt → ...n/exceptions/InvalidMovieListException.kt b/...n/exceptions/InvalidMovieListException.kt → ...n/exceptions/InvalidMovieListException.kt
diff --git a/...ommon/exceptions/InvalidThemeException.kt → ...ommon/exceptions/InvalidThemeException.kt b/...ommon/exceptions/InvalidThemeException.kt → ...ommon/exceptions/InvalidThemeException.kt
diff --git a/...ommon/exceptions/MovieDetailsException.kt → ...ommon/exceptions/MovieDetailsException.kt b/...ommon/exceptions/MovieDetailsException.kt → ...ommon/exceptions/MovieDetailsException.kt
diff --git a/...mon/exceptions/MoviesUpcomingException.kt → ...mon/exceptions/MoviesUpcomingException.kt b/...mon/exceptions/MoviesUpcomingException.kt → ...mon/exceptions/MoviesUpcomingException.kt
diff --git a/...s/common/exceptions/PageEmptyException.kt → ...s/common/exceptions/PageEmptyException.kt b/...s/common/exceptions/PageEmptyException.kt → ...s/common/exceptions/PageEmptyException.kt
diff --git a/...movies/common/gender/GrammaticalGender.kt → ...movies/common/gender/GrammaticalGender.kt b/...movies/common/gender/GrammaticalGender.kt → ...movies/common/gender/GrammaticalGender.kt
diff --git a/...ichaelbel/movies/common/list/MovieList.kt → ...ichaelbel/movies/common/list/MovieList.kt b/...ichaelbel/movies/common/list/MovieList.kt → ...ichaelbel/movies/common/list/MovieList.kt
diff --git a/...rg/michaelbel/movies/common/log/Logger.kt → ...rg/michaelbel/movies/common/log/Logger.kt b/...rg/michaelbel/movies/common/log/Logger.kt → ...rg/michaelbel/movies/common/log/Logger.kt
diff --git a/...ichaelbel/movies/common/theme/AppTheme.kt → ...ichaelbel/movies/common/theme/AppTheme.kt b/...ichaelbel/movies/common/theme/AppTheme.kt → ...ichaelbel/movies/common/theme/AppTheme.kt
diff --git a/...l/movies/common/version/AppVersionData.kt → ...l/movies/common/version/AppVersionData.kt b/...l/movies/common/version/AppVersionData.kt → ...l/movies/common/version/AppVersionData.kt
diff --git a/.../movies/common/viewmodel/BaseViewModel.kt → .../movies/common/viewmodel/BaseViewModel.kt b/.../movies/common/viewmodel/BaseViewModel.kt → .../movies/common/viewmodel/BaseViewModel.kt
diff --git a/...chaelbel/movies/common/browser/Browser.kt → ...chaelbel/movies/common/browser/Browser.kt b/...chaelbel/movies/common/browser/Browser.kt → ...chaelbel/movies/common/browser/Browser.kt
diff --git a/...rg/michaelbel/movies/common/log/Logger.kt → ...rg/michaelbel/movies/common/log/Logger.kt b/...rg/michaelbel/movies/common/log/Logger.kt → ...rg/michaelbel/movies/common/log/Logger.kt
diff --git a/...src/desktopMain/res/values-ru/strings.xml → ...src/desktopMain/res/values-ru/strings.xml b/...src/desktopMain/res/values-ru/strings.xml → ...src/desktopMain/res/values-ru/strings.xml
diff --git a/...mp/src/desktopMain/res/values/strings.xml → ...on/src/desktopMain/res/values/strings.xml b/...mp/src/desktopMain/res/values/strings.xml → ...on/src/desktopMain/res/values/strings.xml
diff --git a/core/debug-kmp/.gitignore → core/debug/.gitignore b/core/debug-kmp/.gitignore → core/debug/.gitignore
diff --git a/core/debug-kmp/build.gradle.kts → core/debug/build.gradle.kts b/core/debug-kmp/build.gradle.kts → 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/...g-kmp/src/androidMain/AndroidManifest.xml → ...debug/src/androidMain/AndroidManifest.xml b/...g-kmp/src/androidMain/AndroidManifest.xml → ...debug/src/androidMain/AndroidManifest.xml
diff --git a/.../michaelbel/movies/debug/DebugActivity.kt → .../michaelbel/movies/debug/DebugActivity.kt b/.../michaelbel/movies/debug/DebugActivity.kt → .../michaelbel/movies/debug/DebugActivity.kt
diff --git a/...michaelbel/movies/debug/DebugViewModel.kt → ...michaelbel/movies/debug/DebugViewModel.kt b/...michaelbel/movies/debug/DebugViewModel.kt → ...michaelbel/movies/debug/DebugViewModel.kt
diff --git a/...aelbel/movies/debug/di/DebugKoinModule.kt → ...aelbel/movies/debug/di/DebugKoinModule.kt b/...aelbel/movies/debug/di/DebugKoinModule.kt → ...aelbel/movies/debug/di/DebugKoinModule.kt
diff --git a/...g/di/DebugNotificationClientKoinModule.kt → ...g/di/DebugNotificationClientKoinModule.kt b/...g/di/DebugNotificationClientKoinModule.kt → ...g/di/DebugNotificationClientKoinModule.kt
diff --git a/...g/notification/DebugNotificationClient.kt → ...g/notification/DebugNotificationClient.kt b/...g/notification/DebugNotificationClient.kt → ...g/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/...l/movies/debug/ui/DebugActivityContent.kt → ...l/movies/debug/ui/DebugActivityContent.kt b/...l/movies/debug/ui/DebugActivityContent.kt → ...l/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/...ichaelbel/movies/debug/ui/DebugToolbar.kt → ...ichaelbel/movies/debug/ui/DebugToolbar.kt b/...ichaelbel/movies/debug/ui/DebugToolbar.kt → ...ichaelbel/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/...michaelbel/movies/debug/ui/SettingItem.kt → ...michaelbel/movies/debug/ui/SettingItem.kt b/...michaelbel/movies/debug/ui/SettingItem.kt → ...michaelbel/movies/debug/ui/SettingItem.kt
diff --git a/...src/androidMain/res/values-ru/strings.xml → ...src/androidMain/res/values-ru/strings.xml b/...src/androidMain/res/values-ru/strings.xml → ...src/androidMain/res/values-ru/strings.xml
diff --git a/...mp/src/androidMain/res/values/strings.xml → ...ug/src/androidMain/res/values/strings.xml b/...mp/src/androidMain/res/values/strings.xml → ...ug/src/androidMain/res/values/strings.xml
diff --git a/core/interactor-kmp/.gitignore → core/interactor/.gitignore b/core/interactor-kmp/.gitignore → core/interactor/.gitignore
diff --git a/core/interactor-kmp/build.gradle.kts → core/interactor/build.gradle.kts b/core/interactor-kmp/build.gradle.kts → 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/...s/interactor/impl/LocaleInteractorImpl.kt → ...s/interactor/impl/LocaleInteractorImpl.kt b/...s/interactor/impl/LocaleInteractorImpl.kt → ...s/interactor/impl/LocaleInteractorImpl.kt
diff --git a/...el/movies/interactor/AccountInteractor.kt → ...el/movies/interactor/AccountInteractor.kt b/...el/movies/interactor/AccountInteractor.kt → ...el/movies/interactor/AccountInteractor.kt
diff --git a/...es/interactor/AuthenticationInteractor.kt → ...es/interactor/AuthenticationInteractor.kt b/...es/interactor/AuthenticationInteractor.kt → ...es/interactor/AuthenticationInteractor.kt
diff --git a/...lbel/movies/interactor/ImageInteractor.kt → ...lbel/movies/interactor/ImageInteractor.kt b/...lbel/movies/interactor/ImageInteractor.kt → ...lbel/movies/interactor/ImageInteractor.kt
diff --git a/...ichaelbel/movies/interactor/Interactor.kt → ...ichaelbel/movies/interactor/Interactor.kt b/...ichaelbel/movies/interactor/Interactor.kt → ...ichaelbel/movies/interactor/Interactor.kt
diff --git a/...bel/movies/interactor/LocaleInteractor.kt → ...bel/movies/interactor/LocaleInteractor.kt b/...bel/movies/interactor/LocaleInteractor.kt → ...bel/movies/interactor/LocaleInteractor.kt
diff --git a/...lbel/movies/interactor/MovieInteractor.kt → ...lbel/movies/interactor/MovieInteractor.kt b/...lbel/movies/interactor/MovieInteractor.kt → ...lbel/movies/interactor/MovieInteractor.kt
diff --git a/...vies/interactor/NotificationInteractor.kt → ...vies/interactor/NotificationInteractor.kt b/...vies/interactor/NotificationInteractor.kt → ...vies/interactor/NotificationInteractor.kt
diff --git a/...bel/movies/interactor/SearchInteractor.kt → ...bel/movies/interactor/SearchInteractor.kt b/...bel/movies/interactor/SearchInteractor.kt → ...bel/movies/interactor/SearchInteractor.kt
diff --git a/...l/movies/interactor/SettingsInteractor.kt → ...l/movies/interactor/SettingsInteractor.kt b/...l/movies/interactor/SettingsInteractor.kt → ...l/movies/interactor/SettingsInteractor.kt
diff --git a/...movies/interactor/SuggestionInteractor.kt → ...movies/interactor/SuggestionInteractor.kt b/...movies/interactor/SuggestionInteractor.kt → ...movies/interactor/SuggestionInteractor.kt
diff --git a/...ies/interactor/di/InteractorKoinModule.kt → ...ies/interactor/di/InteractorKoinModule.kt b/...ies/interactor/di/InteractorKoinModule.kt → ...ies/interactor/di/InteractorKoinModule.kt
diff --git a/...l/movies/interactor/entity/AppLanguage.kt → ...l/movies/interactor/entity/AppLanguage.kt b/...l/movies/interactor/entity/AppLanguage.kt → ...l/movies/interactor/entity/AppLanguage.kt
diff --git a/...lbel/movies/interactor/entity/Password.kt → ...lbel/movies/interactor/entity/Password.kt b/...lbel/movies/interactor/entity/Password.kt → ...lbel/movies/interactor/entity/Password.kt
diff --git a/...lbel/movies/interactor/entity/Username.kt → ...lbel/movies/interactor/entity/Username.kt b/...lbel/movies/interactor/entity/Username.kt → ...lbel/movies/interactor/entity/Username.kt
diff --git a/...actor/exception/InvalidLocaleException.kt → ...actor/exception/InvalidLocaleException.kt b/...actor/exception/InvalidLocaleException.kt → ...actor/exception/InvalidLocaleException.kt
diff --git a/.../interactor/impl/AccountInteractorImpl.kt → .../interactor/impl/AccountInteractorImpl.kt b/.../interactor/impl/AccountInteractorImpl.kt → .../interactor/impl/AccountInteractorImpl.kt
diff --git a/...ctor/impl/AuthenticationInteractorImpl.kt → ...ctor/impl/AuthenticationInteractorImpl.kt b/...ctor/impl/AuthenticationInteractorImpl.kt → ...ctor/impl/AuthenticationInteractorImpl.kt
diff --git a/...es/interactor/impl/ImageInteractorImpl.kt → ...es/interactor/impl/ImageInteractorImpl.kt b/...es/interactor/impl/ImageInteractorImpl.kt → ...es/interactor/impl/ImageInteractorImpl.kt
diff --git a/...s/interactor/impl/LocaleInteractorImpl.kt → ...s/interactor/impl/LocaleInteractorImpl.kt b/...s/interactor/impl/LocaleInteractorImpl.kt → ...s/interactor/impl/LocaleInteractorImpl.kt
diff --git a/...es/interactor/impl/MovieInteractorImpl.kt → ...es/interactor/impl/MovieInteractorImpl.kt b/...es/interactor/impl/MovieInteractorImpl.kt → ...es/interactor/impl/MovieInteractorImpl.kt
diff --git a/...ractor/impl/NotificationInteractorImpl.kt → ...ractor/impl/NotificationInteractorImpl.kt b/...ractor/impl/NotificationInteractorImpl.kt → ...ractor/impl/NotificationInteractorImpl.kt
diff --git a/...s/interactor/impl/SearchInteractorImpl.kt → ...s/interactor/impl/SearchInteractorImpl.kt b/...s/interactor/impl/SearchInteractorImpl.kt → ...s/interactor/impl/SearchInteractorImpl.kt
diff --git a/...interactor/impl/SettingsInteractorImpl.kt → ...interactor/impl/SettingsInteractorImpl.kt b/...interactor/impl/SettingsInteractorImpl.kt → ...interactor/impl/SettingsInteractorImpl.kt
diff --git a/...teractor/impl/SuggestionInteractorImpl.kt → ...teractor/impl/SuggestionInteractorImpl.kt b/...teractor/impl/SuggestionInteractorImpl.kt → ...teractor/impl/SuggestionInteractorImpl.kt
diff --git a/...bel/movies/interactor/ktx/MovieListKtx.kt → ...bel/movies/interactor/ktx/MovieListKtx.kt b/...bel/movies/interactor/ktx/MovieListKtx.kt → ...bel/movies/interactor/ktx/MovieListKtx.kt
diff --git a/...lbel/movies/interactor/ktx/PasswordKtx.kt → ...lbel/movies/interactor/ktx/PasswordKtx.kt b/...lbel/movies/interactor/ktx/PasswordKtx.kt → ...lbel/movies/interactor/ktx/PasswordKtx.kt
diff --git a/...lbel/movies/interactor/ktx/UsernameKtx.kt → ...lbel/movies/interactor/ktx/UsernameKtx.kt b/...lbel/movies/interactor/ktx/UsernameKtx.kt → ...lbel/movies/interactor/ktx/UsernameKtx.kt
diff --git a/...ractor/remote/FeedMoviesRemoteMediator.kt → ...ractor/remote/FeedMoviesRemoteMediator.kt b/...ractor/remote/FeedMoviesRemoteMediator.kt → ...ractor/remote/FeedMoviesRemoteMediator.kt
diff --git a/...ctor/remote/SearchMoviesRemoteMediator.kt → ...ctor/remote/SearchMoviesRemoteMediator.kt b/...ctor/remote/SearchMoviesRemoteMediator.kt → ...ctor/remote/SearchMoviesRemoteMediator.kt
diff --git a/...s/interactor/impl/LocaleInteractorImpl.kt → ...s/interactor/impl/LocaleInteractorImpl.kt b/...s/interactor/impl/LocaleInteractorImpl.kt → ...s/interactor/impl/LocaleInteractorImpl.kt
diff --git a/core/navigation-kmp/.gitignore → core/navigation/.gitignore b/core/navigation-kmp/.gitignore → core/navigation/.gitignore
diff --git a/core/navigation-kmp/build.gradle.kts → core/navigation/build.gradle.kts b/core/navigation-kmp/build.gradle.kts → 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/...es/navigation/ktx/NavHostControllerKtx.kt → ...es/navigation/ktx/NavHostControllerKtx.kt b/...es/navigation/ktx/NavHostControllerKtx.kt → ...es/navigation/ktx/NavHostControllerKtx.kt
diff --git a/...navigation/MoviesNavigationDestination.kt → ...navigation/MoviesNavigationDestination.kt b/...navigation/MoviesNavigationDestination.kt → ...navigation/MoviesNavigationDestination.kt
diff --git a/core/network-kmp/.gitignore → core/network/.gitignore b/core/network-kmp/.gitignore → core/network/.gitignore
diff --git a/core/network-kmp/build.gradle.kts → core/network/build.gradle.kts b/core/network-kmp/build.gradle.kts → 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/...k-kmp/src/androidMain/AndroidManifest.xml → ...twork/src/androidMain/AndroidManifest.xml b/...k-kmp/src/androidMain/AndroidManifest.xml → ...twork/src/androidMain/AndroidManifest.xml
diff --git a/...vies/network/chucker/ChuckerKoinModule.kt → ...vies/network/chucker/ChuckerKoinModule.kt b/...vies/network/chucker/ChuckerKoinModule.kt → ...vies/network/chucker/ChuckerKoinModule.kt
diff --git a/...elbel/movies/network/config/TmdbConfig.kt → ...elbel/movies/network/config/TmdbConfig.kt b/...elbel/movies/network/config/TmdbConfig.kt → ...elbel/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/...es/network/connectivity/NetworkManager.kt → ...es/network/connectivity/NetworkManager.kt b/...es/network/connectivity/NetworkManager.kt → ...es/network/connectivity/NetworkManager.kt
diff --git a/...connectivity/di/ConnectivityKoinModule.kt → ...connectivity/di/ConnectivityKoinModule.kt b/...connectivity/di/ConnectivityKoinModule.kt → ...connectivity/di/ConnectivityKoinModule.kt
diff --git a/...nnectivity/di/NetworkManagerKoinModule.kt → ...nnectivity/di/NetworkManagerKoinModule.kt b/...nnectivity/di/NetworkManagerKoinModule.kt → ...nnectivity/di/NetworkManagerKoinModule.kt
diff --git a/...ovies/network/flaker/FlakerInitializer.kt → ...ovies/network/flaker/FlakerInitializer.kt b/...ovies/network/flaker/FlakerInitializer.kt → ...ovies/network/flaker/FlakerInitializer.kt
diff --git a/...ies/network/flaker/di/FlakerKoinModule.kt → ...ies/network/flaker/di/FlakerKoinModule.kt b/...ies/network/flaker/di/FlakerKoinModule.kt → ...ies/network/flaker/di/FlakerKoinModule.kt
diff --git a/.../movies/network/ktor/di/KtorKoinModule.kt → .../movies/network/ktor/di/KtorKoinModule.kt b/.../movies/network/ktor/di/KtorKoinModule.kt → .../movies/network/ktor/di/KtorKoinModule.kt
diff --git a/...ies/network/okhttp/di/OkhttpKoinModule.kt → ...ies/network/okhttp/di/OkhttpKoinModule.kt b/...ies/network/okhttp/di/OkhttpKoinModule.kt → ...ies/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/...k/okhttp/interceptor/ApikeyInterceptor.kt → ...k/okhttp/interceptor/ApikeyInterceptor.kt b/...k/okhttp/interceptor/ApikeyInterceptor.kt → ...k/okhttp/interceptor/ApikeyInterceptor.kt
diff --git a/...l/movies/network/AccountNetworkService.kt → ...l/movies/network/AccountNetworkService.kt b/...l/movies/network/AccountNetworkService.kt → ...l/movies/network/AccountNetworkService.kt
diff --git a/...s/network/AuthenticationNetworkService.kt → ...s/network/AuthenticationNetworkService.kt b/...s/network/AuthenticationNetworkService.kt → ...s/network/AuthenticationNetworkService.kt
diff --git a/...bel/movies/network/MovieNetworkService.kt → ...bel/movies/network/MovieNetworkService.kt b/...bel/movies/network/MovieNetworkService.kt → ...bel/movies/network/MovieNetworkService.kt
diff --git a/...el/movies/network/SearchNetworkService.kt → ...el/movies/network/SearchNetworkService.kt b/...el/movies/network/SearchNetworkService.kt → ...el/movies/network/SearchNetworkService.kt
diff --git a/...l/movies/network/config/GravatarConfig.kt → ...l/movies/network/config/GravatarConfig.kt b/...l/movies/network/config/GravatarConfig.kt → ...l/movies/network/config/GravatarConfig.kt
diff --git a/...lbel/movies/network/config/ScreenState.kt → ...lbel/movies/network/config/ScreenState.kt b/...lbel/movies/network/config/ScreenState.kt → ...lbel/movies/network/config/ScreenState.kt
diff --git a/...elbel/movies/network/config/TmdbConfig.kt → ...elbel/movies/network/config/TmdbConfig.kt b/...elbel/movies/network/config/TmdbConfig.kt → ...elbel/movies/network/config/TmdbConfig.kt
diff --git a/...el/movies/network/config/TmdbConstants.kt → ...el/movies/network/config/TmdbConstants.kt b/...el/movies/network/config/TmdbConstants.kt → ...el/movies/network/config/TmdbConstants.kt
diff --git a/...aelbel/movies/network/config/TmdbImage.kt → ...aelbel/movies/network/config/TmdbImage.kt b/...aelbel/movies/network/config/TmdbImage.kt → ...aelbel/movies/network/config/TmdbImage.kt
diff --git a/...es/network/connectivity/NetworkManager.kt → ...es/network/connectivity/NetworkManager.kt b/...es/network/connectivity/NetworkManager.kt → ...es/network/connectivity/NetworkManager.kt
diff --git a/...ies/network/connectivity/NetworkStatus.kt → ...ies/network/connectivity/NetworkStatus.kt b/...ies/network/connectivity/NetworkStatus.kt → ...ies/network/connectivity/NetworkStatus.kt
diff --git a/...work/connectivity/ktx/NetworkStatusKtx.kt → ...work/connectivity/ktx/NetworkStatusKtx.kt b/...work/connectivity/ktx/NetworkStatusKtx.kt → ...work/connectivity/ktx/NetworkStatusKtx.kt
diff --git a/...el/movies/network/di/NetworkKoinModule.kt → ...el/movies/network/di/NetworkKoinModule.kt b/...el/movies/network/di/NetworkKoinModule.kt → ...el/movies/network/di/NetworkKoinModule.kt
diff --git a/...movies/network/ktor/KtorAccountService.kt → ...movies/network/ktor/KtorAccountService.kt b/...movies/network/ktor/KtorAccountService.kt → ...movies/network/ktor/KtorAccountService.kt
diff --git a/...network/ktor/KtorAuthenticationService.kt → ...network/ktor/KtorAuthenticationService.kt b/...network/ktor/KtorAuthenticationService.kt → ...network/ktor/KtorAuthenticationService.kt
diff --git a/...l/movies/network/ktor/KtorMovieService.kt → ...l/movies/network/ktor/KtorMovieService.kt b/...l/movies/network/ktor/KtorMovieService.kt → ...l/movies/network/ktor/KtorMovieService.kt
diff --git a/.../movies/network/ktor/KtorSearchService.kt → .../movies/network/ktor/KtorSearchService.kt b/.../movies/network/ktor/KtorSearchService.kt → .../movies/network/ktor/KtorSearchService.kt
diff --git a/.../movies/network/ktor/di/KtorKoinModule.kt → .../movies/network/ktor/di/KtorKoinModule.kt b/.../movies/network/ktor/di/KtorKoinModule.kt → .../movies/network/ktor/di/KtorKoinModule.kt
diff --git a/.../network/ktor/di/KtorNetworkKoinModule.kt → .../network/ktor/di/KtorNetworkKoinModule.kt b/.../network/ktor/di/KtorNetworkKoinModule.kt → .../network/ktor/di/KtorNetworkKoinModule.kt
diff --git a/...ichaelbel/movies/network/ktx/ResultKtx.kt → ...ichaelbel/movies/network/ktx/ResultKtx.kt b/...ichaelbel/movies/network/ktx/ResultKtx.kt → ...ichaelbel/movies/network/ktx/ResultKtx.kt
diff --git a/...lbel/movies/network/ktx/ScreenStateKtx.kt → ...lbel/movies/network/ktx/ScreenStateKtx.kt b/...lbel/movies/network/ktx/ScreenStateKtx.kt → ...lbel/movies/network/ktx/ScreenStateKtx.kt
diff --git a/...ichaelbel/movies/network/model/Account.kt → ...ichaelbel/movies/network/model/Account.kt b/...ichaelbel/movies/network/model/Account.kt → ...ichaelbel/movies/network/model/Account.kt
diff --git a/...michaelbel/movies/network/model/Avatar.kt → ...michaelbel/movies/network/model/Avatar.kt b/...michaelbel/movies/network/model/Avatar.kt → ...michaelbel/movies/network/model/Avatar.kt
diff --git a/...g/michaelbel/movies/network/model/Cast.kt → ...g/michaelbel/movies/network/model/Cast.kt b/...g/michaelbel/movies/network/model/Cast.kt → ...g/michaelbel/movies/network/model/Cast.kt
diff --git a/...aelbel/movies/network/model/Collection.kt → ...aelbel/movies/network/model/Collection.kt b/...aelbel/movies/network/model/Collection.kt → ...aelbel/movies/network/model/Collection.kt
diff --git a/...ichaelbel/movies/network/model/Company.kt → ...ichaelbel/movies/network/model/Company.kt b/...ichaelbel/movies/network/model/Company.kt → ...ichaelbel/movies/network/model/Company.kt
diff --git a/...ichaelbel/movies/network/model/Country.kt → ...ichaelbel/movies/network/model/Country.kt b/...ichaelbel/movies/network/model/Country.kt → ...ichaelbel/movies/network/model/Country.kt
diff --git a/...l/movies/network/model/CreditsResponse.kt → ...l/movies/network/model/CreditsResponse.kt b/...l/movies/network/model/CreditsResponse.kt → ...l/movies/network/model/CreditsResponse.kt
diff --git a/...g/michaelbel/movies/network/model/Crew.kt → ...g/michaelbel/movies/network/model/Crew.kt b/...g/michaelbel/movies/network/model/Crew.kt → ...g/michaelbel/movies/network/model/Crew.kt
diff --git a/.../michaelbel/movies/network/model/Dates.kt → .../michaelbel/movies/network/model/Dates.kt b/.../michaelbel/movies/network/model/Dates.kt → .../michaelbel/movies/network/model/Dates.kt
diff --git a/...el/movies/network/model/DeletedSession.kt → ...el/movies/network/model/DeletedSession.kt b/...el/movies/network/model/DeletedSession.kt → ...el/movies/network/model/DeletedSession.kt
diff --git a/...g/michaelbel/movies/network/model/Fave.kt → ...g/michaelbel/movies/network/model/Fave.kt b/...g/michaelbel/movies/network/model/Fave.kt → ...g/michaelbel/movies/network/model/Fave.kt
diff --git a/.../michaelbel/movies/network/model/Genre.kt → .../michaelbel/movies/network/model/Genre.kt b/.../michaelbel/movies/network/model/Genre.kt → .../michaelbel/movies/network/model/Genre.kt
diff --git a/...el/movies/network/model/GenresResponse.kt → ...el/movies/network/model/GenresResponse.kt b/...el/movies/network/model/GenresResponse.kt → ...el/movies/network/model/GenresResponse.kt
diff --git a/...chaelbel/movies/network/model/GrAvatar.kt → ...chaelbel/movies/network/model/GrAvatar.kt b/...chaelbel/movies/network/model/GrAvatar.kt → ...chaelbel/movies/network/model/GrAvatar.kt
diff --git a/...lbel/movies/network/model/GuestSession.kt → ...lbel/movies/network/model/GuestSession.kt b/...lbel/movies/network/model/GuestSession.kt → ...lbel/movies/network/model/GuestSession.kt
diff --git a/.../michaelbel/movies/network/model/Image.kt → .../michaelbel/movies/network/model/Image.kt b/.../michaelbel/movies/network/model/Image.kt → .../michaelbel/movies/network/model/Image.kt
diff --git a/...el/movies/network/model/ImagesResponse.kt → ...el/movies/network/model/ImagesResponse.kt b/...el/movies/network/model/ImagesResponse.kt → ...el/movies/network/model/ImagesResponse.kt
diff --git a/...ichaelbel/movies/network/model/Keyword.kt → ...ichaelbel/movies/network/model/Keyword.kt b/...ichaelbel/movies/network/model/Keyword.kt → ...ichaelbel/movies/network/model/Keyword.kt
diff --git a/.../movies/network/model/KeywordsResponse.kt → .../movies/network/model/KeywordsResponse.kt b/.../movies/network/model/KeywordsResponse.kt → .../movies/network/model/KeywordsResponse.kt
diff --git a/...chaelbel/movies/network/model/Language.kt → ...chaelbel/movies/network/model/Language.kt b/...chaelbel/movies/network/model/Language.kt → ...chaelbel/movies/network/model/Language.kt
diff --git a/...g/michaelbel/movies/network/model/Mark.kt → ...g/michaelbel/movies/network/model/Mark.kt b/...g/michaelbel/movies/network/model/Mark.kt → ...g/michaelbel/movies/network/model/Mark.kt
diff --git a/.../michaelbel/movies/network/model/Movie.kt → .../michaelbel/movies/network/model/Movie.kt b/.../michaelbel/movies/network/model/Movie.kt → .../michaelbel/movies/network/model/Movie.kt
diff --git a/...bel/movies/network/model/MovieResponse.kt → ...bel/movies/network/model/MovieResponse.kt b/...bel/movies/network/model/MovieResponse.kt → ...bel/movies/network/model/MovieResponse.kt
diff --git a/...ichaelbel/movies/network/model/Network.kt → ...ichaelbel/movies/network/model/Network.kt b/...ichaelbel/movies/network/model/Network.kt → ...ichaelbel/movies/network/model/Network.kt
diff --git a/...michaelbel/movies/network/model/Person.kt → ...michaelbel/movies/network/model/Person.kt b/...michaelbel/movies/network/model/Person.kt → ...michaelbel/movies/network/model/Person.kt
diff --git a/.../michaelbel/movies/network/model/Rated.kt → .../michaelbel/movies/network/model/Rated.kt b/.../michaelbel/movies/network/model/Rated.kt → .../michaelbel/movies/network/model/Rated.kt
diff --git a/...lbel/movies/network/model/RequestToken.kt → ...lbel/movies/network/model/RequestToken.kt b/...lbel/movies/network/model/RequestToken.kt → ...lbel/movies/network/model/RequestToken.kt
diff --git a/...michaelbel/movies/network/model/Result.kt → ...michaelbel/movies/network/model/Result.kt b/...michaelbel/movies/network/model/Result.kt → ...michaelbel/movies/network/model/Result.kt
diff --git a/...michaelbel/movies/network/model/Review.kt → ...michaelbel/movies/network/model/Review.kt b/...michaelbel/movies/network/model/Review.kt → ...michaelbel/movies/network/model/Review.kt
diff --git a/...ichaelbel/movies/network/model/Session.kt → ...ichaelbel/movies/network/model/Session.kt b/...ichaelbel/movies/network/model/Session.kt → ...ichaelbel/movies/network/model/Session.kt
diff --git a/...el/movies/network/model/SessionRequest.kt → ...el/movies/network/model/SessionRequest.kt b/...el/movies/network/model/SessionRequest.kt → ...el/movies/network/model/SessionRequest.kt
diff --git a/...aelbel/movies/network/model/TmdbAvatar.kt → ...aelbel/movies/network/model/TmdbAvatar.kt b/...aelbel/movies/network/model/TmdbAvatar.kt → ...aelbel/movies/network/model/TmdbAvatar.kt
diff --git a/.../michaelbel/movies/network/model/Token.kt → .../michaelbel/movies/network/model/Token.kt b/.../michaelbel/movies/network/model/Token.kt → .../michaelbel/movies/network/model/Token.kt
diff --git a/...chaelbel/movies/network/model/Username.kt → ...chaelbel/movies/network/model/Username.kt b/...chaelbel/movies/network/model/Username.kt → ...chaelbel/movies/network/model/Username.kt
diff --git a/.../michaelbel/movies/network/model/Video.kt → .../michaelbel/movies/network/model/Video.kt b/.../michaelbel/movies/network/model/Video.kt → .../michaelbel/movies/network/model/Video.kt
diff --git a/.../michaelbel/movies/network/model/Watch.kt → .../michaelbel/movies/network/model/Watch.kt b/.../michaelbel/movies/network/model/Watch.kt → .../michaelbel/movies/network/model/Watch.kt
diff --git a/...ovies/network/model/image/BackdropSize.kt → ...ovies/network/model/image/BackdropSize.kt b/...ovies/network/model/image/BackdropSize.kt → ...ovies/network/model/image/BackdropSize.kt
diff --git a/...el/movies/network/model/image/LogoSize.kt → ...el/movies/network/model/image/LogoSize.kt b/...el/movies/network/model/image/LogoSize.kt → ...el/movies/network/model/image/LogoSize.kt
diff --git a/.../movies/network/model/image/PosterSize.kt → .../movies/network/model/image/PosterSize.kt b/.../movies/network/model/image/PosterSize.kt → .../movies/network/model/image/PosterSize.kt
diff --git a/...movies/network/model/image/ProfileSize.kt → ...movies/network/model/image/ProfileSize.kt b/...movies/network/model/image/ProfileSize.kt → ...movies/network/model/image/ProfileSize.kt
diff --git a/...l/movies/network/model/image/StillSize.kt → ...l/movies/network/model/image/StillSize.kt b/...l/movies/network/model/image/StillSize.kt → ...l/movies/network/model/image/StillSize.kt
diff --git a/...elbel/movies/network/config/TmdbConfig.kt → ...elbel/movies/network/config/TmdbConfig.kt b/...elbel/movies/network/config/TmdbConfig.kt → ...elbel/movies/network/config/TmdbConfig.kt
diff --git a/...es/network/connectivity/NetworkManager.kt → ...es/network/connectivity/NetworkManager.kt b/...es/network/connectivity/NetworkManager.kt → ...es/network/connectivity/NetworkManager.kt
diff --git a/.../movies/network/ktor/di/KtorKoinModule.kt → .../movies/network/ktor/di/KtorKoinModule.kt b/.../movies/network/ktor/di/KtorKoinModule.kt → .../movies/network/ktor/di/KtorKoinModule.kt
diff --git a/core/notifications-kmp/.gitignore → core/notifications/.gitignore b/core/notifications-kmp/.gitignore → core/notifications/.gitignore
diff --git a/core/notifications-kmp/build.gradle.kts → core/notifications/build.gradle.kts b/core/notifications-kmp/build.gradle.kts → 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/...s-kmp/src/androidMain/AndroidManifest.xml → ...tions/src/androidMain/AndroidManifest.xml b/...s-kmp/src/androidMain/AndroidManifest.xml → ...tions/src/androidMain/AndroidManifest.xml
diff --git a/...ovies/notifications/NotificationClient.kt → ...ovies/notifications/NotificationClient.kt b/...ovies/notifications/NotificationClient.kt → ...ovies/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/...ations/di/notificationClientKoinModule.kt → ...ations/di/notificationClientKoinModule.kt b/...ations/di/notificationClientKoinModule.kt → ...ations/di/notificationClientKoinModule.kt
diff --git a/.../movies/notifications/model/MoviesPush.kt → .../movies/notifications/model/MoviesPush.kt b/.../movies/notifications/model/MoviesPush.kt → .../movies/notifications/model/MoviesPush.kt
diff --git a/...dMain/res/drawable/ic_movie_filter_24.xml → ...dMain/res/drawable/ic_movie_filter_24.xml b/...dMain/res/drawable/ic_movie_filter_24.xml → ...dMain/res/drawable/ic_movie_filter_24.xml
diff --git a/...src/androidMain/res/values-ru/strings.xml → ...src/androidMain/res/values-ru/strings.xml b/...src/androidMain/res/values-ru/strings.xml → ...src/androidMain/res/values-ru/strings.xml
diff --git a/...mp/src/androidMain/res/values/strings.xml → ...ns/src/androidMain/res/values/strings.xml b/...mp/src/androidMain/res/values/strings.xml → ...ns/src/androidMain/res/values/strings.xml
diff --git a/core/persistence-kmp/.gitignore → core/persistence/.gitignore b/core/persistence-kmp/.gitignore → core/persistence/.gitignore
diff --git a/core/persistence-kmp/build.gradle.kts → core/persistence/build.gradle.kts b/core/persistence-kmp/build.gradle.kts → 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/...ersistence/database/AccountPersistence.kt → ...ersistence/database/AccountPersistence.kt b/...ersistence/database/AccountPersistence.kt → ...ersistence/database/AccountPersistence.kt
diff --git a/.../persistence/database/ImagePersistence.kt → .../persistence/database/ImagePersistence.kt b/.../persistence/database/ImagePersistence.kt → .../persistence/database/ImagePersistence.kt
diff --git a/.../persistence/database/MoviePersistence.kt → .../persistence/database/MoviePersistence.kt b/.../persistence/database/MoviePersistence.kt → .../persistence/database/MoviePersistence.kt
diff --git a/...es/persistence/database/MoviesDatabase.kt → ...es/persistence/database/MoviesDatabase.kt b/...es/persistence/database/MoviesDatabase.kt → ...es/persistence/database/MoviesDatabase.kt
diff --git a/...sistence/database/PagingKeyPersistence.kt → ...sistence/database/PagingKeyPersistence.kt b/...sistence/database/PagingKeyPersistence.kt → ...sistence/database/PagingKeyPersistence.kt
diff --git a/...istence/database/SuggestionPersistence.kt → ...istence/database/SuggestionPersistence.kt b/...istence/database/SuggestionPersistence.kt → ...istence/database/SuggestionPersistence.kt
diff --git a/...e/database/converter/CalendarConverter.kt → ...e/database/converter/CalendarConverter.kt b/...e/database/converter/CalendarConverter.kt → ...e/database/converter/CalendarConverter.kt
diff --git a/...es/persistence/database/dao/AccountDao.kt → ...es/persistence/database/dao/AccountDao.kt b/...es/persistence/database/dao/AccountDao.kt → ...es/persistence/database/dao/AccountDao.kt
diff --git a/...vies/persistence/database/dao/ImageDao.kt → ...vies/persistence/database/dao/ImageDao.kt b/...vies/persistence/database/dao/ImageDao.kt → ...vies/persistence/database/dao/ImageDao.kt
diff --git a/...vies/persistence/database/dao/MovieDao.kt → ...vies/persistence/database/dao/MovieDao.kt b/...vies/persistence/database/dao/MovieDao.kt → ...vies/persistence/database/dao/MovieDao.kt
diff --git a/.../persistence/database/dao/PagingKeyDao.kt → .../persistence/database/dao/PagingKeyDao.kt b/.../persistence/database/dao/PagingKeyDao.kt → .../persistence/database/dao/PagingKeyDao.kt
diff --git a/...persistence/database/dao/SuggestionDao.kt → ...persistence/database/dao/SuggestionDao.kt b/...persistence/database/dao/SuggestionDao.kt → ...persistence/database/dao/SuggestionDao.kt
diff --git a/...es/persistence/database/db/AppDatabase.kt → ...es/persistence/database/db/AppDatabase.kt b/...es/persistence/database/db/AppDatabase.kt → ...es/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/.../persistence/database/di/DaoKoinModule.kt → .../persistence/database/di/DaoKoinModule.kt b/.../persistence/database/di/DaoKoinModule.kt → .../persistence/database/di/DaoKoinModule.kt
diff --git a/...istence/database/di/DatabaseKoinModule.kt → ...istence/database/di/DatabaseKoinModule.kt b/...istence/database/di/DatabaseKoinModule.kt → ...istence/database/di/DatabaseKoinModule.kt
diff --git a/...e/database/di/MoviesDatabaseKoinModule.kt → ...e/database/di/MoviesDatabaseKoinModule.kt b/...e/database/di/MoviesDatabaseKoinModule.kt → ...e/database/di/MoviesDatabaseKoinModule.kt
diff --git a/...ence/database/di/PersistenceKoinModule.kt → ...ence/database/di/PersistenceKoinModule.kt b/...ence/database/di/PersistenceKoinModule.kt → ...ence/database/di/PersistenceKoinModule.kt
diff --git a/.../persistence/database/entity/AccountDb.kt → .../persistence/database/entity/AccountDb.kt b/.../persistence/database/entity/AccountDb.kt → .../persistence/database/entity/AccountDb.kt
diff --git a/...es/persistence/database/entity/ImageDb.kt → ...es/persistence/database/entity/ImageDb.kt b/...es/persistence/database/entity/ImageDb.kt → ...es/persistence/database/entity/ImageDb.kt
diff --git a/...es/persistence/database/entity/MovieDb.kt → ...es/persistence/database/entity/MovieDb.kt b/...es/persistence/database/entity/MovieDb.kt → ...es/persistence/database/entity/MovieDb.kt
diff --git a/...ersistence/database/entity/PagingKeyDb.kt → ...ersistence/database/entity/PagingKeyDb.kt b/...ersistence/database/entity/PagingKeyDb.kt → ...ersistence/database/entity/PagingKeyDb.kt
diff --git a/...rsistence/database/entity/SuggestionDb.kt → ...rsistence/database/entity/SuggestionDb.kt b/...rsistence/database/entity/SuggestionDb.kt → ...rsistence/database/entity/SuggestionDb.kt
diff --git a/...ersistence/database/ktx/AccountPojoKtx.kt → ...ersistence/database/ktx/AccountPojoKtx.kt b/...ersistence/database/ktx/AccountPojoKtx.kt → ...ersistence/database/ktx/AccountPojoKtx.kt
diff --git a/.../persistence/database/ktx/ImagePojoKtx.kt → .../persistence/database/ktx/ImagePojoKtx.kt b/.../persistence/database/ktx/ImagePojoKtx.kt → .../persistence/database/ktx/ImagePojoKtx.kt
diff --git a/.../persistence/database/ktx/MoviePojoKtx.kt → .../persistence/database/ktx/MoviePojoKtx.kt b/.../persistence/database/ktx/MoviePojoKtx.kt → .../persistence/database/ktx/MoviePojoKtx.kt
diff --git a/...sistence/database/ktx/PagingKeyPojoKtx.kt → ...sistence/database/ktx/PagingKeyPojoKtx.kt b/...sistence/database/ktx/PagingKeyPojoKtx.kt → ...sistence/database/ktx/PagingKeyPojoKtx.kt
diff --git a/...istence/database/ktx/SuggestionPojoKtx.kt → ...istence/database/ktx/SuggestionPojoKtx.kt b/...istence/database/ktx/SuggestionPojoKtx.kt → ...istence/database/ktx/SuggestionPojoKtx.kt
diff --git a/...tence/datastore/di/DataStoreKoinModule.kt → ...tence/datastore/di/DataStoreKoinModule.kt b/...tence/datastore/di/DataStoreKoinModule.kt → ...tence/datastore/di/DataStoreKoinModule.kt
diff --git a/...ersistence/database/AccountPersistence.kt → ...ersistence/database/AccountPersistence.kt b/...ersistence/database/AccountPersistence.kt → ...ersistence/database/AccountPersistence.kt
diff --git a/.../persistence/database/ImagePersistence.kt → .../persistence/database/ImagePersistence.kt b/.../persistence/database/ImagePersistence.kt → .../persistence/database/ImagePersistence.kt
diff --git a/.../persistence/database/MoviePersistence.kt → .../persistence/database/MoviePersistence.kt b/.../persistence/database/MoviePersistence.kt → .../persistence/database/MoviePersistence.kt
diff --git a/...es/persistence/database/MoviesDatabase.kt → ...es/persistence/database/MoviesDatabase.kt b/...es/persistence/database/MoviesDatabase.kt → ...es/persistence/database/MoviesDatabase.kt
diff --git a/...sistence/database/PagingKeyPersistence.kt → ...sistence/database/PagingKeyPersistence.kt b/...sistence/database/PagingKeyPersistence.kt → ...sistence/database/PagingKeyPersistence.kt
diff --git a/...istence/database/SuggestionPersistence.kt → ...istence/database/SuggestionPersistence.kt b/...istence/database/SuggestionPersistence.kt → ...istence/database/SuggestionPersistence.kt
diff --git a/.../persistence/database/di/DaoKoinModule.kt → .../persistence/database/di/DaoKoinModule.kt b/.../persistence/database/di/DaoKoinModule.kt → .../persistence/database/di/DaoKoinModule.kt
diff --git a/...istence/database/di/DatabaseKoinModule.kt → ...istence/database/di/DatabaseKoinModule.kt b/...istence/database/di/DatabaseKoinModule.kt → ...istence/database/di/DatabaseKoinModule.kt
diff --git a/...e/database/di/MoviesDatabaseKoinModule.kt → ...e/database/di/MoviesDatabaseKoinModule.kt b/...e/database/di/MoviesDatabaseKoinModule.kt → ...e/database/di/MoviesDatabaseKoinModule.kt
diff --git a/...ence/database/di/PersistenceKoinModule.kt → ...ence/database/di/PersistenceKoinModule.kt b/...ence/database/di/PersistenceKoinModule.kt → ...ence/database/di/PersistenceKoinModule.kt
diff --git a/...ersistence/database/entity/AccountPojo.kt → ...ersistence/database/entity/AccountPojo.kt b/...ersistence/database/entity/AccountPojo.kt → ...ersistence/database/entity/AccountPojo.kt
diff --git a/.../persistence/database/entity/ImagePojo.kt → .../persistence/database/entity/ImagePojo.kt b/.../persistence/database/entity/ImagePojo.kt → .../persistence/database/entity/ImagePojo.kt
diff --git a/.../persistence/database/entity/ImageType.kt → .../persistence/database/entity/ImageType.kt b/.../persistence/database/entity/ImageType.kt → .../persistence/database/entity/ImageType.kt
diff --git a/.../persistence/database/entity/MoviePojo.kt → .../persistence/database/entity/MoviePojo.kt b/.../persistence/database/entity/MoviePojo.kt → .../persistence/database/entity/MoviePojo.kt
diff --git a/...sistence/database/entity/PagingKeyPojo.kt → ...sistence/database/entity/PagingKeyPojo.kt b/...sistence/database/entity/PagingKeyPojo.kt → ...sistence/database/entity/PagingKeyPojo.kt
diff --git a/...istence/database/entity/SuggestionPojo.kt → ...istence/database/entity/SuggestionPojo.kt b/...istence/database/entity/SuggestionPojo.kt → ...istence/database/entity/SuggestionPojo.kt
diff --git a/...tence/database/entity/mini/MovieDbMini.kt → ...tence/database/entity/mini/MovieDbMini.kt b/...tence/database/entity/mini/MovieDbMini.kt → ...tence/database/entity/mini/MovieDbMini.kt
diff --git a/...es/persistence/database/ktx/AccountKtx.kt → ...es/persistence/database/ktx/AccountKtx.kt b/...es/persistence/database/ktx/AccountKtx.kt → ...es/persistence/database/ktx/AccountKtx.kt
diff --git a/...ence/database/ktx/CommonAccountPojoKtx.kt → ...ence/database/ktx/CommonAccountPojoKtx.kt b/...ence/database/ktx/CommonAccountPojoKtx.kt → ...ence/database/ktx/CommonAccountPojoKtx.kt
diff --git a/...stence/database/ktx/CommonImagePojoKtx.kt → ...stence/database/ktx/CommonImagePojoKtx.kt b/...stence/database/ktx/CommonImagePojoKtx.kt → ...stence/database/ktx/CommonImagePojoKtx.kt
diff --git a/...stence/database/ktx/CommonMoviePojoKtx.kt → ...stence/database/ktx/CommonMoviePojoKtx.kt b/...stence/database/ktx/CommonMoviePojoKtx.kt → ...stence/database/ktx/CommonMoviePojoKtx.kt
diff --git a/...vies/persistence/database/ktx/ImageKtx.kt → ...vies/persistence/database/ktx/ImageKtx.kt b/...vies/persistence/database/ktx/ImageKtx.kt → ...vies/persistence/database/ktx/ImageKtx.kt
diff --git a/...vies/persistence/database/ktx/MovieKtx.kt → ...vies/persistence/database/ktx/MovieKtx.kt b/...vies/persistence/database/ktx/MovieKtx.kt → ...vies/persistence/database/ktx/MovieKtx.kt
diff --git a/...sistence/database/ktx/MovieResponseKtx.kt → ...sistence/database/ktx/MovieResponseKtx.kt b/...sistence/database/ktx/MovieResponseKtx.kt → ...sistence/database/ktx/MovieResponseKtx.kt
diff --git a/...es/persistence/datastore/DataStoreName.kt → ...es/persistence/datastore/DataStoreName.kt b/...es/persistence/datastore/DataStoreName.kt → ...es/persistence/datastore/DataStoreName.kt
diff --git a/...ersistence/datastore/MoviesPreferences.kt → ...ersistence/datastore/MoviesPreferences.kt b/...ersistence/datastore/MoviesPreferences.kt → ...ersistence/datastore/MoviesPreferences.kt
diff --git a/...tence/datastore/di/DataStoreKoinModule.kt → ...tence/datastore/di/DataStoreKoinModule.kt b/...tence/datastore/di/DataStoreKoinModule.kt → ...tence/datastore/di/DataStoreKoinModule.kt
diff --git a/...tastore/di/MoviesPreferencesKoinModule.kt → ...tastore/di/MoviesPreferencesKoinModule.kt b/...tastore/di/MoviesPreferencesKoinModule.kt → ...tastore/di/MoviesPreferencesKoinModule.kt
diff --git a/...ersistence/database/AccountPersistence.kt → ...ersistence/database/AccountPersistence.kt b/...ersistence/database/AccountPersistence.kt → ...ersistence/database/AccountPersistence.kt
diff --git a/.../persistence/database/ImagePersistence.kt → .../persistence/database/ImagePersistence.kt b/.../persistence/database/ImagePersistence.kt → .../persistence/database/ImagePersistence.kt
diff --git a/.../persistence/database/MoviePersistence.kt → .../persistence/database/MoviePersistence.kt b/.../persistence/database/MoviePersistence.kt → .../persistence/database/MoviePersistence.kt
diff --git a/...es/persistence/database/MoviesDatabase.kt → ...es/persistence/database/MoviesDatabase.kt b/...es/persistence/database/MoviesDatabase.kt → ...es/persistence/database/MoviesDatabase.kt
diff --git a/...sistence/database/PagingKeyPersistence.kt → ...sistence/database/PagingKeyPersistence.kt b/...sistence/database/PagingKeyPersistence.kt → ...sistence/database/PagingKeyPersistence.kt
diff --git a/...istence/database/SuggestionPersistence.kt → ...istence/database/SuggestionPersistence.kt b/...istence/database/SuggestionPersistence.kt → ...istence/database/SuggestionPersistence.kt
diff --git a/.../persistence/database/di/DaoKoinModule.kt → .../persistence/database/di/DaoKoinModule.kt b/.../persistence/database/di/DaoKoinModule.kt → .../persistence/database/di/DaoKoinModule.kt
diff --git a/...istence/database/di/DatabaseKoinModule.kt → ...istence/database/di/DatabaseKoinModule.kt b/...istence/database/di/DatabaseKoinModule.kt → ...istence/database/di/DatabaseKoinModule.kt
diff --git a/...e/database/di/MoviesDatabaseKoinModule.kt → ...e/database/di/MoviesDatabaseKoinModule.kt b/...e/database/di/MoviesDatabaseKoinModule.kt → ...e/database/di/MoviesDatabaseKoinModule.kt
diff --git a/...ence/database/di/PersistenceKoinModule.kt → ...ence/database/di/PersistenceKoinModule.kt b/...ence/database/di/PersistenceKoinModule.kt → ...ence/database/di/PersistenceKoinModule.kt
diff --git a/...tence/datastore/di/DataStoreKoinModule.kt → ...tence/datastore/di/DataStoreKoinModule.kt b/...tence/datastore/di/DataStoreKoinModule.kt → ...tence/datastore/di/DataStoreKoinModule.kt
diff --git a/core/platform-services/foss-kmp/.gitignore → core/platform-services/foss/.gitignore b/core/platform-services/foss-kmp/.gitignore → core/platform-services/foss/.gitignore
diff --git a/...latform-services/hms-kmp/build.gradle.kts → core/platform-services/foss/build.gradle.kts b/...latform-services/hms-kmp/build.gradle.kts → core/platform-services/foss/build.gradle.kts
@@ -15,15 +15,15 @@ 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)
         }
     }
 }
 
 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/...ovies/platform/impl/PlatformKoinModule.kt → ...ovies/platform/impl/PlatformKoinModule.kt b/...ovies/platform/impl/PlatformKoinModule.kt → ...ovies/platform/impl/PlatformKoinModule.kt
diff --git a/...rm/impl/analytics/AnalyticsServiceImpl.kt → ...rm/impl/analytics/AnalyticsServiceImpl.kt b/...rm/impl/analytics/AnalyticsServiceImpl.kt → ...rm/impl/analytics/AnalyticsServiceImpl.kt
diff --git a/...ovies/platform/impl/app/AppServiceImpl.kt → ...ovies/platform/impl/app/AppServiceImpl.kt b/...ovies/platform/impl/app/AppServiceImpl.kt → ...ovies/platform/impl/app/AppServiceImpl.kt
diff --git a/...platform/impl/config/ConfigServiceImpl.kt → ...platform/impl/config/ConfigServiceImpl.kt b/...platform/impl/config/ConfigServiceImpl.kt → ...platform/impl/config/ConfigServiceImpl.kt
diff --git a/...mpl/crashlytics/CrashlyticsServiceImpl.kt → ...mpl/crashlytics/CrashlyticsServiceImpl.kt b/...mpl/crashlytics/CrashlyticsServiceImpl.kt → ...mpl/crashlytics/CrashlyticsServiceImpl.kt
diff --git a/...rm/impl/messaging/MessagingServiceImpl.kt → ...rm/impl/messaging/MessagingServiceImpl.kt b/...rm/impl/messaging/MessagingServiceImpl.kt → ...rm/impl/messaging/MessagingServiceImpl.kt
diff --git a/...platform/impl/review/ReviewServiceImpl.kt → ...platform/impl/review/ReviewServiceImpl.kt b/...platform/impl/review/ReviewServiceImpl.kt → ...platform/impl/review/ReviewServiceImpl.kt
diff --git a/...platform/impl/update/UpdateServiceImpl.kt → ...platform/impl/update/UpdateServiceImpl.kt b/...platform/impl/update/UpdateServiceImpl.kt → ...platform/impl/update/UpdateServiceImpl.kt
diff --git a/core/platform-services/gms-kmp/.gitignore → core/platform-services/gms/.gitignore b/core/platform-services/gms-kmp/.gitignore → core/platform-services/gms/.gitignore
diff --git a/...latform-services/gms-kmp/build.gradle.kts → core/platform-services/gms/build.gradle.kts b/...latform-services/gms-kmp/build.gradle.kts → 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/...s-kmp/src/androidMain/AndroidManifest.xml → ...s/gms/src/androidMain/AndroidManifest.xml b/...s-kmp/src/androidMain/AndroidManifest.xml → ...s/gms/src/androidMain/AndroidManifest.xml
diff --git a/...ovies/platform/impl/FirebaseKoinModule.kt → ...ovies/platform/impl/FirebaseKoinModule.kt b/...ovies/platform/impl/FirebaseKoinModule.kt → ...ovies/platform/impl/FirebaseKoinModule.kt
diff --git a/...vies/platform/impl/GoogleApiKoinModule.kt → ...vies/platform/impl/GoogleApiKoinModule.kt b/...vies/platform/impl/GoogleApiKoinModule.kt → ...vies/platform/impl/GoogleApiKoinModule.kt
diff --git a/...ovies/platform/impl/PlatformKoinModule.kt → ...ovies/platform/impl/PlatformKoinModule.kt b/...ovies/platform/impl/PlatformKoinModule.kt → ...ovies/platform/impl/PlatformKoinModule.kt
diff --git a/...el/movies/platform/impl/PlayKoinModule.kt → ...el/movies/platform/impl/PlayKoinModule.kt b/...el/movies/platform/impl/PlayKoinModule.kt → ...el/movies/platform/impl/PlayKoinModule.kt
diff --git a/...rm/impl/analytics/AnalyticsServiceImpl.kt → ...rm/impl/analytics/AnalyticsServiceImpl.kt b/...rm/impl/analytics/AnalyticsServiceImpl.kt → ...rm/impl/analytics/AnalyticsServiceImpl.kt
diff --git a/...ovies/platform/impl/app/AppServiceImpl.kt → ...ovies/platform/impl/app/AppServiceImpl.kt b/...ovies/platform/impl/app/AppServiceImpl.kt → ...ovies/platform/impl/app/AppServiceImpl.kt
diff --git a/...platform/impl/config/ConfigServiceImpl.kt → ...platform/impl/config/ConfigServiceImpl.kt b/...platform/impl/config/ConfigServiceImpl.kt → ...platform/impl/config/ConfigServiceImpl.kt
diff --git a/...mpl/crashlytics/CrashlyticsServiceImpl.kt → ...mpl/crashlytics/CrashlyticsServiceImpl.kt b/...mpl/crashlytics/CrashlyticsServiceImpl.kt → ...mpl/crashlytics/CrashlyticsServiceImpl.kt
diff --git a/...rm/impl/messaging/MessagingServiceImpl.kt → ...rm/impl/messaging/MessagingServiceImpl.kt b/...rm/impl/messaging/MessagingServiceImpl.kt → ...rm/impl/messaging/MessagingServiceImpl.kt
diff --git a/...rm/impl/messaging/ktx/RemoteMessageKtx.kt → ...rm/impl/messaging/ktx/RemoteMessageKtx.kt b/...rm/impl/messaging/ktx/RemoteMessageKtx.kt → ...rm/impl/messaging/ktx/RemoteMessageKtx.kt
diff --git a/...ssaging/service/MoviesMessagingService.kt → ...ssaging/service/MoviesMessagingService.kt b/...ssaging/service/MoviesMessagingService.kt → ...ssaging/service/MoviesMessagingService.kt
diff --git a/...platform/impl/review/ReviewServiceImpl.kt → ...platform/impl/review/ReviewServiceImpl.kt b/...platform/impl/review/ReviewServiceImpl.kt → ...platform/impl/review/ReviewServiceImpl.kt
diff --git a/...ovies/platform/impl/update/InAppUpdate.kt → ...ovies/platform/impl/update/InAppUpdate.kt b/...ovies/platform/impl/update/InAppUpdate.kt → ...ovies/platform/impl/update/InAppUpdate.kt
diff --git a/...platform/impl/update/UpdateServiceImpl.kt → ...platform/impl/update/UpdateServiceImpl.kt b/...platform/impl/update/UpdateServiceImpl.kt → ...platform/impl/update/UpdateServiceImpl.kt
diff --git a/...dMain/res/drawable/ic_movie_filter_24.xml → ...dMain/res/drawable/ic_movie_filter_24.xml b/...dMain/res/drawable/ic_movie_filter_24.xml → ...dMain/res/drawable/ic_movie_filter_24.xml