diff --git a/app/src/androidTest/java/org/fnives/test/showcase/ui/AuthComposeInstrumentedTest.kt b/app/src/androidTest/java/org/fnives/test/showcase/ui/AuthComposeInstrumentedTest.kt
index ca38f2c..92d67e7 100644
--- a/app/src/androidTest/java/org/fnives/test/showcase/ui/AuthComposeInstrumentedTest.kt
+++ b/app/src/androidTest/java/org/fnives/test/showcase/ui/AuthComposeInstrumentedTest.kt
@@ -6,7 +6,7 @@ import org.fnives.test.showcase.network.mockserver.scenario.auth.AuthScenario
 import org.fnives.test.showcase.testutils.MockServerScenarioSetupResetingTestRule
 import org.fnives.test.showcase.testutils.idling.MainDispatcherTestRule
 import org.fnives.test.showcase.testutils.idling.anyResourceIdling
-import org.fnives.test.showcase.ui.compose.ComposeActivity
+import org.fnives.test.showcase.compose.ComposeActivity
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
diff --git a/app/src/androidTest/java/org/fnives/test/showcase/ui/ComposeLoginRobot.kt b/app/src/androidTest/java/org/fnives/test/showcase/ui/ComposeLoginRobot.kt
index 335daf9..bfbf5a8 100644
--- a/app/src/androidTest/java/org/fnives/test/showcase/ui/ComposeLoginRobot.kt
+++ b/app/src/androidTest/java/org/fnives/test/showcase/ui/ComposeLoginRobot.kt
@@ -2,7 +2,7 @@ package org.fnives.test.showcase.ui
 
 import androidx.compose.ui.test.*
 import androidx.compose.ui.test.junit4.ComposeTestRule
