diff --git a/.run/desktopApp.run.xml b/.run/desktopApp.run.xml
deleted file mode 100644
index e6a99b47e..000000000
--- a/.run/desktopApp.run.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
-
\ No newline at end of file
diff --git a/core/analytics/src/jvmMain/kotlin/org/michaelbel/movies/analytics/di/MoviesAnalyticsKoinModule.desktop.kt b/core/analytics/src/jvmMain/kotlin/org/michaelbel/movies/analytics/di/MoviesAnalyticsKoinModule.jvm.kt
similarity index 100%
rename from core/analytics/src/jvmMain/kotlin/org/michaelbel/movies/analytics/di/MoviesAnalyticsKoinModule.desktop.kt
rename to core/analytics/src/jvmMain/kotlin/org/michaelbel/movies/analytics/di/MoviesAnalyticsKoinModule.jvm.kt
diff --git a/core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/biometric/di/BiometricKoinModule2.kt b/core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/biometric/di/BiometricKoinModule2.jvm.kt
similarity index 100%
rename from core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/biometric/di/BiometricKoinModule2.kt
rename to core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/biometric/di/BiometricKoinModule2.jvm.kt
diff --git a/core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/browser/Browser.desktop.kt b/core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/browser/Browser.jvm.kt
similarity index 100%
rename from core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/browser/Browser.desktop.kt
rename to core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/browser/Browser.jvm.kt
diff --git a/core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/dispatchers/IoDispatcher.desktop.kt b/core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/dispatchers/IoDispatcher.jvm.kt
similarity index 100%
rename from core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/dispatchers/IoDispatcher.desktop.kt
rename to core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/dispatchers/IoDispatcher.jvm.kt
diff --git a/core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/dispatchers/UiDispatcher.desktop.kt b/core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/dispatchers/UiDispatcher.jvm.kt
similarity index 100%
rename from core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/dispatchers/UiDispatcher.desktop.kt
rename to core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/dispatchers/UiDispatcher.jvm.kt
diff --git a/core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/ktx/SavedStateHandleKtx.desktop.kt b/core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/ktx/SavedStateHandleKtx.jvm.kt
similarity index 100%
rename from core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/ktx/SavedStateHandleKtx.desktop.kt
rename to core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/ktx/SavedStateHandleKtx.jvm.kt
diff --git a/core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/log/Logger.desktop.kt b/core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/log/Logger.jvm.kt
similarity index 100%
rename from core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/log/Logger.desktop.kt
rename to core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/log/Logger.jvm.kt
diff --git a/core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/notify/di/NotifyKoinModule.kt b/core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/notify/di/NotifyKoinModule.jvm.kt
similarity index 100%
rename from core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/notify/di/NotifyKoinModule.kt
rename to core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/notify/di/NotifyKoinModule.jvm.kt
diff --git a/core/interactor/src/jvmMain/kotlin/org/michaelbel/movies/interactor/di/InteractorKoinModule.desktop.kt b/core/interactor/src/jvmMain/kotlin/org/michaelbel/movies/interactor/di/InteractorKoinModule.jvm.kt
similarity index 100%
rename from core/interactor/src/jvmMain/kotlin/org/michaelbel/movies/interactor/di/InteractorKoinModule.desktop.kt
rename to core/interactor/src/jvmMain/kotlin/org/michaelbel/movies/interactor/di/InteractorKoinModule.jvm.kt
diff --git a/core/network/src/jvmMain/kotlin/org/michaelbel/movies/network/config/Interceptor.desktop.kt b/core/network/src/jvmMain/kotlin/org/michaelbel/movies/network/config/Interceptor.jvm.kt
similarity index 100%
rename from core/network/src/jvmMain/kotlin/org/michaelbel/movies/network/config/Interceptor.desktop.kt
rename to core/network/src/jvmMain/kotlin/org/michaelbel/movies/network/config/Interceptor.jvm.kt
diff --git a/core/network/src/jvmMain/kotlin/org/michaelbel/movies/network/config/TmdbConfig.desktop.kt b/core/network/src/jvmMain/kotlin/org/michaelbel/movies/network/config/TmdbConfig.jvm.kt
similarity index 100%
rename from core/network/src/jvmMain/kotlin/org/michaelbel/movies/network/config/TmdbConfig.desktop.kt
rename to core/network/src/jvmMain/kotlin/org/michaelbel/movies/network/config/TmdbConfig.jvm.kt
diff --git a/core/network/src/jvmMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorKoinModule.desktop.kt b/core/network/src/jvmMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorKoinModule.jvm.kt
similarity index 100%
rename from core/network/src/jvmMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorKoinModule.desktop.kt
rename to core/network/src/jvmMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorKoinModule.jvm.kt
diff --git a/core/notifications/src/androidMain/kotlin/org/michaelbel/movies/notifications/NotificationClient.kt b/core/notifications/src/androidMain/kotlin/org/michaelbel/movies/notifications/NotificationClient.kt
index f41b7b1fe..98abf264b 100644
--- a/core/notifications/src/androidMain/kotlin/org/michaelbel/movies/notifications/NotificationClient.kt
+++ b/core/notifications/src/androidMain/kotlin/org/michaelbel/movies/notifications/NotificationClient.kt
@@ -18,7 +18,6 @@ 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.R
import org.michaelbel.movies.ui.icons.MoviesAndroidIcons
import java.util.concurrent.TimeUnit
diff --git a/core/persistence/src/jvmMain/kotlin/org/michaelbel/movies/persistence/database/MoviesDatabaseBuilder.desktop.kt b/core/persistence/src/jvmMain/kotlin/org/michaelbel/movies/persistence/database/MoviesDatabaseBuilder.jvm.kt
similarity index 100%
rename from core/persistence/src/jvmMain/kotlin/org/michaelbel/movies/persistence/database/MoviesDatabaseBuilder.desktop.kt
rename to core/persistence/src/jvmMain/kotlin/org/michaelbel/movies/persistence/database/MoviesDatabaseBuilder.jvm.kt
diff --git a/core/persistence/src/jvmMain/kotlin/org/michaelbel/movies/persistence/database/di/RoomDatabaseBuilderKoinModule.desktop.kt b/core/persistence/src/jvmMain/kotlin/org/michaelbel/movies/persistence/database/di/RoomDatabaseBuilderKoinModule.jvm.kt
similarity index 100%
rename from core/persistence/src/jvmMain/kotlin/org/michaelbel/movies/persistence/database/di/RoomDatabaseBuilderKoinModule.desktop.kt
rename to core/persistence/src/jvmMain/kotlin/org/michaelbel/movies/persistence/database/di/RoomDatabaseBuilderKoinModule.jvm.kt
index 53164dcbf..f0f489c03 100644
--- a/core/persistence/src/jvmMain/kotlin/org/michaelbel/movies/persistence/database/di/RoomDatabaseBuilderKoinModule.desktop.kt
+++ b/core/persistence/src/jvmMain/kotlin/org/michaelbel/movies/persistence/database/di/RoomDatabaseBuilderKoinModule.jvm.kt
@@ -3,9 +3,9 @@ package org.michaelbel.movies.persistence.database.di
import androidx.room.Room
import androidx.room.RoomDatabase
import androidx.sqlite.driver.bundled.BundledSQLiteDriver
-import java.io.File
import org.koin.dsl.module
import org.michaelbel.movies.persistence.database.db.AppDatabase
+import java.io.File
actual val roomDatabaseBuilderModule = module {
factory> {
diff --git a/core/persistence/src/jvmMain/kotlin/org/michaelbel/movies/persistence/datastore/di/DataStoreKoinModule.desktop.kt b/core/persistence/src/jvmMain/kotlin/org/michaelbel/movies/persistence/datastore/di/DataStoreKoinModule.jvm.kt
similarity index 100%
rename from core/persistence/src/jvmMain/kotlin/org/michaelbel/movies/persistence/datastore/di/DataStoreKoinModule.desktop.kt
rename to core/persistence/src/jvmMain/kotlin/org/michaelbel/movies/persistence/datastore/di/DataStoreKoinModule.jvm.kt
diff --git a/core/platform-services/inject-desktop/src/commonMain/kotlin/org/michaelbel/movies/platform/inject/FlavorServiceKtorModule.desktop.kt b/core/platform-services/inject-desktop/src/commonMain/kotlin/org/michaelbel/movies/platform/inject/FlavorServiceKtorModule.jvm.kt
similarity index 100%
rename from core/platform-services/inject-desktop/src/commonMain/kotlin/org/michaelbel/movies/platform/inject/FlavorServiceKtorModule.desktop.kt
rename to core/platform-services/inject-desktop/src/commonMain/kotlin/org/michaelbel/movies/platform/inject/FlavorServiceKtorModule.jvm.kt
diff --git a/core/repository/src/jvmMain/kotlin/org/michaelbel/movies/repository/ktx/BuildKtx.desktop.kt b/core/repository/src/jvmMain/kotlin/org/michaelbel/movies/repository/ktx/BuildKtx.jvm.kt
similarity index 100%
rename from core/repository/src/jvmMain/kotlin/org/michaelbel/movies/repository/ktx/BuildKtx.desktop.kt
rename to core/repository/src/jvmMain/kotlin/org/michaelbel/movies/repository/ktx/BuildKtx.jvm.kt
diff --git a/core/repository/src/jvmMain/kotlin/org/michaelbel/movies/repository/ktx/ExceptionKtx.desktop.kt b/core/repository/src/jvmMain/kotlin/org/michaelbel/movies/repository/ktx/ExceptionKtx.jvm.kt
similarity index 100%
rename from core/repository/src/jvmMain/kotlin/org/michaelbel/movies/repository/ktx/ExceptionKtx.desktop.kt
rename to core/repository/src/jvmMain/kotlin/org/michaelbel/movies/repository/ktx/ExceptionKtx.jvm.kt
diff --git a/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/placeholder/Placeholder.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/placeholder/Placeholder.kt
index b3410180e..d691c8021 100644
--- a/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/placeholder/Placeholder.kt
+++ b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/placeholder/Placeholder.kt
@@ -24,9 +24,9 @@ import androidx.compose.animation.core.Transition
import androidx.compose.animation.core.animateFloat
import androidx.compose.animation.core.infiniteRepeatable
import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.rememberTransition
import androidx.compose.animation.core.spring
import androidx.compose.animation.core.tween
-import androidx.compose.animation.core.updateTransition
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableFloatStateOf
@@ -129,7 +129,7 @@ fun Modifier.placeholder(
val transitionState = remember { MutableTransitionState(visible) }.apply {
targetState = visible
}
- val transition = updateTransition(transitionState, "placeholder_crossfade")
+ val transition = rememberTransition(transitionState, "placeholder_crossfade")
val placeholderAlpha by transition.animateFloat(
transitionSpec = placeholderFadeTransitionSpec,
diff --git a/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/compose/page/PageContent.desktop.kt b/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/compose/page/PageContent.jvm.kt
similarity index 100%
rename from core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/compose/page/PageContent.desktop.kt
rename to core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/compose/page/PageContent.jvm.kt
diff --git a/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/compose/page/PageFailure.desktop.kt b/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/compose/page/PageFailure.jvm.kt
similarity index 100%
rename from core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/compose/page/PageFailure.desktop.kt
rename to core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/compose/page/PageFailure.jvm.kt
diff --git a/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/compose/page/PageLoading.desktop.kt b/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/compose/page/PageLoading.jvm.kt
similarity index 100%
rename from core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/compose/page/PageLoading.desktop.kt
rename to core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/compose/page/PageLoading.jvm.kt
diff --git a/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/ConfigurationKtx.desktop.kt b/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/ConfigurationKtx.jvm.kt
similarity index 100%
rename from core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/ConfigurationKtx.desktop.kt
rename to core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/ConfigurationKtx.jvm.kt
diff --git a/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/GenderStringKtx.desktop.kt b/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/GenderStringKtx.jvm.kt
similarity index 100%
rename from core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/GenderStringKtx.desktop.kt
rename to core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/GenderStringKtx.jvm.kt
diff --git a/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/LazyPagingItemsKtx.desktop.kt b/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/LazyPagingItemsKtx.jvm.kt
similarity index 100%
rename from core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/LazyPagingItemsKtx.desktop.kt
rename to core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/LazyPagingItemsKtx.jvm.kt
diff --git a/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/LifecycleKtx.desktop.kt b/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/LifecycleKtx.jvm.kt
similarity index 100%
rename from core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/LifecycleKtx.desktop.kt
rename to core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/LifecycleKtx.jvm.kt
index 9a9a312e9..6ac0b5fe5 100644
--- a/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/LifecycleKtx.desktop.kt
+++ b/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/LifecycleKtx.jvm.kt
@@ -5,8 +5,8 @@ import androidx.compose.runtime.State
import androidx.compose.runtime.collectAsState
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleOwner
-import kotlin.coroutines.CoroutineContext
import kotlinx.coroutines.flow.StateFlow
+import kotlin.coroutines.CoroutineContext
@Composable
actual fun StateFlow.collectAsStateCommon(
diff --git a/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/TileKtx.desktop.kt b/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/TileKtx.jvm.kt
similarity index 100%
rename from core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/TileKtx.desktop.kt
rename to core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/TileKtx.jvm.kt
diff --git a/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/WindowInsetsKtx.desktop.kt b/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/WindowInsetsKtx.jvm.kt
similarity index 100%
rename from core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/WindowInsetsKtx.desktop.kt
rename to core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/ktx/WindowInsetsKtx.jvm.kt
diff --git a/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/theme/Theme.desktop.kt b/core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/theme/Theme.jvm.kt
similarity index 100%
rename from core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/theme/Theme.desktop.kt
rename to core/ui/src/jvmMain/kotlin/org/michaelbel/movies/ui/theme/Theme.jvm.kt
diff --git a/core/widget/src/jvmMain/kotlin/org/michaelbel/movies/widget/ktx/AppWidgetManagerKtx.desktop.kt b/core/widget/src/jvmMain/kotlin/org/michaelbel/movies/widget/ktx/AppWidgetManagerKtx.jvm.kt
similarity index 100%
rename from core/widget/src/jvmMain/kotlin/org/michaelbel/movies/widget/ktx/AppWidgetManagerKtx.desktop.kt
rename to core/widget/src/jvmMain/kotlin/org/michaelbel/movies/widget/ktx/AppWidgetManagerKtx.jvm.kt
diff --git a/feature/account-impl/src/jvmMain/kotlin/org/michaelbel/movies/account/di/AccountKoinModule.desktop.kt b/feature/account-impl/src/jvmMain/kotlin/org/michaelbel/movies/account/di/AccountKoinModule.jvm.kt
similarity index 100%
rename from feature/account-impl/src/jvmMain/kotlin/org/michaelbel/movies/account/di/AccountKoinModule.desktop.kt
rename to feature/account-impl/src/jvmMain/kotlin/org/michaelbel/movies/account/di/AccountKoinModule.jvm.kt
diff --git a/feature/account-impl/src/jvmMain/kotlin/org/michaelbel/movies/account/ui/AccountRoute.desktop.kt b/feature/account-impl/src/jvmMain/kotlin/org/michaelbel/movies/account/ui/AccountRoute.jvm.kt
similarity index 100%
rename from feature/account-impl/src/jvmMain/kotlin/org/michaelbel/movies/account/ui/AccountRoute.desktop.kt
rename to feature/account-impl/src/jvmMain/kotlin/org/michaelbel/movies/account/ui/AccountRoute.jvm.kt
diff --git a/feature/account/src/jvmMain/kotlin/org/michaelbel/movies/account/AccountNavigation.desktop.kt b/feature/account/src/jvmMain/kotlin/org/michaelbel/movies/account/AccountNavigation.jvm.kt
similarity index 100%
rename from feature/account/src/jvmMain/kotlin/org/michaelbel/movies/account/AccountNavigation.desktop.kt
rename to feature/account/src/jvmMain/kotlin/org/michaelbel/movies/account/AccountNavigation.jvm.kt
diff --git a/feature/auth-impl/src/jvmMain/kotlin/org/michaelbel/movies/auth/di/AuthKoinModule.desktop.kt b/feature/auth-impl/src/jvmMain/kotlin/org/michaelbel/movies/auth/di/AuthKoinModule.jvm.kt
similarity index 100%
rename from feature/auth-impl/src/jvmMain/kotlin/org/michaelbel/movies/auth/di/AuthKoinModule.desktop.kt
rename to feature/auth-impl/src/jvmMain/kotlin/org/michaelbel/movies/auth/di/AuthKoinModule.jvm.kt
diff --git a/feature/auth-impl/src/jvmMain/kotlin/org/michaelbel/movies/auth/ui/AuthRoute.desktop.kt b/feature/auth-impl/src/jvmMain/kotlin/org/michaelbel/movies/auth/ui/AuthRoute.jvm.kt
similarity index 92%
rename from feature/auth-impl/src/jvmMain/kotlin/org/michaelbel/movies/auth/ui/AuthRoute.desktop.kt
rename to feature/auth-impl/src/jvmMain/kotlin/org/michaelbel/movies/auth/ui/AuthRoute.jvm.kt
index 4c0667e0e..a90cc2eac 100644
--- a/feature/auth-impl/src/jvmMain/kotlin/org/michaelbel/movies/auth/ui/AuthRoute.desktop.kt
+++ b/feature/auth-impl/src/jvmMain/kotlin/org/michaelbel/movies/auth/ui/AuthRoute.jvm.kt
@@ -17,7 +17,7 @@ fun AuthRoute(
loginLoading = false,
requestToken = null,
onBackClick = onBackClick,
- onSignInClick = { username, password -> },
+ onSignInClick = { _, _ -> },
onLoginClick = {},
onResetRequestToken = {},
onUrlClick = {},
diff --git a/feature/auth/src/jvmMain/kotlin/org/michaelbel/movies/auth/AuthNavigation.desktop.kt b/feature/auth/src/jvmMain/kotlin/org/michaelbel/movies/auth/AuthNavigation.jvm.kt
similarity index 100%
rename from feature/auth/src/jvmMain/kotlin/org/michaelbel/movies/auth/AuthNavigation.desktop.kt
rename to feature/auth/src/jvmMain/kotlin/org/michaelbel/movies/auth/AuthNavigation.jvm.kt
diff --git a/feature/auth/src/jvmMain/kotlin/org/michaelbel/movies/auth/Settings.desktop.kt b/feature/auth/src/jvmMain/kotlin/org/michaelbel/movies/auth/Settings.jvm.kt
similarity index 100%
rename from feature/auth/src/jvmMain/kotlin/org/michaelbel/movies/auth/Settings.desktop.kt
rename to feature/auth/src/jvmMain/kotlin/org/michaelbel/movies/auth/Settings.jvm.kt
diff --git a/feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/di/DetailsKoinModule.desktop.kt b/feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/di/DetailsKoinModule.jvm.kt
similarity index 100%
rename from feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/di/DetailsKoinModule.desktop.kt
rename to feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/di/DetailsKoinModule.jvm.kt
diff --git a/feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/ui/DetailsContent.desktop.kt b/feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/ui/DetailsContent.jvm.kt
similarity index 100%
rename from feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/ui/DetailsContent.desktop.kt
rename to feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/ui/DetailsContent.jvm.kt
diff --git a/feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/ui/DetailsLoading.desktop.kt b/feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/ui/DetailsLoading.jvm.kt
similarity index 100%
rename from feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/ui/DetailsLoading.desktop.kt
rename to feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/ui/DetailsLoading.jvm.kt
diff --git a/feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/ui/DetailsRoute.desktop.kt b/feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/ui/DetailsRoute.jvm.kt
similarity index 100%
rename from feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/ui/DetailsRoute.desktop.kt
rename to feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/ui/DetailsRoute.jvm.kt
diff --git a/feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/ui/DetailsScreenContent.desktop.kt b/feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/ui/DetailsScreenContent.jvm.kt
similarity index 100%
rename from feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/ui/DetailsScreenContent.desktop.kt
rename to feature/details-impl/src/jvmMain/kotlin/org/michaelbel/movies/details/ui/DetailsScreenContent.jvm.kt
diff --git a/feature/details/src/jvmMain/kotlin/org/michaelbel/movies/details/DetailsNavigation.desktop.kt b/feature/details/src/jvmMain/kotlin/org/michaelbel/movies/details/DetailsNavigation.jvm.kt
similarity index 100%
rename from feature/details/src/jvmMain/kotlin/org/michaelbel/movies/details/DetailsNavigation.desktop.kt
rename to feature/details/src/jvmMain/kotlin/org/michaelbel/movies/details/DetailsNavigation.jvm.kt
diff --git a/feature/feed-impl/src/jvmMain/kotlin/org/michaelbel/movies/feed/di/FeedKoinModule.desktop.kt b/feature/feed-impl/src/jvmMain/kotlin/org/michaelbel/movies/feed/di/FeedKoinModule.jvm.kt
similarity index 100%
rename from feature/feed-impl/src/jvmMain/kotlin/org/michaelbel/movies/feed/di/FeedKoinModule.desktop.kt
rename to feature/feed-impl/src/jvmMain/kotlin/org/michaelbel/movies/feed/di/FeedKoinModule.jvm.kt
diff --git a/feature/feed-impl/src/jvmMain/kotlin/org/michaelbel/movies/feed/ui/FeedRoute.desktop.kt b/feature/feed-impl/src/jvmMain/kotlin/org/michaelbel/movies/feed/ui/FeedRoute.jvm.kt
similarity index 100%
rename from feature/feed-impl/src/jvmMain/kotlin/org/michaelbel/movies/feed/ui/FeedRoute.desktop.kt
rename to feature/feed-impl/src/jvmMain/kotlin/org/michaelbel/movies/feed/ui/FeedRoute.jvm.kt
diff --git a/feature/feed-impl/src/jvmMain/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.desktop.kt b/feature/feed-impl/src/jvmMain/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.jvm.kt
similarity index 100%
rename from feature/feed-impl/src/jvmMain/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.desktop.kt
rename to feature/feed-impl/src/jvmMain/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.jvm.kt
diff --git a/feature/feed/src/jvmMain/kotlin/org/michaelbel/movies/feed/FeedNavigation.desktop.kt b/feature/feed/src/jvmMain/kotlin/org/michaelbel/movies/feed/FeedNavigation.jvm.kt
similarity index 100%
rename from feature/feed/src/jvmMain/kotlin/org/michaelbel/movies/feed/FeedNavigation.desktop.kt
rename to feature/feed/src/jvmMain/kotlin/org/michaelbel/movies/feed/FeedNavigation.jvm.kt
diff --git a/feature/gallery-impl/src/jvmMain/kotlin/org/michaelbel/movies/gallery/di/GalleryKoinModule.desktop.kt b/feature/gallery-impl/src/jvmMain/kotlin/org/michaelbel/movies/gallery/di/GalleryKoinModule.jvm.kt
similarity index 100%
rename from feature/gallery-impl/src/jvmMain/kotlin/org/michaelbel/movies/gallery/di/GalleryKoinModule.desktop.kt
rename to feature/gallery-impl/src/jvmMain/kotlin/org/michaelbel/movies/gallery/di/GalleryKoinModule.jvm.kt
diff --git a/feature/gallery-impl/src/jvmMain/kotlin/org/michaelbel/movies/gallery/ui/GalleryRoute.desktop.kt b/feature/gallery-impl/src/jvmMain/kotlin/org/michaelbel/movies/gallery/ui/GalleryRoute.jvm.kt
similarity index 100%
rename from feature/gallery-impl/src/jvmMain/kotlin/org/michaelbel/movies/gallery/ui/GalleryRoute.desktop.kt
rename to feature/gallery-impl/src/jvmMain/kotlin/org/michaelbel/movies/gallery/ui/GalleryRoute.jvm.kt
diff --git a/feature/gallery/src/jvmMain/kotlin/org/michaelbel/movies/gallery/GalleryNavigation.desktop.kt b/feature/gallery/src/jvmMain/kotlin/org/michaelbel/movies/gallery/GalleryNavigation.jvm.kt
similarity index 100%
rename from feature/gallery/src/jvmMain/kotlin/org/michaelbel/movies/gallery/GalleryNavigation.desktop.kt
rename to feature/gallery/src/jvmMain/kotlin/org/michaelbel/movies/gallery/GalleryNavigation.jvm.kt
diff --git a/feature/main-impl/src/jvmMain/kotlin/org/michaelbel/movies/main/MainContent.desktop.kt b/feature/main-impl/src/jvmMain/kotlin/org/michaelbel/movies/main/MainContent.jvm.kt
similarity index 100%
rename from feature/main-impl/src/jvmMain/kotlin/org/michaelbel/movies/main/MainContent.desktop.kt
rename to feature/main-impl/src/jvmMain/kotlin/org/michaelbel/movies/main/MainContent.jvm.kt
diff --git a/feature/main-impl/src/jvmMain/kotlin/org/michaelbel/movies/main/di/MainKoinModule.desktop.kt b/feature/main-impl/src/jvmMain/kotlin/org/michaelbel/movies/main/di/MainKoinModule.jvm.kt
similarity index 100%
rename from feature/main-impl/src/jvmMain/kotlin/org/michaelbel/movies/main/di/MainKoinModule.desktop.kt
rename to feature/main-impl/src/jvmMain/kotlin/org/michaelbel/movies/main/di/MainKoinModule.jvm.kt
diff --git a/feature/search-impl/src/jvmMain/kotlin/org/michaelbel/movies/search/di/SearchKoinModule.desktop.kt b/feature/search-impl/src/jvmMain/kotlin/org/michaelbel/movies/search/di/SearchKoinModule.jvm.kt
similarity index 100%
rename from feature/search-impl/src/jvmMain/kotlin/org/michaelbel/movies/search/di/SearchKoinModule.desktop.kt
rename to feature/search-impl/src/jvmMain/kotlin/org/michaelbel/movies/search/di/SearchKoinModule.jvm.kt
diff --git a/feature/search-impl/src/jvmMain/kotlin/org/michaelbel/movies/search/ui/SearchRoute.desktop.kt b/feature/search-impl/src/jvmMain/kotlin/org/michaelbel/movies/search/ui/SearchRoute.jvm.kt
similarity index 100%
rename from feature/search-impl/src/jvmMain/kotlin/org/michaelbel/movies/search/ui/SearchRoute.desktop.kt
rename to feature/search-impl/src/jvmMain/kotlin/org/michaelbel/movies/search/ui/SearchRoute.jvm.kt
diff --git a/feature/search/src/jvmMain/kotlin/org/michaelbel/movies/search/SearchNavigation.desktop.kt b/feature/search/src/jvmMain/kotlin/org/michaelbel/movies/search/SearchNavigation.jvm.kt
similarity index 100%
rename from feature/search/src/jvmMain/kotlin/org/michaelbel/movies/search/SearchNavigation.desktop.kt
rename to feature/search/src/jvmMain/kotlin/org/michaelbel/movies/search/SearchNavigation.jvm.kt