diff --git a/app/src/test/java/gq/kirmanak/mealient/data/network/RetrofitServiceFactoryTest.kt b/app/src/test/java/gq/kirmanak/mealient/data/network/RetrofitServiceFactoryTest.kt
deleted file mode 100644
index 59050c6..0000000
--- a/app/src/test/java/gq/kirmanak/mealient/data/network/RetrofitServiceFactoryTest.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-package gq.kirmanak.mealient.data.network
-
-import com.google.common.truth.Truth.assertThat
-import gq.kirmanak.mealient.data.baseurl.BaseURLStorage
-import gq.kirmanak.mealient.data.baseurl.impl.VersionService
-import gq.kirmanak.mealient.logging.Logger
-import gq.kirmanak.mealient.test.AuthImplTestData.TEST_BASE_URL
-import io.mockk.*
-import io.mockk.impl.annotations.MockK
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.runTest
-import org.junit.Before
-import org.junit.Test
-import retrofit2.Retrofit
-
-@OptIn(ExperimentalCoroutinesApi::class)
-class RetrofitServiceFactoryTest {
-
-    @MockK
-    lateinit var retrofitBuilder: RetrofitBuilder
-
-    @MockK
-    lateinit var baseURLStorage: BaseURLStorage
-
-    @MockK
-    lateinit var retrofit: Retrofit
-
-    @MockK
-    lateinit var versionService: VersionService
-
-    @MockK(relaxUnitFun = true)
-    lateinit var logger: Logger
-
-    lateinit var subject: ServiceFactory<VersionService>
-
-    @Before
-    fun setUp() {
-        MockKAnnotations.init(this)
-        subject = retrofitBuilder.createServiceFactory(baseURLStorage, logger)
-        coEvery { retrofitBuilder.buildRetrofit(any()) } returns retrofit
-        every { retrofit.create(eq(VersionService::class.java)) } returns versionService
-        coEvery { baseURLStorage.requireBaseURL() } returns TEST_BASE_URL
-    }
-
-    @Test
-    fun `when provideService and url is null then url storage requested`() = runTest {
-        subject.provideService()
-        coVerify { baseURLStorage.requireBaseURL() }
-    }
-
-    @Test
-    fun `when provideService and url is null then service still provided`() = runTest {
-        assertThat(subject.provideService()).isEqualTo(versionService)
-    }
-
-    @Test
-    fun `when provideService called twice then builder called once`() = runTest {
-        subject.provideService()
-        subject.provideService()
-        coVerifyAll { retrofitBuilder.buildRetrofit(eq(TEST_BASE_URL)) }
-    }
-
-    @Test
-    fun `when provideService called secondly with new url then builder called twice`() = runTest {
-        subject.provideService()
-        subject.provideService("new url")
-        coVerifyAll {
-            retrofitBuilder.buildRetrofit(eq(TEST_BASE_URL))
-            retrofitBuilder.buildRetrofit(eq("new url"))
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediatorTest.kt b/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediatorTest.kt
index 6e25216..62f4375 100644
--- a/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediatorTest.kt
+++ b/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediatorTest.kt
@@ -3,10 +3,10 @@ package gq.kirmanak.mealient.data.recipes.impl
 import androidx.paging.*
 import androidx.paging.LoadType.*
 import com.google.common.truth.Truth.assertThat
-import gq.kirmanak.mealient.data.network.NetworkError.Unauthorized
 import gq.kirmanak.mealient.data.recipes.db.RecipeStorage
 import gq.kirmanak.mealient.data.recipes.network.RecipeDataSource
 import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity
+import gq.kirmanak.mealient.datasource.models.NetworkError.Unauthorized
 import gq.kirmanak.mealient.logging.Logger
 import gq.kirmanak.mealient.test.RecipeImplTestData.TEST_RECIPE_SUMMARIES
 import io.mockk.MockKAnnotations
diff --git a/app/src/test/java/gq/kirmanak/mealient/test/RecipeImplTestData.kt b/app/src/test/java/gq/kirmanak/mealient/test/RecipeImplTestData.kt
index 2b9578c..d64ec91 100644
--- a/app/src/test/java/gq/kirmanak/mealient/test/RecipeImplTestData.kt
+++ b/app/src/test/java/gq/kirmanak/mealient/test/RecipeImplTestData.kt
@@ -1,10 +1,10 @@
 package gq.kirmanak.mealient.test
 
-import gq.kirmanak.mealient.data.recipes.network.response.GetRecipeIngredientResponse
-import gq.kirmanak.mealient.data.recipes.network.response.GetRecipeInstructionResponse
-import gq.kirmanak.mealient.data.recipes.network.response.GetRecipeResponse
-import gq.kirmanak.mealient.data.recipes.network.response.GetRecipeSummaryResponse
 import gq.kirmanak.mealient.database.recipe.entity.*
+import gq.kirmanak.mealient.datasource.models.GetRecipeIngredientResponse
+import gq.kirmanak.mealient.datasource.models.GetRecipeInstructionResponse
+import gq.kirmanak.mealient.datasource.models.GetRecipeResponse
+import gq.kirmanak.mealient.datasource.models.GetRecipeSummaryResponse
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.LocalDateTime
 
diff --git a/app/src/test/java/gq/kirmanak/mealient/ui/add/AddRecipeViewModelTest.kt b/app/src/test/java/gq/kirmanak/mealient/ui/add/AddRecipeViewModelTest.kt
index 1f289bc..42afb57 100644
--- a/app/src/test/java/gq/kirmanak/mealient/ui/add/AddRecipeViewModelTest.kt
+++ b/app/src/test/java/gq/kirmanak/mealient/ui/add/AddRecipeViewModelTest.kt
@@ -2,7 +2,7 @@ package gq.kirmanak.mealient.ui.add
 
 import com.google.common.truth.Truth.assertThat
 import gq.kirmanak.mealient.data.add.AddRecipeRepo
-import gq.kirmanak.mealient.data.add.models.AddRecipeRequest
+import gq.kirmanak.mealient.datasource.models.AddRecipeRequest
 import gq.kirmanak.mealient.logging.Logger
 import io.mockk.MockKAnnotations
 import io.mockk.coEvery