-import org.fnives.test.showcase.ui.compose.screen.auth.AuthScreenTag
+import org.fnives.test.showcase.compose.screen.auth.AuthScreenTag
 
 class ComposeLoginRobot(
     private val composeTestRule: ComposeTestRule,
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f90a9ed..0e1fd4b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,7 +26,7 @@
         <activity android:name=".ui.home.MainActivity" />
         <activity android:name=".ui.auth.AuthActivity" />
         <activity
-            android:name=".ui.compose.ComposeActivity"
+            android:name="org.fnives.test.showcase.compose.ComposeActivity"
             android:configChanges="colorMode|density|fontScale|fontWeightAdjustment|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"
             android:exported="true">
             <intent-filter>
diff --git a/app/src/main/java/org/fnives/test/showcase/ui/compose/ComposeActivity.kt b/app/src/main/java/org/fnives/test/showcase/compose/ComposeActivity.kt
similarity index 85%
rename from app/src/main/java/org/fnives/test/showcase/ui/compose/ComposeActivity.kt
rename to app/src/main/java/org/fnives/test/showcase/compose/ComposeActivity.kt
index f8b60d1..5a0b0cd 100644
--- a/app/src/main/java/org/fnives/test/showcase/ui/compose/ComposeActivity.kt
+++ b/app/src/main/java/org/fnives/test/showcase/compose/ComposeActivity.kt
@@ -1,4 +1,4 @@
-package org.fnives.test.showcase.ui.compose
+package org.fnives.test.showcase.compose
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
@@ -6,7 +6,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import com.google.accompanist.insets.ProvideWindowInsets
-import org.fnives.test.showcase.ui.compose.screen.AppNavigation
+import org.fnives.test.showcase.compose.screen.AppNavigation
 
 class ComposeActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/org/fnives/test/showcase/ui/compose/screen/AppNavigation.kt b/app/src/main/java/org/fnives/test/showcase/compose/screen/AppNavigation.kt
similarity index 77%
rename from app/src/main/java/org/fnives/test/showcase/ui/compose/screen/AppNavigation.kt
rename to app/src/main/java/org/fnives/test/showcase/compose/screen/AppNavigation.kt
index f0a71b8..27890b3 100644
--- a/app/src/main/java/org/fnives/test/showcase/ui/compose/screen/AppNavigation.kt
+++ b/app/src/main/java/org/fnives/test/showcase/compose/screen/AppNavigation.kt
@@ -1,4 +1,4 @@
-package org.fnives.test.showcase.ui.compose.screen
+package org.fnives.test.showcase.compose.screen
 
 import androidx.compose.foundation.background
 import androidx.compose.material.MaterialTheme
@@ -10,11 +10,11 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import kotlinx.coroutines.delay
 import org.fnives.test.showcase.core.login.IsUserLoggedInUseCase
-import org.fnives.test.showcase.ui.compose.screen.auth.AuthScreen
-import org.fnives.test.showcase.ui.compose.screen.auth.rememberAuthScreenState
-import org.fnives.test.showcase.ui.compose.screen.home.HomeScreen
-import org.fnives.test.showcase.ui.compose.screen.home.rememberHomeScreenState
-import org.fnives.test.showcase.ui.compose.screen.splash.SplashScreen
+import org.fnives.test.showcase.compose.screen.auth.AuthScreen
+import org.fnives.test.showcase.compose.screen.auth.rememberAuthScreenState
+import org.fnives.test.showcase.compose.screen.home.HomeScreen
+import org.fnives.test.showcase.compose.screen.home.rememberHomeScreenState
+import org.fnives.test.showcase.compose.screen.splash.SplashScreen
 import org.koin.androidx.compose.get
 
 @Composable
diff --git a/app/src/main/java/org/fnives/test/showcase/ui/compose/screen/auth/AuthScreen.kt b/app/src/main/java/org/fnives/test/showcase/compose/screen/auth/AuthScreen.kt
similarity index 98%
rename from app/src/main/java/org/fnives/test/showcase/ui/compose/screen/auth/AuthScreen.kt
rename to app/src/main/java/org/fnives/test/showcase/compose/screen/auth/AuthScreen.kt
index 081d080..3cfeaae 100644
--- a/app/src/main/java/org/fnives/test/showcase/ui/compose/screen/auth/AuthScreen.kt
+++ b/app/src/main/java/org/fnives/test/showcase/compose/screen/auth/AuthScreen.kt
@@ -1,4 +1,4 @@
-package org.fnives.test.showcase.ui.compose.screen.auth
+package org.fnives.test.showcase.compose.screen.auth
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.text.KeyboardActions
diff --git a/app/src/main/java/org/fnives/test/showcase/ui/compose/screen/auth/AuthScreenState.kt b/app/src/main/java/org/fnives/test/showcase/compose/screen/auth/AuthScreenState.kt
similarity index 97%
rename from app/src/main/java/org/fnives/test/showcase/ui/compose/screen/auth/AuthScreenState.kt
rename to app/src/main/java/org/fnives/test/showcase/compose/screen/auth/AuthScreenState.kt
index 360def2..843f62f 100644
--- a/app/src/main/java/org/fnives/test/showcase/ui/compose/screen/auth/AuthScreenState.kt
+++ b/app/src/main/java/org/fnives/test/showcase/compose/screen/auth/AuthScreenState.kt
@@ -1,4 +1,4 @@
-package org.fnives.test.showcase.ui.compose.screen.auth
+package org.fnives.test.showcase.compose.screen.auth
 
 import androidx.compose.runtime.*
 import kotlinx.coroutines.CoroutineScope
diff --git a/app/src/main/java/org/fnives/test/showcase/ui/compose/screen/home/HomeScreen.kt b/app/src/main/java/org/fnives/test/showcase/compose/screen/home/HomeScreen.kt
similarity index 98%
rename from app/src/main/java/org/fnives/test/showcase/ui/compose/screen/home/HomeScreen.kt
rename to app/src/main/java/org/fnives/test/showcase/compose/screen/home/HomeScreen.kt
index 9c23830..c397037 100644
--- a/app/src/main/java/org/fnives/test/showcase/ui/compose/screen/home/HomeScreen.kt
+++ b/app/src/main/java/org/fnives/test/showcase/compose/screen/home/HomeScreen.kt
@@ -1,4 +1,4 @@
-package org.fnives.test.showcase.ui.compose.screen.home
+package org.fnives.test.showcase.compose.screen.home
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
diff --git a/app/src/main/java/org/fnives/test/showcase/ui/compose/screen/home/HomeScreenState.kt b/app/src/main/java/org/fnives/test/showcase/compose/screen/home/HomeScreenState.kt
similarity index 98%
rename from app/src/main/java/org/fnives/test/showcase/ui/compose/screen/home/HomeScreenState.kt
rename to app/src/main/java/org/fnives/test/showcase/compose/screen/home/HomeScreenState.kt
index 580af5b..38a283b 100644
--- a/app/src/main/java/org/fnives/test/showcase/ui/compose/screen/home/HomeScreenState.kt
+++ b/app/src/main/java/org/fnives/test/showcase/compose/screen/home/HomeScreenState.kt
@@ -1,4 +1,4 @@
-package org.fnives.test.showcase.ui.compose.screen.home
+package org.fnives.test.showcase.compose.screen.home
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
diff --git a/app/src/main/java/org/fnives/test/showcase/ui/compose/screen/splash/SplashScreen.kt b/app/src/main/java/org/fnives/test/showcase/compose/screen/splash/SplashScreen.kt
similarity index 71%
rename from app/src/main/java/org/fnives/test/showcase/ui/compose/screen/splash/SplashScreen.kt
rename to app/src/main/java/org/fnives/test/showcase/compose/screen/splash/SplashScreen.kt
index a557a66..aeff842 100644
--- a/app/src/main/java/org/fnives/test/showcase/ui/compose/screen/splash/SplashScreen.kt
+++ b/app/src/main/java/org/fnives/test/showcase/compose/screen/splash/SplashScreen.kt
@@ -1,21 +1,16 @@
-package org.fnives.test.showcase.ui.compose.screen.splash
+package org.fnives.test.showcase.compose.screen.splash
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
-import androidx.compose.foundation.gestures.rememberDraggableState
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
 import org.fnives.test.showcase.R