diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 03a24e92..da922640 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,34 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/main/domain/usecase/CheckLowBalanceUC.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/main/domain/usecase/CheckLowBalanceUC.kt
index 02be59d7..bdcd7891 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/main/domain/usecase/CheckLowBalanceUC.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/main/domain/usecase/CheckLowBalanceUC.kt
@@ -22,7 +22,7 @@ package cz.lastaapps.menza.features.main.domain.usecase
 import cz.lastaapps.api.main.domain.usecase.wallet.WalletGetBalanceUC
 import cz.lastaapps.core.domain.UCContext
 import cz.lastaapps.core.domain.UseCase
-import cz.lastaapps.menza.features.settings.domain.usecase.GetBalanceWarningThresholdUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetBalanceWarningThresholdUC
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filterNotNull
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/main/ui/vm/MainViewModel.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/main/ui/vm/MainViewModel.kt
index 10fc492d..97f93c8b 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/main/ui/vm/MainViewModel.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/main/ui/vm/MainViewModel.kt
@@ -29,7 +29,7 @@ import cz.lastaapps.core.ui.vm.VMState
 import cz.lastaapps.menza.features.main.domain.usecase.CheckLowBalanceUC
 import cz.lastaapps.menza.features.main.domain.usecase.GetSelectedMenzaUC
 import cz.lastaapps.menza.features.main.domain.usecase.IsFlipUC
