diff --git a/sample-compose/app/proguard-rules.pro b/sample-compose/app/proguard-rules.pro
index 3183d4753..601d66e67 100644
--- a/sample-compose/app/proguard-rules.pro
+++ b/sample-compose/app/proguard-rules.pro
@@ -21,5 +21,5 @@
 #-renamesourcefileattribute SourceFile
 
 # Data class
--keepclassmembers class co.nimblehq.sample.compose.data.request.** { *; }
--keepclassmembers class co.nimblehq.sample.compose.data.response.** { *; }
+-keepclassmembers class co.nimblehq.sample.compose.data.remote.models.requests.** { *; }
+-keepclassmembers class co.nimblehq.sample.compose.data.remote.models.responses.** { *; }
diff --git a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/MoshiModule.kt b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/MoshiModule.kt
index 5e2e2407b..4e1be70d7 100644
--- a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/MoshiModule.kt
+++ b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/MoshiModule.kt
@@ -1,6 +1,6 @@
 package co.nimblehq.sample.compose.di.modules
 
-import co.nimblehq.sample.compose.data.service.providers.MoshiBuilderProvider
+import co.nimblehq.sample.compose.data.remote.providers.MoshiBuilderProvider
 import com.squareup.moshi.Moshi
 import dagger.Module
 import dagger.Provides
diff --git a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/PreferencesModule.kt b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/PreferencesModule.kt
index 89d0e9369..42baa232a 100644
--- a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/PreferencesModule.kt
+++ b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/PreferencesModule.kt
@@ -5,8 +5,8 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.PreferenceDataStoreFactory
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.preferencesDataStoreFile
-import co.nimblehq.sample.compose.data.repository.AppPreferencesRepositoryImpl
-import co.nimblehq.sample.compose.domain.repository.AppPreferencesRepository
+import co.nimblehq.sample.compose.data.repositories.AppPreferencesRepositoryImpl
+import co.nimblehq.sample.compose.domain.repositories.AppPreferencesRepository
 import dagger.*
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
diff --git a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/RepositoryModule.kt b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/RepositoryModule.kt
index 098484905..ef92ae2d3 100644
--- a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/RepositoryModule.kt
+++ b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/RepositoryModule.kt
@@ -1,8 +1,8 @@
 package co.nimblehq.sample.compose.di.modules
 
-import co.nimblehq.sample.compose.data.repository.RepositoryImpl
-import co.nimblehq.sample.compose.data.service.ApiService
-import co.nimblehq.sample.compose.domain.repository.Repository
+import co.nimblehq.sample.compose.data.remote.services.ApiService
+import co.nimblehq.sample.compose.data.repositories.RepositoryImpl
+import co.nimblehq.sample.compose.domain.repositories.Repository
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
diff --git a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/RetrofitModule.kt b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/RetrofitModule.kt
index a3a18f8a8..1305c4622 100644
--- a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/RetrofitModule.kt
+++ b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/RetrofitModule.kt
@@ -1,10 +1,10 @@
 package co.nimblehq.sample.compose.di.modules
 
 import co.nimblehq.sample.compose.BuildConfig
-import co.nimblehq.sample.compose.data.service.ApiService
-import co.nimblehq.sample.compose.data.service.providers.ApiServiceProvider
-import co.nimblehq.sample.compose.data.service.providers.ConverterFactoryProvider
-import co.nimblehq.sample.compose.data.service.providers.RetrofitProvider
+import co.nimblehq.sample.compose.data.remote.providers.ApiServiceProvider
+import co.nimblehq.sample.compose.data.remote.providers.ConverterFactoryProvider
+import co.nimblehq.sample.compose.data.remote.providers.RetrofitProvider
+import co.nimblehq.sample.compose.data.remote.services.ApiService
 import com.squareup.moshi.Moshi
 import dagger.Module
 import dagger.Provides
diff --git a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/StorageModule.kt b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/StorageModule.kt
index 8346f8244..06acb90f3 100644
--- a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/StorageModule.kt
+++ b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/StorageModule.kt
@@ -1,7 +1,7 @@
 package co.nimblehq.sample.compose.di.modules
 
 import android.content.Context
-import co.nimblehq.sample.compose.data.storage.EncryptedSharedPreferences
+import co.nimblehq.sample.compose.data.local.preferences.EncryptedSharedPreferences
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
diff --git a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/AppDestination.kt b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/AppDestination.kt
index 29957a9b3..f4c4adc1e 100644
--- a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/AppDestination.kt
+++ b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/AppDestination.kt
@@ -1,7 +1,9 @@
 package co.nimblehq.sample.compose.ui
 
-import androidx.navigation.*
-import co.nimblehq.sample.compose.model.UiModel
+import androidx.navigation.NamedNavArgument
+import androidx.navigation.NavType
+import androidx.navigation.navArgument
+import co.nimblehq.sample.compose.ui.models.UiModel
 
 const val KeyId = "id"
 const val KeyModel = "model"
diff --git a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/AppNavigation.kt b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/AppNavigation.kt
index 023d126a8..2a20e4621 100644
--- a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/AppNavigation.kt
+++ b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/AppNavigation.kt
@@ -1,9 +1,14 @@
 package co.nimblehq.sample.compose.ui
 
 import androidx.compose.runtime.Composable
-import androidx.navigation.*
-import androidx.navigation.compose.*
-import co.nimblehq.sample.compose.model.UiModel
+import androidx.navigation.NavBackStackEntry
+import androidx.navigation.NavDeepLink
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import co.nimblehq.sample.compose.ui.models.UiModel
 import co.nimblehq.sample.compose.ui.screens.home.HomeScreen
 import co.nimblehq.sample.compose.ui.screens.second.SecondScreen
 import co.nimblehq.sample.compose.ui.screens.third.ThirdScreen
diff --git a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/model/UiModel.kt b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/models/UiModel.kt
similarity index 70%
rename from sample-compose/app/src/main/java/co/nimblehq/sample/compose/model/UiModel.kt
rename to sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/models/UiModel.kt
index 63d7184cb..b105af0f3 100644
--- a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/model/UiModel.kt
+++ b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/models/UiModel.kt
@@ -1,7 +1,7 @@
-package co.nimblehq.sample.compose.model
+package co.nimblehq.sample.compose.ui.models
 
 import android.os.Parcelable
-import co.nimblehq.sample.compose.domain.model.Model
+import co.nimblehq.sample.compose.domain.models.Model
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
diff --git a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/HomeScreen.kt b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/HomeScreen.kt
index 47fd782fa..3fb32e32b 100644
--- a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/HomeScreen.kt
+++ b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/HomeScreen.kt
@@ -15,8 +15,8 @@ import co.nimblehq.sample.compose.R
 import co.nimblehq.sample.compose.extensions.collectAsEffect
 import co.nimblehq.sample.compose.extensions.showToast
 import co.nimblehq.sample.compose.lib.IsLoading
