diff --git a/app/build.gradle b/app/build.gradle
index e2b0af1..a3e6c49 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,6 +22,8 @@ android {
                 arguments += ["room.schemaLocation": "$projectDir/schemas".toString()]
             }
         }
+
+        buildConfigField "Boolean", "DEBUG_PICASSO", "false"
     }
 
     signingConfigs {
diff --git a/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageLoaderImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageLoaderImpl.kt
index 97f31a8..85f1bb2 100644
--- a/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageLoaderImpl.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageLoaderImpl.kt
@@ -4,8 +4,8 @@ import android.widget.ImageView
 import androidx.annotation.VisibleForTesting
 import gq.kirmanak.mealient.R
 import gq.kirmanak.mealient.data.baseurl.BaseURLStorage
-import gq.kirmanak.mealient.data.recipes.RecipeImageLoader
-import gq.kirmanak.mealient.ui.ImageLoader
+import gq.kirmanak.mealient.ui.images.ImageLoader
+import gq.kirmanak.mealient.ui.recipes.RecipeImageLoader
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/app/src/main/java/gq/kirmanak/mealient/di/RecipeModule.kt b/app/src/main/java/gq/kirmanak/mealient/di/RecipeModule.kt
index 8b3ad9e..ad4dd94 100644
--- a/app/src/main/java/gq/kirmanak/mealient/di/RecipeModule.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/di/RecipeModule.kt
@@ -10,7 +10,6 @@ import gq.kirmanak.mealient.data.baseurl.BaseURLStorage
 import gq.kirmanak.mealient.data.network.RetrofitBuilder
 import gq.kirmanak.mealient.data.network.ServiceFactory
 import gq.kirmanak.mealient.data.network.createServiceFactory
-import gq.kirmanak.mealient.data.recipes.RecipeImageLoader
 import gq.kirmanak.mealient.data.recipes.RecipeRepo
 import gq.kirmanak.mealient.data.recipes.db.RecipeStorage
 import gq.kirmanak.mealient.data.recipes.db.RecipeStorageImpl
@@ -19,6 +18,7 @@ import gq.kirmanak.mealient.data.recipes.impl.RecipeRepoImpl
 import gq.kirmanak.mealient.data.recipes.network.RecipeDataSource
 import gq.kirmanak.mealient.data.recipes.network.RecipeDataSourceImpl
 import gq.kirmanak.mealient.data.recipes.network.RecipeService
+import gq.kirmanak.mealient.ui.recipes.RecipeImageLoader
 import kotlinx.serialization.json.Json
 import okhttp3.OkHttpClient
 import javax.inject.Named
diff --git a/app/src/main/java/gq/kirmanak/mealient/di/UiModule.kt b/app/src/main/java/gq/kirmanak/mealient/di/UiModule.kt
index 6c4cd61..1d31cf5 100644
--- a/app/src/main/java/gq/kirmanak/mealient/di/UiModule.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/di/UiModule.kt
@@ -6,9 +6,9 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import gq.kirmanak.mealient.ui.ImageLoader
-import gq.kirmanak.mealient.ui.picasso.ImageLoaderPicasso
-import gq.kirmanak.mealient.ui.picasso.PicassoBuilder
+import gq.kirmanak.mealient.ui.images.ImageLoader
+import gq.kirmanak.mealient.ui.images.ImageLoaderPicasso
+import gq.kirmanak.mealient.ui.images.PicassoBuilder
 import javax.inject.Singleton
 
 @Module
diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/ImageLoader.kt b/app/src/main/java/gq/kirmanak/mealient/ui/images/ImageLoader.kt
similarity index 82%
rename from app/src/main/java/gq/kirmanak/mealient/ui/ImageLoader.kt
rename to app/src/main/java/gq/kirmanak/mealient/ui/images/ImageLoader.kt
index 2658f1b..cc33ed3 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/ImageLoader.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/images/ImageLoader.kt
@@ -1,4 +1,4 @@
-package gq.kirmanak.mealient.ui
+package gq.kirmanak.mealient.ui.images
 
 import android.widget.ImageView
 import androidx.annotation.DrawableRes
diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/picasso/ImageLoaderPicasso.kt b/app/src/main/java/gq/kirmanak/mealient/ui/images/ImageLoaderPicasso.kt
similarity index 90%
rename from app/src/main/java/gq/kirmanak/mealient/ui/picasso/ImageLoaderPicasso.kt
rename to app/src/main/java/gq/kirmanak/mealient/ui/images/ImageLoaderPicasso.kt
index 8779d4d..5dc35ec 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/picasso/ImageLoaderPicasso.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/images/ImageLoaderPicasso.kt
@@ -1,8 +1,7 @@
-package gq.kirmanak.mealient.ui.picasso
+package gq.kirmanak.mealient.ui.images
 
 import android.widget.ImageView
 import com.squareup.picasso.Picasso
-import gq.kirmanak.mealient.ui.ImageLoader
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/picasso/PicassoBuilder.kt b/app/src/main/java/gq/kirmanak/mealient/ui/images/PicassoBuilder.kt
similarity index 92%
rename from app/src/main/java/gq/kirmanak/mealient/ui/picasso/PicassoBuilder.kt
rename to app/src/main/java/gq/kirmanak/mealient/ui/images/PicassoBuilder.kt
index a2cea53..9933996 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/picasso/PicassoBuilder.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/images/PicassoBuilder.kt
@@ -1,4 +1,4 @@
-package gq.kirmanak.mealient.ui.picasso
+package gq.kirmanak.mealient.ui.images
 
 import android.content.Context
 import com.squareup.picasso.OkHttp3Downloader
@@ -22,7 +22,7 @@ class PicassoBuilder @Inject constructor(
         Timber.v("buildPicasso() called")
         val builder = Picasso.Builder(context)
         builder.downloader(OkHttp3Downloader(okHttpClient))
-        if (BuildConfig.DEBUG) {
+        if (BuildConfig.DEBUG_PICASSO) {
             builder.loggingEnabled(true)
             builder.indicatorsEnabled(true)
             builder.listener { _, uri, exception ->
diff --git a/app/src/main/java/gq/kirmanak/mealient/data/recipes/RecipeImageLoader.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeImageLoader.kt
similarity index 75%
rename from app/src/main/java/gq/kirmanak/mealient/data/recipes/RecipeImageLoader.kt
rename to app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeImageLoader.kt
index 0604e72..2afa981 100644
--- a/app/src/main/java/gq/kirmanak/mealient/data/recipes/RecipeImageLoader.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeImageLoader.kt
@@ -1,4 +1,4 @@
-package gq.kirmanak.mealient.data.recipes
+package gq.kirmanak.mealient.ui.recipes
 
 import android.widget.ImageView
 
diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModel.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModel.kt
index 6ff9334..6b71714 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModel.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModel.kt
@@ -5,7 +5,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.cachedIn
 import dagger.hilt.android.lifecycle.HiltViewModel
-import gq.kirmanak.mealient.data.recipes.RecipeImageLoader
 import gq.kirmanak.mealient.data.recipes.RecipeRepo
 import gq.kirmanak.mealient.data.recipes.db.entity.RecipeSummaryEntity
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoViewModel.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoViewModel.kt
index 34bf78e..5bc7242 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoViewModel.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoViewModel.kt
@@ -6,9 +6,9 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import gq.kirmanak.mealient.data.recipes.RecipeImageLoader
 import gq.kirmanak.mealient.data.recipes.RecipeRepo
 import gq.kirmanak.mealient.extensions.runCatchingExceptCancel
+import gq.kirmanak.mealient.ui.recipes.RecipeImageLoader
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageLoaderImplTest.kt b/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageLoaderImplTest.kt
index fc528b8..6cedcc9 100644
--- a/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageLoaderImplTest.kt
+++ b/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageLoaderImplTest.kt
@@ -2,7 +2,7 @@ package gq.kirmanak.mealient.data.recipes.impl
 
 import com.google.common.truth.Truth.assertThat
 import gq.kirmanak.mealient.data.baseurl.BaseURLStorage
-import gq.kirmanak.mealient.ui.ImageLoader
+import gq.kirmanak.mealient.ui.images.ImageLoader
 import io.mockk.MockKAnnotations
 import io.mockk.coEvery
 import io.mockk.impl.annotations.MockK