-import cz.lastaapps.menza.features.settings.domain.usecase.GetSettingsEverOpenedUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetSettingsEverOpenedUC
 import kotlinx.coroutines.flow.collectLatest
 
 internal class MainViewModel(
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/di/settingsModule.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/di/settingsModule.kt
index 6bd11b71..257f1685 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/di/settingsModule.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/di/settingsModule.kt
@@ -35,23 +35,6 @@ import cz.lastaapps.menza.features.settings.data.datasource.OrderSettings
 import cz.lastaapps.menza.features.settings.domain.MainSettingsRepo
 import cz.lastaapps.menza.features.settings.domain.OrderRepo
 import cz.lastaapps.menza.features.settings.domain.usecase.FullAppReloadUC
-import cz.lastaapps.menza.features.settings.domain.usecase.GetBalanceWarningThresholdUC
-import cz.lastaapps.menza.features.settings.domain.usecase.GetDishLanguageUC
-import cz.lastaapps.menza.features.settings.domain.usecase.GetDishListModeUC
-import cz.lastaapps.menza.features.settings.domain.usecase.GetImageScaleRangeUC
-import cz.lastaapps.menza.features.settings.domain.usecase.GetImageScaleUC
-import cz.lastaapps.menza.features.settings.domain.usecase.GetImagesOnMeteredUC
-import cz.lastaapps.menza.features.settings.domain.usecase.GetOliverRowUC
-import cz.lastaapps.menza.features.settings.domain.usecase.GetPriceTypeUC
-import cz.lastaapps.menza.features.settings.domain.usecase.GetSettingsEverOpenedUC
-import cz.lastaapps.menza.features.settings.domain.usecase.OnSettingsOpenedUC
-import cz.lastaapps.menza.features.settings.domain.usecase.SetBalanceWarningThresholdUC
-import cz.lastaapps.menza.features.settings.domain.usecase.SetDishLanguageUC
-import cz.lastaapps.menza.features.settings.domain.usecase.SetDishListModeUC
-import cz.lastaapps.menza.features.settings.domain.usecase.SetImageScaleUC
-import cz.lastaapps.menza.features.settings.domain.usecase.SetImagesOnMeteredUC
-import cz.lastaapps.menza.features.settings.domain.usecase.SetOliverRow
-import cz.lastaapps.menza.features.settings.domain.usecase.SetPriceTypeUC
 import cz.lastaapps.menza.features.settings.domain.usecase.initialmenza.GetInitialMenzaModeUI
 import cz.lastaapps.menza.features.settings.domain.usecase.initialmenza.GetInitialMenzaUC
 import cz.lastaapps.menza.features.settings.domain.usecase.initialmenza.GetPreferredMenzaUC
@@ -64,6 +47,23 @@ import cz.lastaapps.menza.features.settings.domain.usecase.menzaorder.IsMenzaOrd
 import cz.lastaapps.menza.features.settings.domain.usecase.menzaorder.SetMenzaOrderFromTopUC
 import cz.lastaapps.menza.features.settings.domain.usecase.menzaorder.ToggleMenzaVisibilityUC
 import cz.lastaapps.menza.features.settings.domain.usecase.menzaorder.UpdateMenzaOrderUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetBalanceWarningThresholdUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetDishLanguageUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetDishListModeUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetImageScaleRangeUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetImageScaleUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetImagesOnMeteredUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetOliverRowUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetPriceTypeUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetSettingsEverOpenedUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.OnSettingsOpenedUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.SetBalanceWarningThresholdUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.SetDishLanguageUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.SetDishListModeUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.SetImageScaleUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.SetImagesOnMeteredUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.SetOliverRow
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.SetPriceTypeUC
 import cz.lastaapps.menza.features.settings.domain.usecase.theme.GetAppThemeUC
 import cz.lastaapps.menza.features.settings.domain.usecase.theme.GetDarkModeUC
 import cz.lastaapps.menza.features.settings.domain.usecase.theme.GetThemeListUC
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetBalanceWarningThresholdUC.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetBalanceWarningThresholdUC.kt
similarity index 94%
rename from app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetBalanceWarningThresholdUC.kt
rename to app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetBalanceWarningThresholdUC.kt
index 18263327..91b51d9a 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetBalanceWarningThresholdUC.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetBalanceWarningThresholdUC.kt
@@ -17,7 +17,7 @@
  *     along with Menza.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package cz.lastaapps.menza.features.settings.domain.usecase
+package cz.lastaapps.menza.features.settings.domain.usecase.settings
 
 import cz.lastaapps.core.domain.UCContext
 import cz.lastaapps.core.domain.UseCase
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetDishLanguageUC.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetDishLanguageUC.kt
similarity index 94%
rename from app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetDishLanguageUC.kt
rename to app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetDishLanguageUC.kt
index c2d0ed4a..1cea421d 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetDishLanguageUC.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetDishLanguageUC.kt
@@ -17,7 +17,7 @@
  *     along with Menza.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package cz.lastaapps.menza.features.settings.domain.usecase
+package cz.lastaapps.menza.features.settings.domain.usecase.settings
 
 import cz.lastaapps.core.domain.UCContext
 import cz.lastaapps.core.domain.UseCase
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetImageScaleRangeUC.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetImageScaleRangeUC.kt
similarity index 87%
rename from app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetImageScaleRangeUC.kt
rename to app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetImageScaleRangeUC.kt
index 48763c4e..dd23a261 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetImageScaleRangeUC.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetImageScaleRangeUC.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2023, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -17,7 +17,7 @@
  *     along with Menza.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package cz.lastaapps.menza.features.settings.domain.usecase
+package cz.lastaapps.menza.features.settings.domain.usecase.settings
 
 import cz.lastaapps.core.domain.UCContext
 import cz.lastaapps.core.domain.UseCase
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetImageScaleUC.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetImageScaleUC.kt
similarity index 89%
rename from app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetImageScaleUC.kt
rename to app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetImageScaleUC.kt
index 5d9cddac..e132286b 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetImageScaleUC.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetImageScaleUC.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2023, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -17,7 +17,7 @@
  *     along with Menza.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package cz.lastaapps.menza.features.settings.domain.usecase
+package cz.lastaapps.menza.features.settings.domain.usecase.settings
 
 import cz.lastaapps.core.domain.UCContext
 import cz.lastaapps.core.domain.UseCase
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetImagesOnMeteredUC.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetImagesOnMeteredUC.kt
similarity index 89%
rename from app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetImagesOnMeteredUC.kt
rename to app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetImagesOnMeteredUC.kt
index 0e54ac7a..3136be43 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetImagesOnMeteredUC.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetImagesOnMeteredUC.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2023, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -17,7 +17,7 @@
  *     along with Menza.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package cz.lastaapps.menza.features.settings.domain.usecase
+package cz.lastaapps.menza.features.settings.domain.usecase.settings
 
 import cz.lastaapps.core.domain.UCContext
 import cz.lastaapps.core.domain.UseCase
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetOliverRowUC.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetOliverRowUC.kt
similarity index 94%
rename from app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetOliverRowUC.kt
rename to app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetOliverRowUC.kt
index 61f68c9f..21b34383 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetOliverRowUC.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetOliverRowUC.kt
@@ -17,7 +17,7 @@
  *     along with Menza.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package cz.lastaapps.menza.features.settings.domain.usecase
+package cz.lastaapps.menza.features.settings.domain.usecase.settings
 
 import cz.lastaapps.core.domain.UCContext
 import cz.lastaapps.core.domain.UseCase
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetPriceTypeUC.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetPriceTypeUC.kt
similarity index 89%
rename from app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetPriceTypeUC.kt
rename to app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetPriceTypeUC.kt
index 677cca3a..d2ae77d8 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetPriceTypeUC.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetPriceTypeUC.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2023, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -17,7 +17,7 @@
  *     along with Menza.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package cz.lastaapps.menza.features.settings.domain.usecase
+package cz.lastaapps.menza.features.settings.domain.usecase.settings
 
 import cz.lastaapps.core.domain.UCContext
 import cz.lastaapps.core.domain.UseCase
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetSettingsEverOpened.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetSettingsEverOpened.kt
similarity index 89%
rename from app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetSettingsEverOpened.kt
rename to app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetSettingsEverOpened.kt
index 7b1edee0..599bf007 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/GetSettingsEverOpened.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/GetSettingsEverOpened.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2023, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -17,7 +17,7 @@
  *     along with Menza.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package cz.lastaapps.menza.features.settings.domain.usecase
+package cz.lastaapps.menza.features.settings.domain.usecase.settings
 
 import cz.lastaapps.core.domain.UCContext
 import cz.lastaapps.core.domain.UseCase
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/IsCompactView.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/IsCompactView.kt
similarity index 89%
rename from app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/IsCompactView.kt
rename to app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/IsCompactView.kt
index 1862503e..9cbcfa51 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/IsCompactView.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/IsCompactView.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2023, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -17,7 +17,7 @@
  *     along with Menza.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package cz.lastaapps.menza.features.settings.domain.usecase
+package cz.lastaapps.menza.features.settings.domain.usecase.settings
 
 import cz.lastaapps.core.domain.UCContext
 import cz.lastaapps.core.domain.UseCase
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/OnSettingOpened.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/OnSettingOpened.kt
similarity index 89%
rename from app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/OnSettingOpened.kt
rename to app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/OnSettingOpened.kt
index e2c20c7d..b2f42292 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/OnSettingOpened.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/OnSettingOpened.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2023, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -17,7 +17,7 @@
  *     along with Menza.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package cz.lastaapps.menza.features.settings.domain.usecase
+package cz.lastaapps.menza.features.settings.domain.usecase.settings
 
 import cz.lastaapps.core.domain.UCContext
 import cz.lastaapps.core.domain.UseCase
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetBalanceWarningThresholdUC.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetBalanceWarningThresholdUC.kt
similarity index 94%
rename from app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetBalanceWarningThresholdUC.kt
rename to app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetBalanceWarningThresholdUC.kt
index b835d737..dd2a64d3 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetBalanceWarningThresholdUC.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetBalanceWarningThresholdUC.kt
@@ -17,7 +17,7 @@
  *     along with Menza.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package cz.lastaapps.menza.features.settings.domain.usecase
+package cz.lastaapps.menza.features.settings.domain.usecase.settings
 
 import cz.lastaapps.core.domain.UCContext
 import cz.lastaapps.core.domain.UseCase
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetDishLanguageUC.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetDishLanguageUC.kt
similarity index 94%
rename from app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetDishLanguageUC.kt
rename to app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetDishLanguageUC.kt
index 672db3b9..b4f32a75 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetDishLanguageUC.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetDishLanguageUC.kt
@@ -17,7 +17,7 @@
  *     along with Menza.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package cz.lastaapps.menza.features.settings.domain.usecase
+package cz.lastaapps.menza.features.settings.domain.usecase.settings
 
 import cz.lastaapps.core.domain.UCContext
 import cz.lastaapps.core.domain.UseCase
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetDishListModeUC.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetDishListModeUC.kt
similarity index 89%
rename from app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetDishListModeUC.kt
rename to app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetDishListModeUC.kt
index d5cd59e5..c9562ebf 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetDishListModeUC.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetDishListModeUC.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2023, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -17,7 +17,7 @@
  *     along with Menza.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package cz.lastaapps.menza.features.settings.domain.usecase
+package cz.lastaapps.menza.features.settings.domain.usecase.settings
 
 import cz.lastaapps.core.domain.UCContext
 import cz.lastaapps.core.domain.UseCase
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetImageScaleUC.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetImageScaleUC.kt
similarity index 90%
rename from app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetImageScaleUC.kt
rename to app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetImageScaleUC.kt
index 882c02c6..c4f37947 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetImageScaleUC.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetImageScaleUC.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2023, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -17,7 +17,7 @@
  *     along with Menza.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package cz.lastaapps.menza.features.settings.domain.usecase
+package cz.lastaapps.menza.features.settings.domain.usecase.settings
 
 import cz.lastaapps.core.domain.UCContext
 import cz.lastaapps.core.domain.UseCase
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetImagesOnMeteredUC.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetImagesOnMeteredUC.kt
similarity index 89%
rename from app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetImagesOnMeteredUC.kt
rename to app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetImagesOnMeteredUC.kt
index 0309e12e..29fc86b3 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetImagesOnMeteredUC.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetImagesOnMeteredUC.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2023, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -17,7 +17,7 @@
  *     along with Menza.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package cz.lastaapps.menza.features.settings.domain.usecase
+package cz.lastaapps.menza.features.settings.domain.usecase.settings
 
 import cz.lastaapps.core.domain.UCContext
 import cz.lastaapps.core.domain.UseCase
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetOliverRow.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetOliverRow.kt
similarity index 94%
rename from app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetOliverRow.kt
rename to app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetOliverRow.kt
index 8d10400d..c8fc83f0 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetOliverRow.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetOliverRow.kt
@@ -17,7 +17,7 @@
  *     along with Menza.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package cz.lastaapps.menza.features.settings.domain.usecase
+package cz.lastaapps.menza.features.settings.domain.usecase.settings
 
 import cz.lastaapps.core.domain.UCContext
 import cz.lastaapps.core.domain.UseCase
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetPriceTypeUC.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetPriceTypeUC.kt
similarity index 90%
rename from app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetPriceTypeUC.kt
rename to app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetPriceTypeUC.kt
index 44150f7b..749660fc 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/SetPriceTypeUC.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/settings/SetPriceTypeUC.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2023, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -17,7 +17,7 @@
  *     along with Menza.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package cz.lastaapps.menza.features.settings.domain.usecase
+package cz.lastaapps.menza.features.settings.domain.usecase.settings
 
 import cz.lastaapps.core.domain.UCContext
 import cz.lastaapps.core.domain.UseCase
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/ui/vm/DishLanguageViewModel.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/ui/vm/DishLanguageViewModel.kt
index da98a579..64643f63 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/ui/vm/DishLanguageViewModel.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/ui/vm/DishLanguageViewModel.kt
@@ -23,7 +23,7 @@ import cz.lastaapps.core.ui.vm.StateViewModel
 import cz.lastaapps.core.ui.vm.VMContext
 import cz.lastaapps.core.ui.vm.VMState
 import cz.lastaapps.menza.features.settings.domain.model.DishLanguage
-import cz.lastaapps.menza.features.settings.domain.usecase.SetDishLanguageUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.SetDishLanguageUC
 
 internal class DishLanguageViewModel(
     context: VMContext,
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/ui/vm/SettingsViewModel.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/ui/vm/SettingsViewModel.kt
index f3c53ae0..3ec8dc8d 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/ui/vm/SettingsViewModel.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/ui/vm/SettingsViewModel.kt
@@ -31,18 +31,18 @@ import cz.lastaapps.menza.features.settings.domain.model.DarkMode.Dark
 import cz.lastaapps.menza.features.settings.domain.model.InitialSelectionBehaviour
 import cz.lastaapps.menza.features.settings.domain.model.PriceType
 import cz.lastaapps.menza.features.settings.domain.usecase.FullAppReloadUC
-import cz.lastaapps.menza.features.settings.domain.usecase.GetBalanceWarningThresholdUC
-import cz.lastaapps.menza.features.settings.domain.usecase.GetImagesOnMeteredUC
-import cz.lastaapps.menza.features.settings.domain.usecase.GetPriceTypeUC
-import cz.lastaapps.menza.features.settings.domain.usecase.OnSettingsOpenedUC
-import cz.lastaapps.menza.features.settings.domain.usecase.SetBalanceWarningThresholdUC
-import cz.lastaapps.menza.features.settings.domain.usecase.SetImagesOnMeteredUC
-import cz.lastaapps.menza.features.settings.domain.usecase.SetPriceTypeUC
 import cz.lastaapps.menza.features.settings.domain.usecase.initialmenza.GetInitialMenzaModeUI
 import cz.lastaapps.menza.features.settings.domain.usecase.initialmenza.GetPreferredMenzaUC
 import cz.lastaapps.menza.features.settings.domain.usecase.initialmenza.SetInitialMenzaUC
 import cz.lastaapps.menza.features.settings.domain.usecase.initialmenza.SetPreferredMenzaUC
 import cz.lastaapps.menza.features.settings.domain.usecase.menzaorder.GetOrderedVisibleMenzaListUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetBalanceWarningThresholdUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetImagesOnMeteredUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetPriceTypeUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.OnSettingsOpenedUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.SetBalanceWarningThresholdUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.SetImagesOnMeteredUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.SetPriceTypeUC
 import cz.lastaapps.menza.features.settings.domain.usecase.theme.GetAppThemeUC
 import cz.lastaapps.menza.features.settings.domain.usecase.theme.GetDarkModeUC
 import kotlinx.collections.immutable.ImmutableList
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/starting/ui/vm/PriceTypeViewModel.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/starting/ui/vm/PriceTypeViewModel.kt
index c26a1c1f..189600f0 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/starting/ui/vm/PriceTypeViewModel.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/starting/ui/vm/PriceTypeViewModel.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2023, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -24,8 +24,8 @@ import cz.lastaapps.core.ui.vm.StateViewModel
 import cz.lastaapps.core.ui.vm.VMContext
 import cz.lastaapps.core.ui.vm.VMState
 import cz.lastaapps.menza.features.settings.domain.model.PriceType
-import cz.lastaapps.menza.features.settings.domain.usecase.GetPriceTypeUC
-import cz.lastaapps.menza.features.settings.domain.usecase.SetPriceTypeUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetPriceTypeUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.SetPriceTypeUC
 import kotlinx.coroutines.flow.first
 
 internal class PriceTypeViewModel internal constructor(
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/today/domain/usecase/GetTodayUserSettingsUC.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/today/domain/usecase/GetTodayUserSettingsUC.kt
index 035bbcbc..f446e807 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/today/domain/usecase/GetTodayUserSettingsUC.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/today/domain/usecase/GetTodayUserSettingsUC.kt
@@ -21,12 +21,12 @@ package cz.lastaapps.menza.features.today.domain.usecase
 
 import cz.lastaapps.core.domain.UCContext
 import cz.lastaapps.core.domain.UseCase
-import cz.lastaapps.menza.features.settings.domain.usecase.GetDishLanguageUC
-import cz.lastaapps.menza.features.settings.domain.usecase.GetDishListModeUC
-import cz.lastaapps.menza.features.settings.domain.usecase.GetImageScaleUC
-import cz.lastaapps.menza.features.settings.domain.usecase.GetImagesOnMeteredUC
-import cz.lastaapps.menza.features.settings.domain.usecase.GetOliverRowUC
-import cz.lastaapps.menza.features.settings.domain.usecase.GetPriceTypeUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetDishLanguageUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetDishListModeUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetImageScaleUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetImagesOnMeteredUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetOliverRowUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetPriceTypeUC
 import cz.lastaapps.menza.features.today.domain.model.TodayUserSettings
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/today/ui/vm/DishListViewModel.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/today/ui/vm/DishListViewModel.kt
index 62f963e4..0a4268ee 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/today/ui/vm/DishListViewModel.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/today/ui/vm/DishListViewModel.kt
@@ -40,9 +40,9 @@ import cz.lastaapps.core.ui.vm.VMState
 import cz.lastaapps.core.util.extensions.localLogger
 import cz.lastaapps.menza.features.main.domain.usecase.GetSelectedMenzaUC
 import cz.lastaapps.menza.features.settings.domain.model.DishListMode
-import cz.lastaapps.menza.features.settings.domain.usecase.SetDishListModeUC
-import cz.lastaapps.menza.features.settings.domain.usecase.SetImageScaleUC
-import cz.lastaapps.menza.features.settings.domain.usecase.SetOliverRow
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.SetDishListModeUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.SetImageScaleUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.SetOliverRow
 import cz.lastaapps.menza.features.today.domain.model.TodayUserSettings
 import cz.lastaapps.menza.features.today.domain.usecase.GetTodayUserSettingsUC
 import kotlin.time.Duration.Companion.seconds
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/today/ui/vm/TodayViewModel.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/today/ui/vm/TodayViewModel.kt
index f7d46504..c7efa5eb 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/today/ui/vm/TodayViewModel.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/today/ui/vm/TodayViewModel.kt
@@ -23,18 +23,13 @@ import arrow.core.Option
 import arrow.core.toOption
 import cz.lastaapps.api.core.domain.model.Dish
 import cz.lastaapps.api.core.domain.model.Menza
-import cz.lastaapps.api.core.domain.repo.MenzaRepo
-import cz.lastaapps.api.main.domain.usecase.GetRequestParamsUC
 import cz.lastaapps.core.ui.vm.Appearing
 import cz.lastaapps.core.ui.vm.StateViewModel
 import cz.lastaapps.core.ui.vm.VMContext
 import cz.lastaapps.core.ui.vm.VMState
-import cz.lastaapps.core.util.extensions.flattenSensible
 import cz.lastaapps.menza.features.main.domain.usecase.GetSelectedMenzaUC
 import cz.lastaapps.menza.features.settings.domain.model.DishLanguage
-import cz.lastaapps.menza.features.settings.domain.usecase.GetDishLanguageUC
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.map
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetDishLanguageUC
 import kotlinx.coroutines.flow.onEach
 
 internal class TodayViewModel(
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/week/ui/vm/WeekViewModel.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/week/ui/vm/WeekViewModel.kt
index f9789173..19eec1fc 100644
--- a/app/src/main/kotlin/cz/lastaapps/menza/features/week/ui/vm/WeekViewModel.kt
+++ b/app/src/main/kotlin/cz/lastaapps/menza/features/week/ui/vm/WeekViewModel.kt
@@ -39,7 +39,7 @@ import cz.lastaapps.core.ui.vm.VMState
 import cz.lastaapps.core.util.extensions.localLogger
 import cz.lastaapps.menza.features.main.domain.usecase.GetSelectedMenzaUC
 import cz.lastaapps.menza.features.settings.domain.model.PriceType
-import cz.lastaapps.menza.features.settings.domain.usecase.GetPriceTypeUC
+import cz.lastaapps.menza.features.settings.domain.usecase.settings.GetPriceTypeUC
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.Job