-import co.nimblehq.sample.compose.model.UiModel
 import co.nimblehq.sample.compose.ui.AppDestination
+import co.nimblehq.sample.compose.ui.models.UiModel
 import co.nimblehq.sample.compose.ui.screens.AppBar
 import co.nimblehq.sample.compose.ui.showToast
 import co.nimblehq.sample.compose.ui.theme.ComposeTheme
diff --git a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/HomeViewModel.kt b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/HomeViewModel.kt
index 0ea523d99..bbbbaa0f7 100644
--- a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/HomeViewModel.kt
+++ b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/HomeViewModel.kt
@@ -1,16 +1,21 @@
 package co.nimblehq.sample.compose.ui.screens.home
 
 import androidx.lifecycle.viewModelScope
-import co.nimblehq.sample.compose.domain.usecase.GetModelsUseCase
-import co.nimblehq.sample.compose.domain.usecase.IsFirstTimeLaunchPreferencesUseCase
-import co.nimblehq.sample.compose.domain.usecase.UpdateFirstTimeLaunchPreferencesUseCase
-import co.nimblehq.sample.compose.model.UiModel
-import co.nimblehq.sample.compose.model.toUiModel
+import co.nimblehq.sample.compose.domain.usecases.GetModelsUseCase
+import co.nimblehq.sample.compose.domain.usecases.IsFirstTimeLaunchPreferencesUseCase
+import co.nimblehq.sample.compose.domain.usecases.UpdateFirstTimeLaunchPreferencesUseCase
 import co.nimblehq.sample.compose.ui.AppDestination
 import co.nimblehq.sample.compose.ui.base.BaseViewModel
+import co.nimblehq.sample.compose.ui.models.UiModel
+import co.nimblehq.sample.compose.ui.models.toUiModel
 import co.nimblehq.sample.compose.util.DispatchersProvider
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import javax.inject.Inject
 
 @HiltViewModel
diff --git a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/Item.kt b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/Item.kt
index b99d7270b..ff1698ea6 100644
--- a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/Item.kt
+++ b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/Item.kt
@@ -8,7 +8,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import co.nimblehq.sample.compose.R
-import co.nimblehq.sample.compose.model.UiModel
+import co.nimblehq.sample.compose.ui.models.UiModel
 import co.nimblehq.sample.compose.ui.theme.*
 import co.nimblehq.sample.compose.ui.theme.AppTheme.dimensions
 
diff --git a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/ItemList.kt b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/ItemList.kt
index 0ccf1bdff..fe08761f7 100644
--- a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/ItemList.kt
+++ b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/ItemList.kt
@@ -6,7 +6,7 @@ import androidx.compose.material.Divider
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import co.nimblehq.sample.compose.model.UiModel
+import co.nimblehq.sample.compose.ui.models.UiModel
 import co.nimblehq.sample.compose.ui.theme.ComposeTheme
 
 @Composable
diff --git a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/third/ThirdScreen.kt b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/third/ThirdScreen.kt
index f7905ac4d..7b606b2fd 100644
--- a/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/third/ThirdScreen.kt
+++ b/sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/third/ThirdScreen.kt
@@ -13,8 +13,8 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
 import co.nimblehq.sample.compose.R
-import co.nimblehq.sample.compose.model.UiModel
 import co.nimblehq.sample.compose.ui.AppDestination
+import co.nimblehq.sample.compose.ui.models.UiModel
 import co.nimblehq.sample.compose.ui.screens.AppBar
 import co.nimblehq.sample.compose.ui.theme.ComposeTheme
 
diff --git a/sample-compose/app/src/test/java/co/nimblehq/sample/compose/test/MockUtil.kt b/sample-compose/app/src/test/java/co/nimblehq/sample/compose/test/MockUtil.kt
index d79a92a4c..7a2022a2c 100644
--- a/sample-compose/app/src/test/java/co/nimblehq/sample/compose/test/MockUtil.kt
+++ b/sample-compose/app/src/test/java/co/nimblehq/sample/compose/test/MockUtil.kt
@@ -1,6 +1,6 @@
 package co.nimblehq.sample.compose.test
 
