diff --git a/.github/actions/java/action.yml b/.github/actions/java/action.yml
index d2fc454e..7cf1ca88 100644
--- a/.github/actions/java/action.yml
+++ b/.github/actions/java/action.yml
@@ -5,9 +5,9 @@ runs:
   using: "composite"
   steps:
     - uses: actions/checkout@v4
-    - name: set up JDK 17
+    - name: set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: "17"
+        java-version: "21"
         distribution: "temurin"
         cache: gradle
diff --git a/.github/workflows/linter.yaml b/.github/workflows/linter.yaml
new file mode 100644
index 00000000..d1ae0e3f
--- /dev/null
+++ b/.github/workflows/linter.yaml
@@ -0,0 +1,21 @@
+name: Linter
+
+on:
+  pull_request:
+    branches: ["master"]
+
+jobs:
+  linter:
+    runs-on: ubuntu-latest
+    env:
+      MOVIE_DB_API_TOKEN: ${{ secrets.MOVIE_DB_API_TOKEN }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Java
+        uses: ./.github/actions/java
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Run Detekt
+        run: ./gradlew detekt
diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml
deleted file mode 100644
index 3d134405..00000000
--- a/.github/workflows/mega-linter.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-# MegaLinter GitHub Action configuration file
-# More info at https://megalinter.io
----
-name: MegaLinter
-
-on:
-  pull_request:
-    branches:
-      - master
-
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
-
-jobs:
-  megalinter:
-    name: MegaLinter
-    runs-on: ubuntu-latest
-
-    # Give the default GITHUB_TOKEN write permission to commit and push, comment
-    # issues, and post new Pull Requests; remove the ones you do not need
-    permissions:
-      contents: write
-      pull-requests: write
-
-    steps:
-      # Git Checkout
-      - name: Checkout Code
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
-
-          fetch-depth: 0
-
-      # MegaLinter
-      - name: MegaLinter
-        uses: oxsecurity/megalinter/flavors/java@v8
-        id: ml
-
-        env:
-          VALIDATE_ALL_CODEBASE: true
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.mega-linter.yml b/.mega-linter.yml
deleted file mode 100644
index 00e43fe8..00000000
--- a/.mega-linter.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Configuration file for MegaLinter
-#
-# See all available variables at https://megalinter.io/latest/config-file/ and in
-# linters documentation
-
-# all, none, or list of linter keys
-APPLY_FIXES: none
-
-# If you use ENABLE variable, all other languages/formats/tooling-formats will
-# be disabled by default
-# ENABLE:
-
-# If you use ENABLE_LINTERS variable, all other linters will be disabled by
-# default
-ENABLE_LINTERS:
-  - YAML_PRETTIER
-  - MARKDOWN_MARKDOWNLINT
-  - KOTLIN_DETEKT
-
-DISABLE:
-  - COPYPASTE # Comment to enable checks of excessive copy-pastes
-  # - SPELL # Uncomment to disable checks of spelling mistakes
-
-SHOW_ELAPSED_TIME: true
-
-FILEIO_REPORTER: false
-
-KOTLIN_DETEKT_ARGUMENTS: -c config/detekt/detekt.yml -ex "**/build/**"
diff --git a/androidApp/src/main/kotlin/com/codandotv/streamplayerapp/presentation/CustomApplication.kt b/androidApp/src/main/kotlin/com/codandotv/streamplayerapp/presentation/CustomApplication.kt
index a5a52b6e..979e2608 100644
--- a/androidApp/src/main/kotlin/com/codandotv/streamplayerapp/presentation/CustomApplication.kt
+++ b/androidApp/src/main/kotlin/com/codandotv/streamplayerapp/presentation/CustomApplication.kt
@@ -2,8 +2,8 @@ package com.codandotv.streamplayerapp.presentation
 
 import android.app.Application
 import com.codandotv.streamplayerapp.core.shared.ui.R
-import com.codandotv.streamplayerapp.core_background_work.worker.WorkScheduler
-import com.codandotv.streamplayerapp.di.streamPlayerApplication
+import com.codandotv.streamplayerapp.core.background.work.WorkScheduler
+import com.codandotv.streamplayerapp.composeApp.presentation.di.streamPlayerApplication
 import com.mmk.kmpnotifier.notification.NotifierManager
 import com.mmk.kmpnotifier.notification.configuration.NotificationPlatformConfiguration
 import org.koin.android.ext.koin.androidContext
diff --git a/androidApp/src/main/kotlin/com/codandotv/streamplayerapp/presentation/MainActivity.kt b/androidApp/src/main/kotlin/com/codandotv/streamplayerapp/presentation/MainActivity.kt
index 8ceb3041..9b9adcfe 100644
--- a/androidApp/src/main/kotlin/com/codandotv/streamplayerapp/presentation/MainActivity.kt
+++ b/androidApp/src/main/kotlin/com/codandotv/streamplayerapp/presentation/MainActivity.kt
@@ -3,7 +3,7 @@ package com.codandotv.streamplayerapp.presentation
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import com.codandotv.streamplayerapp.StreamPlayerApp
+import com.codandotv.streamplayerapp.composeApp.StreamPlayerApp
 import com.google.firebase.Firebase
 import com.google.firebase.initialize
 import com.mmk.kmpnotifier.permission.permissionUtil
diff --git a/build-logic/src/main/java/com.streamplayer.detekt.gradle.kts b/build-logic/src/main/java/com.streamplayer.detekt.gradle.kts
index d66df7fb..f2bdd79d 100644
--- a/build-logic/src/main/java/com.streamplayer.detekt.gradle.kts
+++ b/build-logic/src/main/java/com.streamplayer.detekt.gradle.kts
@@ -1,16 +1,24 @@
+import org.gradle.accessors.dm.LibrariesForLibs
+
 plugins {
     id("io.gitlab.arturbosch.detekt")
 }
 
+val libs = the<LibrariesForLibs>()
+
 detekt {
     config.setFrom(file(project.rootDir.path.plus("/config/detekt/detekt.yml")))
     buildUponDefaultConfig = true
 
     source.from(
-        "src/main/java",
-        "src/test/java",
-        "src/main/kotlin",
-        "src/test/kotlin"
+        files(
+            "src/commonMain/kotlin",
+            "src/androidMain/kotlin",
+            "src/iosMain/kotlin"
+        )
     )
 
+    dependencies {
+        detektPlugins(libs.detekt.formatting)
+    }
 }
diff --git a/composeApp/src/androidMain/kotlin/com.codandotv.streamplayerapp/presentation/components/LottieComponentPlatform.android.kt b/composeApp/src/androidMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/components/LottieComponentPlatform.android.kt
similarity index 92%
rename from composeApp/src/androidMain/kotlin/com.codandotv.streamplayerapp/presentation/components/LottieComponentPlatform.android.kt
rename to composeApp/src/androidMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/components/LottieComponentPlatform.android.kt
index d7a7f74f..b82f1946 100644
--- a/composeApp/src/androidMain/kotlin/com.codandotv.streamplayerapp/presentation/components/LottieComponentPlatform.android.kt
+++ b/composeApp/src/androidMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/components/LottieComponentPlatform.android.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.presentation.components
+package com.codandotv.streamplayerapp.composeApp.presentation.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
diff --git a/composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/StreamPlayerApp.kt b/composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/StreamPlayerApp.kt
similarity index 58%
rename from composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/StreamPlayerApp.kt
rename to composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/StreamPlayerApp.kt
index 98362c68..481f30cb 100644
--- a/composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/StreamPlayerApp.kt
+++ b/composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/StreamPlayerApp.kt
@@ -1,9 +1,9 @@
-package com.codandotv.streamplayerapp
+package com.codandotv.streamplayerapp.composeApp
 
 import androidx.compose.runtime.Composable
 import androidx.navigation.compose.rememberNavController
-import com.codandotv.streamplayerapp.core_shared_ui.theme.StreamPlayerTheme
-import com.codandotv.streamplayerapp.navigation.NavigationGraph
+import com.codandotv.streamplayerapp.composeApp.presentation.navigation.NavigationGraph
+import com.codandotv.streamplayerapp.core.shared.ui.theme.StreamPlayerTheme
 
 @Composable
 fun StreamPlayerApp() {
diff --git a/composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/SyncBridge.kt b/composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/SyncBridge.kt
similarity index 61%
rename from composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/SyncBridge.kt
rename to composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/SyncBridge.kt
index 0d3a785c..76cf247c 100644
--- a/composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/SyncBridge.kt
+++ b/composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/SyncBridge.kt
@@ -1,16 +1,14 @@
-package com.codandotv.streamplayerapp
+package com.codandotv.streamplayerapp.composeApp.presentation
 
-import com.codandotv.streamplayerapp.core_background_work.SyncManager
+import com.codandotv.streamplayerapp.core.background.work.SyncManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.koin.core.context.startKoin
-import org.koin.dsl.module
-import org.koin.mp.KoinPlatform.getKoin
+import org.koin.mp.KoinPlatform
 
 object SyncBridge {
     suspend fun syncData() {
-        getKoin().get<SyncManager>().syncData()
+        KoinPlatform.getKoin().get<SyncManager>().syncData()
     }
 
     fun syncData(completionHandler: () -> Unit) {
diff --git a/composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/presentation/components/LottieComponentPlatform.kt b/composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/components/LottieComponentPlatform.kt
similarity index 74%
rename from composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/presentation/components/LottieComponentPlatform.kt
rename to composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/components/LottieComponentPlatform.kt
index 68a7f4f7..03f770c9 100644
--- a/composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/presentation/components/LottieComponentPlatform.kt
+++ b/composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/components/LottieComponentPlatform.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.presentation.components
+package com.codandotv.streamplayerapp.composeApp.presentation.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
diff --git a/composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/di/AppModule.kt b/composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/di/AppModule.kt
similarity index 62%
rename from composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/di/AppModule.kt
rename to composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/di/AppModule.kt
index c10fa4a8..49ceb258 100644
--- a/composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/di/AppModule.kt
+++ b/composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/di/AppModule.kt
@@ -1,14 +1,13 @@
-package com.codandotv.streamplayerapp.di
+package com.codandotv.streamplayerapp.composeApp.presentation.di
 
-import com.codandotv.streamplayerapp.core_background_work.di.SyncModule
-import com.codandotv.streamplayerapp.core_local_storage.di.LocalStorageModule
-import com.codandotv.streamplayerapp.core_networking.di.NetworkModule
-import com.codandotv.streamplayerapp.core_shared.qualifier.QualifierDispatcherIO
-import com.codandotv.streamplayerapp.feature_list_streams.list.di.ListStreamModule
-import com.codandotv.streamplayerapp.feature_news.di.NewsScreenModule
-import com.codandotv.streamplayerapp.feature_search.di.SearchModule
-import com.codandotv.streamplayerapp.feature_search.presentation.widgets.StreamsError
-import com.codandotv.streamplayerapp.profile.di.ProfilePickerStreamModule
+import com.codandotv.streamplayerapp.core.background.work.di.SyncModule
+import com.codandotv.streamplayerapp.core.local.storage.di.LocalStorageModule
+import com.codandotv.streamplayerapp.core.networking.di.NetworkModule
+import com.codandotv.streamplayerapp.core.shared.qualifier.QualifierDispatcherIO
+import com.codandotv.streamplayerapp.feature.liststreams.list.di.ListStreamModule
+import com.codandotv.streamplayerapp.feature.news.di.NewsScreenModule
+import com.codandotv.streamplayerapp.feature.profile.di.ProfilePickerStreamModule
+import com.codandotv.streamplayerapp.feature.search.di.SearchModule
 import io.kotzilla.generated.monitoring
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
@@ -48,4 +47,3 @@ fun streamPlayerApplication(platformBlock: KoinApplication.() -> Unit): KoinAppl
         }
     }
 }
-
diff --git a/composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/navigation/NavigationGraph.kt b/composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/navigation/NavigationGraph.kt
similarity index 74%
rename from composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/navigation/NavigationGraph.kt
rename to composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/navigation/NavigationGraph.kt
index fa8f6656..6daa769d 100644
--- a/composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/navigation/NavigationGraph.kt
+++ b/composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/navigation/NavigationGraph.kt
@@ -1,4 +1,6 @@
-package com.codandotv.streamplayerapp.navigation
+@file:Suppress("MagicNumber")
+
+package com.codandotv.streamplayerapp.composeApp.presentation.navigation
 
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
@@ -14,15 +16,14 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import com.codandotv.streamplayerapp.core_navigation.bottomnavigation.StreamPlayerBottomNavigation
-import com.codandotv.streamplayerapp.core_navigation.routes.BottomNavRoutes
-import com.codandotv.streamplayerapp.core_navigation.routes.Routes
-import com.codandotv.streamplayerapp.feature_list_streams.list.presentation.navigation.listStreamsNavGraph
-import com.codandotv.streamplayerapp.profile.presentation.navigation.profilePickerStreamNavGraph
-import com.codandotv.streamplayerapp.presentation.navigation.splashNavGraph
-import com.codandotv.streamplayerapp.feature_detail.presentation.navigation.detailStreamNavGraph
-import com.codandotv.streamplayerapp.feature_news.presentation.navigation.newsStreamNavGraph
-import com.codandotv.streamplayerapp.feature_search.presentation.navigation.searchStreamsNavGraph
+import com.codandotv.streamplayerapp.core.navigation.bottomnavigation.StreamPlayerBottomNavigation
+import com.codandotv.streamplayerapp.core.navigation.routes.BottomNavRoutes
+import com.codandotv.streamplayerapp.core.navigation.routes.Routes
+import com.codandotv.streamplayerapp.feature.detail.presentation.navigation.detailStreamNavGraph
+import com.codandotv.streamplayerapp.feature.liststreams.list.presentation.navigation.listStreamsNavGraph
+import com.codandotv.streamplayerapp.feature.news.presentation.navigation.newsStreamNavGraph
+import com.codandotv.streamplayerapp.feature.profile.presentation.navigation.profilePickerStreamNavGraph
+import com.codandotv.streamplayerapp.feature.search.presentation.navigation.searchStreamsNavGraph
 
 @Composable
 fun NavigationGraph(navController: NavHostController) {
diff --git a/composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/presentation/navigation/SplashNavigation.kt b/composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/navigation/SplashNavigation.kt
similarity index 67%
rename from composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/presentation/navigation/SplashNavigation.kt
rename to composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/navigation/SplashNavigation.kt
index 1813487a..694b104c 100644
--- a/composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/presentation/navigation/SplashNavigation.kt
+++ b/composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/navigation/SplashNavigation.kt
@@ -1,11 +1,11 @@
-package com.codandotv.streamplayerapp.presentation.navigation
+package com.codandotv.streamplayerapp.composeApp.presentation.navigation
 
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
-import com.codandotv.streamplayerapp.core_navigation.routes.BottomNavRoutes
-import com.codandotv.streamplayerapp.core_navigation.routes.Routes
-import com.codandotv.streamplayerapp.presentation.screens.SplashScreen
+import com.codandotv.streamplayerapp.composeApp.presentation.screens.SplashScreen
+import com.codandotv.streamplayerapp.core.navigation.routes.BottomNavRoutes
+import com.codandotv.streamplayerapp.core.navigation.routes.Routes
 
 fun NavGraphBuilder.splashNavGraph(navController: NavHostController) {
     composable(Routes.Splash) {
diff --git a/composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/presentation/screens/SplashScreen.kt b/composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/screens/SplashScreen.kt
similarity index 91%
rename from composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/presentation/screens/SplashScreen.kt
rename to composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/screens/SplashScreen.kt
index ab8cc565..0d7a2f8d 100644
--- a/composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/presentation/screens/SplashScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/screens/SplashScreen.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.presentation.screens
+package com.codandotv.streamplayerapp.composeApp.presentation.screens
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -15,7 +15,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import com.codandotv.streamplayerapp.presentation.components.LottieComponent
+import com.codandotv.streamplayerapp.composeApp.presentation.components.LottieComponent
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import streamplayerapp_kmp.composeapp.generated.resources.Res
 
diff --git a/composeApp/src/iosMain/kotlin/com.codandotv.streamplayerapp/MainViewController.kt b/composeApp/src/iosMain/kotlin/com/codandotv/streamplayerapp/composeApp/MainViewController.kt
similarity index 77%
rename from composeApp/src/iosMain/kotlin/com.codandotv.streamplayerapp/MainViewController.kt
rename to composeApp/src/iosMain/kotlin/com/codandotv/streamplayerapp/composeApp/MainViewController.kt
index 36d92613..2497b3d6 100644
--- a/composeApp/src/iosMain/kotlin/com.codandotv.streamplayerapp/MainViewController.kt
+++ b/composeApp/src/iosMain/kotlin/com/codandotv/streamplayerapp/composeApp/MainViewController.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp
+package com.codandotv.streamplayerapp.composeApp
 
 import androidx.compose.ui.window.ComposeUIViewController
 
diff --git a/composeApp/src/iosMain/kotlin/com.codandotv.streamplayerapp/presentation/components/LottieComponentPlatform.ios.kt b/composeApp/src/iosMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/components/LottieComponentPlatform.ios.kt
similarity index 75%
rename from composeApp/src/iosMain/kotlin/com.codandotv.streamplayerapp/presentation/components/LottieComponentPlatform.ios.kt
rename to composeApp/src/iosMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/components/LottieComponentPlatform.ios.kt
index 3d95d39c..ce4627f6 100644
--- a/composeApp/src/iosMain/kotlin/com.codandotv.streamplayerapp/presentation/components/LottieComponentPlatform.ios.kt
+++ b/composeApp/src/iosMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/components/LottieComponentPlatform.ios.kt
@@ -1,11 +1,10 @@
-package com.codandotv.streamplayerapp.presentation.components
+package com.codandotv.streamplayerapp.composeApp.presentation.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.viewinterop.UIKitView
 import org.koin.mp.KoinPlatform
 import platform.UIKit.UIColor
-import platform.UIKit.UIView
 
 @Composable
 actual fun LottieComponent(
@@ -18,7 +17,7 @@ actual fun LottieComponent(
     UIKitView(
         modifier = modifier,
         factory = {
-            val view = provider.provideLottieView(jsonString,onAnimationFinished)
+            val view = provider.provideLottieView(jsonString, onAnimationFinished)
             view.backgroundColor = UIColor.blackColor()
             view
         }
diff --git a/composeApp/src/iosMain/kotlin/com.codandotv.streamplayerapp/presentation/components/LottieViewProvider.kt b/composeApp/src/iosMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/components/LottieViewProvider.kt
similarity index 55%
rename from composeApp/src/iosMain/kotlin/com.codandotv.streamplayerapp/presentation/components/LottieViewProvider.kt
rename to composeApp/src/iosMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/components/LottieViewProvider.kt
index c2d0ea37..a71b989f 100644
--- a/composeApp/src/iosMain/kotlin/com.codandotv.streamplayerapp/presentation/components/LottieViewProvider.kt
+++ b/composeApp/src/iosMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/components/LottieViewProvider.kt
@@ -1,7 +1,7 @@
-package com.codandotv.streamplayerapp.presentation.components
+package com.codandotv.streamplayerapp.composeApp.presentation.components
 
 import platform.UIKit.UIView
 
 interface LottieViewProvider {
-    fun provideLottieView(lottieAnimationJson: String, onAnimationFinish : () -> Unit) : UIView
+    fun provideLottieView(lottieAnimationJson: String, onAnimationFinish: () -> Unit): UIView
 }
diff --git a/composeApp/src/iosMain/kotlin/com.codandotv.streamplayerapp/di/KoinIosHelper.kt b/composeApp/src/iosMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/di/KoinIosHelper.kt
similarity index 69%
rename from composeApp/src/iosMain/kotlin/com.codandotv.streamplayerapp/di/KoinIosHelper.kt
rename to composeApp/src/iosMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/di/KoinIosHelper.kt
index c2de4634..f44d4d8f 100644
--- a/composeApp/src/iosMain/kotlin/com.codandotv.streamplayerapp/di/KoinIosHelper.kt
+++ b/composeApp/src/iosMain/kotlin/com/codandotv/streamplayerapp/composeApp/presentation/di/KoinIosHelper.kt
@@ -1,6 +1,6 @@
-package com.codandotv.streamplayerapp.di
+package com.codandotv.streamplayerapp.composeApp.presentation.di
 
-import com.codandotv.streamplayerapp.presentation.components.LottieViewProvider
+import com.codandotv.streamplayerapp.composeApp.presentation.components.LottieViewProvider
 import org.koin.dsl.module
 
 class KoinIosHelper {
diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
index b13209da..1c9ccdbd 100644
--- a/config/detekt/detekt.yml
+++ b/config/detekt/detekt.yml
@@ -402,6 +402,11 @@ naming:
   ClassNaming:
     active: true
     classPattern: "[A-Z][a-zA-Z0-9]*"
+  ConstructorParameterNaming:
+    active: true
+    parameterPattern: "[a-z][A-Za-z0-9]*"
+    privateParameterPattern: "[a-z][A-Za-z0-9]*"
+    excludeClassPattern: "$^"
   EnumNaming:
     active: true
     enumEntryPattern: "[A-Z][_a-zA-Z0-9]*"
@@ -435,10 +440,15 @@ naming:
     parameterPattern: "[a-z][A-Za-z0-9]*"
     excludeClassPattern: "$^"
   InvalidPackageDeclaration:
-    active: false
+    active: true
+    rootPackage: ""
+    requireRootInDeclaration: false
   LambdaParameterNaming:
     active: false
     parameterPattern: "[a-z][A-Za-z0-9]*|_"
+  MatchingDeclarationName:
+    active: true
+    mustBeFirst: true
   MemberNameEqualsClassName:
     active: true
     ignoreOverridden: true
@@ -452,7 +462,8 @@ naming:
     propertyPattern: "[A-Za-z][_A-Za-z0-9]*"
     privatePropertyPattern: "(_)?[A-Za-z][_A-Za-z0-9]*"
   PackageNaming:
-    active: false
+    active: true
+    packagePattern: '[a-z]+(\.[a-z][A-Za-z0-9]*)*'
   TopLevelPropertyNaming:
     active: true
     constantPattern: "[A-Z][_A-Z0-9]*"
@@ -738,7 +749,34 @@ style:
     active: true
     maxJumpCount: 1
   MagicNumber:
-    active: false
+    active: true
+    excludes:
+      [
+        "**/test/**",
+        "**/androidTest/**",
+        "**/commonTest/**",
+        "**/jvmTest/**",
+        "**/androidUnitTest/**",
+        "**/androidInstrumentedTest/**",
+        "**/jsTest/**",
+        "**/iosTest/**",
+        "**/*.kts",
+      ]
+    ignoreNumbers:
+      - "-1"
+      - "0"
+      - "1"
+      - "2"
+    ignoreHashCodeFunction: true
+    ignorePropertyDeclaration: false
+    ignoreLocalVariableDeclaration: false
+    ignoreConstantDeclaration: true
+    ignoreCompanionObjectPropertyDeclaration: true
+    ignoreAnnotation: false
+    ignoreNamedArgument: true
+    ignoreEnums: false
+    ignoreRanges: false
+    ignoreExtensionFunctions: true
   MandatoryBracesLoops:
     active: false
   MaxChainedCallsOnSameLine:
@@ -844,7 +882,7 @@ style:
   UntilInsteadOfRangeTo:
     active: false
   UnusedImports:
-    active: false
+    active: true
   UnusedParameter:
     active: true
     allowedNames: "ignored|expected"
@@ -897,3 +935,9 @@ style:
     active: true
     excludeImports:
       - "java.util.*"
+
+formatting:
+  TrailingCommaOnCallSite:
+    active: false
+  TrailingCommaOnDeclarationSite:
+    active: false
\ No newline at end of file
diff --git a/core-background-work/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_background_work/worker/SyncWorker.kt b/core-background-work/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/background/work/SyncWorker.kt
similarity index 80%
rename from core-background-work/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_background_work/worker/SyncWorker.kt
rename to core-background-work/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/background/work/SyncWorker.kt
index 298d5a11..488ed90e 100644
--- a/core-background-work/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_background_work/worker/SyncWorker.kt
+++ b/core-background-work/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/background/work/SyncWorker.kt
@@ -1,9 +1,8 @@
-package com.codandotv.streamplayerapp.core_background_work.worker
+package com.codandotv.streamplayerapp.core.background.work
 
 import android.content.Context
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
-import com.codandotv.streamplayerapp.core_background_work.SyncManager
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
diff --git a/core-background-work/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_background_work/worker/WorkScheduler.kt b/core-background-work/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/background/work/WorkScheduler.kt
similarity index 79%
rename from core-background-work/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_background_work/worker/WorkScheduler.kt
rename to core-background-work/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/background/work/WorkScheduler.kt
index 22bb8e72..3377b4a6 100644
--- a/core-background-work/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_background_work/worker/WorkScheduler.kt
+++ b/core-background-work/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/background/work/WorkScheduler.kt
@@ -1,4 +1,6 @@
-package com.codandotv.streamplayerapp.core_background_work.worker
+@file:Suppress("MagicNumber")
+
+package com.codandotv.streamplayerapp.core.background.work
 
 import android.content.Context
 import androidx.work.ExistingPeriodicWorkPolicy
@@ -9,7 +11,8 @@ import java.util.concurrent.TimeUnit
 object WorkScheduler {
     fun scheduleSync(context: Context) {
         val workRequest = PeriodicWorkRequestBuilder<SyncWorker>(
-            15, TimeUnit.MINUTES
+            15,
+            TimeUnit.MINUTES
         ).build()
 
         WorkManager.getInstance(context).enqueueUniquePeriodicWork(
diff --git a/core-background-work/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_background_work/NotifierHelper.kt b/core-background-work/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/background/work/NotifierHelper.kt
similarity index 93%
rename from core-background-work/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_background_work/NotifierHelper.kt
rename to core-background-work/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/background/work/NotifierHelper.kt
index ae487888..bb9cf3d8 100644
--- a/core-background-work/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_background_work/NotifierHelper.kt
+++ b/core-background-work/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/background/work/NotifierHelper.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_background_work
+package com.codandotv.streamplayerapp.core.background.work
 
 import com.mmk.kmpnotifier.notification.NotificationImage
 import com.mmk.kmpnotifier.notification.Notifier
diff --git a/core-background-work/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_background_work/SyncManager.kt b/core-background-work/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/background/work/SyncManager.kt
similarity index 73%
rename from core-background-work/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_background_work/SyncManager.kt
rename to core-background-work/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/background/work/SyncManager.kt
index 83fea714..65c7c1b7 100644
--- a/core-background-work/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_background_work/SyncManager.kt
+++ b/core-background-work/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/background/work/SyncManager.kt
@@ -1,7 +1,9 @@
-package com.codandotv.streamplayerapp.core_background_work
+@file:Suppress("MagicNumber")
 
-import com.codandotv.streamplayerapp.feature_list_streams.list.data.ListStreamRepository
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.Stream
+package com.codandotv.streamplayerapp.core.background.work
+
+import com.codandotv.streamplayerapp.feature.liststreams.list.data.ListStreamRepository
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.Stream
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.first
 
@@ -9,7 +11,6 @@ class SyncManager(
     private val repository: ListStreamRepository
 ) {
     suspend fun syncData() {
-
         val title: Stream = repository.topRatedStream().first()
         val messageTitle = "${title.name} -Já disponível no app!"
         val messageBody = "Confira a sinopse: ${title.description}"
diff --git a/core-background-work/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_background_work/di/SyncModule.kt b/core-background-work/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/background/work/di/SyncModule.kt
similarity index 54%
rename from core-background-work/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_background_work/di/SyncModule.kt
rename to core-background-work/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/background/work/di/SyncModule.kt
index 2acae685..d5531135 100644
--- a/core-background-work/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_background_work/di/SyncModule.kt
+++ b/core-background-work/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/background/work/di/SyncModule.kt
@@ -1,6 +1,6 @@
-package com.codandotv.streamplayerapp.core_background_work.di
+package com.codandotv.streamplayerapp.core.background.work.di
 
-import com.codandotv.streamplayerapp.core_background_work.SyncManager
+import com.codandotv.streamplayerapp.core.background.work.SyncManager
 import org.koin.dsl.module
 
 object SyncModule {
diff --git a/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/SharedImage.kt b/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/SharedImage.kt
similarity index 69%
rename from core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/SharedImage.kt
rename to core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/SharedImage.kt
index 0f994b17..cab00e46 100644
--- a/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/SharedImage.kt
+++ b/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/SharedImage.kt
@@ -1,4 +1,6 @@
-package com.codandotv.streamplayerapp.core_camera_gallery
+@file:Suppress("MagicNumber")
+
+package com.codandotv.streamplayerapp.core.camera.gallery
 
 import android.graphics.Bitmap
 import androidx.compose.ui.graphics.ImageBitmap
@@ -9,7 +11,11 @@ actual class SharedImage(private val bitmap: Bitmap?) {
     actual fun toByteArray(): ByteArray? {
         return bitmap?.let {
             val stream = ByteArrayOutputStream()
-            it.compress(Bitmap.CompressFormat.PNG, 100, stream)
+            it.compress(
+                Bitmap.CompressFormat.PNG,
+                100,
+                stream
+            )
             stream.toByteArray()
         }
     }
diff --git a/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/camera/CameraExtensions.kt b/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/camera/CameraExtensions.kt
similarity index 89%
rename from core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/camera/CameraExtensions.kt
rename to core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/camera/CameraExtensions.kt
index a7704f89..e627d4fb 100644
--- a/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/camera/CameraExtensions.kt
+++ b/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/camera/CameraExtensions.kt
@@ -1,4 +1,6 @@
-package com.codandotv.streamplayerapp.core_camera_gallery.camera
+@file:Suppress("MagicNumber", "ImportOrdering")
+
+package com.codandotv.streamplayerapp.core.camera.gallery.camera
 
 import android.content.ContentResolver
 import android.graphics.Bitmap
@@ -9,9 +11,8 @@ import android.media.ExifInterface
 import android.net.Uri
 import java.io.InputStream
 
-
 internal fun Uri.getBitmapFromUri(contentResolver: ContentResolver): Bitmap? {
-    return kotlin.runCatching {
+    return runCatching {
         val inputStreamForBitmap = contentResolver.openInputStream(this)
         val bitmap = inputStreamForBitmap?.use {
             BitmapFactory.decodeStream(it)
@@ -28,7 +29,7 @@ internal fun Uri.getBitmapFromUri(contentResolver: ContentResolver): Bitmap? {
 
 internal fun Bitmap.rotateImageIfRequired(inputStream: InputStream?): Bitmap {
     if (inputStream == null) return this
-    return kotlin.runCatching {
+    return runCatching {
         val exif = ExifInterface(inputStream)
         val orientation = exif.getAttributeInt(
             ExifInterface.TAG_ORIENTATION,
diff --git a/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/camera/CameraManager.android.kt b/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/camera/CameraManager.android.kt
similarity index 88%
rename from core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/camera/CameraManager.android.kt
rename to core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/camera/CameraManager.android.kt
index 9f642570..7f215caf 100644
--- a/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/camera/CameraManager.android.kt
+++ b/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/camera/CameraManager.android.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_camera_gallery.camera
+package com.codandotv.streamplayerapp.core.camera.gallery.camera
 
 import android.content.ContentResolver
 import android.net.Uri
@@ -10,7 +10,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
-import com.codandotv.streamplayerapp.core_camera_gallery.SharedImage
+import com.codandotv.streamplayerapp.core.camera.gallery.SharedImage
 
 @Composable
 actual fun rememberCameraManager(onResult: (SharedImage?) -> Unit): CameraManager {
@@ -22,7 +22,7 @@ actual fun rememberCameraManager(onResult: (SharedImage?) -> Unit): CameraManage
         onResult = { success ->
             if (success) {
                 onResult.invoke(SharedImage(tempPhotoUri.getBitmapFromUri(contentResolver)))
-            }else{
+            } else {
                 onResult.invoke(null)
             }
         }
@@ -33,7 +33,7 @@ actual fun rememberCameraManager(onResult: (SharedImage?) -> Unit): CameraManage
                 ComposeFileProvider.getImageUri(context)?.let {
                     tempPhotoUri = it
                     cameraLauncher.launch(tempPhotoUri)
-                }?: run { onResult.invoke(null) }
+                } ?: run { onResult.invoke(null) }
             }
         )
     }
diff --git a/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/camera/ComposeFileProvider.kt b/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/camera/ComposeFileProvider.kt
similarity index 75%
rename from core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/camera/ComposeFileProvider.kt
rename to core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/camera/ComposeFileProvider.kt
index 248a9acc..8dfe3e25 100644
--- a/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/camera/ComposeFileProvider.kt
+++ b/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/camera/ComposeFileProvider.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_camera_gallery.camera
+package com.codandotv.streamplayerapp.core.camera.gallery.camera
 
 import android.content.Context
 import android.net.Uri
@@ -11,9 +11,11 @@ class ComposeFileProvider : FileProvider(
     R.xml.path_provider
 ) {
     companion object {
-        fun getImageUri(context: Context): Uri? = kotlin.runCatching {
+        fun getImageUri(context: Context): Uri? = runCatching {
             val tempFile = File.createTempFile(
-                "picture_${System.currentTimeMillis()}", ".png", context.cacheDir
+                "picture_${System.currentTimeMillis()}",
+                ".png",
+                context.cacheDir
             ).apply {
                 createNewFile()
             }
diff --git a/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/gallery/GalleryManager.android.kt b/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/gallery/GalleryManager.android.kt
similarity index 87%
rename from core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/gallery/GalleryManager.android.kt
rename to core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/gallery/GalleryManager.android.kt
index 3e4fdd67..f7dd365d 100644
--- a/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/gallery/GalleryManager.android.kt
+++ b/core-camera-gallery/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/gallery/GalleryManager.android.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_camera_gallery.gallery
+package com.codandotv.streamplayerapp.core.camera.gallery.gallery
 
 import android.content.ContentResolver
 import androidx.activity.compose.rememberLauncherForActivityResult
@@ -7,8 +7,8 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
-import com.codandotv.streamplayerapp.core_camera_gallery.SharedImage
-import com.codandotv.streamplayerapp.core_camera_gallery.camera.getBitmapFromUri
+import com.codandotv.streamplayerapp.core.camera.gallery.SharedImage
+import com.codandotv.streamplayerapp.core.camera.gallery.camera.getBitmapFromUri
 
 @Composable
 actual fun rememberGalleryManager(onImageSelected: (SharedImage?) -> Unit): GalleryManager {
diff --git a/core-camera-gallery/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/SharedImage.kt b/core-camera-gallery/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/SharedImage.kt
similarity index 72%
rename from core-camera-gallery/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/SharedImage.kt
rename to core-camera-gallery/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/SharedImage.kt
index 465b27e1..b19b7b12 100644
--- a/core-camera-gallery/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/SharedImage.kt
+++ b/core-camera-gallery/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/SharedImage.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_camera_gallery
+package com.codandotv.streamplayerapp.core.camera.gallery
 
 import androidx.compose.ui.graphics.ImageBitmap
 
diff --git a/core-camera-gallery/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/camera/CameraManager.kt b/core-camera-gallery/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/camera/CameraManager.kt
similarity index 63%
rename from core-camera-gallery/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/camera/CameraManager.kt
rename to core-camera-gallery/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/camera/CameraManager.kt
index d144844e..f5164522 100644
--- a/core-camera-gallery/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/camera/CameraManager.kt
+++ b/core-camera-gallery/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/camera/CameraManager.kt
@@ -1,12 +1,11 @@
-package com.codandotv.streamplayerapp.core_camera_gallery.camera
+package com.codandotv.streamplayerapp.core.camera.gallery.camera
 
 import androidx.compose.runtime.Composable
-import com.codandotv.streamplayerapp.core_camera_gallery.SharedImage
+import com.codandotv.streamplayerapp.core.camera.gallery.SharedImage
 
 @Composable
 expect fun rememberCameraManager(onResult: (SharedImage?) -> Unit): CameraManager
 
-
 expect class CameraManager(
     onLaunch: () -> Unit
 ) {
diff --git a/core-camera-gallery/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/gallery/GalleryManager.kt b/core-camera-gallery/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/gallery/GalleryManager.kt
similarity index 64%
rename from core-camera-gallery/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/gallery/GalleryManager.kt
rename to core-camera-gallery/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/gallery/GalleryManager.kt
index 5d0f1a71..14b57d19 100644
--- a/core-camera-gallery/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/gallery/GalleryManager.kt
+++ b/core-camera-gallery/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/gallery/GalleryManager.kt
@@ -1,12 +1,13 @@
-package com.codandotv.streamplayerapp.core_camera_gallery.gallery
+package com.codandotv.streamplayerapp.core.camera.gallery.gallery
 
 import androidx.compose.runtime.Composable
-import com.codandotv.streamplayerapp.core_camera_gallery.SharedImage
+import com.codandotv.streamplayerapp.core.camera.gallery.SharedImage
 
 expect class GalleryManager(
     onLaunch: () -> Unit
 ) {
     fun launch()
 }
+
 @Composable
 expect fun rememberGalleryManager(onImageSelected: (SharedImage?) -> Unit): GalleryManager
diff --git a/core-camera-gallery/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/SharedImage.kt b/core-camera-gallery/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/SharedImage.kt
similarity index 95%
rename from core-camera-gallery/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/SharedImage.kt
rename to core-camera-gallery/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/SharedImage.kt
index 25769ff4..ef25b74d 100644
--- a/core-camera-gallery/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/SharedImage.kt
+++ b/core-camera-gallery/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/SharedImage.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_camera_gallery
+package com.codandotv.streamplayerapp.core.camera.gallery
 
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.toComposeImageBitmap
@@ -26,7 +26,6 @@ actual class SharedImage(private val image: UIImage?) {
         } else {
             null
         }
-
     }
 
     actual fun toImageBitmap(): ImageBitmap? {
diff --git a/core-camera-gallery/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/camera/CameraManager.ios.kt b/core-camera-gallery/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/camera/CameraManager.ios.kt
similarity index 83%
rename from core-camera-gallery/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/camera/CameraManager.ios.kt
rename to core-camera-gallery/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/camera/CameraManager.ios.kt
index f00423e6..a2f9b412 100644
--- a/core-camera-gallery/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/camera/CameraManager.ios.kt
+++ b/core-camera-gallery/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/camera/CameraManager.ios.kt
@@ -1,8 +1,8 @@
-package com.codandotv.streamplayerapp.core_camera_gallery.camera
+package com.codandotv.streamplayerapp.core.camera.gallery.camera
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import com.codandotv.streamplayerapp.core_camera_gallery.SharedImage
+import com.codandotv.streamplayerapp.core.camera.gallery.SharedImage
 import platform.UIKit.UIApplication
 import platform.UIKit.UIImage
 import platform.UIKit.UIImagePickerController
@@ -18,10 +18,13 @@ import platform.darwin.NSObject
 actual fun rememberCameraManager(onResult: (SharedImage?) -> Unit): CameraManager {
     val imagePicker = UIImagePickerController()
     val cameraDelegate = remember {
-        object : NSObject(), UIImagePickerControllerDelegateProtocol,
+        object :
+            NSObject(),
+            UIImagePickerControllerDelegateProtocol,
             UINavigationControllerDelegateProtocol {
             override fun imagePickerController(
-                picker: UIImagePickerController, didFinishPickingMediaWithInfo: Map<Any?, *>
+                picker: UIImagePickerController,
+                didFinishPickingMediaWithInfo: Map<Any?, *>
             ) {
                 val image =
                     didFinishPickingMediaWithInfo.getValue(UIImagePickerControllerEditedImage) as? UIImage
@@ -42,7 +45,9 @@ actual fun rememberCameraManager(onResult: (SharedImage?) -> Unit): CameraManage
             )
             imagePicker.setDelegate(cameraDelegate)
             UIApplication.sharedApplication.keyWindow?.rootViewController?.presentViewController(
-                imagePicker, true, null
+                imagePicker,
+                true,
+                null
             )
         }
     }
diff --git a/core-camera-gallery/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/gallery/GalleryManager.ios.kt b/core-camera-gallery/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/gallery/GalleryManager.ios.kt
similarity index 81%
rename from core-camera-gallery/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/gallery/GalleryManager.ios.kt
rename to core-camera-gallery/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/gallery/GalleryManager.ios.kt
index 125a9007..b489a612 100644
--- a/core-camera-gallery/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_camera_gallery/gallery/GalleryManager.ios.kt
+++ b/core-camera-gallery/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/camera/gallery/gallery/GalleryManager.ios.kt
@@ -1,8 +1,8 @@
-package com.codandotv.streamplayerapp.core_camera_gallery.gallery
+package com.codandotv.streamplayerapp.core.camera.gallery.gallery
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import com.codandotv.streamplayerapp.core_camera_gallery.SharedImage
+import com.codandotv.streamplayerapp.core.camera.gallery.SharedImage
 import platform.UIKit.UIApplication
 import platform.UIKit.UIImage
 import platform.UIKit.UIImagePickerController
@@ -17,10 +17,13 @@ import platform.darwin.NSObject
 actual fun rememberGalleryManager(onImageSelected: (SharedImage?) -> Unit): GalleryManager {
     val imagePicker = UIImagePickerController()
     val galleryDelegate = remember {
-        object : NSObject(), UIImagePickerControllerDelegateProtocol,
+        object :
+            NSObject(),
+            UIImagePickerControllerDelegateProtocol,
             UINavigationControllerDelegateProtocol {
             override fun imagePickerController(
-                picker: UIImagePickerController, didFinishPickingMediaWithInfo: Map<Any?, *>
+                picker: UIImagePickerController,
+                didFinishPickingMediaWithInfo: Map<Any?, *>
             ) {
                 val image = didFinishPickingMediaWithInfo.getValue(
                     UIImagePickerControllerEditedImage
@@ -39,7 +42,9 @@ actual fun rememberGalleryManager(onImageSelected: (SharedImage?) -> Unit): Gall
             imagePicker.setAllowsEditing(true)
             imagePicker.setDelegate(galleryDelegate)
             UIApplication.sharedApplication.keyWindow?.rootViewController?.presentViewController(
-                imagePicker, true, null
+                imagePicker,
+                true,
+                null
             )
         }
     }
diff --git a/core-local-storage/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/data/database/AppDatabasePlatform.android.kt b/core-local-storage/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/local/storage/data/database/AppDatabasePlatform.android.kt
similarity index 79%
rename from core-local-storage/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/data/database/AppDatabasePlatform.android.kt
rename to core-local-storage/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/local/storage/data/database/AppDatabasePlatform.android.kt
index ca347ace..e108800d 100644
--- a/core-local-storage/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/data/database/AppDatabasePlatform.android.kt
+++ b/core-local-storage/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/local/storage/data/database/AppDatabasePlatform.android.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_local_storage.data.database
+package com.codandotv.streamplayerapp.core.local.storage.data.database
 
 import androidx.room.Room
 import org.koin.mp.KoinPlatform
diff --git a/core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/data/dao/FavoriteDao.kt b/core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/local/storage/data/dao/FavoriteDao.kt
similarity index 78%
rename from core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/data/dao/FavoriteDao.kt
rename to core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/local/storage/data/dao/FavoriteDao.kt
index f2a759de..6cba7f9a 100644
--- a/core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/data/dao/FavoriteDao.kt
+++ b/core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/local/storage/data/dao/FavoriteDao.kt
@@ -1,10 +1,10 @@
-package com.codandotv.streamplayerapp.core_local_storage.data.dao
+package com.codandotv.streamplayerapp.core.local.storage.data.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.codandotv.streamplayerapp.core_local_storage.domain.model.MovieEntity
+import com.codandotv.streamplayerapp.core.local.storage.domain.model.MovieEntity
 
 @Dao
 interface FavoriteDao {
diff --git a/core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/data/database/AppDatabasePlatform.kt b/core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/local/storage/data/database/AppDatabasePlatform.kt
similarity index 78%
rename from core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/data/database/AppDatabasePlatform.kt
rename to core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/local/storage/data/database/AppDatabasePlatform.kt
index 58ea6b4d..fda90db0 100644
--- a/core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/data/database/AppDatabasePlatform.kt
+++ b/core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/local/storage/data/database/AppDatabasePlatform.kt
@@ -1,11 +1,11 @@
-package com.codandotv.streamplayerapp.core_local_storage.data.database
+package com.codandotv.streamplayerapp.core.local.storage.data.database
 
 import androidx.room.ConstructedBy
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.RoomDatabaseConstructor
-import com.codandotv.streamplayerapp.core_local_storage.data.dao.FavoriteDao
-import com.codandotv.streamplayerapp.core_local_storage.domain.model.MovieEntity
+import com.codandotv.streamplayerapp.core.local.storage.data.dao.FavoriteDao
+import com.codandotv.streamplayerapp.core.local.storage.domain.model.MovieEntity
 
 @Database(entities = [MovieEntity::class], version = 1, exportSchema = false)
 @ConstructedBy(AppDatabaseConstructor::class)
diff --git a/core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/di/LocalStorageModule.kt b/core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/local/storage/di/LocalStorageModule.kt
similarity index 54%
rename from core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/di/LocalStorageModule.kt
rename to core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/local/storage/di/LocalStorageModule.kt
index d836b517..95f5507f 100644
--- a/core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/di/LocalStorageModule.kt
+++ b/core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/local/storage/di/LocalStorageModule.kt
@@ -1,7 +1,7 @@
-package com.codandotv.streamplayerapp.core_local_storage.di
+package com.codandotv.streamplayerapp.core.local.storage.di
 
-import com.codandotv.streamplayerapp.core_local_storage.data.database.AppDatabase
-import com.codandotv.streamplayerapp.core_local_storage.data.database.databaseInstance
+import com.codandotv.streamplayerapp.core.local.storage.data.database.AppDatabase
+import com.codandotv.streamplayerapp.core.local.storage.data.database.databaseInstance
 import org.koin.dsl.module
 
 object LocalStorageModule {
diff --git a/core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/domain/model/MovieEntity.kt b/core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/local/storage/domain/model/MovieEntity.kt
similarity index 86%
rename from core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/domain/model/MovieEntity.kt
rename to core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/local/storage/domain/model/MovieEntity.kt
index c81bb34e..27f3f58f 100644
--- a/core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/domain/model/MovieEntity.kt
+++ b/core-local-storage/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/local/storage/domain/model/MovieEntity.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_local_storage.domain.model
+package com.codandotv.streamplayerapp.core.local.storage.domain.model
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
diff --git a/core-local-storage/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/data/database/AppDatabasePlatform.ios.kt b/core-local-storage/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/local/storage/data/database/AppDatabasePlatform.ios.kt
similarity index 90%
rename from core-local-storage/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/data/database/AppDatabasePlatform.ios.kt
rename to core-local-storage/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/local/storage/data/database/AppDatabasePlatform.ios.kt
index 442e6682..bb652f01 100644
--- a/core-local-storage/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/data/database/AppDatabasePlatform.ios.kt
+++ b/core-local-storage/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/local/storage/data/database/AppDatabasePlatform.ios.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_local_storage.data.database
+package com.codandotv.streamplayerapp.core.local.storage.data.database
 
 import androidx.room.Room
 import androidx.room.util.findDatabaseConstructorAndInitDatabaseImpl
@@ -24,7 +24,7 @@ private fun documentDirectory(): String {
 }
 
 actual fun databaseInstance(): AppDatabase {
-    val dbFile = "${documentDirectory()}/$DB_FILE_NAME"
+    val dbFile = "${documentDirectory()}/${DB_FILE_NAME}"
     return Room.databaseBuilder<AppDatabase>(
         name = dbFile,
         factory = { findDatabaseConstructorAndInitDatabaseImpl(AppDatabase::class) }
@@ -32,4 +32,3 @@ actual fun databaseInstance(): AppDatabase {
         .setQueryCoroutineContext(Dispatchers.IO)
         .build()
 }
-
diff --git a/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/BottomNavItem.kt b/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/navigation/bottomnavigation/BottomNavItem.kt
similarity index 94%
rename from core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/BottomNavItem.kt
rename to core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/navigation/bottomnavigation/BottomNavItem.kt
index 752441dd..20568340 100644
--- a/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/BottomNavItem.kt
+++ b/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/navigation/bottomnavigation/BottomNavItem.kt
@@ -1,6 +1,6 @@
-package com.codandotv.streamplayerapp.core_navigation.bottomnavigation
+package com.codandotv.streamplayerapp.core.navigation.bottomnavigation
 
-import com.codandotv.streamplayerapp.core_navigation.routes.BottomNavRoutes
+import com.codandotv.streamplayerapp.core.navigation.routes.BottomNavRoutes
 import org.jetbrains.compose.resources.DrawableResource
 import org.jetbrains.compose.resources.StringResource
 import streamplayerapp_kmp.core_navigation.generated.resources.Res
diff --git a/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/StreamPlayerBottomNavigation.kt b/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/navigation/bottomnavigation/StreamPlayerBottomNavigation.kt
similarity index 90%
rename from core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/StreamPlayerBottomNavigation.kt
rename to core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/navigation/bottomnavigation/StreamPlayerBottomNavigation.kt
index 8bf88b86..9ba80bce 100644
--- a/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/StreamPlayerBottomNavigation.kt
+++ b/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/navigation/bottomnavigation/StreamPlayerBottomNavigation.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_navigation.bottomnavigation
+package com.codandotv.streamplayerapp.core.navigation.bottomnavigation
 
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LocalAbsoluteTonalElevation
@@ -10,7 +10,7 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavController
-import com.codandotv.streamplayerapp.core_navigation.helper.currentRoute
+import com.codandotv.streamplayerapp.core.navigation.helper.currentRoute
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
 
@@ -48,7 +48,10 @@ fun StreamPlayerBottomNavigation(navController: NavController) {
                     )
                 },
                 selected = currentRoute == item.screenRoute,
-                onClick = { onItemClicked(navController, item) })
+                onClick = {
+                    onItemClicked(navController, item)
+                }
+            )
         }
     }
 }
@@ -71,7 +74,8 @@ private fun NavItemIcon(
 }
 
 private fun onItemClicked(
-    navController: NavController, item: BottomNavItem
+    navController: NavController,
+    item: BottomNavItem
 ) {
     navController.navigate(item.screenRoute) {
         navController.graph.startDestinationRoute?.let { screen_route ->
diff --git a/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/extensions/NavControllerExtension.kt b/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/navigation/extensions/NavControllerExtension.kt
similarity index 58%
rename from core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/extensions/NavControllerExtension.kt
rename to core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/navigation/extensions/NavControllerExtension.kt
index ca315735..aa2c20f3 100644
--- a/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/extensions/NavControllerExtension.kt
+++ b/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/navigation/extensions/NavControllerExtension.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_navigation.extensions
+package com.codandotv.streamplayerapp.core.navigation.extensions
 
 import androidx.navigation.NavController
 
diff --git a/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/helper/NavigationHelper.kt b/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/navigation/helper/NavigationHelper.kt
similarity index 86%
rename from core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/helper/NavigationHelper.kt
rename to core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/navigation/helper/NavigationHelper.kt
index 105d79c8..568980d2 100644
--- a/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/helper/NavigationHelper.kt
+++ b/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/navigation/helper/NavigationHelper.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_navigation.helper
+package com.codandotv.streamplayerapp.core.navigation.helper
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
diff --git a/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/routes/BottomNavRoutes.kt b/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/navigation/routes/BottomNavRoutes.kt
similarity index 72%
rename from core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/routes/BottomNavRoutes.kt
rename to core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/navigation/routes/BottomNavRoutes.kt
index e1ba66d5..61853910 100644
--- a/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/routes/BottomNavRoutes.kt
+++ b/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/navigation/routes/BottomNavRoutes.kt
@@ -1,6 +1,6 @@
-package com.codandotv.streamplayerapp.core_navigation.routes
+package com.codandotv.streamplayerapp.core.navigation.routes
 
-import com.codandotv.streamplayerapp.core_navigation.routes.BottomNavRoutes.PARAM.PROFILE_ID
+import com.codandotv.streamplayerapp.core.navigation.routes.BottomNavRoutes.PARAM.PROFILE_ID
 
 object BottomNavRoutes {
     const val HOME = "bottomHome"
diff --git a/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/routes/Routes.kt b/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/navigation/routes/Routes.kt
similarity index 57%
rename from core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/routes/Routes.kt
rename to core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/navigation/routes/Routes.kt
index 552cfc46..f4c09074 100644
--- a/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/routes/Routes.kt
+++ b/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/navigation/routes/Routes.kt
@@ -1,10 +1,10 @@
-package com.codandotv.streamplayerapp.core_navigation.routes
+package com.codandotv.streamplayerapp.core.navigation.routes
 
-import com.codandotv.streamplayerapp.core_navigation.routes.Routes.PARAM.ID
+import com.codandotv.streamplayerapp.core.navigation.routes.Routes.PARAM.ID
 
 object Routes {
     const val DETAIL = "DetailList/"
-    const val DETAIL_COMPLETE = "$DETAIL{${ID}}"
+    const val DETAIL_COMPLETE = "$DETAIL{$ID}"
     const val Splash = "splash"
     const val SEARCH = "Search"
     const val PROFILE_PICKER = "profilePicker"
diff --git a/core-networking/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_networking/HttpClientEngineProviderPlatform.android.kt b/core-networking/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/networking/HttpClientEngineProviderPlatform.android.kt
similarity index 50%
rename from core-networking/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_networking/HttpClientEngineProviderPlatform.android.kt
rename to core-networking/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/networking/HttpClientEngineProviderPlatform.android.kt
index 3adf371a..5fa8b7e2 100644
--- a/core-networking/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_networking/HttpClientEngineProviderPlatform.android.kt
+++ b/core-networking/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/networking/HttpClientEngineProviderPlatform.android.kt
@@ -1,7 +1,7 @@
-package com.codandotv.streamplayerapp.core_networking
+package com.codandotv.streamplayerapp.core.networking
 
 import io.ktor.client.engine.HttpClientEngine
 import io.ktor.client.engine.okhttp.OkHttpConfig
 import io.ktor.client.engine.okhttp.OkHttpEngine
 
-actual fun httpClientEnginePlatform() : HttpClientEngine = OkHttpEngine(OkHttpConfig())
+actual fun httpClientEnginePlatform(): HttpClientEngine = OkHttpEngine(OkHttpConfig())
diff --git a/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/HttpClientBuilder.kt b/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/HttpClientBuilder.kt
similarity index 81%
rename from core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/HttpClientBuilder.kt
rename to core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/HttpClientBuilder.kt
index c3dd4fe0..c51f2a6d 100644
--- a/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/HttpClientBuilder.kt
+++ b/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/HttpClientBuilder.kt
@@ -1,7 +1,7 @@
-package com.codandotv.streamplayerapp.core_networking
+package com.codandotv.streamplayerapp.core.networking
 
-import com.codandotv.streamplayerapp.core_networking.di.Network.TIMEOUT
-import com.codandotv.streamplayerapp.core_networking.handleError.Failure
+import com.codandotv.streamplayerapp.core.networking.di.Network
+import com.codandotv.streamplayerapp.core.networking.handleError.Failure
 import core.networking.BuildKonfig
 import io.ktor.client.HttpClient
 import io.ktor.client.plugins.ClientRequestException
@@ -24,21 +24,23 @@ import kotlinx.serialization.SerializationException
 import kotlinx.serialization.json.Json
 
 internal object HttpClientBuilder {
-    fun build(baseUrl: String) : HttpClient {
+    fun build(baseUrl: String): HttpClient {
         return HttpClient(engine = httpClientEnginePlatform()) {
             expectSuccess = false
 
             install(ContentNegotiation) {
-                json(Json {
-                    explicitNulls = false
-                    ignoreUnknownKeys = true
-                })
+                json(
+                    Json {
+                        explicitNulls = false
+                        ignoreUnknownKeys = true
+                    }
+                )
             }
 
             install(HttpTimeout) {
-                socketTimeoutMillis = TIMEOUT
-                requestTimeoutMillis = TIMEOUT
-                connectTimeoutMillis = TIMEOUT
+                socketTimeoutMillis = Network.TIMEOUT
+                requestTimeoutMillis = Network.TIMEOUT
+                connectTimeoutMillis = Network.TIMEOUT
             }
 
             defaultRequest {
@@ -62,7 +64,7 @@ internal object HttpClientBuilder {
                 level = LogLevel.ALL
                 logger = object : Logger {
                     override fun log(message: String) {
-                        println("HttpClient${message}")
+                        println("HttpClient$message")
                     }
                 }
             }
diff --git a/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/HttpClientEngineProviderPlatform.kt b/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/HttpClientEngineProviderPlatform.kt
similarity index 65%
rename from core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/HttpClientEngineProviderPlatform.kt
rename to core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/HttpClientEngineProviderPlatform.kt
index 4096cb84..e5205f8a 100644
--- a/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/HttpClientEngineProviderPlatform.kt
+++ b/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/HttpClientEngineProviderPlatform.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_networking
+package com.codandotv.streamplayerapp.core.networking
 
 import io.ktor.client.engine.HttpClientEngine
 
diff --git a/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/di/NetworkModule.kt b/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/di/NetworkModule.kt
similarity index 78%
rename from core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/di/NetworkModule.kt
rename to core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/di/NetworkModule.kt
index 82334c45..25d73f29 100644
--- a/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/di/NetworkModule.kt
+++ b/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/di/NetworkModule.kt
@@ -1,6 +1,6 @@
-package com.codandotv.streamplayerapp.core_networking.di
+package com.codandotv.streamplayerapp.core.networking.di
 
-import com.codandotv.streamplayerapp.core_networking.HttpClientBuilder
+import com.codandotv.streamplayerapp.core.networking.HttpClientBuilder
 import core.networking.BuildKonfig
 import io.ktor.client.HttpClient
 import org.koin.core.annotation.Module
@@ -11,7 +11,7 @@ import org.koin.core.annotation.Single
 class NetworkModule {
 
     @Single
-    fun provideHttpClient() : HttpClient {
+    fun provideHttpClient(): HttpClient {
         return HttpClientBuilder.build(
             baseUrl = BuildKonfig.HOST,
         )
diff --git a/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/di/QualifierNetworking.kt b/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/di/QualifierProfileHttpClient.kt
similarity index 79%
rename from core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/di/QualifierNetworking.kt
rename to core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/di/QualifierProfileHttpClient.kt
index fe2a9482..9e767f36 100644
--- a/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/di/QualifierNetworking.kt
+++ b/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/di/QualifierProfileHttpClient.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_networking.di
+package com.codandotv.streamplayerapp.core.networking.di
 
 import org.koin.core.qualifier.Qualifier
 import org.koin.core.qualifier.QualifierValue
diff --git a/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/Failure.kt b/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/handleError/Failure.kt
similarity index 54%
rename from core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/Failure.kt
rename to core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/handleError/Failure.kt
index 183c6568..023e0ff2 100644
--- a/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/Failure.kt
+++ b/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/handleError/Failure.kt
@@ -1,6 +1,6 @@
-package com.codandotv.streamplayerapp.core_networking.handleError
+package com.codandotv.streamplayerapp.core.networking.handleError
 
-import com.codandotv.streamplayerapp.core_networking.resources.StringNetworking
+import com.codandotv.streamplayerapp.core.networking.resources.StringNetworking
 import kotlinx.serialization.Serializable
 import org.koin.core.component.KoinComponent
 
@@ -12,7 +12,6 @@ import org.koin.core.component.KoinComponent
     "TooGenericExceptionCaught",
     "MagicNumber"
 )
-
 @Serializable
 sealed class Failure(
     val code: Int? = -1,
@@ -26,38 +25,49 @@ sealed class Failure(
         Failure(codeStatus, errorMessageResKey = StringNetworking.msgServerErrorKey())
 
     data class GenericError(
-        val codeStatus: Int? = -12, private val msg: String? = StringNetworking.msgNetworkErrorKey()
+        val codeStatus: Int? = -12,
+        private val msg: String? = StringNetworking.msgNetworkErrorKey()
     ) : Failure(
         codeStatus
     )
 
     data class NetworkError(
-        val codeStatus: Int? = -13, private val throwable: Throwable
+        val codeStatus: Int? = -13,
+        private val throwable: Throwable
     ) : Failure(
-        codeStatus, errorMessageResKey = StringNetworking.msgNetworkErrorKey()
+        codeStatus,
+        errorMessageResKey = StringNetworking.msgNetworkErrorKey()
     )
 
     data class UnknownError(
-        val codeStatus: Int? = null, private val throwable: Throwable? = Exception()
+        val codeStatus: Int? = null,
+        private val throwable: Throwable? = Exception()
     ) : Failure(
-        codeStatus, throwable?.message
+        codeStatus,
+        throwable?.message
     )
 
     data class UnexpectedApiException(
-        val codeStatus: Int? = -14, private val throwable: Throwable? = Exception()
+        val codeStatus: Int? = -14,
+        private val throwable: Throwable? = Exception()
     ) : Failure(
-        codeStatus, throwable?.message
+        codeStatus,
+        throwable?.message
     )
 
     data class ClientException(
-        val codeStatus: Int? = -15, private val throwable: Throwable? = Exception()
+        val codeStatus: Int? = -15,
+        private val throwable: Throwable? = Exception()
     ) : Failure(
-        codeStatus, throwable?.message
+        codeStatus,
+        throwable?.message
     )
 
     data class UnparsableResponseException(
-        val codeStatus: Int? = -16, private val throwable: Throwable? = Exception()
+        val codeStatus: Int? = -16,
+        private val throwable: Throwable? = Exception()
     ) : Failure(
-        codeStatus, throwable?.message
+        codeStatus,
+        throwable?.message
     )
 }
diff --git a/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/HttpClientConfigExtensions.kt b/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/handleError/HttpClientConfigExtensions.kt
similarity index 87%
rename from core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/HttpClientConfigExtensions.kt
rename to core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/handleError/HttpClientConfigExtensions.kt
index ab9b83f4..8955ac2f 100644
--- a/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/HttpClientConfigExtensions.kt
+++ b/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/handleError/HttpClientConfigExtensions.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_networking.handleError
+package com.codandotv.streamplayerapp.core.networking.handleError
 
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
diff --git a/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/NetworkResponse.kt b/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/handleError/NetworkResponse.kt
similarity index 94%
rename from core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/NetworkResponse.kt
rename to core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/handleError/NetworkResponse.kt
index 51378aab..1876a9fb 100644
--- a/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/NetworkResponse.kt
+++ b/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/handleError/NetworkResponse.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_networking.handleError
+package com.codandotv.streamplayerapp.core.networking.handleError
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
diff --git a/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/ResultExtensions.kt b/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/handleError/ResultExtensions.kt
similarity index 53%
rename from core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/ResultExtensions.kt
rename to core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/handleError/ResultExtensions.kt
index eb58e23a..8c9bf218 100644
--- a/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/ResultExtensions.kt
+++ b/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/handleError/ResultExtensions.kt
@@ -1,21 +1,22 @@
-package com.codandotv.streamplayerapp.core_networking.handleError
+package com.codandotv.streamplayerapp.core.networking.handleError
 
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.catch
 
 inline fun <T> Result<T>.onError(action: (exception: Failure) -> Unit): Result<T> {
-    if(isFailure && exceptionOrNull() is Failure){
+    if (isFailure && exceptionOrNull() is Failure) {
         val error = exceptionOrNull() as Failure
         action(error)
     }
     return this
 }
 
-fun <T> Flow<T>.catchFailure(action: suspend kotlinx.coroutines.flow.FlowCollector<T>.(Failure) -> Unit): Flow<T> =
+fun <T> Flow<T>.catchFailure(action: suspend FlowCollector<T>.(Failure) -> Unit): Flow<T> =
     catch {
-        if(it is Failure){
+        if (it is Failure) {
             action(it)
-        }else{
+        } else {
             action(Failure.GenericError())
         }
     }
diff --git a/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/resources/StringNetworking.kt b/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/resources/StringNetworking.kt
similarity index 95%
rename from core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/resources/StringNetworking.kt
rename to core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/resources/StringNetworking.kt
index 8c2341eb..3b92cfd5 100644
--- a/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_networking/resources/StringNetworking.kt
+++ b/core-networking/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/networking/resources/StringNetworking.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_networking.resources
+package com.codandotv.streamplayerapp.core.networking.resources
 
 import org.jetbrains.compose.resources.StringResource
 import streamplayerapp_kmp.core_networking.generated.resources.Res
diff --git a/core-networking/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_networking/HttpClientEngineProviderPlatform.ios.kt b/core-networking/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/networking/HttpClientEngineProviderPlatform.ios.kt
similarity index 76%
rename from core-networking/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_networking/HttpClientEngineProviderPlatform.ios.kt
rename to core-networking/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/networking/HttpClientEngineProviderPlatform.ios.kt
index 5ddce88d..f859cf84 100644
--- a/core-networking/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_networking/HttpClientEngineProviderPlatform.ios.kt
+++ b/core-networking/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/networking/HttpClientEngineProviderPlatform.ios.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_networking
+package com.codandotv.streamplayerapp.core.networking
 
 import io.ktor.client.engine.HttpClientEngine
 import io.ktor.client.engine.darwin.Darwin
diff --git a/core-permission/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_permission/permission/PermissionsFactotyPlatform.android.kt b/core-permission/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/permission/PermissionFactory.android.kt
similarity index 84%
rename from core-permission/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_permission/permission/PermissionsFactotyPlatform.android.kt
rename to core-permission/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/permission/PermissionFactory.android.kt
index dde61887..7304d5ce 100644
--- a/core-permission/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_permission/permission/PermissionsFactotyPlatform.android.kt
+++ b/core-permission/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/permission/PermissionFactory.android.kt
@@ -1,4 +1,6 @@
-package com.codandotv.streamplayerapp.core_permission.permission
+@file:Suppress("MatchingDeclarationName")
+
+package com.codandotv.streamplayerapp.core.permission
 
 import android.content.Context
 import dev.icerock.moko.permissions.PermissionsController
diff --git a/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_permission/permission/PermissionDeniedDialog.kt b/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/permission/PermissionDeniedDialog.kt
similarity index 97%
rename from core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_permission/permission/PermissionDeniedDialog.kt
rename to core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/permission/PermissionDeniedDialog.kt
index 9663b959..7ce507e0 100644
--- a/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_permission/permission/PermissionDeniedDialog.kt
+++ b/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/permission/PermissionDeniedDialog.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_permission.permission
+package com.codandotv.streamplayerapp.core.permission
 
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.ButtonDefaults.textButtonColors
diff --git a/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/permission/PermissionFactory.kt b/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/permission/PermissionFactory.kt
new file mode 100644
index 00000000..75be66a7
--- /dev/null
+++ b/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/permission/PermissionFactory.kt
@@ -0,0 +1,7 @@
+package com.codandotv.streamplayerapp.core.permission
+
+import dev.icerock.moko.permissions.compose.PermissionsControllerFactory
+
+internal expect class PermissionFactory() {
+    fun getPermissionFactory(): PermissionsControllerFactory
+}
diff --git a/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_permission/permission/PermissionsManager.kt b/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/permission/PermissionsManager.kt
similarity index 84%
rename from core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_permission/permission/PermissionsManager.kt
rename to core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/permission/PermissionsManager.kt
index 4ef63b60..2c1d2a7a 100644
--- a/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_permission/permission/PermissionsManager.kt
+++ b/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/permission/PermissionsManager.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_permission.permission
+package com.codandotv.streamplayerapp.core.permission
 
 import dev.icerock.moko.permissions.DeniedAlwaysException
 import dev.icerock.moko.permissions.DeniedException
@@ -20,16 +20,18 @@ enum class PermissionStatus {
     DENIED_ALWAYS
 }
 
-interface PermissionsManager{
+interface PermissionsManager {
     suspend fun request(
         vararg permissions: AppPermission,
-        blockDenied : () -> Unit,
-        blockDeniedAlways : () -> Unit,
-        blockSuccess : (Map<AppPermission, PermissionStatus>) -> Unit
+        blockDenied: () -> Unit,
+        blockDeniedAlways: () -> Unit,
+        blockSuccess: (Map<AppPermission, PermissionStatus>) -> Unit
     )
+
     fun openSettings()
     val controller: PermissionsController
 }
+
 class PermissionsManagerImpl(
     override val controller: PermissionsController
 ) : PermissionsManager {
@@ -42,15 +44,16 @@ class PermissionsManagerImpl(
         PermissionState.Granted -> PermissionStatus.GRANTED
         PermissionState.NotGranted,
         PermissionState.Denied -> PermissionStatus.DENIED
+
         PermissionState.DeniedAlways -> PermissionStatus.DENIED_ALWAYS
         PermissionState.NotDetermined -> PermissionStatus.NOT_DETERMINED
     }
 
     override suspend fun request(
         vararg permissions: AppPermission,
-        blockDenied : () -> Unit,
-        blockDeniedAlways : () -> Unit,
-        blockSuccess : (Map<AppPermission, PermissionStatus>) -> Unit
+        blockDenied: () -> Unit,
+        blockDeniedAlways: () -> Unit,
+        blockSuccess: (Map<AppPermission, PermissionStatus>) -> Unit
     ) {
         runCatching {
             permissions.forEach {
diff --git a/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/permission/di/PermissionsModule.kt b/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/permission/di/PermissionsModule.kt
new file mode 100644
index 00000000..713ed84f
--- /dev/null
+++ b/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/permission/di/PermissionsModule.kt
@@ -0,0 +1,17 @@
+
+import com.codandotv.streamplayerapp.core.permission.PermissionFactory
+import com.codandotv.streamplayerapp.core.permission.PermissionsManager
+import com.codandotv.streamplayerapp.core.permission.PermissionsManagerImpl
+import org.koin.dsl.lazyModule
+
+object PermissionsModule {
+    val module = lazyModule {
+        single<PermissionsManager> {
+            PermissionsManagerImpl(
+                controller = PermissionFactory()
+                    .getPermissionFactory()
+                    .createPermissionsController()
+            )
+        }
+    }
+}
diff --git a/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_permission/di/PermissionsModule.kt b/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_permission/di/PermissionsModule.kt
deleted file mode 100644
index 281c3461..00000000
--- a/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_permission/di/PermissionsModule.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-
-import com.codandotv.streamplayerapp.core_permission.permission.PermissionsManager
-import org.koin.dsl.lazyModule
-
-object PermissionsModule {
-    val module = lazyModule {
-        single<PermissionsManager> {
-            com.codandotv.streamplayerapp.core_permission.permission.PermissionsManagerImpl(
-                controller = com.codandotv.streamplayerapp.core_permission.permission.PermissionFactory()
-                    .getPermissionFactory()
-                    .createPermissionsController()
-            )
-        }
-    }
-}
diff --git a/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_permission/permission/PermissionsFactotyPlatform.kt b/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_permission/permission/PermissionsFactotyPlatform.kt
deleted file mode 100644
index 079a2583..00000000
--- a/core-permission/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_permission/permission/PermissionsFactotyPlatform.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.codandotv.streamplayerapp.core_permission.permission
-
-import dev.icerock.moko.permissions.compose.PermissionsControllerFactory
-
-
-internal expect class PermissionFactory() {
-    fun getPermissionFactory() : PermissionsControllerFactory
-}
diff --git a/core-permission/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_permission/permission/PermissionsFactotyPlatform.ios.kt b/core-permission/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/permission/PermissionFactory.ios.kt
similarity index 75%
rename from core-permission/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_permission/permission/PermissionsFactotyPlatform.ios.kt
rename to core-permission/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/permission/PermissionFactory.ios.kt
index a1a24952..bc286867 100644
--- a/core-permission/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_permission/permission/PermissionsFactotyPlatform.ios.kt
+++ b/core-permission/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/permission/PermissionFactory.ios.kt
@@ -1,4 +1,6 @@
-package com.codandotv.streamplayerapp.core_permission.permission
+@file:Suppress("MatchingDeclarationName")
+
+package com.codandotv.streamplayerapp.core.permission
 
 import dev.icerock.moko.permissions.compose.PermissionsControllerFactory
 import dev.icerock.moko.permissions.ios.PermissionsController
@@ -7,5 +9,5 @@ internal actual class PermissionFactory {
     actual fun getPermissionFactory(): PermissionsControllerFactory =
         PermissionsControllerFactory {
             PermissionsController()
-    }
+        }
 }
diff --git a/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/extension/PackageExtension.kt b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/extension/PackageExtension.kt
similarity index 72%
rename from core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/extension/PackageExtension.kt
rename to core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/extension/PackageExtension.kt
index b2131aad..6c2f2c86 100644
--- a/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/extension/PackageExtension.kt
+++ b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/extension/PackageExtension.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_shared_ui.extension
+package com.codandotv.streamplayerapp.core.shared.ui.extension
 
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
@@ -8,5 +8,6 @@ fun PackageManager.getPackageInfoCompat(packageName: String, flags: Int = 0): Pa
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
         getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(flags.toLong()))
     } else {
-        @Suppress("DEPRECATION") getPackageInfo(packageName, flags)
+        @Suppress("DEPRECATION")
+        getPackageInfo(packageName, flags)
     }
diff --git a/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/theme/ThemePreviews.kt b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/theme/ThemePreviews.kt
similarity index 90%
rename from core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/theme/ThemePreviews.kt
rename to core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/theme/ThemePreviews.kt
index c25a6fdf..3a4f1365 100644
--- a/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/theme/ThemePreviews.kt
+++ b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/theme/ThemePreviews.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_shared_ui.theme
+package com.codandotv.streamplayerapp.core.shared.ui.theme
 
 import android.content.res.Configuration
 import androidx.compose.material3.Surface
diff --git a/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/utils/SharingPlatform.android.kt b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/utils/SharingPlatform.android.kt
similarity index 73%
rename from core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/utils/SharingPlatform.android.kt
rename to core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/utils/SharingPlatform.android.kt
index 265a6719..aadf064b 100644
--- a/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/utils/SharingPlatform.android.kt
+++ b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/utils/SharingPlatform.android.kt
@@ -1,8 +1,8 @@
-package com.codandotv.streamplayerapp.core_shared_ui.utils
+package com.codandotv.streamplayerapp.core.shared.ui.utils
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
-import com.codandotv.streamplayerapp.core_shared_ui.extension.getPackageInfoCompat
+import com.codandotv.streamplayerapp.core.shared.ui.extension.getPackageInfoCompat
 
 @Composable
 actual fun isPackageInstalled(packageName: String): Boolean {
diff --git a/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SharedHandlerPlatform.android.kt b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/SharedHandlerPlatform.android.kt
similarity index 90%
rename from core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SharedHandlerPlatform.android.kt
rename to core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/SharedHandlerPlatform.android.kt
index 8d7fcf9c..adc0e3f0 100644
--- a/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SharedHandlerPlatform.android.kt
+++ b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/SharedHandlerPlatform.android.kt
@@ -1,4 +1,6 @@
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+@file:Suppress("MatchingDeclarationName")
+
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -6,7 +8,6 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.widget.Toast
-import androidx.core.content.ContextCompat
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
@@ -36,7 +37,8 @@ actual class SharedHandlerPlatform : KoinComponent {
         runCatching {
             context.startActivity(intent)
         }.onFailure {
-            Toast.makeText(context, "Nenhum aplicativo de SMS encontrado.", Toast.LENGTH_SHORT).show()
+            Toast.makeText(context, "Nenhum aplicativo de SMS encontrado.", Toast.LENGTH_SHORT)
+                .show()
         }
     }
 
@@ -74,4 +76,5 @@ actual class SharedHandlerPlatform : KoinComponent {
     }
 }
 
-actual fun getSharedHandlerPlatform(): SharedHandlerPlatform = SharedHandlerPlatform()
+actual fun getSharedHandlerPlatform(): SharedHandlerPlatform =
+    SharedHandlerPlatform()
diff --git a/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamPlayerTopBarPreview.kt b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/StreamPlayerTopBarPreview.kt
similarity index 76%
rename from core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamPlayerTopBarPreview.kt
rename to core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/StreamPlayerTopBarPreview.kt
index 593f0b50..52a45f79 100644
--- a/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamPlayerTopBarPreview.kt
+++ b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/StreamPlayerTopBarPreview.kt
@@ -1,11 +1,11 @@
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
-import com.codandotv.streamplayerapp.core_shared_ui.theme.ThemePreview
-import com.codandotv.streamplayerapp.core_shared_ui.theme.ThemePreviews
+import com.codandotv.streamplayerapp.core.shared.ui.theme.ThemePreview
+import com.codandotv.streamplayerapp.core.shared.ui.theme.ThemePreviews
 
 @OptIn(ExperimentalMaterial3Api::class)
 @ThemePreviews
diff --git a/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCardPreview.kt b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/StreamsCardPreview.kt
similarity index 85%
rename from core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCardPreview.kt
rename to core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/StreamsCardPreview.kt
index 8d4841c8..682c422b 100644
--- a/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCardPreview.kt
+++ b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/StreamsCardPreview.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
diff --git a/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCarouselPreview.kt b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/StreamsCarouselPreview.kt
similarity index 85%
rename from core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCarouselPreview.kt
rename to core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/StreamsCarouselPreview.kt
index 3146f326..f90d889c 100644
--- a/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCarouselPreview.kt
+++ b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/StreamsCarouselPreview.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
diff --git a/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/YoutubePlayerComponent.android.kt b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/YoutubePlayerComponent.android.kt
similarity index 92%
rename from core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/YoutubePlayerComponent.android.kt
rename to core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/YoutubePlayerComponent.android.kt
index 6ea60aad..dde966e6 100644
--- a/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/YoutubePlayerComponent.android.kt
+++ b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/YoutubePlayerComponent.android.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 
 import android.annotation.SuppressLint
 import android.view.ViewGroup
@@ -10,7 +10,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.viewinterop.AndroidView
-import com.codandotv.streamplayerapp.core_shared_ui.resources.COLOR_BACKGROUND
+import com.codandotv.streamplayerapp.core.shared.ui.resources.COLOR_BACKGROUND
 
 @SuppressLint("SetJavaScriptEnabled")
 @Composable
diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/resources/Colors.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/resources/Colors.kt
similarity index 91%
rename from core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/resources/Colors.kt
rename to core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/resources/Colors.kt
index 82a86b72..043dd49e 100644
--- a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/resources/Colors.kt
+++ b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/resources/Colors.kt
@@ -1,4 +1,6 @@
-package com.codandotv.streamplayerapp.core_shared_ui.resources
+@file:Suppress("MagicNumber")
+
+package com.codandotv.streamplayerapp.core.shared.ui.resources
 
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/theme/StreamPlayerTheme.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/theme/StreamPlayerTheme.kt
similarity index 70%
rename from core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/theme/StreamPlayerTheme.kt
rename to core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/theme/StreamPlayerTheme.kt
index 194d0e39..5bd78dd3 100644
--- a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/theme/StreamPlayerTheme.kt
+++ b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/theme/StreamPlayerTheme.kt
@@ -1,18 +1,19 @@
-package com.codandotv.streamplayerapp.core_shared_ui.theme
+package com.codandotv.streamplayerapp.core.shared.ui.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import com.codandotv.streamplayerapp.core_shared_ui.resources.Colors
+import com.codandotv.streamplayerapp.core.shared.ui.resources.Colors
 
 @Composable
 fun StreamPlayerTheme(
     isDarkTheme: Boolean = isSystemInDarkTheme(),
     content: @Composable () -> Unit
 ) {
-
     MaterialTheme(
-        colorScheme = getColorScheme(isDarkTheme),
+        colorScheme = getColorScheme(
+            isDarkTheme
+        ),
         content = content,
     )
 }
diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/utils/Sharing.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/utils/Sharing.kt
similarity index 91%
rename from core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/utils/Sharing.kt
rename to core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/utils/Sharing.kt
index 2f1886fe..1a81ab38 100644
--- a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/utils/Sharing.kt
+++ b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/utils/Sharing.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_shared_ui.utils
+package com.codandotv.streamplayerapp.core.shared.ui.utils
 
 object Sharing {
     const val SHARING_DATA_TYPE_TEXT = "text/plain"
diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/utils/SharingPlatform.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/utils/SharingPlatform.kt
new file mode 100644
index 00000000..893708e9
--- /dev/null
+++ b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/utils/SharingPlatform.kt
@@ -0,0 +1,6 @@
+package com.codandotv.streamplayerapp.core.shared.ui.utils
+
+import androidx.compose.runtime.Composable
+
+@Composable
+expect fun isPackageInstalled(packageName: String): Boolean
diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/BasicToolbar.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/BasicToolbar.kt
similarity index 94%
rename from core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/BasicToolbar.kt
rename to core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/BasicToolbar.kt
index 70b083d2..51ce5eef 100644
--- a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/BasicToolbar.kt
+++ b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/BasicToolbar.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.statusBarsPadding
diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/CloseButton.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/CloseButton.kt
similarity index 91%
rename from core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/CloseButton.kt
rename to core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/CloseButton.kt
index 02993088..618f9e1b 100644
--- a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/CloseButton.kt
+++ b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/CloseButton.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/DefaultIcon.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/DefaultIcon.kt
similarity index 93%
rename from core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/DefaultIcon.kt
rename to core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/DefaultIcon.kt
index 8ec6b8d2..ac928d27 100644
--- a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/DefaultIcon.kt
+++ b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/DefaultIcon.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Search
diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/IconWithText.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/IconWithText.kt
similarity index 90%
rename from core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/IconWithText.kt
rename to core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/IconWithText.kt
index b7573f89..7879bed6 100644
--- a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/IconWithText.kt
+++ b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/IconWithText.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
@@ -26,10 +26,12 @@ fun IconWithText(
     textColor: Color,
     modifier: Modifier = Modifier
 ) {
-
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
-        modifier = modifier.clickable { onClick() } ) {
+        modifier = modifier.clickable {
+            onClick()
+        }
+    ) {
         Icon(
             imageVector = imageVector,
             contentDescription = null,
diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/MicButton.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/MicButton.kt
similarity index 91%
rename from core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/MicButton.kt
rename to core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/MicButton.kt
index ae9f19e6..3d55a6e3 100644
--- a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/MicButton.kt
+++ b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/MicButton.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SearchIcon.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/SearchIcon.kt
similarity index 91%
rename from core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SearchIcon.kt
rename to core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/SearchIcon.kt
index bbc9161a..86a9b2f1 100644
--- a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SearchIcon.kt
+++ b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/SearchIcon.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Search
diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SharedHandlerPlatform.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/SharedHandlerPlatform.kt
similarity index 58%
rename from core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SharedHandlerPlatform.kt
rename to core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/SharedHandlerPlatform.kt
index 6854b3ac..0ce548a7 100644
--- a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SharedHandlerPlatform.kt
+++ b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/SharedHandlerPlatform.kt
@@ -1,7 +1,6 @@
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 
-
-expect class SharedHandlerPlatform{
+expect class SharedHandlerPlatform {
     fun shareWhatsApp(title: String, url: String)
     fun shareSms(title: String, url: String)
     fun shareInstagram(url: String)
@@ -9,4 +8,4 @@ expect class SharedHandlerPlatform{
     fun shareMoreOptions(title: String, url: String)
 }
 
-expect fun getSharedHandlerPlatform() : SharedHandlerPlatform
+expect fun getSharedHandlerPlatform(): SharedHandlerPlatform
diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SharingStreamPlatform.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/SharingStreamPlatform.kt
similarity index 98%
rename from core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SharingStreamPlatform.kt
rename to core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/SharingStreamPlatform.kt
index 8244d152..96db8334 100644
--- a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SharingStreamPlatform.kt
+++ b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/SharingStreamPlatform.kt
@@ -1,5 +1,6 @@
 @file:Suppress("LongMethod")
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamPlayerTopBar.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/StreamPlayerTopBar.kt
similarity index 93%
rename from core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamPlayerTopBar.kt
rename to core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/StreamPlayerTopBar.kt
index 90e8a5b8..bc29940f 100644
--- a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamPlayerTopBar.kt
+++ b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/StreamPlayerTopBar.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -26,7 +26,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import com.codandotv.streamplayerapp.core_shared_ui.resources.Colors
+import com.codandotv.streamplayerapp.core.shared.ui.resources.Colors
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
 import streamplayerapp_kmp.core_shared_ui.generated.resources.Res
@@ -56,7 +56,10 @@ fun StreamPlayerTopBar(
             onNavigateSearchScreen = { onNavigateSearchScreen() },
             profilePicture = onSelectedProfilePicture
         )
-        StreamPlayerOptionsTopBar(modifier = Modifier.padding(top = 50.dp), scrollBehavior)
+        StreamPlayerOptionsTopBar(
+            modifier = Modifier.padding(top = 50.dp),
+            scrollBehavior
+        )
     }
 }
 
@@ -143,6 +146,7 @@ private fun StreamPlayerOptionsTopBar(modifier: Modifier, scrollBehavior: TopApp
                     color = Color.White
                 )
             }
-        }, colors = TopAppBarDefaults.topAppBarColors(containerColor = Color.Transparent)
+        },
+        colors = TopAppBarDefaults.topAppBarColors(containerColor = Color.Transparent)
     )
 }
diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCard.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/StreamsCard.kt
similarity index 95%
rename from core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCard.kt
rename to core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/StreamsCard.kt
index 6d2a6f0e..d16c4937 100644
--- a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCard.kt
+++ b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/StreamsCard.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCarousel.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/StreamsCarousel.kt
similarity index 97%
rename from core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCarousel.kt
rename to core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/StreamsCarousel.kt
index 1e6e1b76..2b60526a 100644
--- a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCarousel.kt
+++ b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/StreamsCarousel.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/WebImage.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/WebImage.kt
similarity index 96%
rename from core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/WebImage.kt
rename to core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/WebImage.kt
index 9a7134e9..fd613c84 100644
--- a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/WebImage.kt
+++ b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/WebImage.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.heightIn
diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/YoutubePlayerComponentPlatform.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/YoutubePlayerComponentPlatform.kt
similarity index 90%
rename from core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/YoutubePlayerComponentPlatform.kt
rename to core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/YoutubePlayerComponentPlatform.kt
index a23a9702..4f1dee6d 100644
--- a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/YoutubePlayerComponentPlatform.kt
+++ b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/YoutubePlayerComponentPlatform.kt
@@ -1,6 +1,6 @@
 @file:Suppress("EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE")
 
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -8,7 +8,6 @@ import androidx.compose.ui.Modifier
 @Composable
 expect fun YoutubePlayerComponentPlatform(videoId: String, modifier: Modifier = Modifier)
 
-
 internal fun String.videoIdToEmbedHTML(): String {
     return """
         <iframe width="100%" height="100%"
diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/utils/SharingPlatform.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/utils/SharingPlatform.kt
deleted file mode 100644
index fa31771b..00000000
--- a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/utils/SharingPlatform.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.codandotv.streamplayerapp.core_shared_ui.utils
-
-import androidx.compose.runtime.Composable
-
-
-@Composable
-expect fun isPackageInstalled(packageName: String) : Boolean
diff --git a/core-shared-ui/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/utils/SharingPlatform.ios.kt b/core-shared-ui/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/utils/SharingPlatform.ios.kt
similarity index 70%
rename from core-shared-ui/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/utils/SharingPlatform.ios.kt
rename to core-shared-ui/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/utils/SharingPlatform.ios.kt
index 750907a2..591a8a7b 100644
--- a/core-shared-ui/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/utils/SharingPlatform.ios.kt
+++ b/core-shared-ui/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/utils/SharingPlatform.ios.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_shared_ui.utils
+package com.codandotv.streamplayerapp.core.shared.ui.utils
 
 import androidx.compose.runtime.Composable
 
diff --git a/core-shared-ui/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SharedHandlerPlatform.ios.kt b/core-shared-ui/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/SharedHandlerPlatform.ios.kt
similarity index 95%
rename from core-shared-ui/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SharedHandlerPlatform.ios.kt
rename to core-shared-ui/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/SharedHandlerPlatform.ios.kt
index 7abde7c4..ab80292e 100644
--- a/core-shared-ui/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SharedHandlerPlatform.ios.kt
+++ b/core-shared-ui/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/SharedHandlerPlatform.ios.kt
@@ -1,4 +1,6 @@
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+@file:Suppress("MatchingDeclarationName")
+
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 import platform.Foundation.NSURL
 import platform.UIKit.UIAlertAction
 import platform.UIKit.UIAlertActionStyleDefault
diff --git a/core-shared-ui/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/YoutubePlayerComponentPlatform.ios.kt b/core-shared-ui/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/YoutubePlayerComponentPlatform.ios.kt
similarity index 93%
rename from core-shared-ui/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/YoutubePlayerComponentPlatform.ios.kt
rename to core-shared-ui/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/YoutubePlayerComponentPlatform.ios.kt
index 3d449ac3..9c49da3f 100644
--- a/core-shared-ui/src/iosMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/YoutubePlayerComponentPlatform.ios.kt
+++ b/core-shared-ui/src/iosMain/kotlin/com/codandotv/streamplayerapp/core/shared/ui/widget/YoutubePlayerComponentPlatform.ios.kt
@@ -1,6 +1,6 @@
 @file:Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE")
 
-package com.codandotv.streamplayerapp.core_shared_ui.widget
+package com.codandotv.streamplayerapp.core.shared.ui.widget
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
@@ -12,7 +12,7 @@ import platform.WebKit.WKWebViewConfiguration
 import platform.WebKit.WKWebsiteDataStore
 
 @Composable
-actual fun YoutubePlayerComponentPlatform(videoId: String, modifier: Modifier){
+actual fun YoutubePlayerComponentPlatform(videoId: String, modifier: Modifier) {
     val webView = remember {
         val embedHTML = videoId.videoIdToEmbedHTML()
         WKWebView().apply {
diff --git a/core-shared/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared/Url.kt b/core-shared/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/Url.kt
similarity index 81%
rename from core-shared/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared/Url.kt
rename to core-shared/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/Url.kt
index 8ea4c8e2..9c9ca120 100644
--- a/core-shared/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared/Url.kt
+++ b/core-shared/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/Url.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_shared
+package com.codandotv.streamplayerapp.core.shared
 
 object Url {
     const val IMAGE_URL_SIZE_200 = "https://image.tmdb.org/t/p/w200/"
diff --git a/core-shared/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared/qualifier/QualifierDispatcherIO.kt b/core-shared/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/qualifier/QualifierDispatcherIO.kt
similarity index 77%
rename from core-shared/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared/qualifier/QualifierDispatcherIO.kt
rename to core-shared/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/qualifier/QualifierDispatcherIO.kt
index 73eb989d..b9477d00 100644
--- a/core-shared/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared/qualifier/QualifierDispatcherIO.kt
+++ b/core-shared/src/commonMain/kotlin/com/codandotv/streamplayerapp/core/shared/qualifier/QualifierDispatcherIO.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.core_shared.qualifier
+package com.codandotv.streamplayerapp.core.shared.qualifier
 
 import org.koin.core.qualifier.Qualifier
 import org.koin.core.qualifier.QualifierValue
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/data/DetailStreamRepository.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/data/DetailStreamRepository.kt
similarity index 58%
rename from feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/data/DetailStreamRepository.kt
rename to feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/data/DetailStreamRepository.kt
index 8b6244da..a917f821 100644
--- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/data/DetailStreamRepository.kt
+++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/data/DetailStreamRepository.kt
@@ -1,12 +1,12 @@
-package com.codandotv.streamplayerapp.feature_detail.data
-
-import com.codandotv.streamplayerapp.core_local_storage.data.dao.FavoriteDao
-import com.codandotv.streamplayerapp.core_networking.handleError.toFlow
-import com.codandotv.streamplayerapp.feature_detail.domain.DetailStream
-import com.codandotv.streamplayerapp.feature_detail.domain.VideoStream
-import com.codandotv.streamplayerapp.feature_detail.domain.toDetailStream
-import com.codandotv.streamplayerapp.feature_detail.domain.toDetailStreamLocal
-import com.codandotv.streamplayerapp.feature_detail.domain.toVideoStreams
+package com.codandotv.streamplayerapp.feature.detail.data
+
+import com.codandotv.streamplayerapp.core.local.storage.data.dao.FavoriteDao
+import com.codandotv.streamplayerapp.core.networking.handleError.toFlow
+import com.codandotv.streamplayerapp.feature.detail.domain.DetailStream
+import com.codandotv.streamplayerapp.feature.detail.domain.VideoStream
+import com.codandotv.streamplayerapp.feature.detail.domain.toDetailStream
+import com.codandotv.streamplayerapp.feature.detail.domain.toDetailStreamLocal
+import com.codandotv.streamplayerapp.feature.detail.domain.toVideoStreams
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
@@ -14,7 +14,7 @@ interface DetailStreamRepository {
     suspend fun getMovie(): Flow<DetailStream>
     suspend fun deleteFromMyList(movie: String)
     suspend fun insertToMyList(movie: DetailStream)
-    suspend fun isFavorite(movieId:String) : Boolean
+    suspend fun isFavorite(movieId: String): Boolean
     suspend fun getVideoStreams(): Flow<List<VideoStream>>
 }
 
@@ -31,20 +31,21 @@ class DetailStreamRepositoryImpl(
                 it.toDetailStream(isFavorite(movieId))
             }
 
-
     override suspend fun deleteFromMyList(movie: String) = favoriteDao.delete(movie)
 
-    override suspend fun insertToMyList(movie: DetailStream) = favoriteDao.insert(movie.toDetailStreamLocal())
+    override suspend fun insertToMyList(movie: DetailStream) =
+        favoriteDao.insert(movie.toDetailStreamLocal())
 
     /**
      * Verify if movieId was saved as favorite
      * @param movieId
      * @return Boolean
      */
-    override suspend fun isFavorite(movieId: String) : Boolean = favoriteDao.fetchAll().any {
-        movie -> movie.id == movieId
-    }
-    
+    override suspend fun isFavorite(movieId: String): Boolean =
+        favoriteDao.fetchAll().any { movie ->
+            movie.id == movieId
+        }
+
     override suspend fun getVideoStreams(): Flow<List<VideoStream>> =
         service.getVideoStreams(movieId)
             .toFlow()
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/data/DetailStreamService.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/data/DetailStreamService.kt
similarity index 71%
rename from feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/data/DetailStreamService.kt
rename to feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/data/DetailStreamService.kt
index f4c69ba1..c1c73c9e 100644
--- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/data/DetailStreamService.kt
+++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/data/DetailStreamService.kt
@@ -1,9 +1,9 @@
-package com.codandotv.streamplayerapp.feature_detail.data
+package com.codandotv.streamplayerapp.feature.detail.data
 
-import com.codandotv.streamplayerapp.core_networking.handleError.NetworkResponse
-import com.codandotv.streamplayerapp.core_networking.handleError.safeRequest
-import com.codandotv.streamplayerapp.feature_detail.data.model.DetailStreamResponse
-import com.codandotv.streamplayerapp.feature_detail.data.model.VideoStreamsResponse
+import com.codandotv.streamplayerapp.core.networking.handleError.NetworkResponse
+import com.codandotv.streamplayerapp.core.networking.handleError.safeRequest
+import com.codandotv.streamplayerapp.feature.detail.data.model.DetailStreamResponse
+import com.codandotv.streamplayerapp.feature.detail.data.model.VideoStreamsResponse
 import io.ktor.client.HttpClient
 import io.ktor.client.request.url
 
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/data/model/DetailStreamResponse.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/data/model/DetailStreamResponse.kt
new file mode 100644
index 00000000..11c10a2d
--- /dev/null
+++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/data/model/DetailStreamResponse.kt
@@ -0,0 +1,17 @@
+package com.codandotv.streamplayerapp.feature.detail.data.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+@Suppress("ConstructorParameterNaming")
+data class DetailStreamResponse(
+    val id: Long,
+    val title: String,
+    val overview: String,
+    val tagline: String,
+    @SerialName("backdrop_path")
+    val backdropPath: String,
+    @SerialName("release_date")
+    val releaseDate: String
+)
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/data/model/VideoStreamResponse.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/data/model/VideoStreamResponse.kt
similarity index 84%
rename from feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/data/model/VideoStreamResponse.kt
rename to feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/data/model/VideoStreamResponse.kt
index 6dd12400..2c7f492c 100644
--- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/data/model/VideoStreamResponse.kt
+++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/data/model/VideoStreamResponse.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_detail.data.model
+package com.codandotv.streamplayerapp.feature.detail.data.model
 
 import kotlinx.serialization.Serializable
 
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/di/DetailStreamModule.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/di/DetailStreamModule.kt
similarity index 69%
rename from feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/di/DetailStreamModule.kt
rename to feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/di/DetailStreamModule.kt
index bfe42650..93c21424 100644
--- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/di/DetailStreamModule.kt
+++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/di/DetailStreamModule.kt
@@ -1,15 +1,15 @@
-package com.codandotv.streamplayerapp.feature_detail.di
+package com.codandotv.streamplayerapp.feature.detail.di
 
-import com.codandotv.streamplayerapp.core_shared_ui.widget.getSharedHandlerPlatform
-import com.codandotv.streamplayerapp.feature_detail.data.DetailStreamRepository
-import com.codandotv.streamplayerapp.feature_detail.data.DetailStreamRepositoryImpl
-import com.codandotv.streamplayerapp.feature_detail.data.DetailStreamService
-import com.codandotv.streamplayerapp.feature_detail.data.DetailStreamServiceImpl
-import com.codandotv.streamplayerapp.feature_detail.domain.DetailStreamUseCase
-import com.codandotv.streamplayerapp.feature_detail.domain.DetailStreamUseCaseImpl
-import com.codandotv.streamplayerapp.feature_detail.domain.VideoStreamsUseCase
-import com.codandotv.streamplayerapp.feature_detail.domain.VideoStreamsUseCaseImpl
-import com.codandotv.streamplayerapp.feature_detail.presentation.screens.DetailStreamViewModel
+import com.codandotv.streamplayerapp.core.shared.ui.widget.getSharedHandlerPlatform
+import com.codandotv.streamplayerapp.feature.detail.data.DetailStreamRepository
+import com.codandotv.streamplayerapp.feature.detail.data.DetailStreamRepositoryImpl
+import com.codandotv.streamplayerapp.feature.detail.data.DetailStreamService
+import com.codandotv.streamplayerapp.feature.detail.data.DetailStreamServiceImpl
+import com.codandotv.streamplayerapp.feature.detail.domain.DetailStreamUseCase
+import com.codandotv.streamplayerapp.feature.detail.domain.DetailStreamUseCaseImpl
+import com.codandotv.streamplayerapp.feature.detail.domain.VideoStreamsUseCase
+import com.codandotv.streamplayerapp.feature.detail.domain.VideoStreamsUseCaseImpl
+import com.codandotv.streamplayerapp.feature.detail.presentation.screens.DetailStreamViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
 import org.koin.core.module.dsl.viewModel
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/domain/DetailStream.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/domain/DetailStream.kt
new file mode 100644
index 00000000..13147573
--- /dev/null
+++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/domain/DetailStream.kt
@@ -0,0 +1,11 @@
+package com.codandotv.streamplayerapp.feature.detail.domain
+
+data class DetailStream(
+    val id: String,
+    val title: String,
+    val overview: String,
+    val tagline: String,
+    val url: String,
+    val releaseYear: String,
+    val isFavorite: Boolean
+)
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/domain/DetailStreamMapper.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/domain/DetailStreamMapper.kt
similarity index 62%
rename from feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/domain/DetailStreamMapper.kt
rename to feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/domain/DetailStreamMapper.kt
index e12cf78f..49bf6475 100644
--- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/domain/DetailStreamMapper.kt
+++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/domain/DetailStreamMapper.kt
@@ -1,9 +1,11 @@
-package com.codandotv.streamplayerapp.feature_detail.domain
+@file:Suppress("MagicNumber")
 
-import com.codandotv.streamplayerapp.core_local_storage.domain.model.MovieEntity
-import com.codandotv.streamplayerapp.core_shared.Url.IMAGE_URL_SIZE_500
-import com.codandotv.streamplayerapp.feature_detail.data.model.DetailStreamResponse
-import com.codandotv.streamplayerapp.feature_detail.data.model.VideoStreamsResponse
+package com.codandotv.streamplayerapp.feature.detail.domain
+
+import com.codandotv.streamplayerapp.core.local.storage.domain.model.MovieEntity
+import com.codandotv.streamplayerapp.core.shared.Url.IMAGE_URL_SIZE_500
+import com.codandotv.streamplayerapp.feature.detail.data.model.DetailStreamResponse
+import com.codandotv.streamplayerapp.feature.detail.data.model.VideoStreamsResponse
 
 fun DetailStreamResponse.toDetailStream(isFavorite: Boolean = false): DetailStream =
     DetailStream(
@@ -11,8 +13,8 @@ fun DetailStreamResponse.toDetailStream(isFavorite: Boolean = false): DetailStre
         title = this.title,
         overview = this.overview,
         tagline = this.tagline,
-        url = "$IMAGE_URL_SIZE_500${this.backdrop_path}",
-        releaseYear = this.release_date.substring(0, 4),
+        url = "$IMAGE_URL_SIZE_500${this.backdropPath}",
+        releaseYear = this.releaseDate.substring(0, 4),
         isFavorite = isFavorite
     )
 
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/domain/DetailStreamUseCase.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/domain/DetailStreamUseCase.kt
similarity index 84%
rename from feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/domain/DetailStreamUseCase.kt
rename to feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/domain/DetailStreamUseCase.kt
index e2b4ade9..cf0f0b18 100644
--- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/domain/DetailStreamUseCase.kt
+++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/domain/DetailStreamUseCase.kt
@@ -1,6 +1,6 @@
-package com.codandotv.streamplayerapp.feature_detail.domain
+package com.codandotv.streamplayerapp.feature.detail.domain
 
-import com.codandotv.streamplayerapp.feature_detail.data.DetailStreamRepository
+import com.codandotv.streamplayerapp.feature.detail.data.DetailStreamRepository
 import kotlinx.coroutines.flow.Flow
 
 interface DetailStreamUseCase {
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/domain/VideoStream.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/domain/VideoStream.kt
similarity index 55%
rename from feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/domain/VideoStream.kt
rename to feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/domain/VideoStream.kt
index 1daa73f9..541139dd 100644
--- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/domain/VideoStream.kt
+++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/domain/VideoStream.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_detail.domain
+package com.codandotv.streamplayerapp.feature.detail.domain
 
 data class VideoStream(
     val movieId: Long,
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/domain/VideoStreamsUseCase.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/domain/VideoStreamsUseCase.kt
similarity index 76%
rename from feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/domain/VideoStreamsUseCase.kt
rename to feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/domain/VideoStreamsUseCase.kt
index 06c9af38..cf31c3d3 100644
--- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/domain/VideoStreamsUseCase.kt
+++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/domain/VideoStreamsUseCase.kt
@@ -1,6 +1,6 @@
-package com.codandotv.streamplayerapp.feature_detail.domain
+package com.codandotv.streamplayerapp.feature.detail.domain
 
-import com.codandotv.streamplayerapp.feature_detail.data.DetailStreamRepository
+import com.codandotv.streamplayerapp.feature.detail.data.DetailStreamRepository
 import kotlinx.coroutines.flow.Flow
 
 interface VideoStreamsUseCase {
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/navigation/DetailStreamNavigation.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/navigation/DetailStreamNavigation.kt
similarity index 66%
rename from feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/navigation/DetailStreamNavigation.kt
rename to feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/navigation/DetailStreamNavigation.kt
index 27ca3eb4..e5e47623 100644
--- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/navigation/DetailStreamNavigation.kt
+++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/navigation/DetailStreamNavigation.kt
@@ -1,12 +1,12 @@
-package com.codandotv.streamplayerapp.feature_detail.presentation.navigation
+package com.codandotv.streamplayerapp.feature.detail.presentation.navigation
 
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
-import com.codandotv.streamplayerapp.core_navigation.routes.Routes.DETAIL_COMPLETE
-import com.codandotv.streamplayerapp.core_navigation.routes.Routes.PARAM.ID
-import com.codandotv.streamplayerapp.feature_detail.di.DetailStreamModule
-import com.codandotv.streamplayerapp.feature_detail.presentation.screens.DetailStreamScreen
+import com.codandotv.streamplayerapp.core.navigation.routes.Routes.DETAIL_COMPLETE
+import com.codandotv.streamplayerapp.core.navigation.routes.Routes.PARAM.ID
+import com.codandotv.streamplayerapp.feature.detail.di.DetailStreamModule
+import com.codandotv.streamplayerapp.feature.detail.presentation.screens.DetailStreamScreen
 import org.koin.compose.getKoin
 import org.koin.compose.module.rememberKoinModules
 import org.koin.compose.viewmodel.koinViewModel
@@ -23,7 +23,10 @@ fun NavGraphBuilder.detailStreamNavGraph(navController: NavHostController) {
         }
         DetailStreamScreen(
             viewModel = koinViewModel {
-                parametersOf(nav.savedStateHandle.get<String>(ID)?: DEFAULT_ID)
+                parametersOf(
+                    nav.savedStateHandle.get<String>(ID)
+                        ?: DEFAULT_ID
+                )
             },
             navController = navController,
             sharedHandlerPlatform = getKoin().get(),
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/screens/DetailStreamViewModel.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/screens/DetailStreamViewModel.kt
similarity index 69%
rename from feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/screens/DetailStreamViewModel.kt
rename to feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/screens/DetailStreamViewModel.kt
index cac14ad2..606b64e4 100644
--- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/screens/DetailStreamViewModel.kt
+++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/screens/DetailStreamViewModel.kt
@@ -1,14 +1,11 @@
-package com.codandotv.streamplayerapp.feature_detail.presentation.screens
+package com.codandotv.streamplayerapp.feature.detail.presentation.screens
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.codandotv.streamplayerapp.core_networking.handleError.catchFailure
-import com.codandotv.streamplayerapp.core_networking.resources.StringNetworking
-import com.codandotv.streamplayerapp.feature_detail.domain.DetailStream
-import com.codandotv.streamplayerapp.feature_detail.domain.DetailStreamUseCase
-import com.codandotv.streamplayerapp.feature_detail.domain.VideoStreamsUseCase
-import com.codandotv.streamplayerapp.feature_detail.presentation.screens.DetailStreamsUIState.DetailStreamsLoadedUIState
-import com.codandotv.streamplayerapp.feature_detail.presentation.screens.DetailStreamsUIState.LoadingStreamUIState
+import com.codandotv.streamplayerapp.core.networking.handleError.catchFailure
+import com.codandotv.streamplayerapp.core.networking.resources.StringNetworking
+import com.codandotv.streamplayerapp.feature.detail.domain.DetailStreamUseCase
+import com.codandotv.streamplayerapp.feature.detail.domain.VideoStreamsUseCase
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
@@ -20,7 +17,7 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.flow.zip
 import kotlinx.coroutines.launch
 
-class  DetailStreamViewModel(
+class DetailStreamViewModel(
     private val detailStreamUseCase: DetailStreamUseCase,
     private val videoStreamsUseCase: VideoStreamsUseCase,
     private val dispatcher: CoroutineDispatcher
@@ -30,7 +27,9 @@ class  DetailStreamViewModel(
         loadDetail()
     }
 
-    private val _uiState = MutableStateFlow<DetailStreamsUIState>(LoadingStreamUIState)
+    private val _uiState = MutableStateFlow<DetailStreamsUIState>(
+        DetailStreamsUIState.LoadingStreamUIState
+    )
     val uiState: StateFlow<DetailStreamsUIState> = _uiState.stateIn(
         viewModelScope,
         SharingStarted.Eagerly,
@@ -41,7 +40,7 @@ class  DetailStreamViewModel(
         viewModelScope.launch {
             detailStreamUseCase.getMovie()
                 .zip(videoStreamsUseCase.getVideoStreams()) { detailStream, videoUrl ->
-                    DetailStreamsLoadedUIState(
+                    DetailStreamsUIState.DetailStreamsLoadedUIState(
                         detailStream = detailStream,
                         videoId = videoUrl.firstOrNull()?.videoId
                     )
@@ -60,10 +59,10 @@ class  DetailStreamViewModel(
     }
 
     private fun onLoading() {
-        _uiState.update { LoadingStreamUIState }
+        _uiState.update { DetailStreamsUIState.LoadingStreamUIState }
     }
 
-    fun toggleItemInFavorites(detailStream: DetailStream) {
+    fun toggleItemInFavorites(detailStream: com.codandotv.streamplayerapp.feature.detail.domain.DetailStream) {
         viewModelScope.launch {
             detailStreamUseCase.toggleItemInFavorites(detailStream)
         }
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/screens/DetailStreamsScreen.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/screens/DetailStreamsScreen.kt
similarity index 87%
rename from feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/screens/DetailStreamsScreen.kt
rename to feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/screens/DetailStreamsScreen.kt
index e92cd470..53b1098f 100644
--- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/screens/DetailStreamsScreen.kt
+++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/screens/DetailStreamsScreen.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_detail.presentation.screens
+package com.codandotv.streamplayerapp.feature.detail.presentation.screens
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -30,14 +30,13 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.em
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
-import com.codandotv.streamplayerapp.core_shared_ui.widget.BasicToolbar
-import com.codandotv.streamplayerapp.core_shared_ui.widget.SharedHandlerPlatform
-import com.codandotv.streamplayerapp.core_shared_ui.widget.SharingStreamPlatform
-import com.codandotv.streamplayerapp.feature_detail.domain.DetailStream
-import com.codandotv.streamplayerapp.feature_detail.presentation.widget.DetailStreamActionOption
-import com.codandotv.streamplayerapp.feature_detail.presentation.widget.DetailStreamButtonAction
-import com.codandotv.streamplayerapp.feature_detail.presentation.widget.DetailStreamImagePreview
-import com.codandotv.streamplayerapp.feature_detail.presentation.widget.DetailStreamRowHeader
+import com.codandotv.streamplayerapp.core.shared.ui.widget.BasicToolbar
+import com.codandotv.streamplayerapp.core.shared.ui.widget.SharedHandlerPlatform
+import com.codandotv.streamplayerapp.core.shared.ui.widget.SharingStreamPlatform
+import com.codandotv.streamplayerapp.feature.detail.presentation.widget.DetailStreamActionOption
+import com.codandotv.streamplayerapp.feature.detail.presentation.widget.DetailStreamButtonAction
+import com.codandotv.streamplayerapp.feature.detail.presentation.widget.DetailStreamImagePreview
+import com.codandotv.streamplayerapp.feature.detail.presentation.widget.DetailStreamRowHeader
 import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.viewmodel.koinViewModel
 import streamplayerapp_kmp.feature_detail.generated.resources.Res
@@ -71,14 +70,13 @@ fun DetailStreamScreen(
                 )
             }
         }
-
     }
 }
 
 @Suppress("LongMethod")
 @Composable
 private fun SetupDetailScreen(
-    onToggleToMyList: (DetailStream) -> Unit,
+    onToggleToMyList: (com.codandotv.streamplayerapp.feature.detail.domain.DetailStream) -> Unit,
     uiState: DetailStreamsUIState.DetailStreamsLoadedUIState,
     navController: NavController,
     sharedHandlerPlatform: SharedHandlerPlatform,
@@ -116,7 +114,8 @@ private fun SetupDetailScreen(
                     Text(
                         text = uiState.detailStream.title,
                         style = MaterialTheme.typography.headlineMedium.copy(
-                            fontWeight = FontWeight.Bold, fontSize = 28.sp
+                            fontWeight = FontWeight.Bold,
+                            fontSize = 28.sp
                         )
                     )
                     Spacer(modifier = Modifier.height(8.dp))
@@ -124,7 +123,8 @@ private fun SetupDetailScreen(
                         text = uiState.detailStream.releaseYear,
                         style = MaterialTheme.typography.headlineMedium.copy(
                             color = MaterialTheme.colorScheme.onSurfaceVariant,
-                            fontSize = 14.sp, fontWeight = FontWeight.Bold
+                            fontSize = 14.sp,
+                            fontWeight = FontWeight.Bold
                         )
                     )
                     Spacer(modifier = Modifier.height(8.dp))
@@ -160,7 +160,8 @@ private fun SetupDetailScreen(
                     DetailStreamActionOption(
                         uiState.detailStream,
                         onToggleToMyList,
-                        { showDialog.value = true })
+                        { showDialog.value = true }
+                    )
                     Spacer(modifier = Modifier.height(16.dp))
                 }
             }
@@ -171,7 +172,9 @@ private fun SetupDetailScreen(
                     shareHandler = sharedHandlerPlatform,
                     setShowDialog = {
                         showDialog.value = it
-                    })
+                    }
+                )
             }
-        })
+        }
+    )
 }
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/screens/DetailStreamsUIState.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/screens/DetailStreamsUIState.kt
similarity index 67%
rename from feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/screens/DetailStreamsUIState.kt
rename to feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/screens/DetailStreamsUIState.kt
index 66c2a144..df762976 100644
--- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/screens/DetailStreamsUIState.kt
+++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/screens/DetailStreamsUIState.kt
@@ -1,6 +1,6 @@
-package com.codandotv.streamplayerapp.feature_detail.presentation.screens
+package com.codandotv.streamplayerapp.feature.detail.presentation.screens
 
-import com.codandotv.streamplayerapp.feature_detail.domain.DetailStream
+import com.codandotv.streamplayerapp.feature.detail.domain.DetailStream
 
 sealed class DetailStreamsUIState {
     data class DetailStreamsLoadedUIState(
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamActionOption.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/widget/DetailStreamActionOption.kt
similarity index 94%
rename from feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamActionOption.kt
rename to feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/widget/DetailStreamActionOption.kt
index 1b6b8623..30d7a575 100644
--- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamActionOption.kt
+++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/widget/DetailStreamActionOption.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_detail.presentation.widget
+package com.codandotv.streamplayerapp.feature.detail.presentation.widget
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
@@ -17,8 +17,8 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import com.codandotv.streamplayerapp.core_shared_ui.widget.IconWithText
-import com.codandotv.streamplayerapp.feature_detail.domain.DetailStream
+import com.codandotv.streamplayerapp.core.shared.ui.widget.IconWithText
+import com.codandotv.streamplayerapp.feature.detail.domain.DetailStream
 import org.jetbrains.compose.resources.stringResource
 import streamplayerapp_kmp.feature_detail.generated.resources.Res
 import streamplayerapp_kmp.feature_detail.generated.resources.detail_classification
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamButtonAction.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/widget/DetailStreamButtonAction.kt
similarity index 96%
rename from feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamButtonAction.kt
rename to feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/widget/DetailStreamButtonAction.kt
index d2cd3161..712d593e 100644
--- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamButtonAction.kt
+++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/widget/DetailStreamButtonAction.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_detail.presentation.widget
+package com.codandotv.streamplayerapp.feature.detail.presentation.widget
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamImagePreview.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/widget/DetailStreamImagePreview.kt
similarity index 87%
rename from feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamImagePreview.kt
rename to feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/widget/DetailStreamImagePreview.kt
index 121c3f8e..c6a4bf97 100644
--- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamImagePreview.kt
+++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/widget/DetailStreamImagePreview.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_detail.presentation.widget
+package com.codandotv.streamplayerapp.feature.detail.presentation.widget
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -16,9 +16,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
-import com.codandotv.streamplayerapp.core_shared_ui.widget.YoutubePlayerComponentPlatform
-import com.codandotv.streamplayerapp.core_shared_ui.widget.WebImage
-import com.codandotv.streamplayerapp.feature_detail.presentation.screens.DetailStreamsUIState.DetailStreamsLoadedUIState
+import com.codandotv.streamplayerapp.core.shared.ui.widget.WebImage
+import com.codandotv.streamplayerapp.core.shared.ui.widget.YoutubePlayerComponentPlatform
+import com.codandotv.streamplayerapp.feature.detail.presentation.screens.DetailStreamsUIState
 import org.jetbrains.compose.resources.painterResource
 import streamplayerapp_kmp.feature_detail.generated.resources.Res
 import streamplayerapp_kmp.feature_detail.generated.resources.play_circle
@@ -26,7 +26,7 @@ import streamplayerapp_kmp.feature_detail.generated.resources.play_circle
 @Suppress("MagicNumber")
 @Composable
 fun DetailStreamImagePreview(
-    uiState: DetailStreamsLoadedUIState,
+    uiState: DetailStreamsUIState.DetailStreamsLoadedUIState,
     modifier: Modifier = Modifier,
     showPlayer: Boolean = false,
     onPlayEvent: (() -> Unit)
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamRowHeader.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/widget/DetailStreamRowHeader.kt
similarity index 96%
rename from feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamRowHeader.kt
rename to feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/widget/DetailStreamRowHeader.kt
index 96e7b07d..9e918a72 100644
--- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamRowHeader.kt
+++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/widget/DetailStreamRowHeader.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_detail.presentation.widget
+package com.codandotv.streamplayerapp.feature.detail.presentation.widget
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Row
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/data/model/DetailStreamResponse.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/data/model/DetailStreamResponse.kt
deleted file mode 100644
index 18ef31d9..00000000
--- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/data/model/DetailStreamResponse.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.codandotv.streamplayerapp.feature_detail.data.model
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-@Suppress("ConstructorParameterNaming")
-data class DetailStreamResponse(
-    val id : Long,
-    val title : String,
-    val overview : String,
-    val tagline : String,
-    val backdrop_path : String,
-    val release_date : String
-)
diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/domain/DetailStream.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/domain/DetailStream.kt
deleted file mode 100644
index 7d9e59f9..00000000
--- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/domain/DetailStream.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.codandotv.streamplayerapp.feature_detail.domain
-
-data class DetailStream(
-    val id : String,
-    val title : String,
-    val overview : String,
-    val tagline : String,
-    val url : String,
-    val releaseYear : String,
-    val isFavorite: Boolean
-)
diff --git a/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/Shared.kt b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/Shared.kt
new file mode 100644
index 00000000..3943b881
--- /dev/null
+++ b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/Shared.kt
@@ -0,0 +1,36 @@
+package com.codandotv.streamplayerapp.feature.detail
+
+import com.codandotv.streamplayerapp.feature.detail.data.model.DetailStreamResponse
+import com.codandotv.streamplayerapp.feature.detail.domain.DetailStream
+import com.codandotv.streamplayerapp.feature.detail.domain.VideoStream
+import com.codandotv.streamplayerapp.feature.detail.presentation.screens.DetailStreamsUIState
+
+val videoStream = VideoStream(
+    movieId = 123,
+    videoId = "123"
+)
+
+val fakeStream =
+    DetailStream(
+        id = "1",
+        title = "Fake Movie",
+        overview = "Overview of the fake movie",
+        tagline = "The ultimate test movie",
+        url = "https://example.com/fake.jpg",
+        releaseYear = "2025",
+        isFavorite = false
+    )
+
+val expectedDetailStream =
+    DetailStreamResponse(
+        id = 1L,
+        title = "Fake Movie",
+        overview = "This is a fake overview.",
+        tagline = "Fake Tagline",
+        backdropPath = "aaaa",
+        releaseDate = "2025"
+    )
+val expectedDetailStreamLoadedUI = DetailStreamsUIState.DetailStreamsLoadedUIState(
+    detailStream = fakeStream,
+    videoId = "123"
+)
diff --git a/feature-detail/src/commonTest/kotlin/feature_detail/DetailStreamRepositoryTest.kt b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/data/DetailStreamRepositoryTest.kt
similarity index 65%
rename from feature-detail/src/commonTest/kotlin/feature_detail/DetailStreamRepositoryTest.kt
rename to feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/data/DetailStreamRepositoryTest.kt
index 5706b2e2..59625914 100644
--- a/feature-detail/src/commonTest/kotlin/feature_detail/DetailStreamRepositoryTest.kt
+++ b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/data/DetailStreamRepositoryTest.kt
@@ -1,11 +1,10 @@
-package feature_detail
+package com.codandotv.streamplayerapp.feature.detail.data
 
-import com.codandotv.streamplayerapp.core_networking.handleError.NetworkResponse
-import com.codandotv.streamplayerapp.feature_detail.data.DetailStreamRepository
-import com.codandotv.streamplayerapp.feature_detail.data.DetailStreamRepositoryImpl
-import com.codandotv.streamplayerapp.feature_detail.domain.toDetailStream
-import feature_detail.fake.FakeDetailStreamService
-import feature_detail.fake.FakeFavoriteDao
+import com.codandotv.streamplayerapp.core.networking.handleError.NetworkResponse
+import com.codandotv.streamplayerapp.feature.detail.domain.toDetailStream
+import com.codandotv.streamplayerapp.feature.detail.expectedDetailStream
+import com.codandotv.streamplayerapp.feature.detail.fake.FakeDetailStreamService
+import com.codandotv.streamplayerapp.feature.detail.fake.FakeFavoriteDao
 import kotlinx.coroutines.test.runTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
@@ -22,11 +21,12 @@ class DetailStreamRepositoryTest {
     fun setUp() {
         service = FakeDetailStreamService()
         favoriteDao = FakeFavoriteDao()
-        repository = DetailStreamRepositoryImpl(
-            movieId = movieId,
-            service = service,
-            favoriteDao = favoriteDao
-        )
+        repository =
+            DetailStreamRepositoryImpl(
+                movieId = movieId,
+                service = service,
+                favoriteDao = favoriteDao
+            )
     }
 
     @Test
@@ -43,4 +43,4 @@ class DetailStreamRepositoryTest {
         assertTrue(service.getMovieCalled, "Service should have been called")
         assertTrue(favoriteDao.fetchAllCalled, "FavoriteDao should have been called")
     }
-}
+}
\ No newline at end of file
diff --git a/feature-detail/src/commonTest/kotlin/feature_detail/DetailStreamUseCaseTest.kt b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/domain/DetailStreamUseCaseTest.kt
similarity index 77%
rename from feature-detail/src/commonTest/kotlin/feature_detail/DetailStreamUseCaseTest.kt
rename to feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/domain/DetailStreamUseCaseTest.kt
index cbdc5e96..030d377c 100644
--- a/feature-detail/src/commonTest/kotlin/feature_detail/DetailStreamUseCaseTest.kt
+++ b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/domain/DetailStreamUseCaseTest.kt
@@ -1,9 +1,7 @@
-package feature_detail
+package com.codandotv.streamplayerapp.feature.detail.domain
 
 import FakeDetailStreamRepository
-import com.codandotv.streamplayerapp.feature_detail.domain.DetailStream
-import com.codandotv.streamplayerapp.feature_detail.domain.DetailStreamUseCase
-import com.codandotv.streamplayerapp.feature_detail.domain.DetailStreamUseCaseImpl
+import com.codandotv.streamplayerapp.feature.detail.fakeStream
 import kotlinx.coroutines.test.runTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
@@ -33,4 +31,4 @@ class DetailStreamUseCaseTest {
         assertEquals(fakeStream, collected)
         assertTrue(detailStreamRepository.getMovieCalled)
     }
-}
+}
\ No newline at end of file
diff --git a/feature-detail/src/commonTest/kotlin/feature_detail/fake/FakeDetailStreamRepository.kt b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/fake/FakeDetailStreamRepository.kt
similarity index 83%
rename from feature-detail/src/commonTest/kotlin/feature_detail/fake/FakeDetailStreamRepository.kt
rename to feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/fake/FakeDetailStreamRepository.kt
index 2c465860..232716d1 100644
--- a/feature-detail/src/commonTest/kotlin/feature_detail/fake/FakeDetailStreamRepository.kt
+++ b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/fake/FakeDetailStreamRepository.kt
@@ -1,6 +1,6 @@
-import com.codandotv.streamplayerapp.feature_detail.data.DetailStreamRepository
-import com.codandotv.streamplayerapp.feature_detail.domain.DetailStream
-import com.codandotv.streamplayerapp.feature_detail.domain.VideoStream
+import com.codandotv.streamplayerapp.feature.detail.data.DetailStreamRepository
+import com.codandotv.streamplayerapp.feature.detail.domain.DetailStream
+import com.codandotv.streamplayerapp.feature.detail.domain.VideoStream
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 
diff --git a/feature-detail/src/commonTest/kotlin/feature_detail/fake/FakeDetailStreamService.kt b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/fake/FakeDetailStreamService.kt
similarity index 67%
rename from feature-detail/src/commonTest/kotlin/feature_detail/fake/FakeDetailStreamService.kt
rename to feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/fake/FakeDetailStreamService.kt
index 2625aace..3b601afc 100644
--- a/feature-detail/src/commonTest/kotlin/feature_detail/fake/FakeDetailStreamService.kt
+++ b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/fake/FakeDetailStreamService.kt
@@ -1,11 +1,12 @@
-package feature_detail.fake
+package com.codandotv.streamplayerapp.feature.detail.fake
 
-import com.codandotv.streamplayerapp.core_networking.handleError.NetworkResponse
-import com.codandotv.streamplayerapp.feature_detail.data.DetailStreamService
-import com.codandotv.streamplayerapp.feature_detail.data.model.DetailStreamResponse
-import com.codandotv.streamplayerapp.feature_detail.data.model.VideoStreamsResponse
+import com.codandotv.streamplayerapp.core.networking.handleError.NetworkResponse
+import com.codandotv.streamplayerapp.feature.detail.data.DetailStreamService
+import com.codandotv.streamplayerapp.feature.detail.data.model.DetailStreamResponse
+import com.codandotv.streamplayerapp.feature.detail.data.model.VideoStreamsResponse
 
-class FakeDetailStreamService : DetailStreamService {
+class FakeDetailStreamService :
+    DetailStreamService {
     var getMovieCalled = false
     var getVideoStreamsCalled = false
 
@@ -15,8 +16,8 @@ class FakeDetailStreamService : DetailStreamService {
             title = "Fake Movie",
             overview = "This is a fake overview.",
             tagline = "Fake Tagline",
-            backdrop_path = "/fake_backdrop.jpg",
-            release_date = "2025-01-01"
+            backdropPath = "/fake_backdrop.jpg",
+            releaseDate = "2025-01-01"
         )
     )
 
diff --git a/feature-detail/src/commonTest/kotlin/feature_detail/fake/FakeDetailStreamUseCase.kt b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/fake/FakeDetailStreamUseCase.kt
similarity index 57%
rename from feature-detail/src/commonTest/kotlin/feature_detail/fake/FakeDetailStreamUseCase.kt
rename to feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/fake/FakeDetailStreamUseCase.kt
index 98ec0f12..4790aeb6 100644
--- a/feature-detail/src/commonTest/kotlin/feature_detail/fake/FakeDetailStreamUseCase.kt
+++ b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/fake/FakeDetailStreamUseCase.kt
@@ -1,12 +1,13 @@
-package feature_detail.fake
+package com.codandotv.streamplayerapp.feature.detail.fake
 
-import com.codandotv.streamplayerapp.feature_detail.domain.DetailStream
-import com.codandotv.streamplayerapp.feature_detail.domain.DetailStreamUseCase
-import feature_detail.fakeStream
+import com.codandotv.streamplayerapp.feature.detail.domain.DetailStream
+import com.codandotv.streamplayerapp.feature.detail.domain.DetailStreamUseCase
+import com.codandotv.streamplayerapp.feature.detail.fakeStream
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 
-class FakeDetailStreamUseCase : DetailStreamUseCase {
+class FakeDetailStreamUseCase :
+    DetailStreamUseCase {
     var getMovieCalled = false
     var lastToggledMovie: DetailStream? = null
 
diff --git a/feature-detail/src/commonTest/kotlin/feature_detail/fake/FakeFavoriteDao.kt b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/fake/FakeFavoriteDao.kt
similarity index 79%
rename from feature-detail/src/commonTest/kotlin/feature_detail/fake/FakeFavoriteDao.kt
rename to feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/fake/FakeFavoriteDao.kt
index 5b768408..8c798ce2 100644
--- a/feature-detail/src/commonTest/kotlin/feature_detail/fake/FakeFavoriteDao.kt
+++ b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/fake/FakeFavoriteDao.kt
@@ -1,7 +1,7 @@
-package feature_detail.fake
+package com.codandotv.streamplayerapp.feature.detail.fake
 
-import com.codandotv.streamplayerapp.core_local_storage.data.dao.FavoriteDao
-import com.codandotv.streamplayerapp.core_local_storage.domain.model.MovieEntity
+import com.codandotv.streamplayerapp.core.local.storage.data.dao.FavoriteDao
+import com.codandotv.streamplayerapp.core.local.storage.domain.model.MovieEntity
 
 class FakeFavoriteDao : FavoriteDao {
     private val movies = mutableListOf<MovieEntity>()
diff --git a/feature-detail/src/commonTest/kotlin/feature_detail/fake/FakeVideoStreamsUseCase.kt b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/fake/FakeVideoStreamsUseCase.kt
similarity index 54%
rename from feature-detail/src/commonTest/kotlin/feature_detail/fake/FakeVideoStreamsUseCase.kt
rename to feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/fake/FakeVideoStreamsUseCase.kt
index f548cdab..a1f75dd0 100644
--- a/feature-detail/src/commonTest/kotlin/feature_detail/fake/FakeVideoStreamsUseCase.kt
+++ b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/fake/FakeVideoStreamsUseCase.kt
@@ -1,12 +1,13 @@
-package feature_detail.fake
+package com.codandotv.streamplayerapp.feature.detail.fake
 
-import com.codandotv.streamplayerapp.feature_detail.domain.VideoStream
-import com.codandotv.streamplayerapp.feature_detail.domain.VideoStreamsUseCase
-import feature_detail.videoStream
+import com.codandotv.streamplayerapp.feature.detail.domain.VideoStream
+import com.codandotv.streamplayerapp.feature.detail.domain.VideoStreamsUseCase
+import com.codandotv.streamplayerapp.feature.detail.videoStream
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 
-class FakeVideoStreamsUseCase : VideoStreamsUseCase {
+class FakeVideoStreamsUseCase :
+    VideoStreamsUseCase {
     var getVideoStreamsCalled = false
     var videoStreamsToReturn: List<VideoStream> = listOf(videoStream)
 
diff --git a/feature-detail/src/commonTest/kotlin/feature_detail/DetailStreamViewModelTest.kt b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/DetailStreamViewModelTest.kt
similarity index 79%
rename from feature-detail/src/commonTest/kotlin/feature_detail/DetailStreamViewModelTest.kt
rename to feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/DetailStreamViewModelTest.kt
index 3505225b..fb31690e 100644
--- a/feature-detail/src/commonTest/kotlin/feature_detail/DetailStreamViewModelTest.kt
+++ b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature/detail/presentation/DetailStreamViewModelTest.kt
@@ -1,8 +1,9 @@
-package feature_detail
+package com.codandotv.streamplayerapp.feature.detail.presentation
 
-import com.codandotv.streamplayerapp.feature_detail.presentation.screens.DetailStreamViewModel
-import feature_detail.fake.FakeDetailStreamUseCase
-import feature_detail.fake.FakeVideoStreamsUseCase
+import com.codandotv.streamplayerapp.feature.detail.expectedDetailStreamLoadedUI
+import com.codandotv.streamplayerapp.feature.detail.fake.FakeDetailStreamUseCase
+import com.codandotv.streamplayerapp.feature.detail.fake.FakeVideoStreamsUseCase
+import com.codandotv.streamplayerapp.feature.detail.presentation.screens.DetailStreamViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.StandardTestDispatcher
@@ -31,7 +32,7 @@ class DetailStreamViewModelTest {
         detailStreamViewModel = DetailStreamViewModel(
             detailStreamUseCase = detailUseCase,
             videoStreamsUseCase = videoUseCase,
-            dispatcher =  StandardTestDispatcher()
+            dispatcher = StandardTestDispatcher()
         )
     }
 
@@ -51,4 +52,4 @@ class DetailStreamViewModelTest {
     fun after() {
         Dispatchers.resetMain()
     }
-}
+}
\ No newline at end of file
diff --git a/feature-detail/src/commonTest/kotlin/feature_detail/Shared.kt b/feature-detail/src/commonTest/kotlin/feature_detail/Shared.kt
deleted file mode 100644
index f8be4c4d..00000000
--- a/feature-detail/src/commonTest/kotlin/feature_detail/Shared.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package feature_detail
-
-import com.codandotv.streamplayerapp.feature_detail.data.model.DetailStreamResponse
-import com.codandotv.streamplayerapp.feature_detail.domain.DetailStream
-import com.codandotv.streamplayerapp.feature_detail.domain.VideoStream
-import com.codandotv.streamplayerapp.feature_detail.presentation.screens.DetailStreamsUIState
-
-val videoStream = VideoStream(
-    movieId = 123,
-    videoId = "123"
-)
-
-val fakeStream = DetailStream(
-    id = "1",
-    title = "Fake Movie",
-    overview = "Overview of the fake movie",
-    tagline = "The ultimate test movie",
-    url = "https://example.com/fake.jpg",
-    releaseYear = "2025",
-    isFavorite = false
-)
-
-val expectedDetailStream = DetailStreamResponse(
-    id = 1L,
-    title = "Fake Movie",
-    overview = "This is a fake overview.",
-    tagline = "Fake Tagline",
-    backdrop_path = "aaaa",
-    release_date = "2025"
-)
-val expectedDetailStreamLoadedUI = DetailStreamsUIState.DetailStreamsLoadedUIState(
-    detailStream = fakeStream,
-    videoId = "123"
-)
diff --git a/feature-list-streams/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/presentation/screen/ListStreamsScreenPreview.kt b/feature-list-streams/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/presentation/screen/ListStreamsScreenPreview.kt
new file mode 100644
index 00000000..12cd5539
--- /dev/null
+++ b/feature-list-streams/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/presentation/screen/ListStreamsScreenPreview.kt
@@ -0,0 +1,14 @@
+package com.codandotv.streamplayerapp.feature.liststreams.presentation.screen
+
+import androidx.compose.runtime.Composable
+import androidx.navigation.compose.rememberNavController
+import com.codandotv.streamplayerapp.core.shared.ui.theme.ThemePreviews
+
+@ThemePreviews
+@Composable
+fun ListStreamsScreenPreview() {
+    com.codandotv.streamplayerapp.feature.liststreams.list.presentation.screens.ListStreamsScreen(
+        navController = rememberNavController(),
+        profilePicture = ""
+    )
+}
diff --git a/feature-list-streams/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screen/ListStreamsScreenPreview.kt b/feature-list-streams/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screen/ListStreamsScreenPreview.kt
deleted file mode 100644
index 0717265b..00000000
--- a/feature-list-streams/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screen/ListStreamsScreenPreview.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.presentation.screen
-
-import androidx.compose.runtime.Composable
-import androidx.navigation.compose.rememberNavController
-import com.codandotv.streamplayerapp.core_shared_ui.theme.ThemePreviews
-import com.codandotv.streamplayerapp.feature_list_streams.list.presentation.screens.ListStreamsScreen
-
-@ThemePreviews
-@Composable
-fun ListStreamsScreenPreview() {
-    ListStreamsScreen(navController = rememberNavController(), profilePicture = "")
-}
diff --git a/feature-list-streams/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/widgets/HighlightBannerPreview.kt b/feature-list-streams/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/widgets/HighlightBannerPreview.kt
deleted file mode 100644
index deae77b4..00000000
--- a/feature-list-streams/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/widgets/HighlightBannerPreview.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.presentation.widgets
-
-import androidx.compose.runtime.Composable
-import com.codandotv.streamplayerapp.core_shared_ui.theme.ThemePreviews
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.IconAndTextInfo
-import org.jetbrains.compose.resources.stringResource
-import streamplayerapp_kmp.core_shared_ui.generated.resources.Res
-import streamplayerapp_kmp.core_shared_ui.generated.resources.app_name
-import streamplayerapp_kmp.core_shared_ui.generated.resources.ic_add
-import streamplayerapp_kmp.core_shared_ui.generated.resources.ic_info
-import streamplayerapp_kmp.core_shared_ui.generated.resources.ic_play
-import streamplayerapp_kmp.feature_list_streams.generated.resources.ic_top_10
-import streamplayerapp_kmp.feature_list_streams.generated.resources.list_highlight_banner_add
-import streamplayerapp_kmp.feature_list_streams.generated.resources.list_highlight_banner_info
-import streamplayerapp_kmp.feature_list_streams.generated.resources.list_highlight_banner_watch
-
-typealias ContentType = com.codandotv.streamplayerapp.feature_list_streams.core.ContentType
-@ThemePreviews
-@Composable
-fun HighlightBannerPreview() {
-    HighlightBanner(
-        data = com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.HighlightBanner(
-            name = stringResource(Res.string.app_name),
-            imageUrl = String(),
-            contentType = ContentType.getContentName(
-                ContentType.SHOW
-            ),
-            contentTypeAsPlural = ContentType.getContentNameAsPlural(
-                ContentType.SHOW
-            ),
-            extraInfo = IconAndTextInfo(
-                streamplayerapp_kmp.feature_list_streams.generated.resources.Res.drawable.ic_top_10,
-                ContentType.getContentName(
-                    ContentType.SHOW
-                )
-            ),
-            leftButton = IconAndTextInfo(
-                Res.drawable.ic_add,
-                streamplayerapp_kmp.feature_list_streams.generated.resources.Res.string.list_highlight_banner_add
-            ),
-            centralButton = IconAndTextInfo(
-                Res.drawable.ic_play,
-                streamplayerapp_kmp.feature_list_streams.generated.resources.Res.string.list_highlight_banner_watch
-            ),
-            rightButton = IconAndTextInfo(
-                Res.drawable.ic_info,
-                streamplayerapp_kmp.feature_list_streams.generated.resources.Res.string.list_highlight_banner_info
-            ),
-        )
-    )
-}
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/core/ContentType.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/core/ContentType.kt
similarity index 94%
rename from feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/core/ContentType.kt
rename to feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/core/ContentType.kt
index 576308ba..d8d7ae86 100644
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/core/ContentType.kt
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/core/ContentType.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_list_streams.core
+package com.codandotv.streamplayerapp.feature.liststreams.core
 
 import org.jetbrains.compose.resources.StringResource
 import streamplayerapp_kmp.feature_list_streams.generated.resources.Res
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/data/ListStreamRepository.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/data/ListStreamRepository.kt
similarity index 62%
rename from feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/data/ListStreamRepository.kt
rename to feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/data/ListStreamRepository.kt
index 04030707..2c2f434b 100644
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/data/ListStreamRepository.kt
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/data/ListStreamRepository.kt
@@ -1,13 +1,13 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.data
+package com.codandotv.streamplayerapp.feature.liststreams.list.data
 
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
-import com.codandotv.streamplayerapp.core_networking.handleError.toFlow
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.Genre
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.Stream
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.toGenres
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.toStream
+import com.codandotv.streamplayerapp.core.networking.handleError.toFlow
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.Genre
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.Stream
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.toGenres
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.toStream
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
@@ -28,7 +28,7 @@ class ListStreamRepositoryImpl(
     }
 
     override suspend fun topRatedStream() = service.getTopRatedMovies().toFlow().map {
-        it.results.first { it.poster_path != null }.toStream()
+        it.results.first { it.posterPath != null }.toStream()
     }
 
     override fun loadMovies(genre: Genre): Flow<PagingData<Stream>> {
@@ -38,7 +38,11 @@ class ListStreamRepositoryImpl(
                 maxSize = MAX_SIZE,
             ),
             pagingSourceFactory = {
-                StreamDataSource(service, genreName = genre.name, genreId = genre.id)
+                StreamDataSource(
+                    service,
+                    genreName = genre.name,
+                    genreId = genre.id
+                )
             },
             initialKey = 1
         ).flow
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/data/ListStreamService.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/data/ListStreamService.kt
similarity index 81%
rename from feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/data/ListStreamService.kt
rename to feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/data/ListStreamService.kt
index e2634895..6dccadf5 100644
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/data/ListStreamService.kt
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/data/ListStreamService.kt
@@ -1,9 +1,9 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.data
+package com.codandotv.streamplayerapp.feature.liststreams.list.data
 
-import ListStreamResponse
-import com.codandotv.streamplayerapp.core_networking.handleError.NetworkResponse
-import com.codandotv.streamplayerapp.core_networking.handleError.safeRequest
-import com.codandotv.streamplayerapp.feature_list_streams.list.data.model.GenresResponse
+import com.codandotv.streamplayerapp.core.networking.handleError.NetworkResponse
+import com.codandotv.streamplayerapp.core.networking.handleError.safeRequest
+import com.codandotv.streamplayerapp.feature.liststreams.list.data.model.GenresResponse
+import com.codandotv.streamplayerapp.feature.liststreams.list.data.model.ListStreamResponse
 import io.ktor.client.HttpClient
 import io.ktor.client.request.parameter
 import io.ktor.client.request.url
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/data/StreamDataSource.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/data/StreamDataSource.kt
similarity index 81%
rename from feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/data/StreamDataSource.kt
rename to feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/data/StreamDataSource.kt
index cf89dd96..2a59eb2a 100644
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/data/StreamDataSource.kt
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/data/StreamDataSource.kt
@@ -1,10 +1,10 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.data
+package com.codandotv.streamplayerapp.feature.liststreams.list.data
 
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
-import com.codandotv.streamplayerapp.core_networking.handleError.NetworkResponse
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.Stream
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.toListStream
+import com.codandotv.streamplayerapp.core.networking.handleError.NetworkResponse
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.Stream
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.toListStream
 
 @Suppress("TooGenericExceptionCaught", "UseCheckOrError")
 class StreamDataSource(
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/data/model/GenresResponse.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/data/model/GenresResponse.kt
similarity index 73%
rename from feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/data/model/GenresResponse.kt
rename to feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/data/model/GenresResponse.kt
index 4ad38d13..52c82fe3 100644
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/data/model/GenresResponse.kt
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/data/model/GenresResponse.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.data.model
+package com.codandotv.streamplayerapp.feature.liststreams.list.data.model
 
 import kotlinx.serialization.Serializable
 
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/data/model/ListStreamResponse.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/data/model/ListStreamResponse.kt
similarity index 56%
rename from feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/data/model/ListStreamResponse.kt
rename to feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/data/model/ListStreamResponse.kt
index 89574e2c..e2802b43 100644
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/data/model/ListStreamResponse.kt
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/data/model/ListStreamResponse.kt
@@ -1,3 +1,6 @@
+package com.codandotv.streamplayerapp.feature.liststreams.list.data.model
+
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -5,7 +8,8 @@ data class StreamResponse(
     val id: Int,
     val title: String,
     val overview: String,
-    val poster_path: String? = null
+    @SerialName("poster_path")
+    val posterPath: String? = null
 )
 
 @Serializable
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/di/ListStreamModule.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/di/ListStreamModule.kt
new file mode 100644
index 00000000..3a97de4b
--- /dev/null
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/di/ListStreamModule.kt
@@ -0,0 +1,63 @@
+package com.codandotv.streamplayerapp.feature.liststreams.list.di
+
+import com.codandotv.streamplayerapp.feature.liststreams.list.data.ListStreamRepository
+import com.codandotv.streamplayerapp.feature.liststreams.list.data.ListStreamRepositoryImpl
+import com.codandotv.streamplayerapp.feature.liststreams.list.data.ListStreamService
+import com.codandotv.streamplayerapp.feature.liststreams.list.data.ListStreamServiceImpl
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.GetGenresUseCase
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.GetGenresUseCaseImpl
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.GetTopRatedStream
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.GetTopRatedStreamImpl
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.ListStreamAnalytics
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.ListStreamAnalyticsImpl
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.ListStreamUseCase
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.ListStreamUseCaseImpl
+import com.codandotv.streamplayerapp.feature.liststreams.list.presentation.screens.ListStreamViewModel
+import org.koin.core.module.dsl.viewModel
+import org.koin.dsl.module
+
+object ListStreamModule {
+    val module = module {
+        viewModel {
+            ListStreamViewModel(
+                listStreams = get(),
+                listGenres = get(),
+                latestStream = get()
+            )
+        }
+
+        factory<ListStreamUseCase> {
+            ListStreamUseCaseImpl(
+                repository = get()
+            )
+        }
+
+        factory<GetGenresUseCase> {
+            GetGenresUseCaseImpl(
+                repository = get()
+            )
+        }
+
+        factory<GetTopRatedStream> {
+            GetTopRatedStreamImpl(
+                repository = get()
+            )
+        }
+
+        factory<ListStreamAnalytics> {
+            ListStreamAnalyticsImpl()
+        }
+
+        factory<ListStreamRepository> {
+            ListStreamRepositoryImpl(
+                service = get(),
+            )
+        }
+
+        factory<ListStreamService> {
+            ListStreamServiceImpl(
+                client = get()
+            )
+        }
+    }
+}
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/GetGenresUseCase.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/GetGenresUseCase.kt
similarity index 57%
rename from feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/GetGenresUseCase.kt
rename to feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/GetGenresUseCase.kt
index c798d16f..59740cde 100644
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/GetGenresUseCase.kt
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/GetGenresUseCase.kt
@@ -1,7 +1,7 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.domain
+package com.codandotv.streamplayerapp.feature.liststreams.list.domain
 
-import com.codandotv.streamplayerapp.feature_list_streams.list.data.ListStreamRepository
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.Genre
+import com.codandotv.streamplayerapp.feature.liststreams.list.data.ListStreamRepository
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.Genre
 import kotlinx.coroutines.flow.Flow
 
 interface GetGenresUseCase {
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/GetLatestMovieUseCase.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/GetLatestMovieUseCase.kt
similarity index 57%
rename from feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/GetLatestMovieUseCase.kt
rename to feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/GetLatestMovieUseCase.kt
index 921d6ac6..197ab984 100644
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/GetLatestMovieUseCase.kt
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/GetLatestMovieUseCase.kt
@@ -1,7 +1,7 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.domain
+package com.codandotv.streamplayerapp.feature.liststreams.list.domain
 
-import com.codandotv.streamplayerapp.feature_list_streams.list.data.ListStreamRepository
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.Stream
+import com.codandotv.streamplayerapp.feature.liststreams.list.data.ListStreamRepository
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.Stream
 import kotlinx.coroutines.flow.Flow
 
 interface GetTopRatedStream {
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/ListMovieUseCase.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/ListMovieUseCase.kt
similarity index 55%
rename from feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/ListMovieUseCase.kt
rename to feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/ListMovieUseCase.kt
index a2705721..79b5fbf6 100644
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/ListMovieUseCase.kt
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/ListMovieUseCase.kt
@@ -1,9 +1,9 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.domain
+package com.codandotv.streamplayerapp.feature.liststreams.list.domain
 
 import androidx.paging.PagingData
-import com.codandotv.streamplayerapp.feature_list_streams.list.data.ListStreamRepository
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.Genre
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.Stream
+import com.codandotv.streamplayerapp.feature.liststreams.list.data.ListStreamRepository
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.Genre
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.Stream
 import kotlinx.coroutines.flow.Flow
 
 interface ListStreamUseCase {
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/ListStreamAnalytics.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/ListStreamAnalytics.kt
similarity index 53%
rename from feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/ListStreamAnalytics.kt
rename to feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/ListStreamAnalytics.kt
index fba556a0..28cd930f 100644
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/ListStreamAnalytics.kt
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/ListStreamAnalytics.kt
@@ -1,5 +1,4 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.domain
-
+package com.codandotv.streamplayerapp.feature.liststreams.list.domain
 
 interface ListStreamAnalytics
 
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/ListStreamMapper.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/ListStreamMapper.kt
new file mode 100644
index 00000000..38bdcfbf
--- /dev/null
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/ListStreamMapper.kt
@@ -0,0 +1,32 @@
+package com.codandotv.streamplayerapp.feature.liststreams.list.domain
+
+import com.codandotv.streamplayerapp.core.shared.Url
+import com.codandotv.streamplayerapp.feature.liststreams.list.data.model.GenresResponse
+import com.codandotv.streamplayerapp.feature.liststreams.list.data.model.ListStreamResponse
+import com.codandotv.streamplayerapp.feature.liststreams.list.data.model.StreamResponse
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.Genre
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.ListStream
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.Stream
+
+fun ListStreamResponse.toListStream(genre: String): ListStream =
+    ListStream(
+        categoryName = genre,
+        streams = this.results.map { streamResponse ->
+            streamResponse.toStream()
+        }
+    )
+
+fun GenresResponse.toGenres(): List<Genre> = this.genres.map { genreResponse ->
+    Genre(
+        id = genreResponse.id,
+        name = genreResponse.name
+    )
+}
+
+fun StreamResponse.toStream(): Stream =
+    Stream(
+        description = overview,
+        name = title,
+        posterPathUrl = "${Url.IMAGE_URL_SIZE_300}$posterPath",
+        id = id.toString()
+    )
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/model/Genre.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/model/Genre.kt
new file mode 100644
index 00000000..66bb9796
--- /dev/null
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/model/Genre.kt
@@ -0,0 +1,6 @@
+package com.codandotv.streamplayerapp.feature.liststreams.list.domain.model
+
+data class Genre(
+    val id: Long,
+    val name: String
+)
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/model/HighlightBanner.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/model/HighlightBanner.kt
similarity index 86%
rename from feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/model/HighlightBanner.kt
rename to feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/model/HighlightBanner.kt
index 20786df5..ca0c052a 100644
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/model/HighlightBanner.kt
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/model/HighlightBanner.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.domain.model
+package com.codandotv.streamplayerapp.feature.liststreams.list.domain.model
 
 import org.jetbrains.compose.resources.DrawableResource
 import org.jetbrains.compose.resources.StringResource
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/model/ListStream.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/model/ListStream.kt
new file mode 100644
index 00000000..6e180ac3
--- /dev/null
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/domain/model/ListStream.kt
@@ -0,0 +1,13 @@
+package com.codandotv.streamplayerapp.feature.liststreams.list.domain.model
+
+data class Stream(
+    val id: String,
+    val name: String,
+    val description: String,
+    val posterPathUrl: String,
+)
+
+data class ListStream(
+    val categoryName: String,
+    val streams: List<Stream>
+)
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/navigation/ListStreamsNavigation.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/presentation/navigation/ListStreamsNavigation.kt
similarity index 59%
rename from feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/navigation/ListStreamsNavigation.kt
rename to feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/presentation/navigation/ListStreamsNavigation.kt
index f7055ea9..b2d3c6a4 100644
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/navigation/ListStreamsNavigation.kt
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/presentation/navigation/ListStreamsNavigation.kt
@@ -1,15 +1,15 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.presentation.navigation
+package com.codandotv.streamplayerapp.feature.liststreams.list.presentation.navigation
 
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
-import com.codandotv.streamplayerapp.core_navigation.routes.BottomNavRoutes.HOME_COMPLETE
-import com.codandotv.streamplayerapp.core_navigation.routes.BottomNavRoutes.PARAM.PROFILE_ID
-import com.codandotv.streamplayerapp.core_navigation.routes.Routes
-import com.codandotv.streamplayerapp.core_navigation.routes.Routes.DETAIL
-import com.codandotv.streamplayerapp.core_navigation.routes.Routes.PROFILE_PICKER
-import com.codandotv.streamplayerapp.feature_list_streams.list.di.ListStreamModule
-import com.codandotv.streamplayerapp.feature_list_streams.list.presentation.screens.ListStreamsScreen
+import com.codandotv.streamplayerapp.core.navigation.routes.BottomNavRoutes.HOME_COMPLETE
+import com.codandotv.streamplayerapp.core.navigation.routes.BottomNavRoutes.PARAM.PROFILE_ID
+import com.codandotv.streamplayerapp.core.navigation.routes.Routes
+import com.codandotv.streamplayerapp.core.navigation.routes.Routes.DETAIL
+import com.codandotv.streamplayerapp.core.navigation.routes.Routes.PROFILE_PICKER
+import com.codandotv.streamplayerapp.feature.liststreams.list.di.ListStreamModule
+import com.codandotv.streamplayerapp.feature.liststreams.list.presentation.screens.ListStreamsScreen
 import org.koin.compose.module.rememberKoinModules
 import org.koin.core.annotation.KoinExperimentalAPI
 
@@ -25,7 +25,7 @@ fun NavGraphBuilder.listStreamsNavGraph(navController: NavHostController) {
         ListStreamsScreen(
             navController = navController,
             onNavigateDetailList = { id ->
-                navController.navigate("${DETAIL}${id}")
+                navController.navigate("${DETAIL}$id")
             },
             onNavigateProfilePicker = {
                 navController.navigate(PROFILE_PICKER)
@@ -33,7 +33,8 @@ fun NavGraphBuilder.listStreamsNavGraph(navController: NavHostController) {
             onNavigateSearchScreen = {
                 navController.navigate(Routes.SEARCH)
             },
-            profilePicture = nav.savedStateHandle.get<String>(PROFILE_ID) ?: DEFAULT_ID
+            profilePicture = nav.savedStateHandle.get<String>(PROFILE_ID)
+                ?: DEFAULT_ID
         )
     }
 }
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screens/ListStreamViewModel.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/presentation/screens/ListStreamViewModel.kt
similarity index 78%
rename from feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screens/ListStreamViewModel.kt
rename to feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/presentation/screens/ListStreamViewModel.kt
index 0a38de37..b5665b61 100644
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screens/ListStreamViewModel.kt
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/presentation/screens/ListStreamViewModel.kt
@@ -1,20 +1,22 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.presentation.screens
+@file:Suppress("ImportOrdering")
+
+package com.codandotv.streamplayerapp.feature.liststreams.list.presentation.screens
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.cachedIn
 import androidx.paging.map
-import com.codandotv.streamplayerapp.core_networking.handleError.catchFailure
-import com.codandotv.streamplayerapp.feature_list_streams.core.ContentType
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.GetGenresUseCase
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.GetTopRatedStream
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.ListStreamUseCase
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.Genre
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.HighlightBanner
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.IconAndTextInfo
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.Stream
-import com.codandotv.streamplayerapp.core_shared_ui.widget.StreamsCardContent
-import com.codandotv.streamplayerapp.core_shared_ui.widget.StreamsCarouselContent
+import com.codandotv.streamplayerapp.core.networking.handleError.catchFailure
+import com.codandotv.streamplayerapp.core.shared.ui.widget.StreamsCardContent
+import com.codandotv.streamplayerapp.core.shared.ui.widget.StreamsCarouselContent
+import com.codandotv.streamplayerapp.feature.liststreams.core.ContentType
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.GetGenresUseCase
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.GetTopRatedStream
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.ListStreamUseCase
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.Genre
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.HighlightBanner
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.IconAndTextInfo
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.Stream
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
@@ -27,13 +29,14 @@ import kotlinx.coroutines.launch
 import streamplayerapp_kmp.core_shared_ui.generated.resources.ic_add
 import streamplayerapp_kmp.core_shared_ui.generated.resources.ic_info
 import streamplayerapp_kmp.core_shared_ui.generated.resources.ic_play
-import streamplayerapp_kmp.feature_list_streams.generated.resources.Res
 import streamplayerapp_kmp.feature_list_streams.generated.resources.ic_top_10
-import streamplayerapp_kmp.core_shared_ui.generated.resources.Res as SharedRes
 import streamplayerapp_kmp.feature_list_streams.generated.resources.list_highlight_banner_add
 import streamplayerapp_kmp.feature_list_streams.generated.resources.list_highlight_banner_info
 import streamplayerapp_kmp.feature_list_streams.generated.resources.list_highlight_banner_stream_ranking
 import streamplayerapp_kmp.feature_list_streams.generated.resources.list_highlight_banner_watch
+import streamplayerapp_kmp.feature_list_streams.generated.resources.Res
+import kotlin.collections.map
+import streamplayerapp_kmp.core_shared_ui.generated.resources.Res as SharedRes
 
 class ListStreamViewModel(
     private val listStreams: ListStreamUseCase,
@@ -86,8 +89,12 @@ class ListStreamViewModel(
         HighlightBanner(
             name = latest.name,
             imageUrl = latest.posterPathUrl,
-            contentType = ContentType.getContentName(ContentType.FILM),
-            contentTypeAsPlural = ContentType.getContentNameAsPlural(ContentType.FILM),
+            contentType = ContentType.getContentName(
+                ContentType.FILM
+            ),
+            contentTypeAsPlural = ContentType.getContentNameAsPlural(
+                ContentType.FILM
+            ),
             extraInfo = IconAndTextInfo(
                 Res.drawable.ic_top_10,
                 Res.string.list_highlight_banner_stream_ranking
@@ -106,7 +113,6 @@ class ListStreamViewModel(
             ),
         )
 
-
     private fun getStreamsByGenre(genre: Genre): StreamsCarouselContent {
         return StreamsCarouselContent(
             genre.name,
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screens/ListStreamsScreen.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/presentation/screens/ListStreamsScreen.kt
similarity index 85%
rename from feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screens/ListStreamsScreen.kt
rename to feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/presentation/screens/ListStreamsScreen.kt
index 7f254a4b..a4506ae1 100644
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screens/ListStreamsScreen.kt
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/presentation/screens/ListStreamsScreen.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.presentation.screens
+package com.codandotv.streamplayerapp.feature.liststreams.list.presentation.screens
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.CircularProgressIndicator
@@ -24,10 +23,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
-import com.codandotv.streamplayerapp.core_navigation.bottomnavigation.StreamPlayerBottomNavigation
-import com.codandotv.streamplayerapp.core_shared_ui.widget.StreamPlayerTopBar
-import com.codandotv.streamplayerapp.feature_list_streams.list.presentation.widgets.HighlightBanner
-import com.codandotv.streamplayerapp.core_shared_ui.widget.StreamsCarousel
+import com.codandotv.streamplayerapp.core.navigation.bottomnavigation.StreamPlayerBottomNavigation
+import com.codandotv.streamplayerapp.core.shared.ui.widget.StreamPlayerTopBar
+import com.codandotv.streamplayerapp.core.shared.ui.widget.StreamsCarousel
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.HighlightBanner
+import com.codandotv.streamplayerapp.feature.liststreams.list.presentation.widgets.HighlightBanner
 import org.koin.compose.viewmodel.koinViewModel
 
 @Suppress("LongParameterList")
@@ -80,8 +80,9 @@ fun ListStreamsScreen(
                         .align(Alignment.TopCenter)
                         .verticalScroll(baseScrollState)
                 ) {
-
-                    HighlightBanner(data = uiState.highlightBanner)
+                    HighlightBanner(
+                        data = uiState.highlightBanner
+                    )
 
                     uiState.streamsCarouselContent.forEach { streamCarouselContent ->
                         StreamsCarousel(
@@ -95,4 +96,3 @@ fun ListStreamsScreen(
         }
     }
 }
-
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/presentation/screens/ListStreamsUIState.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/presentation/screens/ListStreamsUIState.kt
new file mode 100644
index 00000000..9c4eedd0
--- /dev/null
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/presentation/screens/ListStreamsUIState.kt
@@ -0,0 +1,10 @@
+package com.codandotv.streamplayerapp.feature.liststreams.list.presentation.screens
+
+import com.codandotv.streamplayerapp.core.shared.ui.widget.StreamsCarouselContent
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.HighlightBanner
+
+data class ListStreamsUIState(
+    val highlightBanner: HighlightBanner? = null,
+    val streamsCarouselContent: List<StreamsCarouselContent>,
+    val isLoading: Boolean
+)
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/widgets/HighlightBanner.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/presentation/widgets/HighlightBanner.kt
similarity index 88%
rename from feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/widgets/HighlightBanner.kt
rename to feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/presentation/widgets/HighlightBanner.kt
index 8b411424..c6a6ac68 100644
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/widgets/HighlightBanner.kt
+++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/liststreams/list/presentation/widgets/HighlightBanner.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.presentation.widgets
+package com.codandotv.streamplayerapp.feature.liststreams.list.presentation.widgets
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -31,9 +31,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.codandotv.streamplayerapp.core_shared_ui.widget.WebImage
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.HighlightBanner
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.IconAndTextInfo
+import com.codandotv.streamplayerapp.core.shared.ui.widget.WebImage
+import com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.HighlightBanner
 import org.jetbrains.compose.resources.StringResource
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
@@ -53,7 +52,10 @@ import streamplayerapp_kmp.core_shared_ui.generated.resources.Res as SharedRes
 
 @Suppress("MagicNumber")
 @Composable
-fun HighlightBanner(modifier: Modifier = Modifier, data: HighlightBanner?) {
+fun HighlightBanner(
+    data: HighlightBanner?,
+    modifier: Modifier = Modifier,
+) {
     data ?: return
 
     Box(
@@ -61,7 +63,9 @@ fun HighlightBanner(modifier: Modifier = Modifier, data: HighlightBanner?) {
             .fillMaxWidth()
             .height(500.dp)
     ) {
-        ContentImage(imageUrl = data.imageUrl)
+        ContentImage(
+            imageUrl = data.imageUrl
+        )
         BackgroundGradient()
         Column(
             modifier = Modifier
@@ -70,13 +74,20 @@ fun HighlightBanner(modifier: Modifier = Modifier, data: HighlightBanner?) {
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
             Spacer(modifier = Modifier.weight(1F))
-            ContentType(contentType = data.contentType)
-            ContentName(name = data.name)
+            ContentType(
+                contentType = data.contentType
+            )
+            ContentName(
+                name = data.name
+            )
             ContentRanking(
                 extraInfo = data.extraInfo,
                 contentTypeAsPlural = data.contentTypeAsPlural
             )
-            ActionButtons(Modifier.weight(0.3F), data)
+            ActionButtons(
+                Modifier.weight(0.3F),
+                data
+            )
         }
     }
 }
@@ -123,7 +134,7 @@ fun ContentName(modifier: Modifier = Modifier, name: String) {
 @Composable
 fun ContentRanking(
     modifier: Modifier = Modifier,
-    extraInfo: IconAndTextInfo,
+    extraInfo: com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.IconAndTextInfo,
     contentTypeAsPlural: StringResource
 ) {
     Row(modifier = modifier, verticalAlignment = Alignment.CenterVertically) {
@@ -160,16 +171,17 @@ fun ContentType(modifier: Modifier = Modifier, contentType: StringResource) {
             letterSpacing = 4.sp
         )
     }
-
 }
 
 @Composable
-fun ActionButtons(modifier: Modifier, data: HighlightBanner) {
+fun ActionButtons(
+    modifier: Modifier,
+    data: HighlightBanner,
+) {
     Row(verticalAlignment = Alignment.CenterVertically, modifier = modifier) {
         AddToListButton(
-            modifier = Modifier
-                .weight(1F)
-                .fillMaxSize(), data
+            modifier = Modifier.weight(1F).fillMaxSize(),
+            data
         ) {
             /* todo */
         }
@@ -179,7 +191,8 @@ fun ActionButtons(modifier: Modifier, data: HighlightBanner) {
         InfoButton(
             modifier = Modifier
                 .weight(1F)
-                .fillMaxSize(), data
+                .fillMaxSize(),
+            data
         ) {
             /* todo */
         }
@@ -189,7 +202,7 @@ fun ActionButtons(modifier: Modifier, data: HighlightBanner) {
 @Composable
 fun AddToListButton(
     modifier: Modifier = Modifier,
-    data: HighlightBanner,
+    data: com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.HighlightBanner,
     onClick: () -> Unit
 ) {
     IconButton(onClick = { onClick.invoke() }, modifier = modifier) {
@@ -211,7 +224,7 @@ fun AddToListButton(
 @Composable
 fun InfoButton(
     modifier: Modifier = Modifier,
-    data: HighlightBanner,
+    data: com.codandotv.streamplayerapp.feature.liststreams.list.domain.model.HighlightBanner,
     onClick: () -> Unit
 ) {
     IconButton(onClick = { onClick.invoke() }, modifier = modifier) {
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/di/ListStreamModule.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/di/ListStreamModule.kt
deleted file mode 100644
index 02a1cf6d..00000000
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/di/ListStreamModule.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.di
-
-import com.codandotv.streamplayerapp.feature_list_streams.list.data.ListStreamRepository
-import com.codandotv.streamplayerapp.feature_list_streams.list.data.ListStreamRepositoryImpl
-import com.codandotv.streamplayerapp.feature_list_streams.list.data.ListStreamService
-import com.codandotv.streamplayerapp.feature_list_streams.list.data.ListStreamServiceImpl
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.GetGenresUseCase
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.GetGenresUseCaseImpl
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.GetTopRatedStream
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.GetTopRatedStreamImpl
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.ListStreamAnalytics
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.ListStreamAnalyticsImpl
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.ListStreamUseCase
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.ListStreamUseCaseImpl
-import com.codandotv.streamplayerapp.feature_list_streams.list.presentation.screens.ListStreamViewModel
-import org.koin.core.module.dsl.viewModel
-import org.koin.dsl.module
-
-object ListStreamModule {
-    val module = module {
-        viewModel {
-            ListStreamViewModel(
-                listStreams = get(),
-                listGenres = get(),
-                latestStream = get()
-            )
-        }
-
-        factory<ListStreamUseCase> {
-            ListStreamUseCaseImpl(
-                repository = get()
-            )
-        }
-
-        factory<GetGenresUseCase> {
-            GetGenresUseCaseImpl(
-                repository = get()
-            )
-        }
-
-        factory<GetTopRatedStream> {
-            GetTopRatedStreamImpl(
-                repository = get()
-            )
-        }
-
-        factory<ListStreamAnalytics> {
-            ListStreamAnalyticsImpl()
-        }
-
-        factory<ListStreamRepository> {
-            ListStreamRepositoryImpl(
-                service = get(),
-            )
-        }
-
-        factory<ListStreamService> {
-            ListStreamServiceImpl(
-                client = get()
-            )
-        }
-    }
-}
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/ListStreamMapper.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/ListStreamMapper.kt
deleted file mode 100644
index 7cab23fe..00000000
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/ListStreamMapper.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.domain
-
-import ListStreamResponse
-import StreamResponse
-import com.codandotv.streamplayerapp.core_shared.Url
-import com.codandotv.streamplayerapp.feature_list_streams.list.data.model.GenresResponse
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.Genre
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.ListStream
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.Stream
-
-fun ListStreamResponse.toListStream(genre: String): ListStream =
-    ListStream(
-        categoryName = genre,
-        streams = this.results.map { streamResponse ->
-            streamResponse.toStream()
-        }
-    )
-
-fun GenresResponse.toGenres(): List<Genre> = this.genres.map { genreResponse ->
-    Genre(id = genreResponse.id, name = genreResponse.name)
-}
-
-fun StreamResponse.toStream(): Stream = Stream(
-    description = overview,
-    name = title,
-    posterPathUrl = "${Url.IMAGE_URL_SIZE_300}${poster_path}",
-    id = id.toString()
-)
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/model/Genre.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/model/Genre.kt
deleted file mode 100644
index aa3c00ee..00000000
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/model/Genre.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.domain.model
-
-data class Genre(
-    val id: Long,
-    val name: String
-)
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/model/ListStream.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/model/ListStream.kt
deleted file mode 100644
index c79aa627..00000000
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/model/ListStream.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.domain.model
-
-data class Stream(
-    val id : String,
-    val name : String,
-    val description : String,
-    val posterPathUrl: String,
-)
-data class ListStream(
-    val categoryName: String,
-    val streams: List<Stream>
-)
diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screens/ListStreamsUIState.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screens/ListStreamsUIState.kt
deleted file mode 100644
index 3e444dfa..00000000
--- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screens/ListStreamsUIState.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.codandotv.streamplayerapp.feature_list_streams.list.presentation.screens
-
-import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.HighlightBanner
-import com.codandotv.streamplayerapp.core_shared_ui.widget.StreamsCarouselContent
-
-data class ListStreamsUIState(
-    val highlightBanner: HighlightBanner? = null,
-    val streamsCarouselContent: List<StreamsCarouselContent>,
-    val isLoading: Boolean
-)
diff --git a/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_news/di/NewsScreenModule.kt b/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/news/di/NewsScreenModule.kt
similarity index 50%
rename from feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_news/di/NewsScreenModule.kt
rename to feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/news/di/NewsScreenModule.kt
index 0b1ab285..8b665f6c 100644
--- a/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_news/di/NewsScreenModule.kt
+++ b/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/news/di/NewsScreenModule.kt
@@ -1,8 +1,8 @@
-package com.codandotv.streamplayerapp.feature_news.di
+package com.codandotv.streamplayerapp.feature.news.di
 
 import org.koin.core.annotation.ComponentScan
 import org.koin.core.annotation.Module
 
 @Module
-@ComponentScan("com.codandotv.streamplayerapp.feature_news")
+@ComponentScan("com.codandotv.streamplayerapp.feature.news")
 class NewsScreenModule
diff --git a/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_news/presentation/NewsScreenViewModel.kt b/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/news/presentation/NewsScreenViewModel.kt
similarity index 90%
rename from feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_news/presentation/NewsScreenViewModel.kt
rename to feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/news/presentation/NewsScreenViewModel.kt
index 005fe60d..b33df42e 100644
--- a/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_news/presentation/NewsScreenViewModel.kt
+++ b/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/news/presentation/NewsScreenViewModel.kt
@@ -1,10 +1,10 @@
-package com.codandotv.streamplayerapp.feature_news.presentation
+package com.codandotv.streamplayerapp.feature.news.presentation
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.codandotv.streamplayerapp.core_permission.permission.AppPermission
-import com.codandotv.streamplayerapp.core_permission.permission.PermissionStatus
-import com.codandotv.streamplayerapp.core_permission.permission.PermissionsManager
+import com.codandotv.streamplayerapp.core.permission.AppPermission
+import com.codandotv.streamplayerapp.core.permission.PermissionStatus
+import com.codandotv.streamplayerapp.core.permission.PermissionsManager
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
diff --git a/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_news/presentation/navigation/NewsNavigation.kt b/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/news/presentation/navigation/NewsNavigation.kt
similarity index 69%
rename from feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_news/presentation/navigation/NewsNavigation.kt
rename to feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/news/presentation/navigation/NewsNavigation.kt
index 56ada54d..27ae635b 100644
--- a/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_news/presentation/navigation/NewsNavigation.kt
+++ b/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/news/presentation/navigation/NewsNavigation.kt
@@ -1,10 +1,10 @@
-package com.codandotv.streamplayerapp.feature_news.presentation.navigation
+package com.codandotv.streamplayerapp.feature.news.presentation.navigation
 
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
-import com.codandotv.streamplayerapp.core_navigation.routes.BottomNavRoutes
-import com.codandotv.streamplayerapp.feature_news.presentation.screens.NewsScreenContent
+import com.codandotv.streamplayerapp.core.navigation.routes.BottomNavRoutes
+import com.codandotv.streamplayerapp.feature.news.presentation.screens.NewsScreenContent
 import org.koin.core.annotation.KoinExperimentalAPI
 
 @OptIn(KoinExperimentalAPI::class)
diff --git a/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_news/presentation/screens/NewsScreen.kt b/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/news/presentation/screens/NewsScreen.kt
similarity index 89%
rename from feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_news/presentation/screens/NewsScreen.kt
rename to feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/news/presentation/screens/NewsScreen.kt
index ff0265ce..93b82ffd 100644
--- a/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_news/presentation/screens/NewsScreen.kt
+++ b/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/news/presentation/screens/NewsScreen.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_news.presentation.screens
+package com.codandotv.streamplayerapp.feature.news.presentation.screens
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -20,14 +20,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
-import com.codandotv.streamplayerapp.core_camera_gallery.SharedImage
-import com.codandotv.streamplayerapp.core_camera_gallery.camera.rememberCameraManager
-import com.codandotv.streamplayerapp.core_camera_gallery.gallery.rememberGalleryManager
-import com.codandotv.streamplayerapp.core_navigation.bottomnavigation.StreamPlayerBottomNavigation
-import com.codandotv.streamplayerapp.core_permission.permission.PermissionDeniedDialog
-import com.codandotv.streamplayerapp.feature_news.presentation.NewsScreenActionTakeImage
-import com.codandotv.streamplayerapp.feature_news.presentation.NewsScreenViewModel
-import com.codandotv.streamplayerapp.feature_news.presentation.widget.ImagePickerContent
+import com.codandotv.streamplayerapp.core.camera.gallery.SharedImage
+import com.codandotv.streamplayerapp.core.camera.gallery.camera.rememberCameraManager
+import com.codandotv.streamplayerapp.core.camera.gallery.gallery.rememberGalleryManager
+import com.codandotv.streamplayerapp.core.navigation.bottomnavigation.StreamPlayerBottomNavigation
+import com.codandotv.streamplayerapp.core.permission.PermissionDeniedDialog
+import com.codandotv.streamplayerapp.feature.news.presentation.NewsScreenActionTakeImage
+import com.codandotv.streamplayerapp.feature.news.presentation.NewsScreenViewModel
+import com.codandotv.streamplayerapp.feature.news.presentation.widget.ImagePickerContent
 import dev.icerock.moko.permissions.compose.BindEffect
 import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.viewmodel.koinViewModel
@@ -36,7 +36,6 @@ import streamplayerapp_kmp.feature_news.generated.resources.error_image_loaded
 import streamplayerapp_kmp.feature_news.generated.resources.select_image_subtitle
 import streamplayerapp_kmp.feature_news.generated.resources.select_image_title
 
-
 @Composable
 fun NewsScreenContent(
     navController: NavController,
@@ -65,7 +64,7 @@ fun NewsScreenContent(
 
     LaunchedEffect(Unit) {
         viewModel.actionTakeImage.collect { action ->
-            when(action) {
+            when (action) {
                 NewsScreenActionTakeImage.Camera -> cameraManager.launch()
                 NewsScreenActionTakeImage.Gallery -> galleryManager.launch()
             }
diff --git a/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_news/presentation/widget/ImageCaptureHandler.kt b/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/news/presentation/widget/ImageCaptureHandler.kt
similarity index 78%
rename from feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_news/presentation/widget/ImageCaptureHandler.kt
rename to feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/news/presentation/widget/ImageCaptureHandler.kt
index e5220f9f..3109f010 100644
--- a/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_news/presentation/widget/ImageCaptureHandler.kt
+++ b/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/news/presentation/widget/ImageCaptureHandler.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_news.presentation.widget
+package com.codandotv.streamplayerapp.feature.news.presentation.widget
 
 class ImageCaptureHandler(
     val onCameraRequest: () -> Unit,
diff --git a/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_news/presentation/widget/ImagePickerCameraGallery.kt b/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/news/presentation/widget/ImagePickerCameraGallery.kt
similarity index 94%
rename from feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_news/presentation/widget/ImagePickerCameraGallery.kt
rename to feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/news/presentation/widget/ImagePickerCameraGallery.kt
index c975b994..eae2cdca 100644
--- a/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_news/presentation/widget/ImagePickerCameraGallery.kt
+++ b/feature-news/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/news/presentation/widget/ImagePickerCameraGallery.kt
@@ -1,4 +1,6 @@
-package com.codandotv.streamplayerapp.feature_news.presentation.widget
+@file:Suppress("MagicNumber")
+
+package com.codandotv.streamplayerapp.feature.news.presentation.widget
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@@ -23,7 +25,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
-import com.codandotv.streamplayerapp.core_camera_gallery.SharedImage
+import com.codandotv.streamplayerapp.core.camera.gallery.SharedImage
 import org.jetbrains.compose.resources.stringResource
 import streamplayerapp_kmp.feature_news.generated.resources.Res
 import streamplayerapp_kmp.feature_news.generated.resources.open_camera
diff --git a/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/screens/ProfilePickerStreamToolbarPreview.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/screens/ProfilePickerStreamToolbarPreview.kt
new file mode 100644
index 00000000..63912647
--- /dev/null
+++ b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/screens/ProfilePickerStreamToolbarPreview.kt
@@ -0,0 +1,14 @@
+package com.codandotv.streamplayerapp.feature.profile.presentation.screens
+
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import com.codandotv.streamplayerapp.core.shared.ui.theme.ThemePreviews
+import com.codandotv.streamplayerapp.feature.profile.presentation.widget.ProfilePickerStreamToolbar
+
+@ThemePreviews
+@Composable
+fun ProfilePickerStreamToolbarPreview() {
+    MaterialTheme {
+        ProfilePickerStreamToolbar()
+    }
+}
diff --git a/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/screens/SetupProfilePickerScreenPreview.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/screens/SetupProfilePickerScreenPreview.kt
new file mode 100644
index 00000000..59dff3c3
--- /dev/null
+++ b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/screens/SetupProfilePickerScreenPreview.kt
@@ -0,0 +1,22 @@
+package com.codandotv.streamplayerapp.feature.profile.presentation.screens
+
+import androidx.compose.runtime.Composable
+import com.codandotv.streamplayerapp.core.shared.ui.theme.ThemePreview
+import com.codandotv.streamplayerapp.core.shared.ui.theme.ThemePreviews
+import com.codandotv.streamplayerapp.feature.profile.domain.ProfileStream
+
+@ThemePreviews
+@Composable
+fun SetupProfilePickerScreenPreview() {
+    ThemePreview {
+        SetupProfilePickerScreen(
+            uiState = ProfilePickerStreamsUIState(
+                selectedItem = ProfileStream(
+                    "1",
+                    "Name",
+                    ""
+                ),
+            )
+        )
+    }
+}
diff --git a/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamToolbarPreview.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamToolbarPreview.kt
deleted file mode 100644
index eca69bc3..00000000
--- a/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamToolbarPreview.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.codandotv.streamplayerapp.profile.presentation.screens
-
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import com.codandotv.streamplayerapp.core_shared_ui.theme.ThemePreviews
-import com.codandotv.streamplayerapp.profile.presentation.widget.ProfilePickerStreamToolbar
-
-@ThemePreviews
-@Composable
-fun ProfilePickerStreamToolbarPreview() {
-    MaterialTheme {
-        ProfilePickerStreamToolbar()
-    }
-}
diff --git a/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/SetupProfilePickerScreenPreview.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/SetupProfilePickerScreenPreview.kt
deleted file mode 100644
index d985a6bc..00000000
--- a/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/SetupProfilePickerScreenPreview.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.codandotv.streamplayerapp.profile.presentation.screens
-
-import androidx.compose.runtime.Composable
-import com.codandotv.streamplayerapp.core_shared_ui.theme.ThemePreview
-import com.codandotv.streamplayerapp.core_shared_ui.theme.ThemePreviews
-import com.codandotv.streamplayerapp.profile.domain.ProfileStream
-
-@ThemePreviews
-@Composable
-fun SetupProfilePickerScreenPreview() {
-    ThemePreview {
-        SetupProfilePickerScreen(
-            uiState = ProfilePickerStreamsUIState(
-                selectedItem = ProfileStream("1", "Name", ""),
-            )
-        )
-    }
-}
diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/data/ProfilePickerStreamRepository.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/data/ProfilePickerStreamRepository.kt
similarity index 76%
rename from feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/data/ProfilePickerStreamRepository.kt
rename to feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/data/ProfilePickerStreamRepository.kt
index 827f6151..28e43084 100644
--- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/data/ProfilePickerStreamRepository.kt
+++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/data/ProfilePickerStreamRepository.kt
@@ -1,16 +1,16 @@
-package com.codandotv.streamplayerapp.profile.data
+package com.codandotv.streamplayerapp.feature.profile.data
 
-import com.codandotv.streamplayerapp.core_networking.handleError.toFlow
-import com.codandotv.streamplayerapp.core_networking.handleError.toResult
-import com.codandotv.streamplayerapp.profile.domain.ProfileStream
-import com.codandotv.streamplayerapp.profile.domain.toProfiles
+import com.codandotv.streamplayerapp.core.networking.handleError.toFlow
+import com.codandotv.streamplayerapp.core.networking.handleError.toResult
+import com.codandotv.streamplayerapp.feature.profile.domain.ProfileStream
+import com.codandotv.streamplayerapp.feature.profile.domain.toProfiles
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import org.koin.core.annotation.Factory
 
 interface ProfilePickerStreamRepository {
-    suspend fun getProfiles(): Flow<List<ProfileStream>>
+    suspend fun getProfiles(): Flow<List<com.codandotv.streamplayerapp.feature.profile.domain.ProfileStream>>
 }
 
 @Factory
@@ -18,11 +18,9 @@ class ProfilePickerStreamRepositoryImpl(
     private val service: ProfilePickerStreamService
 ) : ProfilePickerStreamRepository {
 
-    override suspend fun getProfiles(): Flow<List<ProfileStream>> {
-
+    override suspend fun getProfiles(): Flow<List<com.codandotv.streamplayerapp.feature.profile.domain.ProfileStream>> {
         with(service.getProfiles()) {
             if (this.toResult().isFailure || this.toResult().getOrNull() == null) {
-                // Log.i("ProfilePickerStreamRepositoryImpl", "versão off carregada")
                 return flowOf(mockProfiles)
             } else {
                 return this.toFlow().map { it.toProfiles() }
@@ -31,7 +29,6 @@ class ProfilePickerStreamRepositoryImpl(
     }
 }
 
-
 private val mockProfiles = listOf(
     ProfileStream(
         id = "1",
diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/data/ProfilePickerStreamService.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/data/ProfilePickerStreamService.kt
similarity index 67%
rename from feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/data/ProfilePickerStreamService.kt
rename to feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/data/ProfilePickerStreamService.kt
index f1d6ca32..9e94da44 100644
--- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/data/ProfilePickerStreamService.kt
+++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/data/ProfilePickerStreamService.kt
@@ -1,8 +1,8 @@
-package com.codandotv.streamplayerapp.profile.data
+package com.codandotv.streamplayerapp.feature.profile.data
 
-import com.codandotv.streamplayerapp.core_networking.handleError.NetworkResponse
-import com.codandotv.streamplayerapp.core_networking.handleError.safeRequest
-import com.codandotv.streamplayerapp.profile.data.model.ProfilesResponse
+import com.codandotv.streamplayerapp.core.networking.handleError.NetworkResponse
+import com.codandotv.streamplayerapp.core.networking.handleError.safeRequest
+import com.codandotv.streamplayerapp.feature.profile.data.model.ProfilesResponse
 import io.ktor.client.HttpClient
 import io.ktor.client.request.url
 import org.koin.core.annotation.Factory
diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/data/model/ProfileStreamResponse.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/data/model/ProfileStreamResponse.kt
similarity index 59%
rename from feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/data/model/ProfileStreamResponse.kt
rename to feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/data/model/ProfileStreamResponse.kt
index 8c61aa6a..670210e8 100644
--- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/data/model/ProfileStreamResponse.kt
+++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/data/model/ProfileStreamResponse.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.profile.data.model
+package com.codandotv.streamplayerapp.feature.profile.data.model
 
 import kotlinx.serialization.Serializable
 
@@ -12,5 +12,5 @@ data class ProfileStreamResponse(
 
 @Serializable
 data class ProfilesResponse(
-    val profiles: List<ProfileStreamResponse>
+    val profiles: List<com.codandotv.streamplayerapp.feature.profile.data.model.ProfileStreamResponse>
 )
diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/di/ProfilePickerStreamModule.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/di/ProfilePickerStreamModule.kt
similarity index 51%
rename from feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/di/ProfilePickerStreamModule.kt
rename to feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/di/ProfilePickerStreamModule.kt
index f06a7da4..71edf025 100644
--- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/di/ProfilePickerStreamModule.kt
+++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/di/ProfilePickerStreamModule.kt
@@ -1,8 +1,8 @@
-package com.codandotv.streamplayerapp.profile.di
+package com.codandotv.streamplayerapp.feature.profile.di
 
 import org.koin.core.annotation.ComponentScan
 import org.koin.core.annotation.Module
 
 @Module
-@ComponentScan("com.codandotv.streamplayerapp.profile")
+@ComponentScan("com.codandotv.streamplayerapp.feature.profile")
 class ProfilePickerStreamModule
diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/domain/ProfilePickerStreamMapper.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/domain/ProfilePickerStreamMapper.kt
similarity index 63%
rename from feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/domain/ProfilePickerStreamMapper.kt
rename to feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/domain/ProfilePickerStreamMapper.kt
index ff732549..e7662781 100644
--- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/domain/ProfilePickerStreamMapper.kt
+++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/domain/ProfilePickerStreamMapper.kt
@@ -1,6 +1,6 @@
-package com.codandotv.streamplayerapp.profile.domain
+package com.codandotv.streamplayerapp.feature.profile.domain
 
-import com.codandotv.streamplayerapp.profile.data.model.ProfilesResponse
+import com.codandotv.streamplayerapp.feature.profile.data.model.ProfilesResponse
 
 fun ProfilesResponse.toProfiles(): List<ProfileStream> = this.profiles.map { profileResponse ->
     ProfileStream(
diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/domain/ProfilePickerStreamUseCase.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/domain/ProfilePickerStreamUseCase.kt
similarity index 93%
rename from feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/domain/ProfilePickerStreamUseCase.kt
rename to feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/domain/ProfilePickerStreamUseCase.kt
index 490d855b..934fb029 100644
--- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/domain/ProfilePickerStreamUseCase.kt
+++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/domain/ProfilePickerStreamUseCase.kt
@@ -1,7 +1,8 @@
 @file:Suppress("MagicNumber")
-package com.codandotv.streamplayerapp.profile.domain
 
-import com.codandotv.streamplayerapp.profile.data.ProfilePickerStreamRepository
+package com.codandotv.streamplayerapp.feature.profile.domain
+
+import com.codandotv.streamplayerapp.feature.profile.data.ProfilePickerStreamRepository
 import kotlinx.coroutines.flow.Flow
 import org.koin.core.annotation.Factory
 
@@ -35,7 +36,6 @@ class ProfilePickerStreamUseCaseImpl(
         oneThirdOfWidthScreen: Int,
         oneQuarterOfHeightScreen: Int
     ): List<Pair<Int, Int>> {
-
         return listOf(
             Pair(oneThirdOfWidthScreen - haltSizeImage, 0),
             Pair(oneThirdOfWidthScreen * 2 - haltSizeImage, 0),
diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/domain/ProfileStream.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/domain/ProfileStream.kt
similarity index 61%
rename from feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/domain/ProfileStream.kt
rename to feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/domain/ProfileStream.kt
index 3eaa2cb8..1dd1f510 100644
--- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/domain/ProfileStream.kt
+++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/domain/ProfileStream.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.profile.domain
+package com.codandotv.streamplayerapp.feature.profile.domain
 
 data class ProfileStream(
     val id: String,
diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/navigation/ProfilePickerStreamNavigation.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/navigation/ProfilePickerStreamNavigation.kt
similarity index 61%
rename from feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/navigation/ProfilePickerStreamNavigation.kt
rename to feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/navigation/ProfilePickerStreamNavigation.kt
index a50acfc5..d6f83d84 100644
--- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/navigation/ProfilePickerStreamNavigation.kt
+++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/navigation/ProfilePickerStreamNavigation.kt
@@ -1,12 +1,12 @@
-package com.codandotv.streamplayerapp.profile.presentation.navigation
+package com.codandotv.streamplayerapp.feature.profile.presentation.navigation
 
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
-import com.codandotv.streamplayerapp.core_navigation.routes.BottomNavRoutes.HOME
-import com.codandotv.streamplayerapp.core_navigation.routes.BottomNavRoutes.PARAM.PROFILE_ID
-import com.codandotv.streamplayerapp.core_navigation.routes.Routes
-import com.codandotv.streamplayerapp.profile.presentation.screens.ProfilePickerStreamScreen
+import com.codandotv.streamplayerapp.core.navigation.routes.BottomNavRoutes.HOME
+import com.codandotv.streamplayerapp.core.navigation.routes.BottomNavRoutes.PARAM.PROFILE_ID
+import com.codandotv.streamplayerapp.core.navigation.routes.Routes
+import com.codandotv.streamplayerapp.feature.profile.presentation.screens.ProfilePickerStreamScreen
 import org.koin.core.annotation.KoinExperimentalAPI
 
 @OptIn(KoinExperimentalAPI::class)
diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamScreen.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/screens/ProfilePickerStreamScreen.kt
similarity index 84%
rename from feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamScreen.kt
rename to feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/screens/ProfilePickerStreamScreen.kt
index 31162930..d582ea59 100644
--- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamScreen.kt
+++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/screens/ProfilePickerStreamScreen.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.profile.presentation.screens
+package com.codandotv.streamplayerapp.feature.profile.presentation.screens
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.animateDpAsState
@@ -15,13 +15,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
-import com.codandotv.streamplayerapp.profile.domain.ProfileStream
-import com.codandotv.streamplayerapp.profile.presentation.widget.LoadScreen
-import com.codandotv.streamplayerapp.profile.presentation.widget.ProfilePickerOpacityLayer
-import com.codandotv.streamplayerapp.profile.presentation.widget.ProfilePickerProfilesGrid
-import com.codandotv.streamplayerapp.profile.presentation.widget.ProfilePickerSelectedProfileContainer
-import com.codandotv.streamplayerapp.profile.presentation.widget.ProfilePickerStreamToolbar
-import com.codandotv.streamplayerapp.profile.presentation.widget.dpToPx
+import com.codandotv.streamplayerapp.feature.profile.domain.ProfileStream
+import com.codandotv.streamplayerapp.feature.profile.presentation.widget.LoadScreen
+import com.codandotv.streamplayerapp.feature.profile.presentation.widget.ProfilePickerOpacityLayer
+import com.codandotv.streamplayerapp.feature.profile.presentation.widget.ProfilePickerProfilesGrid
+import com.codandotv.streamplayerapp.feature.profile.presentation.widget.ProfilePickerSelectedProfileContainer
+import com.codandotv.streamplayerapp.feature.profile.presentation.widget.ProfilePickerStreamToolbar
+import com.codandotv.streamplayerapp.feature.profile.presentation.widget.dpToPx
 import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.viewmodel.koinViewModel
 import streamplayerapp_kmp.feature_profile.generated.resources.Res
@@ -29,6 +29,7 @@ import streamplayerapp_kmp.feature_profile.generated.resources.profile_animation
 import streamplayerapp_kmp.feature_profile.generated.resources.profile_animation_selected_image_position
 import streamplayerapp_kmp.feature_profile.generated.resources.profile_animation_selected_image_size
 import streamplayerapp_kmp.feature_profile.generated.resources.profile_animation_showing_all_profiles
+import kotlin.collections.indexOf
 
 @Composable
 fun ProfilePickerStreamScreen(
@@ -83,7 +84,9 @@ fun SetupProfilePickerScreen(
 
     Scaffold(
         topBar = {
-            ProfilePickerStreamToolbar(modifier = Modifier.background(animatedOpacityBackground))
+            ProfilePickerStreamToolbar(
+                modifier = Modifier.background(animatedOpacityBackground)
+            )
         },
         content = { _ ->
             with(uiState) {
@@ -116,7 +119,10 @@ fun SetupProfilePickerScreen(
                     } else {
                         if (uiState.profilesStream.isNotEmpty() && offsetProfiles.isNotEmpty()) {
                             with(offsetProfiles[uiState.profilesStream.indexOf(selectedItem)]) {
-                                IntOffset(first, second)
+                                IntOffset(
+                                    first,
+                                    second
+                                )
                             }
                         } else {
                             IntOffset(0, 0)
@@ -134,7 +140,9 @@ fun SetupProfilePickerScreen(
                     onSetLastItemPositioned = onSetLastItemPositioned
                 )
 
-                ProfilePickerOpacityLayer(animatedOpacityBackground)
+                ProfilePickerOpacityLayer(
+                    animatedOpacityBackground
+                )
 
                 ProfilePickerSelectedProfileContainer(
                     state = uiState,
diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamViewModel.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/screens/ProfilePickerStreamViewModel.kt
similarity index 91%
rename from feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamViewModel.kt
rename to feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/screens/ProfilePickerStreamViewModel.kt
index 2dc3c90f..ea57880f 100644
--- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamViewModel.kt
+++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/screens/ProfilePickerStreamViewModel.kt
@@ -1,10 +1,8 @@
-package com.codandotv.streamplayerapp.profile.presentation.screens
+package com.codandotv.streamplayerapp.feature.profile.presentation.screens
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.codandotv.streamplayerapp.core_networking.handleError.catchFailure
-import com.codandotv.streamplayerapp.profile.domain.ProfilePickerStreamUseCase
-import com.codandotv.streamplayerapp.profile.domain.ProfileStream
+import com.codandotv.streamplayerapp.core.networking.handleError.catchFailure
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
@@ -15,7 +13,7 @@ import org.koin.android.annotation.KoinViewModel
 
 @KoinViewModel
 class ProfilePickerStreamViewModel(
-    private val useCase: ProfilePickerStreamUseCase,
+    private val useCase: com.codandotv.streamplayerapp.feature.profile.domain.ProfilePickerStreamUseCase,
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow(ProfilePickerStreamsUIState())
@@ -107,7 +105,7 @@ class ProfilePickerStreamViewModel(
     }
 
     @Suppress("MagicNumber")
-    fun moveSelectedProfileToCenterImage(profile: ProfileStream) {
+    fun moveSelectedProfileToCenterImage(profile: com.codandotv.streamplayerapp.feature.profile.domain.ProfileStream) {
         viewModelScope.launch {
             with(_uiState.value) {
                 // move hide image to the position of the clicked item
@@ -137,5 +135,4 @@ class ProfilePickerStreamViewModel(
             }
         }
     }
-
 }
diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamsUIState.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/screens/ProfilePickerStreamsUIState.kt
similarity index 85%
rename from feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamsUIState.kt
rename to feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/screens/ProfilePickerStreamsUIState.kt
index 0ca2751b..977a1857 100644
--- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamsUIState.kt
+++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/screens/ProfilePickerStreamsUIState.kt
@@ -1,7 +1,6 @@
-package com.codandotv.streamplayerapp.profile.presentation.screens
-
-import com.codandotv.streamplayerapp.profile.domain.ProfileStream
+package com.codandotv.streamplayerapp.feature.profile.presentation.screens
 
+import com.codandotv.streamplayerapp.feature.profile.domain.ProfileStream
 
 data class ProfilePickerStreamsUIState(
     val profilesStream: List<ProfileStream> = emptyList(),
@@ -26,4 +25,3 @@ data class ProfilePickerStreamsUIState(
     val selectedImageAlpha: Float = 1f,
     val centerScreen: Pair<Int, Int> = Pair(0, 0),
 )
-
diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ComposeExtensions.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/widget/ComposeExtensions.kt
similarity index 74%
rename from feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ComposeExtensions.kt
rename to feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/widget/ComposeExtensions.kt
index 64e6de7c..ad3a9f60 100644
--- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ComposeExtensions.kt
+++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/widget/ComposeExtensions.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.profile.presentation.widget
+package com.codandotv.streamplayerapp.feature.profile.presentation.widget
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalDensity
diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerOpacityLayer.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/widget/ProfilePickerOpacityLayer.kt
similarity index 85%
rename from feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerOpacityLayer.kt
rename to feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/widget/ProfilePickerOpacityLayer.kt
index efbd403f..387985e7 100644
--- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerOpacityLayer.kt
+++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/widget/ProfilePickerOpacityLayer.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.profile.presentation.widget
+package com.codandotv.streamplayerapp.feature.profile.presentation.widget
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerProfilesGrid.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/widget/ProfilePickerProfilesGrid.kt
similarity index 80%
rename from feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerProfilesGrid.kt
rename to feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/widget/ProfilePickerProfilesGrid.kt
index 6b99fe34..dbb31c72 100644
--- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerProfilesGrid.kt
+++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/widget/ProfilePickerProfilesGrid.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.profile.presentation.widget
+package com.codandotv.streamplayerapp.feature.profile.presentation.widget
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.BoxWithConstraints
@@ -21,21 +21,17 @@ import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
-import com.codandotv.streamplayerapp.core_shared_ui.widget.WebImage
-import com.codandotv.streamplayerapp.profile.domain.ProfileStream
-import com.codandotv.streamplayerapp.profile.presentation.screens.ProfilePickerStreamsUIState
-import org.jetbrains.compose.resources.painterResource
+import com.codandotv.streamplayerapp.core.shared.ui.widget.WebImage
 import org.jetbrains.compose.resources.stringResource
 import streamplayerapp_kmp.feature_profile.generated.resources.Res
-import streamplayerapp_kmp.feature_profile.generated.resources.image_placeholder
 import streamplayerapp_kmp.feature_profile.generated.resources.profile_current_profile_name
 
 @Composable
 fun ProfilePickerProfilesGrid(
-    uiState: ProfilePickerStreamsUIState,
+    uiState: com.codandotv.streamplayerapp.feature.profile.presentation.screens.ProfilePickerStreamsUIState,
     animatedProfileAlpha: Float,
     onSetScreenSize: (Float, Float, Int, Int) -> Unit,
-    onClickSelectedProfile: (ProfileStream) -> Unit,
+    onClickSelectedProfile: (com.codandotv.streamplayerapp.feature.profile.domain.ProfileStream) -> Unit,
     onSetLastItemPositioned: (Boolean) -> Unit
 ) {
     BoxWithConstraints(
@@ -54,11 +50,13 @@ fun ProfilePickerProfilesGrid(
         )
 
         with(uiState) {
-
             profilesStream.forEach { profile ->
                 val profileItemPosition = if (offsetProfiles.isNotEmpty()) {
                     with(offsetProfiles[profilesStream.indexOf(profile)]) {
-                        IntOffset(first, second)
+                        IntOffset(
+                            first,
+                            second
+                        )
                     }
                 } else {
                     IntOffset(0, 0)
@@ -66,7 +64,9 @@ fun ProfilePickerProfilesGrid(
 
                 ProfileItem(
                     state = uiState,
-                    profileItemPosition, profile, onClickSelectedProfile
+                    profileItemPosition,
+                    profile,
+                    onClickSelectedProfile
                 )
 
                 if (profilesStream.indexOf(profile) == profilesStream.size - 1) {
@@ -80,10 +80,10 @@ fun ProfilePickerProfilesGrid(
 @Suppress("MagicNumber")
 @Composable
 private fun ProfileItem(
-    state: ProfilePickerStreamsUIState,
+    state: com.codandotv.streamplayerapp.feature.profile.presentation.screens.ProfilePickerStreamsUIState,
     profileItemPosition: IntOffset,
-    profile: ProfileStream,
-    onClickSelectedProfile: (ProfileStream) -> Unit
+    profile: com.codandotv.streamplayerapp.feature.profile.domain.ProfileStream,
+    onClickSelectedProfile: (com.codandotv.streamplayerapp.feature.profile.domain.ProfileStream) -> Unit
 ) {
     with(state) {
         Column(
@@ -95,7 +95,6 @@ private fun ProfileItem(
         ) {
             WebImage(
                 imageUrl = profile.imageUrl,
-                //placeholder = painterResource(Res.drawable.image_placeholder),
                 contentDescription = stringResource(
                     Res.string.profile_current_profile_name,
                     profile.name
diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerSelectedProfileContainer.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/widget/ProfilePickerSelectedProfileContainer.kt
similarity index 87%
rename from feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerSelectedProfileContainer.kt
rename to feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/widget/ProfilePickerSelectedProfileContainer.kt
index b54ed2e8..71369ee9 100644
--- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerSelectedProfileContainer.kt
+++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/widget/ProfilePickerSelectedProfileContainer.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.profile.presentation.widget
+package com.codandotv.streamplayerapp.feature.profile.presentation.widget
 
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
@@ -16,8 +16,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
-import com.codandotv.streamplayerapp.core_shared_ui.widget.WebImage
-import com.codandotv.streamplayerapp.profile.presentation.screens.ProfilePickerStreamsUIState
+import com.codandotv.streamplayerapp.core.shared.ui.widget.WebImage
 import org.jetbrains.compose.resources.stringResource
 import streamplayerapp_kmp.feature_profile.generated.resources.Res
 import streamplayerapp_kmp.feature_profile.generated.resources.profile_current_profile_name
@@ -25,7 +24,7 @@ import streamplayerapp_kmp.feature_profile.generated.resources.profile_current_p
 @Suppress("MagicNumber")
 @Composable
 fun ProfilePickerSelectedProfileContainer(
-    state: ProfilePickerStreamsUIState,
+    state: com.codandotv.streamplayerapp.feature.profile.presentation.screens.ProfilePickerStreamsUIState,
     offsetSelectedProfileImage: IntOffset,
     animatedSizeImage: Dp
 ) {
@@ -43,7 +42,7 @@ fun ProfilePickerSelectedProfileContainer(
                 ) {
                     selectedItem?.imageUrl?.let { imageUrl ->
                         WebImage(
-                            imageUrl =imageUrl,
+                            imageUrl = imageUrl,
                             contentScale = ContentScale.Fit,
                             contentDescription = stringResource(
                                 Res.string.profile_current_profile_name,
diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerStreamLoad.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/widget/ProfilePickerStreamLoad.kt
similarity index 86%
rename from feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerStreamLoad.kt
rename to feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/widget/ProfilePickerStreamLoad.kt
index a2746cbd..eb34f489 100644
--- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerStreamLoad.kt
+++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/widget/ProfilePickerStreamLoad.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.profile.presentation.widget
+package com.codandotv.streamplayerapp.feature.profile.presentation.widget
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
@@ -7,7 +7,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 
-
 @Composable
 fun LoadScreen() {
     Box(Modifier.fillMaxSize()) {
diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerStreamToolbar.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/widget/ProfilePickerStreamToolbar.kt
similarity index 96%
rename from feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerStreamToolbar.kt
rename to feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/widget/ProfilePickerStreamToolbar.kt
index b94752f2..1df38e39 100644
--- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerStreamToolbar.kt
+++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/profile/presentation/widget/ProfilePickerStreamToolbar.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.profile.presentation.widget
+package com.codandotv.streamplayerapp.feature.profile.presentation.widget
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
@@ -22,7 +22,6 @@ import streamplayerapp_kmp.feature_profile.generated.resources.netflix_horizonta
 
 @Composable
 fun ProfilePickerStreamToolbar(modifier: Modifier = Modifier) {
-
     Box(
         modifier
             .fillMaxWidth()
diff --git a/feature-search/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/SearchStreamCardPreview.kt b/feature-search/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/widgets/SearchStreamCardPreview.kt
similarity index 79%
rename from feature-search/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/SearchStreamCardPreview.kt
rename to feature-search/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/widgets/SearchStreamCardPreview.kt
index 460ae0fb..6c01fcfe 100644
--- a/feature-search/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/SearchStreamCardPreview.kt
+++ b/feature-search/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/widgets/SearchStreamCardPreview.kt
@@ -1,9 +1,8 @@
-package com.codandotv.streamplayerapp.feature_search.presentation.widgets
+package com.codandotv.streamplayerapp.feature.search.presentation.widgets
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import com.codandotv.streamplayerapp.core_shared_ui.theme.ThemePreviews
-
+import com.codandotv.streamplayerapp.core.shared.ui.theme.ThemePreviews
 
 @ThemePreviews
 @Composable
diff --git a/feature-search/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/SearchStreamsPreview.kt b/feature-search/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/widgets/SearchStreamsPreview.kt
similarity index 91%
rename from feature-search/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/SearchStreamsPreview.kt
rename to feature-search/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/widgets/SearchStreamsPreview.kt
index 8b37e056..536b1fa7 100644
--- a/feature-search/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/SearchStreamsPreview.kt
+++ b/feature-search/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/widgets/SearchStreamsPreview.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_search.presentation.widgets
+package com.codandotv.streamplayerapp.feature.search.presentation.widgets
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
diff --git a/feature-search/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/StreamsCarouselPreview.kt b/feature-search/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/widgets/StreamsCarouselPreview.kt
similarity index 82%
rename from feature-search/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/StreamsCarouselPreview.kt
rename to feature-search/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/widgets/StreamsCarouselPreview.kt
index 9a3c0a2a..56476391 100644
--- a/feature-search/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/StreamsCarouselPreview.kt
+++ b/feature-search/src/androidMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/widgets/StreamsCarouselPreview.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_search.presentation.widgets
+package com.codandotv.streamplayerapp.feature.search.presentation.widgets
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/api/MostPopularMoviesService.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/api/MostPopularMoviesService.kt
similarity index 66%
rename from feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/api/MostPopularMoviesService.kt
rename to feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/api/MostPopularMoviesService.kt
index ea68be71..74c6dabb 100644
--- a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/api/MostPopularMoviesService.kt
+++ b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/api/MostPopularMoviesService.kt
@@ -1,11 +1,9 @@
-package com.codandotv.streamplayerapp.feature_search.data.api
+package com.codandotv.streamplayerapp.feature.search.data.api
 
-import com.codandotv.streamplayerapp.core_networking.handleError.NetworkResponse
-import com.codandotv.streamplayerapp.core_networking.handleError.safeRequest
-import com.codandotv.streamplayerapp.feature_search.data.model.ListSearchStreamResponse
+import com.codandotv.streamplayerapp.core.networking.handleError.NetworkResponse
+import com.codandotv.streamplayerapp.core.networking.handleError.safeRequest
+import com.codandotv.streamplayerapp.feature.search.data.model.ListSearchStreamResponse
 import io.ktor.client.HttpClient
-import io.ktor.client.call.body
-import io.ktor.client.request.get
 import io.ktor.client.request.url
 import org.koin.core.annotation.Factory
 import org.koin.core.annotation.Provided
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/api/SearchStreamService.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/api/SearchStreamService.kt
similarity index 70%
rename from feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/api/SearchStreamService.kt
rename to feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/api/SearchStreamService.kt
index 8bff2425..daf06b8f 100644
--- a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/api/SearchStreamService.kt
+++ b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/api/SearchStreamService.kt
@@ -1,14 +1,13 @@
-package com.codandotv.streamplayerapp.feature_search.data.api
+package com.codandotv.streamplayerapp.feature.search.data.api
 
-import com.codandotv.streamplayerapp.core_networking.handleError.NetworkResponse
-import com.codandotv.streamplayerapp.core_networking.handleError.safeRequest
-import com.codandotv.streamplayerapp.feature_search.data.model.ListSearchStreamResponse
+import com.codandotv.streamplayerapp.core.networking.handleError.NetworkResponse
+import com.codandotv.streamplayerapp.core.networking.handleError.safeRequest
+import com.codandotv.streamplayerapp.feature.search.data.model.ListSearchStreamResponse
 import io.ktor.client.HttpClient
 import io.ktor.client.request.parameter
 import io.ktor.client.request.url
 import org.koin.core.annotation.Factory
 import org.koin.core.annotation.Provided
-import org.koin.meta.annotations.ExternalDefinition
 
 interface SearchStreamService {
     suspend fun getSearch(query: String): NetworkResponse<ListSearchStreamResponse>
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/datasource/MostPopularMoviesDataSource.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/datasource/MostPopularMoviesDataSource.kt
similarity index 59%
rename from feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/datasource/MostPopularMoviesDataSource.kt
rename to feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/datasource/MostPopularMoviesDataSource.kt
index 556be8c9..52248c24 100644
--- a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/datasource/MostPopularMoviesDataSource.kt
+++ b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/datasource/MostPopularMoviesDataSource.kt
@@ -1,8 +1,7 @@
-package com.codandotv.streamplayerapp.feature_search.data.datasource
+package com.codandotv.streamplayerapp.feature.search.data.datasource
 
-import com.codandotv.streamplayerapp.core_networking.handleError.toFlow
-import com.codandotv.streamplayerapp.feature_search.data.model.ListSearchStreamResponse
-import com.codandotv.streamplayerapp.feature_search.data.api.MostPopularMoviesService
+import com.codandotv.streamplayerapp.core.networking.handleError.toFlow
+import com.codandotv.streamplayerapp.feature.search.data.model.ListSearchStreamResponse
 import kotlinx.coroutines.flow.Flow
 import org.koin.core.annotation.Factory
 
@@ -12,7 +11,7 @@ interface MostPopularMoviesDataSource {
 
 @Factory(binds = [MostPopularMoviesDataSource::class])
 class MostPopularMoviesDataSourceImpl(
-    private val service: MostPopularMoviesService
+    private val service: com.codandotv.streamplayerapp.feature.search.data.api.MostPopularMoviesService
 ) : MostPopularMoviesDataSource {
 
     override suspend fun getMostPopularMovies(): Flow<ListSearchStreamResponse> =
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/datasource/SearchStreamDataSource.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/datasource/SearchStreamDataSource.kt
new file mode 100644
index 00000000..33b351d0
--- /dev/null
+++ b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/datasource/SearchStreamDataSource.kt
@@ -0,0 +1,19 @@
+package com.codandotv.streamplayerapp.feature.search.data.datasource
+
+import com.codandotv.streamplayerapp.core.networking.handleError.toFlow
+import com.codandotv.streamplayerapp.feature.search.data.model.ListSearchStreamResponse
+import kotlinx.coroutines.flow.Flow
+import org.koin.core.annotation.Factory
+
+interface SearchStreamDataSource {
+    suspend fun getMovieSearch(query: String): Flow<ListSearchStreamResponse>
+}
+
+@Factory(binds = [SearchStreamDataSource::class])
+class SearchStreamDataSourceImpl(
+    private val service: com.codandotv.streamplayerapp.feature.search.data.api.SearchStreamService
+) : SearchStreamDataSource {
+
+    override suspend fun getMovieSearch(query: String): Flow<ListSearchStreamResponse> =
+        service.getSearch(query = query).toFlow()
+}
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/model/ListSearchStreamResponse.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/model/ListSearchStreamResponse.kt
similarity index 88%
rename from feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/model/ListSearchStreamResponse.kt
rename to feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/model/ListSearchStreamResponse.kt
index 88fa6d04..1b953895 100644
--- a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/model/ListSearchStreamResponse.kt
+++ b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/model/ListSearchStreamResponse.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_search.data.model
+package com.codandotv.streamplayerapp.feature.search.data.model
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/repository/MostPopularMoviesRepository.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/repository/MostPopularMoviesRepository.kt
similarity index 74%
rename from feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/repository/MostPopularMoviesRepository.kt
rename to feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/repository/MostPopularMoviesRepository.kt
index 7a630a48..01610e73 100644
--- a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/repository/MostPopularMoviesRepository.kt
+++ b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/repository/MostPopularMoviesRepository.kt
@@ -1,7 +1,7 @@
-package com.codandotv.streamplayerapp.feature_search.data.repository
+package com.codandotv.streamplayerapp.feature.search.data.repository
 
-import com.codandotv.streamplayerapp.feature_search.data.model.ListSearchStreamResponse
-import com.codandotv.streamplayerapp.feature_search.data.datasource.MostPopularMoviesDataSource
+import com.codandotv.streamplayerapp.feature.search.data.datasource.MostPopularMoviesDataSource
+import com.codandotv.streamplayerapp.feature.search.data.model.ListSearchStreamResponse
 import kotlinx.coroutines.flow.Flow
 import org.koin.core.annotation.Factory
 
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/repository/SearchStreamRepository.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/repository/SearchStreamRepository.kt
similarity index 73%
rename from feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/repository/SearchStreamRepository.kt
rename to feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/repository/SearchStreamRepository.kt
index 6358c928..33f22a64 100644
--- a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/repository/SearchStreamRepository.kt
+++ b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/data/repository/SearchStreamRepository.kt
@@ -1,13 +1,12 @@
-package com.codandotv.streamplayerapp.feature_search.data.repository
+package com.codandotv.streamplayerapp.feature.search.data.repository
 
-import com.codandotv.streamplayerapp.feature_search.data.datasource.SearchStreamDataSource
-import com.codandotv.streamplayerapp.feature_search.data.model.ListSearchStreamResponse
+import com.codandotv.streamplayerapp.feature.search.data.datasource.SearchStreamDataSource
+import com.codandotv.streamplayerapp.feature.search.data.model.ListSearchStreamResponse
 import kotlinx.coroutines.flow.Flow
 import org.koin.core.annotation.Factory
 
 interface SearchStreamRepository {
     suspend fun getMovieSearch(query: String): Flow<ListSearchStreamResponse>
-
 }
 
 @Factory(binds = [SearchStreamRepository::class])
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/di/SearchModule.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/di/SearchModule.kt
new file mode 100644
index 00000000..1172f614
--- /dev/null
+++ b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/di/SearchModule.kt
@@ -0,0 +1,8 @@
+package com.codandotv.streamplayerapp.feature.search.di
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan("com.codandotv.streamplayerapp.feature.search")
+class SearchModule
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/domain/MostPopularMoviesUseCase.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/domain/MostPopularMoviesUseCase.kt
similarity index 74%
rename from feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/domain/MostPopularMoviesUseCase.kt
rename to feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/domain/MostPopularMoviesUseCase.kt
index 4afdd79f..7308cbb0 100644
--- a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/domain/MostPopularMoviesUseCase.kt
+++ b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/domain/MostPopularMoviesUseCase.kt
@@ -1,7 +1,7 @@
-package com.codandotv.streamplayerapp.feature_search.domain
+package com.codandotv.streamplayerapp.feature.search.domain
 
-import com.codandotv.streamplayerapp.feature_search.data.model.ListSearchStreamResponse
-import com.codandotv.streamplayerapp.feature_search.data.repository.MostPopularMoviesRepository
+import com.codandotv.streamplayerapp.feature.search.data.model.ListSearchStreamResponse
+import com.codandotv.streamplayerapp.feature.search.data.repository.MostPopularMoviesRepository
 import kotlinx.coroutines.flow.Flow
 import org.koin.core.annotation.Factory
 
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/domain/SearchUseCase.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/domain/SearchUseCase.kt
new file mode 100644
index 00000000..3a4ada37
--- /dev/null
+++ b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/domain/SearchUseCase.kt
@@ -0,0 +1,17 @@
+package com.codandotv.streamplayerapp.feature.search.domain
+
+import com.codandotv.streamplayerapp.feature.search.data.model.ListSearchStreamResponse
+import com.codandotv.streamplayerapp.feature.search.data.repository.SearchStreamRepository
+import kotlinx.coroutines.flow.Flow
+import org.koin.core.annotation.Factory
+
+interface SearchUseCase {
+    suspend operator fun invoke(query: String): Flow<ListSearchStreamResponse>
+}
+
+@Factory(binds = [SearchUseCase::class])
+class SearchUseCaseImpl(val repository: SearchStreamRepository) : SearchUseCase {
+    override suspend operator fun invoke(query: String): Flow<ListSearchStreamResponse> {
+        return repository.getMovieSearch(query = query)
+    }
+}
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/domain/mapper/SearchMapper.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/domain/mapper/SearchMapper.kt
new file mode 100644
index 00000000..78fa8b16
--- /dev/null
+++ b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/domain/mapper/SearchMapper.kt
@@ -0,0 +1,12 @@
+package com.codandotv.streamplayerapp.feature.search.domain.mapper
+
+import com.codandotv.streamplayerapp.core.shared.Url
+import com.codandotv.streamplayerapp.feature.search.data.model.ListSearchStreamResponse
+import com.codandotv.streamplayerapp.feature.search.presentation.widgets.SearchStreamCardModel
+
+fun ListSearchStreamResponse.SearchStreamResponse.toSearchStreamCardModel() =
+    SearchStreamCardModel(
+        id = id.toString(),
+        title = title,
+        url = "${Url.IMAGE_URL_SIZE_200}$posterPath"
+    )
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/navigation/SearchStreamNavigation.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/navigation/SearchStreamNavigation.kt
similarity index 66%
rename from feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/navigation/SearchStreamNavigation.kt
rename to feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/navigation/SearchStreamNavigation.kt
index bddaadad..9b1a01db 100644
--- a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/navigation/SearchStreamNavigation.kt
+++ b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/navigation/SearchStreamNavigation.kt
@@ -1,10 +1,10 @@
-package com.codandotv.streamplayerapp.feature_search.presentation.navigation
+package com.codandotv.streamplayerapp.feature.search.presentation.navigation
 
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
-import com.codandotv.streamplayerapp.core_navigation.routes.Routes
-import com.codandotv.streamplayerapp.feature_search.presentation.screens.SearchScreen
+import com.codandotv.streamplayerapp.core.navigation.routes.Routes
+import com.codandotv.streamplayerapp.feature.search.presentation.screens.SearchScreen
 import org.koin.core.annotation.KoinExperimentalAPI
 
 @OptIn(KoinExperimentalAPI::class)
@@ -13,7 +13,7 @@ fun NavGraphBuilder.searchStreamsNavGraph(navController: NavHostController) {
         SearchScreen(
             navController = navController,
             onNavigateDetailList = { id ->
-                navController.navigate("${Routes.DETAIL}${id}")
+                navController.navigate("${Routes.DETAIL}$id")
             }
         )
     }
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/screens/SearchScreen.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/screens/SearchScreen.kt
similarity index 91%
rename from feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/screens/SearchScreen.kt
rename to feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/screens/SearchScreen.kt
index 885f13b6..4a50b431 100644
--- a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/screens/SearchScreen.kt
+++ b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/screens/SearchScreen.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_search.presentation.screens
+package com.codandotv.streamplayerapp.feature.search.presentation.screens
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -20,12 +20,12 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
-import com.codandotv.streamplayerapp.core_navigation.extensions.goBack
-import com.codandotv.streamplayerapp.feature_search.domain.mapper.toSearchStreamCardModel
-import com.codandotv.streamplayerapp.feature_search.presentation.widgets.SearchStreamCard
-import com.codandotv.streamplayerapp.feature_search.presentation.widgets.SearchableTopBar
-import com.codandotv.streamplayerapp.feature_search.presentation.widgets.StreamsEmpty
-import com.codandotv.streamplayerapp.feature_search.presentation.widgets.StreamsError
+import com.codandotv.streamplayerapp.core.navigation.extensions.goBack
+import com.codandotv.streamplayerapp.feature.search.domain.mapper.toSearchStreamCardModel
+import com.codandotv.streamplayerapp.feature.search.presentation.widgets.SearchStreamCard
+import com.codandotv.streamplayerapp.feature.search.presentation.widgets.SearchableTopBar
+import com.codandotv.streamplayerapp.feature.search.presentation.widgets.StreamsEmpty
+import com.codandotv.streamplayerapp.feature.search.presentation.widgets.StreamsError
 import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.viewmodel.koinViewModel
 import streamplayerapp_kmp.feature_search.generated.resources.Res
@@ -37,7 +37,6 @@ fun SearchScreen(
     onNavigateDetailList: (String) -> Unit = {},
     navController: NavController,
 ) {
-
     val uiState by viewModel.uiState.collectAsState()
     when (uiState) {
         is SearchUIState.Success -> {
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/screens/SearchUIState.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/screens/SearchUIState.kt
similarity index 69%
rename from feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/screens/SearchUIState.kt
rename to feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/screens/SearchUIState.kt
index aae069c5..8b60b6ba 100644
--- a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/screens/SearchUIState.kt
+++ b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/screens/SearchUIState.kt
@@ -1,6 +1,6 @@
-package com.codandotv.streamplayerapp.feature_search.presentation.screens
+package com.codandotv.streamplayerapp.feature.search.presentation.screens
 
-import com.codandotv.streamplayerapp.feature_search.data.model.ListSearchStreamResponse
+import com.codandotv.streamplayerapp.feature.search.data.model.ListSearchStreamResponse
 
 sealed class SearchUIState {
     data class Success(val listCharacters: ListSearchStreamResponse) : SearchUIState()
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/screens/SearchViewModel.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/screens/SearchViewModel.kt
similarity index 85%
rename from feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/screens/SearchViewModel.kt
rename to feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/screens/SearchViewModel.kt
index 964a49d4..288633d4 100644
--- a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/screens/SearchViewModel.kt
+++ b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/screens/SearchViewModel.kt
@@ -1,10 +1,8 @@
-package com.codandotv.streamplayerapp.feature_search.presentation.screens
+package com.codandotv.streamplayerapp.feature.search.presentation.screens
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.codandotv.streamplayerapp.core_networking.handleError.catchFailure
-import com.codandotv.streamplayerapp.feature_search.domain.MostPopularMoviesUseCase
-import com.codandotv.streamplayerapp.feature_search.domain.SearchUseCase
+import com.codandotv.streamplayerapp.core.networking.handleError.catchFailure
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -17,13 +15,15 @@ import org.koin.android.annotation.KoinViewModel
 
 @KoinViewModel
 class SearchViewModel(
-    private val searchUseCase: SearchUseCase,
-    private val mostPopularMoviesUseCase: MostPopularMoviesUseCase
+    private val searchUseCase: com.codandotv.streamplayerapp.feature.search.domain.SearchUseCase,
+    private val mostPopularMoviesUseCase: com.codandotv.streamplayerapp.feature.search.domain.MostPopularMoviesUseCase
 ) : ViewModel() {
 
     private var tryAgain: () -> Unit = {}
 
-    private val _uiState = MutableStateFlow<SearchUIState>(SearchUIState.Loading)
+    private val _uiState = MutableStateFlow<SearchUIState>(
+        SearchUIState.Loading
+    )
     val uiState: StateFlow<SearchUIState> = _uiState.stateIn(
         scope = viewModelScope,
         started = SharingStarted.Eagerly,
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/SearchCarousel.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/widgets/SearchCarousel.kt
similarity index 95%
rename from feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/SearchCarousel.kt
rename to feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/widgets/SearchCarousel.kt
index d736bac1..01e20684 100644
--- a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/SearchCarousel.kt
+++ b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/widgets/SearchCarousel.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_search.presentation.widgets
+package com.codandotv.streamplayerapp.feature.search.presentation.widgets
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -29,8 +29,8 @@ import androidx.paging.PagingData
 import app.cash.paging.compose.collectAsLazyPagingItems
 import app.cash.paging.compose.itemContentType
 import app.cash.paging.compose.itemKey
-import com.codandotv.streamplayerapp.core_shared_ui.widget.StreamsCard
-import com.codandotv.streamplayerapp.core_shared_ui.widget.StreamsCardContent
+import com.codandotv.streamplayerapp.core.shared.ui.widget.StreamsCard
+import com.codandotv.streamplayerapp.core.shared.ui.widget.StreamsCardContent
 import kotlinx.coroutines.flow.Flow
 import org.jetbrains.compose.resources.stringResource
 import streamplayerapp_kmp.feature_search.generated.resources.Res
@@ -106,7 +106,7 @@ fun StreamsError(
             color = Color.White,
             fontWeight = FontWeight.SemiBold,
             fontSize = 20.sp,
-            textAlign= TextAlign.Center,
+            textAlign = TextAlign.Center,
             modifier = Modifier
                 .align(Alignment.Center)
         )
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/SearchStreamCard.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/widgets/SearchStreamCard.kt
similarity index 96%
rename from feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/SearchStreamCard.kt
rename to feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/widgets/SearchStreamCard.kt
index f496d701..8d1cbbb4 100644
--- a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/SearchStreamCard.kt
+++ b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/widgets/SearchStreamCard.kt
@@ -1,13 +1,9 @@
-package com.codandotv.streamplayerapp.feature_search.presentation.widgets
+package com.codandotv.streamplayerapp.feature.search.presentation.widgets
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
-import androidx.compose.material3.Icon
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -17,14 +13,18 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.PlayArrow
 import androidx.compose.material3.Card
+import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.codandotv.streamplayerapp.core_shared_ui.widget.WebImage
+import com.codandotv.streamplayerapp.core.shared.ui.widget.WebImage
 
 @Suppress("MagicNumber")
 @Composable
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/SearchStreams.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/widgets/SearchStreams.kt
similarity index 90%
rename from feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/SearchStreams.kt
rename to feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/widgets/SearchStreams.kt
index b86c064f..0c3e30bd 100644
--- a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/SearchStreams.kt
+++ b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature/search/presentation/widgets/SearchStreams.kt
@@ -1,4 +1,4 @@
-package com.codandotv.streamplayerapp.feature_search.presentation.widgets
+package com.codandotv.streamplayerapp.feature.search.presentation.widgets
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -27,10 +27,10 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
-import com.codandotv.streamplayerapp.core_shared_ui.resources.Colors
-import com.codandotv.streamplayerapp.core_shared_ui.widget.CloseButton
-import com.codandotv.streamplayerapp.core_shared_ui.widget.MicButton
-import com.codandotv.streamplayerapp.core_shared_ui.widget.SearchIcon
+import com.codandotv.streamplayerapp.core.shared.ui.resources.Colors
+import com.codandotv.streamplayerapp.core.shared.ui.widget.CloseButton
+import com.codandotv.streamplayerapp.core.shared.ui.widget.MicButton
+import com.codandotv.streamplayerapp.core.shared.ui.widget.SearchIcon
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
 import streamplayerapp_kmp.core_shared_ui.generated.resources.icon_back
@@ -155,12 +155,18 @@ fun SearchTopBar(
             singleLine = true,
             maxLines = 1,
             leadingIcon = {
-                SearchIcon(action = onSearchIconPressed)
+                SearchIcon(
+                    action = onSearchIconPressed
+                )
             },
             trailingIcon = {
-                if (currentSearchText.isEmpty()) MicButton() else CloseButton(
-                    action = onCleanTextPressed
-                )
+                if (currentSearchText.isEmpty()) {
+                    MicButton()
+                } else {
+                    CloseButton(
+                        action = onCleanTextPressed
+                    )
+                }
             },
             keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
             keyboardActions = KeyboardActions(onSearch = {
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/datasource/SearchStreamDataSource.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/datasource/SearchStreamDataSource.kt
deleted file mode 100644
index bb0606f2..00000000
--- a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/data/datasource/SearchStreamDataSource.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.codandotv.streamplayerapp.feature_search.data.datasource
-
-import com.codandotv.streamplayerapp.core_networking.handleError.toFlow
-import com.codandotv.streamplayerapp.feature_search.data.model.ListSearchStreamResponse
-import com.codandotv.streamplayerapp.feature_search.data.api.SearchStreamService
-import kotlinx.coroutines.flow.Flow
-import org.koin.core.annotation.Factory
-
-interface SearchStreamDataSource {
-    suspend fun getMovieSearch(query: String): Flow<ListSearchStreamResponse>
-}
-
-@Factory(binds = [SearchStreamDataSource::class])
-class SearchStreamDataSourceImpl(
-    private val service: SearchStreamService
-): SearchStreamDataSource {
-
-    override suspend fun getMovieSearch(query:String): Flow<ListSearchStreamResponse> =
-        service.getSearch(query = query).toFlow()
-}
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/di/SearchModule.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/di/SearchModule.kt
deleted file mode 100644
index f6741e4e..00000000
--- a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/di/SearchModule.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.codandotv.streamplayerapp.feature_search.di
-
-import org.koin.core.annotation.ComponentScan
-import org.koin.core.annotation.Module
-
-@Module
-@ComponentScan("com.codandotv.streamplayerapp.feature_search")
-class SearchModule
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/domain/SearchUseCase.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/domain/SearchUseCase.kt
deleted file mode 100644
index 28b77f76..00000000
--- a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/domain/SearchUseCase.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.codandotv.streamplayerapp.feature_search.domain
-
-import com.codandotv.streamplayerapp.feature_search.data.model.ListSearchStreamResponse
-import com.codandotv.streamplayerapp.feature_search.data.repository.SearchStreamRepository
-import kotlinx.coroutines.flow.Flow
-import org.koin.core.annotation.Factory
-
-interface SearchUseCase {
-    suspend operator fun invoke(query:String): Flow<ListSearchStreamResponse>
-}
-
-@Factory(binds = [SearchUseCase::class])
-class SearchUseCaseImpl(val repository: SearchStreamRepository) : SearchUseCase {
-    override suspend operator fun invoke(query:String): Flow<ListSearchStreamResponse> {
-        return repository.getMovieSearch(query = query)
-    }
-}
diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/domain/mapper/SearchMapper.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/domain/mapper/SearchMapper.kt
deleted file mode 100644
index a96edcb1..00000000
--- a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/domain/mapper/SearchMapper.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.codandotv.streamplayerapp.feature_search.domain.mapper
-
-import com.codandotv.streamplayerapp.core_shared.Url
-import com.codandotv.streamplayerapp.feature_search.data.model.ListSearchStreamResponse.SearchStreamResponse
-import com.codandotv.streamplayerapp.feature_search.presentation.widgets.SearchStreamCardModel
-
-fun SearchStreamResponse.toSearchStreamCardModel() = SearchStreamCardModel(
-    id = id.toString(),
-    title = title,
-    url = "${Url.IMAGE_URL_SIZE_200}${posterPath}"
-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8a271f63..d6966080 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -61,6 +61,7 @@ kotzilla-sdk-compose = { group = "io.kotzilla", name = "kotzilla-sdk-compose", v
 kotlin_gradle_plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 android_gradle_plugin = { group = "com.android.tools.build", name = "gradle", version.ref = "android_gradle_plugin" }
 detekt-gradle-plugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
+detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
 serialization = { module = "org.jetbrains.kotlin.plugin.serialization:org.jetbrains.kotlin.plugin.serialization.gradle.plugin", version.ref = "kotlin" }
 
 com-google-devtools-ksp-gradle-plugin = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
diff --git a/scripts/linter/run_detekt.sh b/scripts/linter/run_detekt.sh
deleted file mode 100644
index 5d81fe1a..00000000
--- a/scripts/linter/run_detekt.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Default configuration path
-DETEKT_CONFIG="../../config/detekt/detekt.yml"
-DETEKT_CLI="detekt"
-INPUT_PATH="../../"
-
-# Check if detekt is installed
-if ! command -v $DETEKT_CLI &> /dev/null
-then
-    echo "Detekt CLI could not be found. Please install detekt first."
-    exit 1
-fi
-
-# Run Detekt
-# --config: path to config file
-# --input: path(s) to scan
-# --report: where to save output (xml, html, txt)
-$DETEKT_CLI --input "$INPUT_PATH" --config "$DETEKT_CONFIG" --excludes "**/build/**" --debug
\ No newline at end of file
diff --git a/scripts/linter/run_markdownlint.sh b/scripts/linter/run_markdownlint.sh
deleted file mode 100755
index 3659e865..00000000
--- a/scripts/linter/run_markdownlint.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Default configuration path
-MD_CONFIG="../../.markdownlint.json"
-MD_CLI="markdownlint"
-INPUT_PATH="../../"
-
-# Check if detekt is installed
-if ! command -v $MD_CLI &> /dev/null
-then
-    echo "Markdownlint CLI could not be found. Please install Markdownlint first."
-    exit 1
-fi
-
-# Run Prettier
-$MD_CLI --config "$MD_CONFIG" --fix "$INPUT_PATH"
\ No newline at end of file
diff --git a/scripts/linter/run_prettier.sh b/scripts/linter/run_prettier.sh
deleted file mode 100755
index 739dd9b5..00000000
--- a/scripts/linter/run_prettier.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Default configuration path
-PRETTIER_CLI="prettier"
-INPUT_PATH="../.."
-
-# Check if detekt is installed
-if ! command -v $PRETTIER_CLI &> /dev/null
-then
-    echo "Prettier CLI could not be found. Please install prettier first."
-    exit 1
-fi
-
-# Run Prettier
-$PRETTIER_CLI --write "$INPUT_PATH"
\ No newline at end of file