-import co.nimblehq.sample.compose.domain.model.Model
+import co.nimblehq.sample.compose.domain.models.Model
 
 object MockUtil {
 
diff --git a/sample-compose/app/src/test/java/co/nimblehq/sample/compose/ui/screens/home/HomeScreenTest.kt b/sample-compose/app/src/test/java/co/nimblehq/sample/compose/ui/screens/home/HomeScreenTest.kt
index 5981e4946..43058f8e3 100644
--- a/sample-compose/app/src/test/java/co/nimblehq/sample/compose/ui/screens/home/HomeScreenTest.kt
+++ b/sample-compose/app/src/test/java/co/nimblehq/sample/compose/ui/screens/home/HomeScreenTest.kt
@@ -7,7 +7,7 @@ import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.rule.GrantPermissionRule
 import co.nimblehq.sample.compose.R
-import co.nimblehq.sample.compose.domain.usecase.*
+import co.nimblehq.sample.compose.domain.usecases.*
 import co.nimblehq.sample.compose.test.MockUtil
 import co.nimblehq.sample.compose.ui.AppDestination
 import co.nimblehq.sample.compose.ui.screens.BaseScreenTest
diff --git a/sample-compose/app/src/test/java/co/nimblehq/sample/compose/ui/screens/home/HomeViewModelTest.kt b/sample-compose/app/src/test/java/co/nimblehq/sample/compose/ui/screens/home/HomeViewModelTest.kt
index e5bb7dcc2..2085d0f16 100644
--- a/sample-compose/app/src/test/java/co/nimblehq/sample/compose/ui/screens/home/HomeViewModelTest.kt
+++ b/sample-compose/app/src/test/java/co/nimblehq/sample/compose/ui/screens/home/HomeViewModelTest.kt
@@ -1,18 +1,25 @@
 package co.nimblehq.sample.compose.ui.screens.home
 
 import app.cash.turbine.test
-import co.nimblehq.sample.compose.domain.usecase.GetModelsUseCase
-import co.nimblehq.sample.compose.domain.usecase.IsFirstTimeLaunchPreferencesUseCase
-import co.nimblehq.sample.compose.domain.usecase.UpdateFirstTimeLaunchPreferencesUseCase
-import co.nimblehq.sample.compose.model.toUiModel
+import co.nimblehq.sample.compose.domain.usecases.GetModelsUseCase
+import co.nimblehq.sample.compose.domain.usecases.IsFirstTimeLaunchPreferencesUseCase
+import co.nimblehq.sample.compose.domain.usecases.UpdateFirstTimeLaunchPreferencesUseCase
 import co.nimblehq.sample.compose.test.CoroutineTestRule
 import co.nimblehq.sample.compose.test.MockUtil
 import co.nimblehq.sample.compose.ui.AppDestination
+import co.nimblehq.sample.compose.ui.models.toUiModel
 import co.nimblehq.sample.compose.util.DispatchersProvider
 import io.kotest.matchers.shouldBe
-import io.mockk.*
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
diff --git a/sample-compose/buildSrc/src/main/java/Versions.kt b/sample-compose/buildSrc/src/main/java/Versions.kt
index 80aaaab2f..bbe6767ff 100644
--- a/sample-compose/buildSrc/src/main/java/Versions.kt
+++ b/sample-compose/buildSrc/src/main/java/Versions.kt
@@ -6,7 +6,7 @@ object Versions {
     const val ANDROID_TARGET_SDK_VERSION = 33
 
     const val ANDROID_VERSION_CODE = 1
-    const val ANDROID_VERSION_NAME = "3.25.0"
+    const val ANDROID_VERSION_NAME = "3.26.0"
 
     // Dependencies (Alphabet sorted)
     const val ACCOMPANIST_PERMISSIONS_VERSION = "0.30.1"
diff --git a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/extensions/ResponseMapping.kt b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/extensions/ResponseMapping.kt
index e8e6a9de5..9a5509bbf 100644
--- a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/extensions/ResponseMapping.kt
+++ b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/extensions/ResponseMapping.kt
@@ -1,8 +1,8 @@
 package co.nimblehq.sample.compose.data.extensions
 
-import co.nimblehq.sample.compose.data.response.ErrorResponse
-import co.nimblehq.sample.compose.data.response.toModel
-import co.nimblehq.sample.compose.data.service.providers.MoshiBuilderProvider
+import co.nimblehq.sample.compose.data.remote.models.responses.ErrorResponse
+import co.nimblehq.sample.compose.data.remote.models.responses.toModel
+import co.nimblehq.sample.compose.data.remote.providers.MoshiBuilderProvider
 import co.nimblehq.sample.compose.domain.exceptions.ApiException
 import co.nimblehq.sample.compose.domain.exceptions.NoConnectivityException
 import com.squareup.moshi.JsonDataException
diff --git a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/storage/BaseSharedPreferences.kt b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/local/preferences/BaseSharedPreferences.kt
similarity index 95%
rename from sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/storage/BaseSharedPreferences.kt
rename to sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/local/preferences/BaseSharedPreferences.kt
index 4c24acf8e..f734bcfd5 100644
--- a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/storage/BaseSharedPreferences.kt
+++ b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/local/preferences/BaseSharedPreferences.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.sample.compose.data.storage
+package co.nimblehq.sample.compose.data.local.preferences
 
 import android.content.SharedPreferences
 
diff --git a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/storages/EncryptedSharedPreferences.kt b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/local/preferences/EncryptedSharedPreferences.kt
similarity index 92%
rename from template-compose/data/src/main/java/co/nimblehq/template/compose/data/storages/EncryptedSharedPreferences.kt
rename to sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/local/preferences/EncryptedSharedPreferences.kt
index f9c687266..09ba68550 100644
--- a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/storages/EncryptedSharedPreferences.kt
+++ b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/local/preferences/EncryptedSharedPreferences.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.template.compose.data.storages
+package co.nimblehq.sample.compose.data.local.preferences
 
 import android.content.Context
 import androidx.security.crypto.EncryptedSharedPreferences
diff --git a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/storages/SharedPreferencesExt.kt b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/local/preferences/SharedPreferencesExt.kt
similarity index 76%
rename from template-compose/data/src/main/java/co/nimblehq/template/compose/data/storages/SharedPreferencesExt.kt
rename to sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/local/preferences/SharedPreferencesExt.kt
index 99b1e5be2..31b891651 100644
--- a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/storages/SharedPreferencesExt.kt
+++ b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/local/preferences/SharedPreferencesExt.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.template.compose.data.storages
+package co.nimblehq.sample.compose.data.local.preferences
 
 import android.content.SharedPreferences
 
diff --git a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/requests/.keep b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/authenticators/.keep
similarity index 100%
rename from template-compose/data/src/main/java/co/nimblehq/template/compose/data/requests/.keep
rename to sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/authenticators/.keep
diff --git a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/interceptors/.keep b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/interceptors/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/models/requests/.keep b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/models/requests/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/response/ErrorResponse.kt b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/models/responses/ErrorResponse.kt
similarity index 60%
rename from sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/response/ErrorResponse.kt
rename to sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/models/responses/ErrorResponse.kt
index c917772e9..e83aeda26 100644
--- a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/response/ErrorResponse.kt
+++ b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/models/responses/ErrorResponse.kt
@@ -1,6 +1,6 @@
-package co.nimblehq.sample.compose.data.response
+package co.nimblehq.sample.compose.data.remote.models.responses
 
-import co.nimblehq.sample.compose.domain.model.Error
+import co.nimblehq.sample.compose.domain.models.Error
 import com.squareup.moshi.Json
 
 data class ErrorResponse(
diff --git a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/response/Response.kt b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/models/responses/Response.kt
similarity index 77%
rename from sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/response/Response.kt
rename to sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/models/responses/Response.kt
index 703648033..d0a0ee510 100644
--- a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/response/Response.kt
+++ b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/models/responses/Response.kt
@@ -1,6 +1,6 @@
-package co.nimblehq.sample.compose.data.response
+package co.nimblehq.sample.compose.data.remote.models.responses
 
-import co.nimblehq.sample.compose.domain.model.Model
+import co.nimblehq.sample.compose.domain.models.Model
 import com.squareup.moshi.Json
 
 data class Response(
diff --git a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/service/providers/ApiServiceProvider.kt b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/providers/ApiServiceProvider.kt
similarity index 58%
rename from sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/service/providers/ApiServiceProvider.kt
rename to sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/providers/ApiServiceProvider.kt
index fba9fe564..b7c1398d2 100644
--- a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/service/providers/ApiServiceProvider.kt
+++ b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/providers/ApiServiceProvider.kt
@@ -1,6 +1,6 @@
-package co.nimblehq.sample.compose.data.service.providers
+package co.nimblehq.sample.compose.data.remote.providers
 
-import co.nimblehq.sample.compose.data.service.ApiService
+import co.nimblehq.sample.compose.data.remote.services.ApiService
 import retrofit2.Retrofit
 
 object ApiServiceProvider {
diff --git a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/service/providers/ConverterFactoryProvider.kt b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/providers/ConverterFactoryProvider.kt
similarity index 82%
rename from sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/service/providers/ConverterFactoryProvider.kt
rename to sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/providers/ConverterFactoryProvider.kt
index 8194484cf..a3ca805ba 100644
--- a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/service/providers/ConverterFactoryProvider.kt
+++ b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/providers/ConverterFactoryProvider.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.sample.compose.data.service.providers
+package co.nimblehq.sample.compose.data.remote.providers
 
 import com.squareup.moshi.Moshi
 import retrofit2.Converter
diff --git a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/services/providers/MoshiBuilderProvider.kt b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/providers/MoshiBuilderProvider.kt
similarity index 89%
rename from template-compose/data/src/main/java/co/nimblehq/template/compose/data/services/providers/MoshiBuilderProvider.kt
rename to sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/providers/MoshiBuilderProvider.kt
index 667c8d9cb..406ca79be 100644
--- a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/services/providers/MoshiBuilderProvider.kt
+++ b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/providers/MoshiBuilderProvider.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.template.compose.data.services.providers
+package co.nimblehq.sample.compose.data.remote.providers
 
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
diff --git a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/service/providers/RetrofitProvider.kt b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/providers/RetrofitProvider.kt
similarity index 88%
rename from sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/service/providers/RetrofitProvider.kt
rename to sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/providers/RetrofitProvider.kt
index c2d65daa9..00b0206ab 100644
--- a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/service/providers/RetrofitProvider.kt
+++ b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/providers/RetrofitProvider.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.sample.compose.data.service.providers
+package co.nimblehq.sample.compose.data.remote.providers
 
 import okhttp3.OkHttpClient
 import retrofit2.Converter
diff --git a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/services/ApiService.kt b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/services/ApiService.kt
new file mode 100644
index 000000000..2eb702d9e
--- /dev/null
+++ b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/services/ApiService.kt
@@ -0,0 +1,10 @@
+package co.nimblehq.sample.compose.data.remote.services
+
+import co.nimblehq.sample.compose.data.remote.models.responses.Response
+import retrofit2.http.GET
+
+interface ApiService {
+
+    @GET("users")
+    suspend fun getResponses(): List<Response>
+}
diff --git a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/repository/AppPreferencesRepositoryImpl.kt b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/repositories/AppPreferencesRepositoryImpl.kt
similarity index 71%
rename from sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/repository/AppPreferencesRepositoryImpl.kt
rename to sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/repositories/AppPreferencesRepositoryImpl.kt
index b9fa75340..0ec7ed2b8 100644
--- a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/repository/AppPreferencesRepositoryImpl.kt
+++ b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/repositories/AppPreferencesRepositoryImpl.kt
@@ -1,10 +1,15 @@
-package co.nimblehq.sample.compose.data.repository
+package co.nimblehq.sample.compose.data.repositories
 
 import android.util.Log
 import androidx.datastore.core.DataStore
-import androidx.datastore.preferences.core.*
-import co.nimblehq.sample.compose.domain.repository.AppPreferencesRepository
-import kotlinx.coroutines.flow.*
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.emptyPreferences
+import co.nimblehq.sample.compose.domain.repositories.AppPreferencesRepository
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.map
 import java.io.IOException
 import javax.inject.Inject
 
diff --git a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/repository/RepositoryImpl.kt b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/repositories/RepositoryImpl.kt
similarity index 50%
rename from sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/repository/RepositoryImpl.kt
rename to sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/repositories/RepositoryImpl.kt
index 74655073f..eb939659a 100644
--- a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/repository/RepositoryImpl.kt
+++ b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/repositories/RepositoryImpl.kt
@@ -1,10 +1,10 @@
-package co.nimblehq.sample.compose.data.repository
+package co.nimblehq.sample.compose.data.repositories
 
 import co.nimblehq.sample.compose.data.extensions.flowTransform
-import co.nimblehq.sample.compose.data.response.toModels
-import co.nimblehq.sample.compose.data.service.ApiService
-import co.nimblehq.sample.compose.domain.model.Model
-import co.nimblehq.sample.compose.domain.repository.Repository
+import co.nimblehq.sample.compose.data.remote.models.responses.toModels
+import co.nimblehq.sample.compose.data.remote.services.ApiService
+import co.nimblehq.sample.compose.domain.models.Model
+import co.nimblehq.sample.compose.domain.repositories.Repository
 import kotlinx.coroutines.flow.Flow
 
 class RepositoryImpl constructor(
diff --git a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/service/ApiService.kt b/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/service/ApiService.kt
deleted file mode 100644
index 6352c500e..000000000
--- a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/service/ApiService.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package co.nimblehq.sample.compose.data.service
-
-import co.nimblehq.sample.compose.data.response.Response
-import retrofit2.http.GET
-
-interface ApiService {
-
-    @GET("users")
-    suspend fun getResponses(): List<Response>
-}
diff --git a/sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/extensions/ResponseMappingTest.kt b/sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/extensions/ResponseMappingTest.kt
index 609735c20..1bc301da9 100644
--- a/sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/extensions/ResponseMappingTest.kt
+++ b/sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/extensions/ResponseMappingTest.kt
@@ -1,10 +1,10 @@
 package co.nimblehq.sample.compose.data.extensions
 
-import co.nimblehq.sample.compose.data.response.toModel
+import co.nimblehq.sample.compose.data.remote.models.responses.toModel
 import co.nimblehq.sample.compose.data.test.MockUtil
 import co.nimblehq.sample.compose.domain.exceptions.ApiException
 import co.nimblehq.sample.compose.domain.exceptions.NoConnectivityException
-import co.nimblehq.sample.compose.domain.model.Model
+import co.nimblehq.sample.compose.domain.models.Model
 import io.kotest.matchers.shouldBe
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.catch
diff --git a/sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/repository/AppPreferencesRepositoryImplTest.kt b/sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/repositories/AppPreferencesRepositoryImplTest.kt
similarity index 96%
rename from sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/repository/AppPreferencesRepositoryImplTest.kt
rename to sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/repositories/AppPreferencesRepositoryImplTest.kt
index 1af22889e..619bd4eb4 100644
--- a/sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/repository/AppPreferencesRepositoryImplTest.kt
+++ b/sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/repositories/AppPreferencesRepositoryImplTest.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.sample.compose.data.repository
+package co.nimblehq.sample.compose.data.repositories
 
 import android.content.Context
 import androidx.datastore.core.DataStore
@@ -6,7 +6,7 @@ import androidx.datastore.preferences.core.*
 import androidx.datastore.preferences.preferencesDataStoreFile
 import androidx.test.core.app.ApplicationProvider
 import app.cash.turbine.test
-import co.nimblehq.sample.compose.domain.repository.AppPreferencesRepository
+import co.nimblehq.sample.compose.domain.repositories.AppPreferencesRepository
 import io.kotest.matchers.shouldBe
 import io.mockk.every
 import io.mockk.mockk
diff --git a/sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/repository/RepositoryTest.kt b/sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/repositories/RepositoryTest.kt
similarity index 82%
rename from sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/repository/RepositoryTest.kt
rename to sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/repositories/RepositoryTest.kt
index 8e5afc778..477da8640 100644
--- a/sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/repository/RepositoryTest.kt
+++ b/sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/repositories/RepositoryTest.kt
@@ -1,9 +1,9 @@
-package co.nimblehq.sample.compose.data.repository
+package co.nimblehq.sample.compose.data.repositories
 
-import co.nimblehq.sample.compose.data.response.toModels
-import co.nimblehq.sample.compose.data.service.ApiService
+import co.nimblehq.sample.compose.data.remote.models.responses.toModels
+import co.nimblehq.sample.compose.data.remote.services.ApiService
 import co.nimblehq.sample.compose.data.test.MockUtil
-import co.nimblehq.sample.compose.domain.repository.Repository
+import co.nimblehq.sample.compose.domain.repositories.Repository
 import io.kotest.matchers.shouldBe
 import io.mockk.coEvery
 import io.mockk.mockk
diff --git a/sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/test/MockUtil.kt b/sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/test/MockUtil.kt
index 4a2ca5142..84ef37691 100644
--- a/sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/test/MockUtil.kt
+++ b/sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/test/MockUtil.kt
@@ -1,6 +1,6 @@
 package co.nimblehq.sample.compose.data.test
 
-import co.nimblehq.sample.compose.data.response.ErrorResponse
+import co.nimblehq.sample.compose.data.remote.models.responses.ErrorResponse
 import io.mockk.every
 import io.mockk.mockk
 import okhttp3.ResponseBody
@@ -31,7 +31,7 @@ object MockUtil {
     )
 
     val responses = listOf(
-        co.nimblehq.sample.compose.data.response.Response(
+        co.nimblehq.sample.compose.data.remote.models.responses.Response(
             id = 1,
             userName = "name1",
         )
diff --git a/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/exceptions/Exceptions.kt b/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/exceptions/Exceptions.kt
index 20269461d..e37d15cd4 100644
--- a/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/exceptions/Exceptions.kt
+++ b/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/exceptions/Exceptions.kt
@@ -1,6 +1,6 @@
 package co.nimblehq.sample.compose.domain.exceptions
 
-import co.nimblehq.sample.compose.domain.model.Error
+import co.nimblehq.sample.compose.domain.models.Error
 
 object NoConnectivityException : RuntimeException()
 
diff --git a/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/model/Error.kt b/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/model/Error.kt
deleted file mode 100644
index e7260f8a6..000000000
--- a/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/model/Error.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.nimblehq.sample.compose.domain.model
-
-data class Error(
-    val message: String
-)
diff --git a/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/models/Error.kt b/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/models/Error.kt
new file mode 100644
index 000000000..95174a0f6
--- /dev/null
+++ b/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/models/Error.kt
@@ -0,0 +1,5 @@
+package co.nimblehq.sample.compose.domain.models
+
+data class Error(
+    val message: String
+)
diff --git a/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/model/Model.kt b/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/models/Model.kt
similarity index 57%
rename from sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/model/Model.kt
rename to sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/models/Model.kt
index 559f5a236..05b89da54 100644
--- a/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/model/Model.kt
+++ b/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/models/Model.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.sample.compose.domain.model
+package co.nimblehq.sample.compose.domain.models
 
 data class Model(
     val id: Int?,
diff --git a/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/repository/AppPreferencesRepository.kt b/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/repositories/AppPreferencesRepository.kt
similarity index 77%
rename from sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/repository/AppPreferencesRepository.kt
rename to sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/repositories/AppPreferencesRepository.kt
index 7cd372b68..2c6c83973 100644
--- a/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/repository/AppPreferencesRepository.kt
+++ b/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/repositories/AppPreferencesRepository.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.sample.compose.domain.repository
+package co.nimblehq.sample.compose.domain.repositories
 
 import kotlinx.coroutines.flow.Flow
 
diff --git a/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/repositories/Repository.kt b/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/repositories/Repository.kt
new file mode 100644
index 000000000..47c77b39d
--- /dev/null
+++ b/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/repositories/Repository.kt
@@ -0,0 +1,9 @@
+package co.nimblehq.sample.compose.domain.repositories
+
+import co.nimblehq.sample.compose.domain.models.Model
+import kotlinx.coroutines.flow.Flow
+
+interface Repository {
+
+    fun getModels(): Flow<List<Model>>
+}
diff --git a/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/repository/Repository.kt b/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/repository/Repository.kt
deleted file mode 100644
index 493fcd665..000000000
--- a/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/repository/Repository.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package co.nimblehq.sample.compose.domain.repository
-
-import co.nimblehq.sample.compose.domain.model.Model
-import kotlinx.coroutines.flow.Flow
-
-interface Repository {
-
-    fun getModels(): Flow<List<Model>>
-}
diff --git a/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/usecase/GetModelsUseCase.kt b/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/usecases/GetModelsUseCase.kt
similarity index 58%
rename from sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/usecase/GetModelsUseCase.kt
rename to sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/usecases/GetModelsUseCase.kt
index 77d25665e..b07b00302 100644
--- a/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/usecase/GetModelsUseCase.kt
+++ b/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/usecases/GetModelsUseCase.kt
@@ -1,7 +1,7 @@
-package co.nimblehq.sample.compose.domain.usecase
+package co.nimblehq.sample.compose.domain.usecases
 
-import co.nimblehq.sample.compose.domain.model.Model
-import co.nimblehq.sample.compose.domain.repository.Repository
+import co.nimblehq.sample.compose.domain.models.Model
+import co.nimblehq.sample.compose.domain.repositories.Repository
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
diff --git a/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/usecase/IsFirstTimeLaunchPreferencesUseCase.kt b/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/usecases/IsFirstTimeLaunchPreferencesUseCase.kt
similarity index 70%
rename from sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/usecase/IsFirstTimeLaunchPreferencesUseCase.kt
rename to sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/usecases/IsFirstTimeLaunchPreferencesUseCase.kt
index e6519e719..549d6ee41 100644
--- a/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/usecase/IsFirstTimeLaunchPreferencesUseCase.kt
+++ b/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/usecases/IsFirstTimeLaunchPreferencesUseCase.kt
@@ -1,6 +1,6 @@
-package co.nimblehq.sample.compose.domain.usecase
+package co.nimblehq.sample.compose.domain.usecases
 
-import co.nimblehq.sample.compose.domain.repository.AppPreferencesRepository
+import co.nimblehq.sample.compose.domain.repositories.AppPreferencesRepository
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
diff --git a/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/usecase/UpdateFirstTimeLaunchPreferencesUseCase.kt b/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/usecases/UpdateFirstTimeLaunchPreferencesUseCase.kt
similarity index 70%
rename from sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/usecase/UpdateFirstTimeLaunchPreferencesUseCase.kt
rename to sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/usecases/UpdateFirstTimeLaunchPreferencesUseCase.kt
index 84f94d837..250e6e2c7 100644
--- a/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/usecase/UpdateFirstTimeLaunchPreferencesUseCase.kt
+++ b/sample-compose/domain/src/main/java/co/nimblehq/sample/compose/domain/usecases/UpdateFirstTimeLaunchPreferencesUseCase.kt
@@ -1,6 +1,6 @@
-package co.nimblehq.sample.compose.domain.usecase
+package co.nimblehq.sample.compose.domain.usecases
 
-import co.nimblehq.sample.compose.domain.repository.AppPreferencesRepository
+import co.nimblehq.sample.compose.domain.repositories.AppPreferencesRepository
 import javax.inject.Inject
 
 class UpdateFirstTimeLaunchPreferencesUseCase @Inject constructor(
diff --git a/sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/test/MockUtil.kt b/sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/test/MockUtil.kt
index f0fbd33da..27fe5c27f 100644
--- a/sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/test/MockUtil.kt
+++ b/sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/test/MockUtil.kt
@@ -1,6 +1,6 @@
 package co.nimblehq.sample.compose.domain.test
 
-import co.nimblehq.sample.compose.domain.model.Model
+import co.nimblehq.sample.compose.domain.models.Model
 
 object MockUtil {
 
diff --git a/sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/usecase/GetModelsUseCaseTest.kt b/sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/usecases/GetModelsUseCaseTest.kt
similarity index 91%
rename from sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/usecase/GetModelsUseCaseTest.kt
rename to sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/usecases/GetModelsUseCaseTest.kt
index 1a64b64d4..d32a928c8 100644
--- a/sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/usecase/GetModelsUseCaseTest.kt
+++ b/sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/usecases/GetModelsUseCaseTest.kt
@@ -1,6 +1,6 @@
-package co.nimblehq.sample.compose.domain.usecase
+package co.nimblehq.sample.compose.domain.usecases
 
-import co.nimblehq.sample.compose.domain.repository.Repository
+import co.nimblehq.sample.compose.domain.repositories.Repository
 import co.nimblehq.sample.compose.domain.test.MockUtil
 import io.kotest.matchers.shouldBe
 import io.mockk.every
diff --git a/sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/usecase/IsFirstTimeLaunchPreferencesUseCaseTest.kt b/sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/usecases/IsFirstTimeLaunchPreferencesUseCaseTest.kt
similarity index 91%
rename from sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/usecase/IsFirstTimeLaunchPreferencesUseCaseTest.kt
rename to sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/usecases/IsFirstTimeLaunchPreferencesUseCaseTest.kt
index b53d864f6..7a9d4f2e8 100644
--- a/sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/usecase/IsFirstTimeLaunchPreferencesUseCaseTest.kt
+++ b/sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/usecases/IsFirstTimeLaunchPreferencesUseCaseTest.kt
@@ -1,6 +1,6 @@
-package co.nimblehq.sample.compose.domain.usecase
+package co.nimblehq.sample.compose.domain.usecases
 
-import co.nimblehq.sample.compose.domain.repository.AppPreferencesRepository
+import co.nimblehq.sample.compose.domain.repositories.AppPreferencesRepository
 import io.kotest.matchers.shouldBe
 import io.mockk.every
 import io.mockk.mockk
diff --git a/sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/usecase/UpdateFirstTimeLaunchPreferencesUseCaseTest.kt b/sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/usecases/UpdateFirstTimeLaunchPreferencesUseCaseTest.kt
similarity index 89%
rename from sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/usecase/UpdateFirstTimeLaunchPreferencesUseCaseTest.kt
rename to sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/usecases/UpdateFirstTimeLaunchPreferencesUseCaseTest.kt
index 53676e80c..4514b5f15 100644
--- a/sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/usecase/UpdateFirstTimeLaunchPreferencesUseCaseTest.kt
+++ b/sample-compose/domain/src/test/java/co/nimblehq/sample/compose/domain/usecases/UpdateFirstTimeLaunchPreferencesUseCaseTest.kt
@@ -1,6 +1,6 @@
-package co.nimblehq.sample.compose.domain.usecase
+package co.nimblehq.sample.compose.domain.usecases
 
-import co.nimblehq.sample.compose.domain.repository.AppPreferencesRepository
+import co.nimblehq.sample.compose.domain.repositories.AppPreferencesRepository
 import io.mockk.*
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.*
diff --git a/scripts/new_project.kts b/scripts/new_project.kts
index b111306bc..1bf287785 100644
--- a/scripts/new_project.kts
+++ b/scripts/new_project.kts
@@ -235,14 +235,16 @@ object NewProject {
             "$projectPath${fileSeparator}gradlew",
             "-p",
             "$projectPath",
-            "clean"
+            "clean",
+            "--stacktrace"
         )
         executeCommand(
             "sh",
             "$projectPath${fileSeparator}gradlew",
             "-p",
             "$projectPath${fileSeparator}buildSrc",
-            "clean"
+            "clean",
+            "--stacktrace"
         )
         listOf(".idea", ".gradle", "buildSrc$fileSeparator.gradle", ".git").forEach {
             File("$projectPath$fileSeparator$it")?.let { targetFile ->
@@ -310,7 +312,8 @@ object NewProject {
             "$projectPath${fileSeparator}gradlew",
             "-p",
             "$projectPath",
-            "assembleDebug"
+            "assembleDebug",
+            "--stacktrace"
         )
         showMessage("=> 🚓 Running tests...")
         executeCommand(
@@ -320,7 +323,8 @@ object NewProject {
             "$projectPath",
             ":app:testStagingDebugUnitTest",
             ":data:testDebugUnitTest",
-            ":domain:test"
+            ":domain:test",
+            "--stacktrace"
         )
         showMessage("=> 🚀 Done! The project is ready for development")
     }
diff --git a/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/MoshiModule.kt b/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/MoshiModule.kt
index 396fde5c8..ee66dc6a5 100644
--- a/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/MoshiModule.kt
+++ b/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/MoshiModule.kt
@@ -1,6 +1,6 @@
 package co.nimblehq.template.compose.di.modules
 
-import co.nimblehq.template.compose.data.services.providers.MoshiBuilderProvider
+import co.nimblehq.template.compose.data.remote.providers.MoshiBuilderProvider
 import com.squareup.moshi.Moshi
 import dagger.Module
 import dagger.Provides
diff --git a/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/RepositoryModule.kt b/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/RepositoryModule.kt
index 6399e632f..107b444d7 100644
--- a/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/RepositoryModule.kt
+++ b/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/RepositoryModule.kt
@@ -1,7 +1,7 @@
 package co.nimblehq.template.compose.di.modules
 
+import co.nimblehq.template.compose.data.remote.services.ApiService
 import co.nimblehq.template.compose.data.repositories.RepositoryImpl
-import co.nimblehq.template.compose.data.services.ApiService
 import co.nimblehq.template.compose.domain.repositories.Repository
 import dagger.Module
 import dagger.Provides
diff --git a/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/RetrofitModule.kt b/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/RetrofitModule.kt
index 56100dd74..7fb90ab68 100644
--- a/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/RetrofitModule.kt
+++ b/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/RetrofitModule.kt
@@ -1,8 +1,8 @@
 package co.nimblehq.template.compose.di.modules
 
 import co.nimblehq.template.compose.BuildConfig
-import co.nimblehq.template.compose.data.services.ApiService
-import co.nimblehq.template.compose.data.services.providers.*
+import co.nimblehq.template.compose.data.remote.providers.*
+import co.nimblehq.template.compose.data.remote.services.ApiService
 import com.squareup.moshi.Moshi
 import dagger.Module
 import dagger.Provides
diff --git a/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/StorageModule.kt b/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/StorageModule.kt
index 8744865c9..871cc0bc9 100644
--- a/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/StorageModule.kt
+++ b/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/StorageModule.kt
@@ -1,7 +1,7 @@
 package co.nimblehq.template.compose.di.modules
 
 import android.content.Context
-import co.nimblehq.template.compose.data.storages.EncryptedSharedPreferences
+import co.nimblehq.template.compose.data.local.preferences.EncryptedSharedPreferences
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
diff --git a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/extensions/ResponseMapping.kt b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/extensions/ResponseMapping.kt
index e4119ef94..fb4b416e7 100644
--- a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/extensions/ResponseMapping.kt
+++ b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/extensions/ResponseMapping.kt
@@ -1,8 +1,8 @@
 package co.nimblehq.template.compose.data.extensions
 
-import co.nimblehq.template.compose.data.responses.ErrorResponse
-import co.nimblehq.template.compose.data.responses.toModel
-import co.nimblehq.template.compose.data.services.providers.MoshiBuilderProvider
+import co.nimblehq.template.compose.data.remote.models.responses.ErrorResponse
+import co.nimblehq.template.compose.data.remote.models.responses.toModel
+import co.nimblehq.template.compose.data.remote.providers.MoshiBuilderProvider
 import co.nimblehq.template.compose.domain.exceptions.ApiException
 import co.nimblehq.template.compose.domain.exceptions.NoConnectivityException
 import com.squareup.moshi.JsonDataException
diff --git a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/storages/BaseSharedPreferences.kt b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/local/preferences/BaseSharedPreferences.kt
similarity index 95%
rename from template-compose/data/src/main/java/co/nimblehq/template/compose/data/storages/BaseSharedPreferences.kt
rename to template-compose/data/src/main/java/co/nimblehq/template/compose/data/local/preferences/BaseSharedPreferences.kt
index e6fb7ba12..4b30ea8dc 100644
--- a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/storages/BaseSharedPreferences.kt
+++ b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/local/preferences/BaseSharedPreferences.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.template.compose.data.storages
+package co.nimblehq.template.compose.data.local.preferences
 
 import android.content.SharedPreferences
 
diff --git a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/storage/EncryptedSharedPreferences.kt b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/local/preferences/EncryptedSharedPreferences.kt
similarity index 92%
rename from sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/storage/EncryptedSharedPreferences.kt
rename to template-compose/data/src/main/java/co/nimblehq/template/compose/data/local/preferences/EncryptedSharedPreferences.kt
index c44947405..baa85c780 100644
--- a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/storage/EncryptedSharedPreferences.kt
+++ b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/local/preferences/EncryptedSharedPreferences.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.sample.compose.data.storage
+package co.nimblehq.template.compose.data.local.preferences
 
 import android.content.Context
 import androidx.security.crypto.EncryptedSharedPreferences
diff --git a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/storage/SharedPreferencesExt.kt b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/local/preferences/SharedPreferencesExt.kt
similarity index 75%
rename from sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/storage/SharedPreferencesExt.kt
rename to template-compose/data/src/main/java/co/nimblehq/template/compose/data/local/preferences/SharedPreferencesExt.kt
index 0fc8c95b9..1da4553f1 100644
--- a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/storage/SharedPreferencesExt.kt
+++ b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/local/preferences/SharedPreferencesExt.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.sample.compose.data.storage
+package co.nimblehq.template.compose.data.local.preferences
 
 import android.content.SharedPreferences
 
diff --git a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/authenticators/.keep b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/authenticators/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/interceptors/.keep b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/interceptors/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/models/requests/.keep b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/models/requests/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/responses/ErrorResponse.kt b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/models/responses/ErrorResponse.kt
similarity index 78%
rename from template-compose/data/src/main/java/co/nimblehq/template/compose/data/responses/ErrorResponse.kt
rename to template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/models/responses/ErrorResponse.kt
index f3a7cf672..427ed54f4 100644
--- a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/responses/ErrorResponse.kt
+++ b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/models/responses/ErrorResponse.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.template.compose.data.responses
+package co.nimblehq.template.compose.data.remote.models.responses
 
 import co.nimblehq.template.compose.domain.models.Error
 import com.squareup.moshi.Json
diff --git a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/responses/Response.kt b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/models/responses/Response.kt
similarity index 79%
rename from template-compose/data/src/main/java/co/nimblehq/template/compose/data/responses/Response.kt
rename to template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/models/responses/Response.kt
index b6a1a4c51..b0e5f5381 100644
--- a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/responses/Response.kt
+++ b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/models/responses/Response.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.template.compose.data.responses
+package co.nimblehq.template.compose.data.remote.models.responses
 
 import co.nimblehq.template.compose.domain.models.Model
 import com.squareup.moshi.Json
diff --git a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/services/providers/ApiServiceProvider.kt b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/providers/ApiServiceProvider.kt
similarity index 58%
rename from template-compose/data/src/main/java/co/nimblehq/template/compose/data/services/providers/ApiServiceProvider.kt
rename to template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/providers/ApiServiceProvider.kt
index 4d93e9ef0..ef132278f 100644
--- a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/services/providers/ApiServiceProvider.kt
+++ b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/providers/ApiServiceProvider.kt
@@ -1,6 +1,6 @@
-package co.nimblehq.template.compose.data.services.providers
+package co.nimblehq.template.compose.data.remote.providers
 
-import co.nimblehq.template.compose.data.services.ApiService
+import co.nimblehq.template.compose.data.remote.services.ApiService
 import retrofit2.Retrofit
 
 object ApiServiceProvider {
diff --git a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/services/providers/ConverterFactoryProvider.kt b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/providers/ConverterFactoryProvider.kt
similarity index 82%
rename from template-compose/data/src/main/java/co/nimblehq/template/compose/data/services/providers/ConverterFactoryProvider.kt
rename to template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/providers/ConverterFactoryProvider.kt
index c0992f3a6..8a7895fe6 100644
--- a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/services/providers/ConverterFactoryProvider.kt
+++ b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/providers/ConverterFactoryProvider.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.template.compose.data.services.providers
+package co.nimblehq.template.compose.data.remote.providers
 
 import com.squareup.moshi.Moshi
 import retrofit2.Converter
diff --git a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/service/providers/MoshiBuilderProvider.kt b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/providers/MoshiBuilderProvider.kt
similarity index 85%
rename from sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/service/providers/MoshiBuilderProvider.kt
rename to template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/providers/MoshiBuilderProvider.kt
index 2af87f89f..104835e1d 100644
--- a/sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/service/providers/MoshiBuilderProvider.kt
+++ b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/providers/MoshiBuilderProvider.kt
@@ -1,9 +1,9 @@
-package co.nimblehq.sample.compose.data.service.providers
+package co.nimblehq.template.compose.data.remote.providers
 
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
-import java.util.*
+import java.util.Date
 
 object MoshiBuilderProvider {
 
diff --git a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/services/providers/RetrofitProvider.kt b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/providers/RetrofitProvider.kt
similarity index 87%
rename from template-compose/data/src/main/java/co/nimblehq/template/compose/data/services/providers/RetrofitProvider.kt
rename to template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/providers/RetrofitProvider.kt
index 1ec48b823..28136bd0d 100644
--- a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/services/providers/RetrofitProvider.kt
+++ b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/providers/RetrofitProvider.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.template.compose.data.services.providers
+package co.nimblehq.template.compose.data.remote.providers
 
 import okhttp3.OkHttpClient
 import retrofit2.Converter
diff --git a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/services/ApiService.kt b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/services/ApiService.kt
new file mode 100644
index 000000000..e0133a168
--- /dev/null
+++ b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/services/ApiService.kt
@@ -0,0 +1,10 @@
+package co.nimblehq.template.compose.data.remote.services
+
+import co.nimblehq.template.compose.data.remote.models.responses.Response
+import retrofit2.http.GET
+
+interface ApiService {
+
+    @GET("users")
+    suspend fun getResponses(): List<Response>
+}
diff --git a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/repositories/RepositoryImpl.kt b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/repositories/RepositoryImpl.kt
index 27fe20eab..4dc8fa5f7 100644
--- a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/repositories/RepositoryImpl.kt
+++ b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/repositories/RepositoryImpl.kt
@@ -1,8 +1,8 @@
 package co.nimblehq.template.compose.data.repositories
 
 import co.nimblehq.template.compose.data.extensions.flowTransform
-import co.nimblehq.template.compose.data.responses.toModels
-import co.nimblehq.template.compose.data.services.ApiService
+import co.nimblehq.template.compose.data.remote.models.responses.toModels
+import co.nimblehq.template.compose.data.remote.services.ApiService
 import co.nimblehq.template.compose.domain.models.Model
 import co.nimblehq.template.compose.domain.repositories.Repository
 import kotlinx.coroutines.flow.Flow
diff --git a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/services/ApiService.kt b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/services/ApiService.kt
deleted file mode 100644
index ba12c82e7..000000000
--- a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/services/ApiService.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package co.nimblehq.template.compose.data.services
-
-import co.nimblehq.template.compose.data.responses.Response
-import retrofit2.http.GET
-
-interface ApiService {
-
-    @GET("users")
-    suspend fun getResponses(): List<Response>
-}
diff --git a/template-compose/data/src/test/java/co/nimblehq/template/compose/data/extensions/ResponseMappingTest.kt b/template-compose/data/src/test/java/co/nimblehq/template/compose/data/extensions/ResponseMappingTest.kt
index 7ccc3b4e1..03e388748 100644
--- a/template-compose/data/src/test/java/co/nimblehq/template/compose/data/extensions/ResponseMappingTest.kt
+++ b/template-compose/data/src/test/java/co/nimblehq/template/compose/data/extensions/ResponseMappingTest.kt
@@ -1,6 +1,6 @@
 package co.nimblehq.template.compose.data.extensions
 
-import co.nimblehq.template.compose.data.responses.toModel
+import co.nimblehq.template.compose.data.remote.models.responses.toModel
 import co.nimblehq.template.compose.data.test.MockUtil
 import co.nimblehq.template.compose.domain.exceptions.ApiException
 import co.nimblehq.template.compose.domain.exceptions.NoConnectivityException
diff --git a/template-compose/data/src/test/java/co/nimblehq/template/compose/data/repositories/RepositoryTest.kt b/template-compose/data/src/test/java/co/nimblehq/template/compose/data/repositories/RepositoryTest.kt
index a316679f2..3e3ed6f2f 100644
--- a/template-compose/data/src/test/java/co/nimblehq/template/compose/data/repositories/RepositoryTest.kt
+++ b/template-compose/data/src/test/java/co/nimblehq/template/compose/data/repositories/RepositoryTest.kt
@@ -1,7 +1,7 @@
 package co.nimblehq.template.compose.data.repositories
 
-import co.nimblehq.template.compose.data.responses.toModels
-import co.nimblehq.template.compose.data.services.ApiService
+import co.nimblehq.template.compose.data.remote.models.responses.toModels
+import co.nimblehq.template.compose.data.remote.services.ApiService
 import co.nimblehq.template.compose.data.test.MockUtil
 import co.nimblehq.template.compose.domain.repositories.Repository
 import io.kotest.matchers.shouldBe
diff --git a/template-compose/data/src/test/java/co/nimblehq/template/compose/data/test/MockUtil.kt b/template-compose/data/src/test/java/co/nimblehq/template/compose/data/test/MockUtil.kt
index c7c26da9a..bab3aa922 100644
--- a/template-compose/data/src/test/java/co/nimblehq/template/compose/data/test/MockUtil.kt
+++ b/template-compose/data/src/test/java/co/nimblehq/template/compose/data/test/MockUtil.kt
@@ -1,6 +1,6 @@
 package co.nimblehq.template.compose.data.test
 
-import co.nimblehq.template.compose.data.responses.ErrorResponse
+import co.nimblehq.template.compose.data.remote.models.responses.ErrorResponse
 import io.mockk.every
 import io.mockk.mockk
 import okhttp3.ResponseBody
@@ -31,6 +31,6 @@ object MockUtil {
     )
 
     val responses = listOf(
-        co.nimblehq.template.compose.data.responses.Response(id = 1)
+        co.nimblehq.template.compose.data.remote.models.responses.Response(id = 1)
     )
 }
diff --git a/version.properties b/version.properties
index 8b6b9493b..a1b0908da 100644
--- a/version.properties
+++ b/version.properties
@@ -1,3 +1,3 @@
 kotlinVersion=1.6.21
 kscriptVersion=4.0.3
-templateScriptVersion=3.25.0
+templateScriptVersion=3.26.0