diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 684215ac..08742c3c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -37,7 +37,7 @@
 
         <!-- Main activity -->
         <activity
-            android:name=".ui.main.MainActivity"
+            android:name=".presentation.main.MainActivity"
             android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|locale|density|uiMode"
             android:exported="true"
             android:theme="@style/Splash"
@@ -50,7 +50,7 @@
 
         <!-- Crash activity -->
         <activity
-            android:name=".ui.crash.CrashActivity"
+            android:name=".presentation.crash.CrashActivity"
             android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|locale|density|uiMode"
             android:exported="false"
             android:theme="@style/BookStory"
diff --git a/app/src/main/java/ua/acclorite/book_story/core/crash/CrashHandler.kt b/app/src/main/java/ua/acclorite/book_story/core/crash/CrashHandler.kt
index f6dfb381..2762197b 100644
--- a/app/src/main/java/ua/acclorite/book_story/core/crash/CrashHandler.kt
+++ b/app/src/main/java/ua/acclorite/book_story/core/crash/CrashHandler.kt
@@ -10,7 +10,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Process
 import android.util.Log
-import ua.acclorite.book_story.ui.crash.CrashActivity
+import ua.acclorite.book_story.presentation.crash.CrashActivity
 import kotlin.system.exitProcess
 
 private const val CRASH_TAG = "CRASH, APP"
diff --git a/app/src/main/java/ua/acclorite/book_story/data/local/dto/CategorySortEntity.kt b/app/src/main/java/ua/acclorite/book_story/data/local/dto/CategorySortEntity.kt
index 9592b6d5..44f53cf9 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/local/dto/CategorySortEntity.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/local/dto/CategorySortEntity.kt
@@ -8,7 +8,7 @@ package ua.acclorite.book_story.data.local.dto
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import ua.acclorite.book_story.ui.library.model.LibrarySortOrder
+import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder
 
 @Entity
 data class CategorySortEntity(
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/DocumentParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/DocumentParser.kt
index 101b8868..8688736a 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/DocumentParser.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/DocumentParser.kt
@@ -12,9 +12,9 @@ import androidx.compose.ui.graphics.asImageBitmap
 import kotlinx.coroutines.yield
 import org.jsoup.nodes.Document
 import ua.acclorite.book_story.domain.reader.ReaderText
-import ua.acclorite.book_story.presentation.common.util.clearAllMarkdown
-import ua.acclorite.book_story.presentation.common.util.clearMarkdown
-import ua.acclorite.book_story.presentation.common.util.containsVisibleText
+import ua.acclorite.book_story.ui.common.util.clearAllMarkdown
+import ua.acclorite.book_story.ui.common.util.clearMarkdown
+import ua.acclorite.book_story.ui.common.util.containsVisibleText
 import java.io.File
 import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/MarkdownParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/MarkdownParser.kt
index df0a53b8..a03098c1 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/MarkdownParser.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/MarkdownParser.kt
@@ -23,7 +23,7 @@ import org.commonmark.node.Node
 import org.commonmark.node.StrongEmphasis
 import org.commonmark.node.Text
 import org.commonmark.parser.Parser
-import ua.acclorite.book_story.presentation.common.util.clearMarkdown
+import ua.acclorite.book_story.ui.common.util.clearMarkdown
 import javax.inject.Inject
 
 class MarkdownParser @Inject constructor(
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubTextParser.kt
index cbfe9220..27709890 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubTextParser.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubTextParser.kt
@@ -21,9 +21,9 @@ import ua.acclorite.book_story.data.model.file.CachedFile
 import ua.acclorite.book_story.data.parser.DocumentParser
 import ua.acclorite.book_story.data.parser.TextParser
 import ua.acclorite.book_story.domain.reader.ReaderText
-import ua.acclorite.book_story.presentation.common.constants.provideImageExtensions
-import ua.acclorite.book_story.presentation.common.util.addAll
-import ua.acclorite.book_story.presentation.common.util.containsVisibleText
+import ua.acclorite.book_story.ui.common.constants.provideImageExtensions
+import ua.acclorite.book_story.ui.common.util.addAll
+import ua.acclorite.book_story.ui.common.util.containsVisibleText
 import java.io.File
 import java.util.concurrent.ConcurrentLinkedQueue
 import java.util.zip.ZipEntry
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfTextParser.kt
index 370bb0d3..9b70647d 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfTextParser.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfTextParser.kt
@@ -16,7 +16,7 @@ import ua.acclorite.book_story.data.model.file.CachedFile
 import ua.acclorite.book_story.data.parser.MarkdownParser
 import ua.acclorite.book_story.data.parser.TextParser
 import ua.acclorite.book_story.domain.reader.ReaderText
-import ua.acclorite.book_story.presentation.common.util.clearAllMarkdown
+import ua.acclorite.book_story.ui.common.util.clearAllMarkdown
 import javax.inject.Inject
 
 private const val PDF_TAG = "PDF Parser"
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtTextParser.kt
index d3a17dca..4b06d567 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtTextParser.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtTextParser.kt
@@ -14,7 +14,7 @@ import ua.acclorite.book_story.data.model.file.CachedFile
 import ua.acclorite.book_story.data.parser.MarkdownParser
 import ua.acclorite.book_story.data.parser.TextParser
 import ua.acclorite.book_story.domain.reader.ReaderText
-import ua.acclorite.book_story.presentation.common.util.clearAllMarkdown
+import ua.acclorite.book_story.ui.common.util.clearAllMarkdown
 import javax.inject.Inject
 
 private const val TXT_TAG = "TXT Parser"
diff --git a/app/src/main/java/ua/acclorite/book_story/data/repository/DataStoreRepositoryImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/repository/DataStoreRepositoryImpl.kt
index 4b57ff61..285a9207 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/repository/DataStoreRepositoryImpl.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/repository/DataStoreRepositoryImpl.kt
@@ -15,7 +15,7 @@ import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.withContext
 import ua.acclorite.book_story.data.local.data_store.DataStore
 import ua.acclorite.book_story.domain.repository.DataStoreRepository
-import ua.acclorite.book_story.ui.main.MainState
+import ua.acclorite.book_story.presentation.main.MainState
 import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/app/src/main/java/ua/acclorite/book_story/data/repository/FileSystemRepositoryImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/repository/FileSystemRepositoryImpl.kt
index 744a77e3..6d543bd0 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/repository/FileSystemRepositoryImpl.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/repository/FileSystemRepositoryImpl.kt
@@ -19,7 +19,7 @@ import ua.acclorite.book_story.data.model.file.CachedFileCompat
 import ua.acclorite.book_story.data.parser.FileParser
 import ua.acclorite.book_story.domain.file.File
 import ua.acclorite.book_story.domain.repository.FileSystemRepository
-import ua.acclorite.book_story.presentation.common.constants.provideExtensions
+import ua.acclorite.book_story.ui.common.constants.provideExtensions
 import java.util.UUID
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/library/CategorySort.kt b/app/src/main/java/ua/acclorite/book_story/domain/library/CategorySort.kt
index f1e59d53..abcfe0e2 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/library/CategorySort.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/library/CategorySort.kt
@@ -7,7 +7,7 @@
 package ua.acclorite.book_story.domain.library
 
 import androidx.compose.runtime.Immutable
-import ua.acclorite.book_story.ui.library.model.LibrarySortOrder
+import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder
 
 @Immutable
 data class CategorySort(
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/repository/DataStoreRepository.kt b/app/src/main/java/ua/acclorite/book_story/domain/repository/DataStoreRepository.kt
index a07370df..aa71fe5d 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/repository/DataStoreRepository.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/repository/DataStoreRepository.kt
@@ -7,7 +7,7 @@
 package ua.acclorite.book_story.domain.repository
 
 import androidx.datastore.preferences.core.Preferences
-import ua.acclorite.book_story.ui.main.MainState
+import ua.acclorite.book_story.presentation.main.MainState
 
 interface DataStoreRepository {
 
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/data_store/ChangeLanguage.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/data_store/ChangeLanguage.kt
index 18dc1868..2d1c0925 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/data_store/ChangeLanguage.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/data_store/ChangeLanguage.kt
@@ -9,7 +9,7 @@ package ua.acclorite.book_story.domain.use_case.data_store
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.os.LocaleListCompat
 import ua.acclorite.book_story.domain.repository.DataStoreRepository
-import ua.acclorite.book_story.presentation.common.constants.DataStoreConstants
+import ua.acclorite.book_story.ui.common.constants.DataStoreConstants
 import javax.inject.Inject
 
 class ChangeLanguage @Inject constructor(
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/data_store/GetAllSettings.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/data_store/GetAllSettings.kt
index 3496167e..4c4216c4 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/data_store/GetAllSettings.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/data_store/GetAllSettings.kt
@@ -7,7 +7,7 @@
 package ua.acclorite.book_story.domain.use_case.data_store
 
 import ua.acclorite.book_story.domain.repository.DataStoreRepository
-import ua.acclorite.book_story.ui.main.MainState
+import ua.acclorite.book_story.presentation.main.MainState
 import javax.inject.Inject
 
 class GetAllSettings @Inject constructor(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutEvent.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/ui/about/AboutEvent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/about/AboutEvent.kt
index 626574df..b7c01768 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutEvent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.about
+package ua.acclorite.book_story.presentation.about
 
 import android.content.Context
 import androidx.compose.runtime.Immutable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutModel.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/ui/about/AboutModel.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/about/AboutModel.kt
index b4714a8d..4284873b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutModel.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutModel.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.about
+package ua.acclorite.book_story.presentation.about
 
 import android.content.Intent
 import androidx.activity.ComponentActivity
@@ -16,8 +16,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.util.launchActivity
-import ua.acclorite.book_story.presentation.common.util.showToast
+import ua.acclorite.book_story.ui.common.util.launchActivity
+import ua.acclorite.book_story.ui.common.util.showToast
 import javax.inject.Inject
 
 @HiltViewModel
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutScreen.kt
similarity index 72%
rename from app/src/main/java/ua/acclorite/book_story/ui/about/AboutScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/about/AboutScreen.kt
index 71124c44..16c36132 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.about
+package ua.acclorite.book_story.presentation.about
 
 import android.os.Parcelable
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -12,12 +12,12 @@ import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.hilt.navigation.compose.hiltViewModel
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.presentation.about.AboutContent
-import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior
-import ua.acclorite.book_story.presentation.navigator.LocalNavigator
-import ua.acclorite.book_story.ui.credits.CreditsScreen
-import ua.acclorite.book_story.ui.licenses.LicensesScreen
-import ua.acclorite.book_story.ui.navigator.Screen
+import ua.acclorite.book_story.presentation.credits.CreditsScreen
+import ua.acclorite.book_story.presentation.licenses.LicensesScreen
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.ui.about.AboutContent
+import ua.acclorite.book_story.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import ua.acclorite.book_story.ui.navigator.LocalNavigator
 
 @Parcelize
 object AboutScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoEvent.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoEvent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoEvent.kt
index e298868b..66294c74 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoEvent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package ua.acclorite.book_story.presentation.book_info
 
 import android.content.Context
 import android.net.Uri
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoModel.kt
similarity index 98%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoModel.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoModel.kt
index a536d659..70175b75 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoModel.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoModel.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package ua.acclorite.book_story.presentation.book_info
 
 import android.graphics.BitmapFactory
 import androidx.lifecycle.ViewModel
@@ -27,10 +27,10 @@ import ua.acclorite.book_story.domain.use_case.book.GetBookById
 import ua.acclorite.book_story.domain.use_case.book.ResetCoverImage
 import ua.acclorite.book_story.domain.use_case.book.UpdateBook
 import ua.acclorite.book_story.domain.use_case.book.UpdateCoverImageOfBook
-import ua.acclorite.book_story.presentation.common.util.showToast
-import ua.acclorite.book_story.ui.browse.BrowseScreen
-import ua.acclorite.book_story.ui.history.HistoryScreen
-import ua.acclorite.book_story.ui.library.LibraryScreen
+import ua.acclorite.book_story.presentation.browse.BrowseScreen
+import ua.acclorite.book_story.presentation.history.HistoryScreen
+import ua.acclorite.book_story.presentation.library.LibraryScreen
+import ua.acclorite.book_story.ui.common.util.showToast
 import javax.inject.Inject
 
 @HiltViewModel
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoScreen.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoScreen.kt
index b0ee33c1..cc05b54e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package ua.acclorite.book_story.presentation.book_info
 
 import android.os.Parcelable
 import androidx.compose.foundation.layout.Box
@@ -19,13 +19,13 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.getOrElse
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.presentation.book_info.BookInfoContent
-import ua.acclorite.book_story.presentation.navigator.LocalNavigator
-import ua.acclorite.book_story.ui.history.HistoryScreen
-import ua.acclorite.book_story.ui.navigator.Screen
-import ua.acclorite.book_story.ui.reader.ReaderScreen
-import ua.acclorite.book_story.ui.settings.LibrarySettingsScreen
-import ua.acclorite.book_story.ui.settings.SettingsModel
+import ua.acclorite.book_story.presentation.history.HistoryScreen
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.presentation.reader.ReaderScreen
+import ua.acclorite.book_story.presentation.settings.LibrarySettingsScreen
+import ua.acclorite.book_story.presentation.settings.SettingsModel
+import ua.acclorite.book_story.ui.book_info.BookInfoContent
+import ua.acclorite.book_story.ui.navigator.LocalNavigator
 
 @Parcelize
 data class BookInfoScreen(val bookId: Int) : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoState.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoState.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoState.kt
index 1119cc9c..b992ac02 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoState.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoState.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package ua.acclorite.book_story.presentation.book_info
 
 import androidx.compose.runtime.Immutable
 import ua.acclorite.book_story.core.BottomSheet
 import ua.acclorite.book_story.core.Dialog
 import ua.acclorite.book_story.domain.library.Book
-import ua.acclorite.book_story.presentation.common.constants.provideEmptyBook
+import ua.acclorite.book_story.ui.common.constants.provideEmptyBook
 
 @Immutable
 data class BookInfoState(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseEvent.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEvent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseEvent.kt
index 16f3bd85..12bf44ed 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseEvent.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package ua.acclorite.book_story.presentation.browse
 
 import android.content.Context
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.focus.FocusRequester
-import ua.acclorite.book_story.ui.browse.model.SelectableFile
-import ua.acclorite.book_story.ui.library.model.SelectableNullableBook
+import ua.acclorite.book_story.presentation.browse.model.SelectableFile
+import ua.acclorite.book_story.presentation.library.model.SelectableNullableBook
 
 @Immutable
 sealed class BrowseEvent {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseModel.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseModel.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseModel.kt
index 972c85fb..6f788bfe 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseModel.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseModel.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package ua.acclorite.book_story.presentation.browse
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -27,12 +27,12 @@ import ua.acclorite.book_story.domain.file.File
 import ua.acclorite.book_story.domain.use_case.book.InsertBook
 import ua.acclorite.book_story.domain.use_case.file_system.GetBookFromFile
 import ua.acclorite.book_story.domain.use_case.file_system.GetFiles
-import ua.acclorite.book_story.presentation.common.util.compareByWithOrder
-import ua.acclorite.book_story.presentation.common.util.showToast
-import ua.acclorite.book_story.ui.browse.model.BrowseSortOrder
-import ua.acclorite.book_story.ui.browse.model.SelectableFile
-import ua.acclorite.book_story.ui.library.LibraryScreen
-import ua.acclorite.book_story.ui.library.model.SelectableNullableBook
+import ua.acclorite.book_story.presentation.browse.model.BrowseSortOrder
+import ua.acclorite.book_story.presentation.browse.model.SelectableFile
+import ua.acclorite.book_story.presentation.library.LibraryScreen
+import ua.acclorite.book_story.presentation.library.model.SelectableNullableBook
+import ua.acclorite.book_story.ui.common.util.compareByWithOrder
+import ua.acclorite.book_story.ui.common.util.showToast
 import javax.inject.Inject
 
 @HiltViewModel
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseScreen.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseScreen.kt
index 26c51ce4..8486ecda 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package ua.acclorite.book_story.presentation.browse
 
 import android.os.Parcelable
 import androidx.compose.foundation.lazy.grid.rememberLazyGridState
@@ -24,13 +24,13 @@ import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.presentation.browse.BrowseContent
-import ua.acclorite.book_story.presentation.navigator.LocalNavigator
-import ua.acclorite.book_story.ui.browse.model.BrowseLayout
-import ua.acclorite.book_story.ui.library.LibraryScreen
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.navigator.Screen
-import ua.acclorite.book_story.ui.settings.BrowseSettingsScreen
+import ua.acclorite.book_story.presentation.browse.model.BrowseLayout
+import ua.acclorite.book_story.presentation.library.LibraryScreen
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.presentation.settings.BrowseSettingsScreen
+import ua.acclorite.book_story.ui.browse.BrowseContent
+import ua.acclorite.book_story.ui.navigator.LocalNavigator
 
 @Parcelize
 object BrowseScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseState.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseState.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseState.kt
index 51cfcd84..30ae0233 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseState.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseState.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package ua.acclorite.book_story.presentation.browse
 
 import androidx.compose.runtime.Immutable
 import ua.acclorite.book_story.core.BottomSheet
 import ua.acclorite.book_story.core.Dialog
-import ua.acclorite.book_story.ui.browse.model.SelectableFile
-import ua.acclorite.book_story.ui.library.model.SelectableNullableBook
+import ua.acclorite.book_story.presentation.browse.model.SelectableFile
+import ua.acclorite.book_story.presentation.library.model.SelectableNullableBook
 
 @Immutable
 data class BrowseState(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/model/BrowseLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseLayout.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/model/BrowseLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseLayout.kt
index bf062924..bdca7a8f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/model/BrowseLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse.model
+package ua.acclorite.book_story.presentation.browse.model
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/model/BrowseSortOrder.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseSortOrder.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/model/BrowseSortOrder.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseSortOrder.kt
index 5d770c0d..c70f711e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/model/BrowseSortOrder.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseSortOrder.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse.model
+package ua.acclorite.book_story.presentation.browse.model
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/model/GroupedFiles.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/GroupedFiles.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/model/GroupedFiles.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/browse/model/GroupedFiles.kt
index 6cc9540f..50f21b08 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/model/GroupedFiles.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/GroupedFiles.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse.model
+package ua.acclorite.book_story.presentation.browse.model
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/model/SelectableFile.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/SelectableFile.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/model/SelectableFile.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/browse/model/SelectableFile.kt
index 623f8ab6..66b112db 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/model/SelectableFile.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/SelectableFile.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse.model
+package ua.acclorite.book_story.presentation.browse.model
 
 import android.net.Uri
 import androidx.compose.runtime.Immutable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashActivity.kt b/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashActivity.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/ui/crash/CrashActivity.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashActivity.kt
index 67ebfac5..85357319 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashActivity.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashActivity.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.crash
+package ua.acclorite.book_story.presentation.crash
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
@@ -12,9 +12,9 @@ import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.core.view.WindowCompat
-import ua.acclorite.book_story.ui.main.model.ThemeContrast
-import ua.acclorite.book_story.ui.theme.BookStoryTheme
-import ua.acclorite.book_story.ui.theme.Theme
+import ua.acclorite.book_story.presentation.main.model.ThemeContrast
+import ua.acclorite.book_story.presentation.theme.BookStoryTheme
+import ua.acclorite.book_story.presentation.theme.Theme
 
 class CrashActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashScreen.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/ui/crash/CrashScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashScreen.kt
index 8aa11c12..2689af3c 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.crash
+package ua.acclorite.book_story.presentation.crash
 
 import android.content.ClipData
 import android.content.Intent
@@ -20,11 +20,11 @@ import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.core.crash.CrashUtils
-import ua.acclorite.book_story.presentation.common.util.LocalActivity
-import ua.acclorite.book_story.presentation.common.util.launchActivity
-import ua.acclorite.book_story.presentation.common.util.showToast
-import ua.acclorite.book_story.presentation.crash.CrashContent
-import ua.acclorite.book_story.ui.navigator.Screen
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.ui.common.util.LocalActivity
+import ua.acclorite.book_story.ui.common.util.launchActivity
+import ua.acclorite.book_story.ui.common.util.showToast
+import ua.acclorite.book_story.ui.crash.CrashContent
 
 @Parcelize
 object CrashScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsScreen.kt
similarity index 72%
rename from app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsScreen.kt
index f0378fe1..36743fd6 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.credits
+package ua.acclorite.book_story.presentation.credits
 
 import android.os.Parcelable
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -12,11 +12,11 @@ import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.hilt.navigation.compose.hiltViewModel
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior
-import ua.acclorite.book_story.presentation.credits.CreditsContent
-import ua.acclorite.book_story.presentation.navigator.LocalNavigator
-import ua.acclorite.book_story.ui.about.AboutModel
-import ua.acclorite.book_story.ui.navigator.Screen
+import ua.acclorite.book_story.presentation.about.AboutModel
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import ua.acclorite.book_story.ui.credits.CreditsContent
+import ua.acclorite.book_story.ui.navigator.LocalNavigator
 
 @Parcelize
 object CreditsScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/help/HelpScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpScreen.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/ui/help/HelpScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/help/HelpScreen.kt
index 1da9ebfd..3764d640 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/help/HelpScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.help
+package ua.acclorite.book_story.presentation.help
 
 import android.os.Parcelable
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -12,14 +12,14 @@ import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.hilt.navigation.compose.hiltViewModel
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior
-import ua.acclorite.book_story.presentation.help.HelpContent
-import ua.acclorite.book_story.presentation.navigator.LocalNavigator
-import ua.acclorite.book_story.ui.browse.BrowseScreen
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.navigator.Screen
-import ua.acclorite.book_story.ui.start.StartScreen
+import ua.acclorite.book_story.presentation.browse.BrowseScreen
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.presentation.start.StartScreen
+import ua.acclorite.book_story.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import ua.acclorite.book_story.ui.help.HelpContent
+import ua.acclorite.book_story.ui.navigator.LocalNavigator
 
 @Parcelize
 data class HelpScreen(val fromStart: Boolean) : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEvent.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/ui/history/HistoryEvent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEvent.kt
index ad4ba7ce..06846067 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEvent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.history
+package ua.acclorite.book_story.presentation.history
 
 import android.content.Context
 import androidx.compose.material3.SnackbarHostState
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryModel.kt
similarity index 98%
rename from app/src/main/java/ua/acclorite/book_story/ui/history/HistoryModel.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryModel.kt
index 5daf1c06..976e9323 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryModel.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryModel.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.history
+package ua.acclorite.book_story.presentation.history
 
 import androidx.compose.material3.SnackbarResult
 import androidx.lifecycle.ViewModel
@@ -29,9 +29,9 @@ import ua.acclorite.book_story.domain.use_case.history.DeleteHistory
 import ua.acclorite.book_story.domain.use_case.history.DeleteWholeHistory
 import ua.acclorite.book_story.domain.use_case.history.GetHistory
 import ua.acclorite.book_story.domain.use_case.history.InsertHistory
-import ua.acclorite.book_story.presentation.common.util.showToast
-import ua.acclorite.book_story.ui.history.model.GroupedHistory
-import ua.acclorite.book_story.ui.library.LibraryScreen
+import ua.acclorite.book_story.presentation.history.model.GroupedHistory
+import ua.acclorite.book_story.presentation.library.LibraryScreen
+import ua.acclorite.book_story.ui.common.util.showToast
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryScreen.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/history/HistoryScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryScreen.kt
index b87a7841..1f84db1a 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryScreen.kt
@@ -6,7 +6,7 @@
 
 @file:OptIn(ExperimentalMaterialApi::class)
 
-package ua.acclorite.book_story.ui.history
+package ua.acclorite.book_story.presentation.history
 
 import android.os.Parcelable
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -22,12 +22,12 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.coroutines.channels.Channel
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.presentation.history.HistoryContent
-import ua.acclorite.book_story.presentation.navigator.LocalNavigator
-import ua.acclorite.book_story.ui.book_info.BookInfoScreen
-import ua.acclorite.book_story.ui.library.LibraryScreen
-import ua.acclorite.book_story.ui.navigator.Screen
-import ua.acclorite.book_story.ui.reader.ReaderScreen
+import ua.acclorite.book_story.presentation.book_info.BookInfoScreen
+import ua.acclorite.book_story.presentation.library.LibraryScreen
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.presentation.reader.ReaderScreen
+import ua.acclorite.book_story.ui.history.HistoryContent
+import ua.acclorite.book_story.ui.navigator.LocalNavigator
 
 @Parcelize
 object HistoryScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryState.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/ui/history/HistoryState.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryState.kt
index ef1be69e..fef1be2a 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryState.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryState.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.history
+package ua.acclorite.book_story.presentation.history
 
 import androidx.compose.runtime.Immutable
 import ua.acclorite.book_story.core.Dialog
-import ua.acclorite.book_story.ui.history.model.GroupedHistory
+import ua.acclorite.book_story.presentation.history.model.GroupedHistory
 
 @Immutable
 data class HistoryState(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/model/GroupedHistory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/history/model/GroupedHistory.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/ui/history/model/GroupedHistory.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/history/model/GroupedHistory.kt
index 64d64bdd..3af88b58 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/history/model/GroupedHistory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/history/model/GroupedHistory.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.history.model
+package ua.acclorite.book_story.presentation.history.model
 
 import androidx.compose.runtime.Immutable
 import ua.acclorite.book_story.domain.history.History
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEvent.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEvent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEvent.kt
index 0cfe9a30..d0094105 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEvent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package ua.acclorite.book_story.presentation.library
 
 import android.content.Context
 import androidx.compose.runtime.Immutable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryModel.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryModel.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryModel.kt
index 2e8246cf..f819ce5e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryModel.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryModel.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package ua.acclorite.book_story.presentation.library
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -26,10 +26,10 @@ import ua.acclorite.book_story.domain.library.Book
 import ua.acclorite.book_story.domain.use_case.book.DeleteBooks
 import ua.acclorite.book_story.domain.use_case.book.GetBooks
 import ua.acclorite.book_story.domain.use_case.book.UpdateBook
-import ua.acclorite.book_story.presentation.common.util.showToast
-import ua.acclorite.book_story.ui.browse.BrowseScreen
-import ua.acclorite.book_story.ui.history.HistoryScreen
-import ua.acclorite.book_story.ui.library.model.SelectableBook
+import ua.acclorite.book_story.presentation.browse.BrowseScreen
+import ua.acclorite.book_story.presentation.history.HistoryScreen
+import ua.acclorite.book_story.presentation.library.model.SelectableBook
+import ua.acclorite.book_story.ui.common.util.showToast
 import javax.inject.Inject
 
 @HiltViewModel
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryScreen.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryScreen.kt
index d1455569..53d55c0b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package ua.acclorite.book_story.presentation.library
 
 import android.os.Parcelable
 import androidx.compose.foundation.pager.rememberPagerState
@@ -23,16 +23,16 @@ import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.presentation.library.LibraryContent
-import ua.acclorite.book_story.presentation.navigator.LocalNavigator
-import ua.acclorite.book_story.ui.book_info.BookInfoScreen
-import ua.acclorite.book_story.ui.browse.BrowseScreen
-import ua.acclorite.book_story.ui.history.HistoryScreen
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.navigator.Screen
-import ua.acclorite.book_story.ui.reader.ReaderScreen
-import ua.acclorite.book_story.ui.settings.LibrarySettingsScreen
-import ua.acclorite.book_story.ui.settings.SettingsModel
+import ua.acclorite.book_story.presentation.book_info.BookInfoScreen
+import ua.acclorite.book_story.presentation.browse.BrowseScreen
+import ua.acclorite.book_story.presentation.history.HistoryScreen
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.presentation.reader.ReaderScreen
+import ua.acclorite.book_story.presentation.settings.LibrarySettingsScreen
+import ua.acclorite.book_story.presentation.settings.SettingsModel
+import ua.acclorite.book_story.ui.library.LibraryContent
+import ua.acclorite.book_story.ui.navigator.LocalNavigator
 
 @Parcelize
 object LibraryScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryState.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryState.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryState.kt
index f012acf2..9ee4c132 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryState.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryState.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package ua.acclorite.book_story.presentation.library
 
 import androidx.compose.runtime.Immutable
 import ua.acclorite.book_story.core.BottomSheet
 import ua.acclorite.book_story.core.Dialog
-import ua.acclorite.book_story.ui.library.model.SelectableBook
+import ua.acclorite.book_story.presentation.library.model.SelectableBook
 
 @Immutable
 data class LibraryState(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/model/LibraryLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryLayout.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/model/LibraryLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryLayout.kt
index e346ad22..2a537798 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/model/LibraryLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library.model
+package ua.acclorite.book_story.presentation.library.model
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/model/LibrarySortOrder.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibrarySortOrder.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/model/LibrarySortOrder.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibrarySortOrder.kt
index 4192133e..3899deab 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/model/LibrarySortOrder.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibrarySortOrder.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library.model
+package ua.acclorite.book_story.presentation.library.model
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/model/LibraryTitlePosition.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryTitlePosition.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/model/LibraryTitlePosition.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryTitlePosition.kt
index b676fa8b..7bfc2e72 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/model/LibraryTitlePosition.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryTitlePosition.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library.model
+package ua.acclorite.book_story.presentation.library.model
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/model/SelectableBook.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/model/SelectableBook.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/model/SelectableBook.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/library/model/SelectableBook.kt
index 6cf8b809..efc24628 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/model/SelectableBook.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/model/SelectableBook.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library.model
+package ua.acclorite.book_story.presentation.library.model
 
 import androidx.compose.runtime.Immutable
 import ua.acclorite.book_story.core.Selected
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/model/SelectableNullableBook.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/model/SelectableNullableBook.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/model/SelectableNullableBook.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/library/model/SelectableNullableBook.kt
index 72569f22..7126840f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/model/SelectableNullableBook.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/model/SelectableNullableBook.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library.model
+package ua.acclorite.book_story.presentation.library.model
 
 import androidx.compose.runtime.Immutable
 import ua.acclorite.book_story.core.Selected
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoScreen.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoScreen.kt
index fbbff7d0..7de077ce 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.license_info
+package ua.acclorite.book_story.presentation.license_info
 
 import android.os.Parcelable
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -18,11 +18,11 @@ import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.util.withJson
 import kotlinx.parcelize.Parcelize
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior
-import ua.acclorite.book_story.presentation.license_info.LicenseInfoContent
-import ua.acclorite.book_story.presentation.navigator.LocalNavigator
-import ua.acclorite.book_story.ui.about.AboutModel
-import ua.acclorite.book_story.ui.navigator.Screen
+import ua.acclorite.book_story.presentation.about.AboutModel
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import ua.acclorite.book_story.ui.license_info.LicenseInfoContent
+import ua.acclorite.book_story.ui.navigator.LocalNavigator
 
 @Parcelize
 data class LicenseInfoScreen(val uniqueId: String) : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesScreen.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesScreen.kt
index 171f430e..ef311fa4 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.licenses
+package ua.acclorite.book_story.presentation.licenses
 
 import android.os.Parcelable
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -20,11 +20,11 @@ import com.mikepenz.aboutlibraries.util.withJson
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior
-import ua.acclorite.book_story.presentation.licenses.LicensesContent
-import ua.acclorite.book_story.presentation.navigator.LocalNavigator
-import ua.acclorite.book_story.ui.license_info.LicenseInfoScreen
-import ua.acclorite.book_story.ui.navigator.Screen
+import ua.acclorite.book_story.presentation.license_info.LicenseInfoScreen
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import ua.acclorite.book_story.ui.licenses.LicensesContent
+import ua.acclorite.book_story.ui.navigator.LocalNavigator
 
 @Parcelize
 object LicensesScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/main/MainActivity.kt b/app/src/main/java/ua/acclorite/book_story/presentation/main/MainActivity.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/main/MainActivity.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/main/MainActivity.kt
index 90e550c4..656327e0 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/main/MainActivity.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/main/MainActivity.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("UnusedVariable", "unused")
 
-package ua.acclorite.book_story.ui.main
+package ua.acclorite.book_story.presentation.main
 
 import android.annotation.SuppressLint
 import android.database.CursorWindow
@@ -23,25 +23,25 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import dagger.hilt.android.AndroidEntryPoint
 import okhttp3.internal.immutableListOf
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.navigation_bar.NavigationBar
-import ua.acclorite.book_story.presentation.common.components.navigation_rail.NavigationRail
-import ua.acclorite.book_story.presentation.main.MainActivityKeyboardManager
-import ua.acclorite.book_story.presentation.navigator.Navigator
-import ua.acclorite.book_story.presentation.navigator.NavigatorTabs
-import ua.acclorite.book_story.ui.browse.BrowseModel
-import ua.acclorite.book_story.ui.browse.BrowseScreen
-import ua.acclorite.book_story.ui.history.HistoryModel
-import ua.acclorite.book_story.ui.history.HistoryScreen
-import ua.acclorite.book_story.ui.library.LibraryModel
-import ua.acclorite.book_story.ui.library.LibraryScreen
-import ua.acclorite.book_story.ui.main.model.isDark
-import ua.acclorite.book_story.ui.main.model.isPureDark
-import ua.acclorite.book_story.ui.navigator.NavigatorItem
-import ua.acclorite.book_story.ui.navigator.StackEvent
-import ua.acclorite.book_story.ui.settings.SettingsModel
-import ua.acclorite.book_story.ui.start.StartScreen
-import ua.acclorite.book_story.ui.theme.BookStoryTheme
-import ua.acclorite.book_story.ui.theme.Transitions
+import ua.acclorite.book_story.presentation.browse.BrowseModel
+import ua.acclorite.book_story.presentation.browse.BrowseScreen
+import ua.acclorite.book_story.presentation.history.HistoryModel
+import ua.acclorite.book_story.presentation.history.HistoryScreen
+import ua.acclorite.book_story.presentation.library.LibraryModel
+import ua.acclorite.book_story.presentation.library.LibraryScreen
+import ua.acclorite.book_story.presentation.main.model.isDark
+import ua.acclorite.book_story.presentation.main.model.isPureDark
+import ua.acclorite.book_story.presentation.navigator.NavigatorItem
+import ua.acclorite.book_story.presentation.navigator.StackEvent
+import ua.acclorite.book_story.presentation.settings.SettingsModel
+import ua.acclorite.book_story.presentation.start.StartScreen
+import ua.acclorite.book_story.presentation.theme.BookStoryTheme
+import ua.acclorite.book_story.presentation.theme.Transitions
+import ua.acclorite.book_story.ui.common.components.navigation_bar.NavigationBar
+import ua.acclorite.book_story.ui.common.components.navigation_rail.NavigationRail
+import ua.acclorite.book_story.ui.main.MainActivityKeyboardManager
+import ua.acclorite.book_story.ui.navigator.Navigator
+import ua.acclorite.book_story.ui.navigator.NavigatorTabs
 import java.lang.reflect.Field
 
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/main/MainEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/main/MainEvent.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/ui/main/MainEvent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/main/MainEvent.kt
index 25e50d07..9d285601 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/main/MainEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/main/MainEvent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.main
+package ua.acclorite.book_story.presentation.main
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/main/MainModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/main/MainModel.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/main/MainModel.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/main/MainModel.kt
index 5f26e82a..7380fa9e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/main/MainModel.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/main/MainModel.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.main
+package ua.acclorite.book_story.presentation.main
 
 import androidx.datastore.preferences.core.Preferences
 import androidx.lifecycle.SavedStateHandle
@@ -25,25 +25,25 @@ import kotlinx.coroutines.yield
 import ua.acclorite.book_story.domain.use_case.data_store.ChangeLanguage
 import ua.acclorite.book_story.domain.use_case.data_store.GetAllSettings
 import ua.acclorite.book_story.domain.use_case.data_store.SetDatastore
-import ua.acclorite.book_story.presentation.common.constants.DataStoreConstants
-import ua.acclorite.book_story.presentation.common.constants.provideFonts
-import ua.acclorite.book_story.presentation.common.constants.provideMainState
-import ua.acclorite.book_story.ui.browse.model.BrowseLayout
-import ua.acclorite.book_story.ui.browse.model.BrowseSortOrder
-import ua.acclorite.book_story.ui.library.model.LibraryLayout
-import ua.acclorite.book_story.ui.library.model.LibrarySortOrder
-import ua.acclorite.book_story.ui.library.model.LibraryTitlePosition
-import ua.acclorite.book_story.ui.main.model.DarkTheme
-import ua.acclorite.book_story.ui.main.model.HorizontalAlignment
-import ua.acclorite.book_story.ui.main.model.PureDark
-import ua.acclorite.book_story.ui.main.model.ThemeContrast
-import ua.acclorite.book_story.ui.reader.model.ReaderColorEffects
-import ua.acclorite.book_story.ui.reader.model.ReaderFontThickness
-import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture
-import ua.acclorite.book_story.ui.reader.model.ReaderProgressCount
-import ua.acclorite.book_story.ui.reader.model.ReaderScreenOrientation
-import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment
-import ua.acclorite.book_story.ui.theme.toTheme
+import ua.acclorite.book_story.presentation.browse.model.BrowseLayout
+import ua.acclorite.book_story.presentation.browse.model.BrowseSortOrder
+import ua.acclorite.book_story.presentation.library.model.LibraryLayout
+import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder
+import ua.acclorite.book_story.presentation.library.model.LibraryTitlePosition
+import ua.acclorite.book_story.presentation.main.model.DarkTheme
+import ua.acclorite.book_story.presentation.main.model.HorizontalAlignment
+import ua.acclorite.book_story.presentation.main.model.PureDark
+import ua.acclorite.book_story.presentation.main.model.ThemeContrast
+import ua.acclorite.book_story.presentation.reader.model.ReaderColorEffects
+import ua.acclorite.book_story.presentation.reader.model.ReaderFontThickness
+import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture
+import ua.acclorite.book_story.presentation.reader.model.ReaderProgressCount
+import ua.acclorite.book_story.presentation.reader.model.ReaderScreenOrientation
+import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment
+import ua.acclorite.book_story.presentation.theme.toTheme
+import ua.acclorite.book_story.ui.common.constants.DataStoreConstants
+import ua.acclorite.book_story.ui.common.constants.provideFonts
+import ua.acclorite.book_story.ui.common.constants.provideMainState
 import javax.inject.Inject
 
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/main/MainState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/main/MainState.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/main/MainState.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/main/MainState.kt
index de7da0bb..6d034d55 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/main/MainState.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/main/MainState.kt
@@ -6,33 +6,33 @@
 
 @file:Suppress("UNCHECKED_CAST")
 
-package ua.acclorite.book_story.ui.main
+package ua.acclorite.book_story.presentation.main
 
 import android.os.Parcelable
 import androidx.annotation.Keep
 import androidx.compose.runtime.Immutable
 import androidx.datastore.preferences.core.Preferences
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.presentation.common.constants.DataStoreConstants
-import ua.acclorite.book_story.presentation.common.constants.provideFonts
-import ua.acclorite.book_story.presentation.common.constants.provideLanguages
-import ua.acclorite.book_story.ui.browse.model.BrowseLayout
-import ua.acclorite.book_story.ui.browse.model.BrowseSortOrder
-import ua.acclorite.book_story.ui.library.model.LibraryLayout
-import ua.acclorite.book_story.ui.library.model.LibrarySortOrder
-import ua.acclorite.book_story.ui.library.model.LibraryTitlePosition
-import ua.acclorite.book_story.ui.main.model.DarkTheme
-import ua.acclorite.book_story.ui.main.model.HorizontalAlignment
-import ua.acclorite.book_story.ui.main.model.PureDark
-import ua.acclorite.book_story.ui.main.model.ThemeContrast
-import ua.acclorite.book_story.ui.reader.model.ReaderColorEffects
-import ua.acclorite.book_story.ui.reader.model.ReaderFontThickness
-import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture
-import ua.acclorite.book_story.ui.reader.model.ReaderProgressCount
-import ua.acclorite.book_story.ui.reader.model.ReaderScreenOrientation
-import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment
-import ua.acclorite.book_story.ui.theme.Theme
-import ua.acclorite.book_story.ui.theme.toTheme
+import ua.acclorite.book_story.presentation.browse.model.BrowseLayout
+import ua.acclorite.book_story.presentation.browse.model.BrowseSortOrder
+import ua.acclorite.book_story.presentation.library.model.LibraryLayout
+import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder
+import ua.acclorite.book_story.presentation.library.model.LibraryTitlePosition
+import ua.acclorite.book_story.presentation.main.model.DarkTheme
+import ua.acclorite.book_story.presentation.main.model.HorizontalAlignment
+import ua.acclorite.book_story.presentation.main.model.PureDark
+import ua.acclorite.book_story.presentation.main.model.ThemeContrast
+import ua.acclorite.book_story.presentation.reader.model.ReaderColorEffects
+import ua.acclorite.book_story.presentation.reader.model.ReaderFontThickness
+import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture
+import ua.acclorite.book_story.presentation.reader.model.ReaderProgressCount
+import ua.acclorite.book_story.presentation.reader.model.ReaderScreenOrientation
+import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment
+import ua.acclorite.book_story.presentation.theme.Theme
+import ua.acclorite.book_story.presentation.theme.toTheme
+import ua.acclorite.book_story.ui.common.constants.DataStoreConstants
+import ua.acclorite.book_story.ui.common.constants.provideFonts
+import ua.acclorite.book_story.ui.common.constants.provideLanguages
 import java.util.Locale
 
 /**
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/main/model/DarkTheme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/main/model/DarkTheme.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/ui/main/model/DarkTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/main/model/DarkTheme.kt
index 0afcf722..3ca2e9cb 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/main/model/DarkTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/main/model/DarkTheme.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.main.model
+package ua.acclorite.book_story.presentation.main.model
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/main/model/HorizontalAlignment.kt b/app/src/main/java/ua/acclorite/book_story/presentation/main/model/HorizontalAlignment.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/ui/main/model/HorizontalAlignment.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/main/model/HorizontalAlignment.kt
index 09d0e3bc..fdb6543a 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/main/model/HorizontalAlignment.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/main/model/HorizontalAlignment.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.main.model
+package ua.acclorite.book_story.presentation.main.model
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.Alignment
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/main/model/PureDark.kt b/app/src/main/java/ua/acclorite/book_story/presentation/main/model/PureDark.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/main/model/PureDark.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/main/model/PureDark.kt
index ee94d5dc..868f6580 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/main/model/PureDark.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/main/model/PureDark.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.main.model
+package ua.acclorite.book_story.presentation.main.model
 
 import android.content.Context
 import android.os.PowerManager
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/main/model/ThemeContrast.kt b/app/src/main/java/ua/acclorite/book_story/presentation/main/model/ThemeContrast.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/main/model/ThemeContrast.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/main/model/ThemeContrast.kt
index 7d2e91d4..b2ea6ad8 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/main/model/ThemeContrast.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/main/model/ThemeContrast.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.main.model
+package ua.acclorite.book_story.presentation.main.model
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/Navigator.kt b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/Navigator.kt
index d9d2f499..0ad7d3ff 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/Navigator.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/Navigator.kt
@@ -6,70 +6,76 @@
 
 package ua.acclorite.book_story.presentation.navigator
 
-import androidx.activity.compose.BackHandler
-import androidx.activity.viewModels
-import androidx.compose.animation.AnimatedContent
-import androidx.compose.animation.AnimatedContentTransitionScope
-import androidx.compose.animation.ContentTransform
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.ui.Modifier
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import dagger.hilt.android.lifecycle.withCreationCallback
-import kotlinx.coroutines.Dispatchers
-import ua.acclorite.book_story.presentation.common.util.LocalActivity
-import ua.acclorite.book_story.ui.navigator.Navigator
-import ua.acclorite.book_story.ui.navigator.Screen
-import ua.acclorite.book_story.ui.navigator.StackEvent
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
 
-@Composable
-fun rememberNavigator(initialScreen: Screen): Navigator {
-    val activity = LocalActivity.current
-    return activity.viewModels<Navigator>(
-        extrasProducer = {
-            activity.defaultViewModelCreationExtras
-                .withCreationCallback<Navigator.Factory> { factory ->
-                    factory.create(initialScreen)
-                }
-        }
-    ).value
-}
+@HiltViewModel(assistedFactory = Navigator.Factory::class)
+class Navigator @AssistedInject constructor(
+    private val savedStateHandle: SavedStateHandle,
+    @Assisted private val initialScreen: Screen
+) : ViewModel() {
 
-@Composable
-fun Navigator(
-    modifier: Modifier = Modifier,
-    initialScreen: Screen,
-    transitionSpec: AnimatedContentTransitionScope<Screen>.(lastEvent: StackEvent) -> ContentTransform,
-    contentKey: (Screen) -> Any? = { it },
-    backHandlerEnabled: (Screen) -> Boolean = { true },
-    content: @Composable (currentScreen: Screen) -> Unit
-) {
-    val navigator = rememberNavigator(initialScreen = initialScreen)
-    val currentScreen = navigator.lastItem.collectAsStateWithLifecycle(
-        context = Dispatchers.Main.immediate
-    )
-    val lastEvent = navigator.lastEvent.collectAsStateWithLifecycle(
-        context = Dispatchers.Main.immediate
-    )
-
-    CompositionLocalProvider(LocalNavigator provides navigator) {
-        AnimatedContent(
-            modifier = modifier
-                .fillMaxSize()
-                .background(MaterialTheme.colorScheme.surface),
-            targetState = currentScreen.value,
-            transitionSpec = {
-                transitionSpec(this, lastEvent.value)
-            },
-            contentKey = contentKey,
-            content = { content(it) }
-        )
+    val items = savedStateHandle.getStateFlow("items", mutableListOf(initialScreen))
+    private fun StateFlow<MutableList<Screen>>.removeLast() {
+        savedStateHandle["items"] = value.dropLast(1)
     }
 
-    BackHandler(enabled = backHandlerEnabled.invoke(currentScreen.value)) {
-        navigator.pop()
+    private fun StateFlow<MutableList<Screen>>.add(item: Screen) {
+        savedStateHandle["items"] = value + item
+    }
+
+    val lastItem = items.map {
+        it.lastOrNull() ?: initialScreen
+    }.stateIn(
+        scope = viewModelScope,
+        started = SharingStarted.Eagerly,
+        initialValue = initialScreen
+    )
+
+    val lastEvent = savedStateHandle.getStateFlow("stack_event", StackEvent.Default)
+    private fun changeStackEvent(stackEvent: StackEvent) {
+        savedStateHandle["stack_event"] = stackEvent
+    }
+
+
+    fun push(
+        targetScreen: Screen,
+        popping: Boolean = false,
+        saveInBackStack: Boolean = true
+    ) {
+        if (lastItem.value::class == targetScreen::class) return
+        if (!saveInBackStack) items.removeLast()
+
+        changeStackEvent(
+            if (popping) StackEvent.Pop
+            else StackEvent.Default
+        )
+
+        if (lastItem.value::class == targetScreen::class) items.removeLast()
+        items.add(targetScreen)
+    }
+
+    fun pop(popping: Boolean = true) {
+        if (items.value.count() > 1) {
+            changeStackEvent(
+                if (popping) StackEvent.Pop
+                else StackEvent.Default
+            )
+            items.removeLast()
+        }
+    }
+
+    @AssistedFactory
+    interface Factory {
+        fun create(startScreen: Screen): Navigator
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorItem.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorItem.kt
index 411e9f05..5b92a236 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.navigator
+package ua.acclorite.book_story.presentation.navigator
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/navigator/Screen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/Screen.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/navigator/Screen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/navigator/Screen.kt
index 16b3d808..9a4f3f72 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/navigator/Screen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/Screen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.navigator
+package ua.acclorite.book_story.presentation.navigator
 
 import androidx.compose.runtime.Composable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/navigator/StackEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/StackEvent.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/ui/navigator/StackEvent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/navigator/StackEvent.kt
index ce17ca8d..7f4bead0 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/navigator/StackEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/StackEvent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.navigator
+package ua.acclorite.book_story.presentation.navigator
 
 import android.os.Parcelable
 import androidx.compose.runtime.Immutable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderEvent.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderEvent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderEvent.kt
index a99887ac..aa6c0a2b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderEvent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package ua.acclorite.book_story.presentation.reader
 
 import androidx.activity.ComponentActivity
 import androidx.compose.runtime.Immutable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderModel.kt
similarity index 98%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderModel.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderModel.kt
index 73a84bf1..f400bdb0 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderModel.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderModel.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package ua.acclorite.book_story.presentation.reader
 
 import android.app.SearchManager
 import android.content.Intent
@@ -41,13 +41,13 @@ import ua.acclorite.book_story.domain.use_case.book.GetBookById
 import ua.acclorite.book_story.domain.use_case.book.GetText
 import ua.acclorite.book_story.domain.use_case.book.UpdateBook
 import ua.acclorite.book_story.domain.use_case.history.GetLatestHistory
-import ua.acclorite.book_story.presentation.common.util.coerceAndPreventNaN
-import ua.acclorite.book_story.presentation.common.util.launchActivity
-import ua.acclorite.book_story.presentation.common.util.setBrightness
-import ua.acclorite.book_story.presentation.common.util.showToast
-import ua.acclorite.book_story.ui.history.HistoryScreen
-import ua.acclorite.book_story.ui.library.LibraryScreen
-import ua.acclorite.book_story.ui.reader.model.Checkpoint
+import ua.acclorite.book_story.presentation.history.HistoryScreen
+import ua.acclorite.book_story.presentation.library.LibraryScreen
+import ua.acclorite.book_story.presentation.reader.model.Checkpoint
+import ua.acclorite.book_story.ui.common.util.coerceAndPreventNaN
+import ua.acclorite.book_story.ui.common.util.launchActivity
+import ua.acclorite.book_story.ui.common.util.setBrightness
+import ua.acclorite.book_story.ui.common.util.showToast
 import javax.inject.Inject
 import kotlin.math.roundToInt
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderScreen.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderScreen.kt
index e06d3dc7..57badd62 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package ua.acclorite.book_story.presentation.reader
 
 import android.content.pm.ActivityInfo
 import android.os.Parcelable
@@ -44,19 +44,19 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.presentation.common.constants.provideFonts
-import ua.acclorite.book_story.presentation.common.util.LocalActivity
-import ua.acclorite.book_story.presentation.common.util.calculateProgress
-import ua.acclorite.book_story.presentation.common.util.setBrightness
-import ua.acclorite.book_story.presentation.navigator.LocalNavigator
-import ua.acclorite.book_story.presentation.reader.ReaderContent
-import ua.acclorite.book_story.ui.book_info.BookInfoScreen
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.navigator.Screen
-import ua.acclorite.book_story.ui.reader.model.ReaderColorEffects
-import ua.acclorite.book_story.ui.reader.model.ReaderProgressCount
-import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment
-import ua.acclorite.book_story.ui.settings.SettingsModel
+import ua.acclorite.book_story.presentation.book_info.BookInfoScreen
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.presentation.reader.model.ReaderColorEffects
+import ua.acclorite.book_story.presentation.reader.model.ReaderProgressCount
+import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment
+import ua.acclorite.book_story.presentation.settings.SettingsModel
+import ua.acclorite.book_story.ui.common.constants.provideFonts
+import ua.acclorite.book_story.ui.common.util.LocalActivity
+import ua.acclorite.book_story.ui.common.util.calculateProgress
+import ua.acclorite.book_story.ui.common.util.setBrightness
+import ua.acclorite.book_story.ui.navigator.LocalNavigator
+import ua.acclorite.book_story.ui.reader.ReaderContent
 import kotlin.math.roundToInt
 
 @Parcelize
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderState.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderState.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderState.kt
index 181f73f8..01ae8c7b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderState.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderState.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package ua.acclorite.book_story.presentation.reader
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Immutable
@@ -14,8 +14,8 @@ import ua.acclorite.book_story.core.ui.UIText
 import ua.acclorite.book_story.domain.library.Book
 import ua.acclorite.book_story.domain.reader.ReaderText
 import ua.acclorite.book_story.domain.reader.ReaderText.Chapter
-import ua.acclorite.book_story.presentation.common.constants.provideEmptyBook
-import ua.acclorite.book_story.ui.reader.model.Checkpoint
+import ua.acclorite.book_story.presentation.reader.model.Checkpoint
+import ua.acclorite.book_story.ui.common.constants.provideEmptyBook
 
 @Immutable
 data class ReaderState(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/Checkpoint.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/Checkpoint.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/model/Checkpoint.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/reader/model/Checkpoint.kt
index cca1e44a..25489519 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/Checkpoint.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/Checkpoint.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader.model
+package ua.acclorite.book_story.presentation.reader.model
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderColorEffects.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderColorEffects.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderColorEffects.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderColorEffects.kt
index 3e40ca2f..49914677 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderColorEffects.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderColorEffects.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader.model
+package ua.acclorite.book_story.presentation.reader.model
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderFontThickness.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderFontThickness.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderFontThickness.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderFontThickness.kt
index 3109b266..c7e0667c 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderFontThickness.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderFontThickness.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader.model
+package ua.acclorite.book_story.presentation.reader.model
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.text.font.FontWeight
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderHorizontalGesture.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderHorizontalGesture.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderHorizontalGesture.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderHorizontalGesture.kt
index 59504697..6364781d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderHorizontalGesture.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderHorizontalGesture.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader.model
+package ua.acclorite.book_story.presentation.reader.model
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderProgressCount.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderProgressCount.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderProgressCount.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderProgressCount.kt
index 59767f07..30256b2e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderProgressCount.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderProgressCount.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader.model
+package ua.acclorite.book_story.presentation.reader.model
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderScreenOrientation.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderScreenOrientation.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderScreenOrientation.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderScreenOrientation.kt
index 83fd328b..4ed6f5c9 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderScreenOrientation.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderScreenOrientation.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader.model
+package ua.acclorite.book_story.presentation.reader.model
 
 import android.content.pm.ActivityInfo
 import androidx.compose.runtime.Immutable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderTextAlignment.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderTextAlignment.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderTextAlignment.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderTextAlignment.kt
index 6c52d058..e201ee95 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ReaderTextAlignment.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderTextAlignment.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader.model
+package ua.acclorite.book_story.presentation.reader.model
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.text.style.TextAlign
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/AppearanceSettingsScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/AppearanceSettingsScreen.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/AppearanceSettingsScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/settings/AppearanceSettingsScreen.kt
index 8b6fedc8..9da0a7a9 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/AppearanceSettingsScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/AppearanceSettingsScreen.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings
+package ua.acclorite.book_story.presentation.settings
 
 import android.os.Parcelable
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior
-import ua.acclorite.book_story.presentation.navigator.LocalNavigator
-import ua.acclorite.book_story.presentation.settings.appearance.AppearanceSettingsContent
-import ua.acclorite.book_story.ui.navigator.Screen
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import ua.acclorite.book_story.ui.navigator.LocalNavigator
+import ua.acclorite.book_story.ui.settings.appearance.AppearanceSettingsContent
 
 @Parcelize
 object AppearanceSettingsScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/BrowseSettingsScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/BrowseSettingsScreen.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/BrowseSettingsScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/settings/BrowseSettingsScreen.kt
index 88f6bdf9..5e17f88c 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/BrowseSettingsScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/BrowseSettingsScreen.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings
+package ua.acclorite.book_story.presentation.settings
 
 import android.os.Parcelable
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior
-import ua.acclorite.book_story.presentation.navigator.LocalNavigator
-import ua.acclorite.book_story.presentation.settings.browse.BrowseSettingsContent
-import ua.acclorite.book_story.ui.navigator.Screen
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import ua.acclorite.book_story.ui.navigator.LocalNavigator
+import ua.acclorite.book_story.ui.settings.browse.BrowseSettingsContent
 
 @Parcelize
 object BrowseSettingsScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/GeneralSettingsScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/GeneralSettingsScreen.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/GeneralSettingsScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/settings/GeneralSettingsScreen.kt
index 06200953..5b4f3425 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/GeneralSettingsScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/GeneralSettingsScreen.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings
+package ua.acclorite.book_story.presentation.settings
 
 import android.os.Parcelable
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior
-import ua.acclorite.book_story.presentation.navigator.LocalNavigator
-import ua.acclorite.book_story.presentation.settings.general.GeneralSettingsContent
-import ua.acclorite.book_story.ui.navigator.Screen
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import ua.acclorite.book_story.ui.navigator.LocalNavigator
+import ua.acclorite.book_story.ui.settings.general.GeneralSettingsContent
 
 @Parcelize
 object GeneralSettingsScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/LibrarySettingsScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/LibrarySettingsScreen.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/LibrarySettingsScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/settings/LibrarySettingsScreen.kt
index 6848fac3..39aa9f70 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/LibrarySettingsScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/LibrarySettingsScreen.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings
+package ua.acclorite.book_story.presentation.settings
 
 import android.os.Parcelable
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior
-import ua.acclorite.book_story.presentation.navigator.LocalNavigator
-import ua.acclorite.book_story.presentation.settings.library.LibrarySettingsContent
-import ua.acclorite.book_story.ui.navigator.Screen
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import ua.acclorite.book_story.ui.navigator.LocalNavigator
+import ua.acclorite.book_story.ui.settings.library.LibrarySettingsContent
 
 @Parcelize
 object LibrarySettingsScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/ReaderSettingsScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/ReaderSettingsScreen.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/ReaderSettingsScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/settings/ReaderSettingsScreen.kt
index ce317fad..aedefb65 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/ReaderSettingsScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/ReaderSettingsScreen.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings
+package ua.acclorite.book_story.presentation.settings
 
 import android.os.Parcelable
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior
-import ua.acclorite.book_story.presentation.navigator.LocalNavigator
-import ua.acclorite.book_story.presentation.settings.reader.ReaderSettingsContent
-import ua.acclorite.book_story.ui.navigator.Screen
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import ua.acclorite.book_story.ui.navigator.LocalNavigator
+import ua.acclorite.book_story.ui.settings.reader.ReaderSettingsContent
 
 @Parcelize
 object ReaderSettingsScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsEvent.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsEvent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsEvent.kt
index 54e1bbda..5918900e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsEvent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings
+package ua.acclorite.book_story.presentation.settings
 
 import android.content.Context
 import android.net.Uri
@@ -12,7 +12,7 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.Color
 import ua.acclorite.book_story.core.ID
 import ua.acclorite.book_story.domain.library.Category
-import ua.acclorite.book_story.ui.library.model.LibrarySortOrder
+import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder
 
 @Immutable
 sealed class SettingsEvent {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsModel.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsModel.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsModel.kt
index 04920a27..881aafbf 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsModel.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsModel.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings
+package ua.acclorite.book_story.presentation.settings
 
 import android.util.Log
 import androidx.lifecycle.ViewModel
@@ -37,8 +37,8 @@ import ua.acclorite.book_story.domain.use_case.color_preset.SelectColorPreset
 import ua.acclorite.book_story.domain.use_case.color_preset.UpdateColorPreset
 import ua.acclorite.book_story.domain.use_case.permission.GrantPersistableUriPermission
 import ua.acclorite.book_story.domain.use_case.permission.ReleasePersistableUriPermission
-import ua.acclorite.book_story.presentation.common.constants.provideDefaultColorPreset
-import ua.acclorite.book_story.presentation.common.util.showToast
+import ua.acclorite.book_story.ui.common.constants.provideDefaultColorPreset
+import ua.acclorite.book_story.ui.common.util.showToast
 import javax.inject.Inject
 import kotlin.random.Random
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsScreen.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsScreen.kt
index c73593b1..9eaae4cd 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsScreen.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings
+package ua.acclorite.book_story.presentation.settings
 
 import android.os.Parcelable
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.presentation.common.components.top_bar.collapsibleTopAppBarScrollBehavior
-import ua.acclorite.book_story.presentation.navigator.LocalNavigator
-import ua.acclorite.book_story.presentation.settings.SettingsContent
-import ua.acclorite.book_story.ui.navigator.Screen
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import ua.acclorite.book_story.ui.navigator.LocalNavigator
+import ua.acclorite.book_story.ui.settings.SettingsContent
 
 @Parcelize
 object SettingsScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsState.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsState.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsState.kt
index c3595c9a..d4e5f06b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsState.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsState.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings
+package ua.acclorite.book_story.presentation.settings
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Immutable
 import ua.acclorite.book_story.domain.library.Category
 import ua.acclorite.book_story.domain.library.CategorySort
 import ua.acclorite.book_story.domain.reader.ColorPreset
-import ua.acclorite.book_story.presentation.common.constants.provideDefaultColorPreset
+import ua.acclorite.book_story.ui.common.constants.provideDefaultColorPreset
 
 @Immutable
 data class SettingsState(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/start/StartScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartScreen.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/ui/start/StartScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/start/StartScreen.kt
index 145b4a86..2173ac2d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/start/StartScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.start
+package ua.acclorite.book_story.presentation.start
 
 import android.annotation.SuppressLint
 import android.os.Parcelable
@@ -17,17 +17,17 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.presentation.common.constants.provideLanguages
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.presentation.common.util.LocalActivity
-import ua.acclorite.book_story.presentation.navigator.LocalNavigator
-import ua.acclorite.book_story.presentation.start.StartContent
-import ua.acclorite.book_story.ui.browse.BrowseScreen
-import ua.acclorite.book_story.ui.help.HelpScreen
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.navigator.Screen
-import ua.acclorite.book_story.ui.navigator.StackEvent
+import ua.acclorite.book_story.presentation.browse.BrowseScreen
+import ua.acclorite.book_story.presentation.help.HelpScreen
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.presentation.navigator.StackEvent
+import ua.acclorite.book_story.ui.common.constants.provideLanguages
+import ua.acclorite.book_story.ui.common.model.ButtonItem
+import ua.acclorite.book_story.ui.common.util.LocalActivity
+import ua.acclorite.book_story.ui.navigator.LocalNavigator
+import ua.acclorite.book_story.ui.start.StartContent
 
 @Parcelize
 object StartScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/Animations.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/Animations.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/Animations.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/Animations.kt
index 4b4cac23..5fb76ddc 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/Animations.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/Animations.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme
+package ua.acclorite.book_story.presentation.theme
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.tween
 import androidx.compose.material3.ColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
-import ua.acclorite.book_story.ui.main.model.ThemeContrast
+import ua.acclorite.book_story.presentation.main.model.ThemeContrast
 
 @Composable
 private fun animateColor(targetColor: Color): Color {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/Color.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/Color.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/Color.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/Color.kt
index 98d4b3a0..df450833 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/Color.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/Color.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme
+package ua.acclorite.book_story.presentation.theme
 
 import android.os.Build
 import androidx.annotation.StringRes
@@ -12,24 +12,24 @@ import androidx.compose.material3.ColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.main.model.ThemeContrast
-import ua.acclorite.book_story.ui.theme.color.aquaTheme
-import ua.acclorite.book_story.ui.theme.color.blackTheme
-import ua.acclorite.book_story.ui.theme.color.blueTheme
-import ua.acclorite.book_story.ui.theme.color.dynamicTheme
-import ua.acclorite.book_story.ui.theme.color.green2Theme
-import ua.acclorite.book_story.ui.theme.color.greenGrayTheme
-import ua.acclorite.book_story.ui.theme.color.greenTheme
-import ua.acclorite.book_story.ui.theme.color.lavenderTheme
-import ua.acclorite.book_story.ui.theme.color.marshTheme
-import ua.acclorite.book_story.ui.theme.color.pink2Theme
-import ua.acclorite.book_story.ui.theme.color.pinkTheme
-import ua.acclorite.book_story.ui.theme.color.purpleGrayTheme
-import ua.acclorite.book_story.ui.theme.color.purpleTheme
-import ua.acclorite.book_story.ui.theme.color.redGrayTheme
-import ua.acclorite.book_story.ui.theme.color.redTheme
-import ua.acclorite.book_story.ui.theme.color.yellow2Theme
-import ua.acclorite.book_story.ui.theme.color.yellowTheme
+import ua.acclorite.book_story.presentation.main.model.ThemeContrast
+import ua.acclorite.book_story.presentation.theme.color.aquaTheme
+import ua.acclorite.book_story.presentation.theme.color.blackTheme
+import ua.acclorite.book_story.presentation.theme.color.blueTheme
+import ua.acclorite.book_story.presentation.theme.color.dynamicTheme
+import ua.acclorite.book_story.presentation.theme.color.green2Theme
+import ua.acclorite.book_story.presentation.theme.color.greenGrayTheme
+import ua.acclorite.book_story.presentation.theme.color.greenTheme
+import ua.acclorite.book_story.presentation.theme.color.lavenderTheme
+import ua.acclorite.book_story.presentation.theme.color.marshTheme
+import ua.acclorite.book_story.presentation.theme.color.pink2Theme
+import ua.acclorite.book_story.presentation.theme.color.pinkTheme
+import ua.acclorite.book_story.presentation.theme.color.purpleGrayTheme
+import ua.acclorite.book_story.presentation.theme.color.purpleTheme
+import ua.acclorite.book_story.presentation.theme.color.redGrayTheme
+import ua.acclorite.book_story.presentation.theme.color.redTheme
+import ua.acclorite.book_story.presentation.theme.color.yellow2Theme
+import ua.acclorite.book_story.presentation.theme.color.yellowTheme
 
 
 @Immutable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/Theme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/Theme.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/Theme.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/Theme.kt
index 29204f23..29a621b9 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/Theme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/Theme.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme
+package ua.acclorite.book_story.presentation.theme
 
 import android.app.Activity
 import android.os.Build
@@ -16,7 +16,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.WindowCompat
-import ua.acclorite.book_story.ui.main.model.ThemeContrast
+import ua.acclorite.book_story.presentation.main.model.ThemeContrast
 
 @Composable
 fun BookStoryTheme(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/ThemeExtensions.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/ThemeExtensions.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/ThemeExtensions.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/ThemeExtensions.kt
index 4a6e62ee..26119f28 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/ThemeExtensions.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/ThemeExtensions.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme
+package ua.acclorite.book_story.presentation.theme
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.ui.graphics.Color
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/ThemeLogger.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/ThemeLogger.kt
similarity index 98%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/ThemeLogger.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/ThemeLogger.kt
index c1d00151..ae8063be 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/ThemeLogger.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/ThemeLogger.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("unused")
 
-package ua.acclorite.book_story.ui.theme
+package ua.acclorite.book_story.presentation.theme
 
 import android.util.Log
 import androidx.compose.material3.ColorScheme
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/Transitions.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/Transitions.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/Transitions.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/Transitions.kt
index bd583661..2a999857 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/Transitions.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/Transitions.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme
+package ua.acclorite.book_story.presentation.theme
 
 import androidx.compose.animation.core.AnimationSpec
 import androidx.compose.animation.core.EaseInOut
@@ -30,7 +30,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility
+import ua.acclorite.book_story.ui.common.components.common.AnimatedVisibility
 import kotlin.math.roundToInt
 
 object Transitions {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/AquaTheme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/AquaTheme.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/color/AquaTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/color/AquaTheme.kt
index 3b36d002..736c7f7f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/AquaTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/AquaTheme.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package ua.acclorite.book_story.presentation.theme.color
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
-import ua.acclorite.book_story.ui.main.model.ThemeContrast
+import ua.acclorite.book_story.presentation.main.model.ThemeContrast
 
 
 private val primaryLight = Color(0xFF116682)
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlackTheme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/BlackTheme.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlackTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/color/BlackTheme.kt
index 05aea656..d16e8039 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlackTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/BlackTheme.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package ua.acclorite.book_story.presentation.theme.color
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainModel
 
 @Composable
 fun blackTheme(initialTheme: ColorScheme): ColorScheme {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlueTheme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/BlueTheme.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlueTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/color/BlueTheme.kt
index a7e54ba5..b1e5b436 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlueTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/BlueTheme.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package ua.acclorite.book_story.presentation.theme.color
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
-import ua.acclorite.book_story.ui.main.model.ThemeContrast
+import ua.acclorite.book_story.presentation.main.model.ThemeContrast
 
 
 private val primaryLight = Color(0xFF485D92)
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/DynamicTheme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/DynamicTheme.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/color/DynamicTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/color/DynamicTheme.kt
index 3e349ee8..19bb10c4 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/DynamicTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/DynamicTheme.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package ua.acclorite.book_story.presentation.theme.color
 
 import android.annotation.SuppressLint
 import androidx.compose.material3.ColorScheme
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/Green2Theme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Green2Theme.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/color/Green2Theme.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Green2Theme.kt
index ad9e10c7..b08dc43c 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/Green2Theme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Green2Theme.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package ua.acclorite.book_story.presentation.theme.color
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenGrayTheme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/GreenGrayTheme.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenGrayTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/color/GreenGrayTheme.kt
index f3c3d1da..29c75439 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenGrayTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/GreenGrayTheme.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package ua.acclorite.book_story.presentation.theme.color
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenTheme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/GreenTheme.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/color/GreenTheme.kt
index 512e8008..553ba72d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/GreenTheme.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package ua.acclorite.book_story.presentation.theme.color
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
-import ua.acclorite.book_story.ui.main.model.ThemeContrast
+import ua.acclorite.book_story.presentation.main.model.ThemeContrast
 
 private val primaryLight = Color(0xFF306A42)
 private val onPrimaryLight = Color(0xFFFFFFFF)
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/LavenderTheme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/LavenderTheme.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/color/LavenderTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/color/LavenderTheme.kt
index c2f4ff27..936735f4 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/LavenderTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/LavenderTheme.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package ua.acclorite.book_story.presentation.theme.color
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
-import ua.acclorite.book_story.ui.main.model.ThemeContrast
+import ua.acclorite.book_story.presentation.main.model.ThemeContrast
 
 private val primaryLight = Color(0xFF824C76)
 private val onPrimaryLight = Color(0xFFFFFFFF)
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/MarshTheme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/MarshTheme.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/color/MarshTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/color/MarshTheme.kt
index 7eac00d3..e9196473 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/MarshTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/MarshTheme.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package ua.acclorite.book_story.presentation.theme.color
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
-import ua.acclorite.book_story.ui.main.model.ThemeContrast
+import ua.acclorite.book_story.presentation.main.model.ThemeContrast
 
 private val primaryLight = Color(0xFF006A65)
 private val onPrimaryLight = Color(0xFFFFFFFF)
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/Pink2Theme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Pink2Theme.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/color/Pink2Theme.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Pink2Theme.kt
index 0b15a9f2..62087274 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/Pink2Theme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Pink2Theme.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package ua.acclorite.book_story.presentation.theme.color
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PinkTheme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PinkTheme.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/color/PinkTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PinkTheme.kt
index bda71655..4a12c4db 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PinkTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PinkTheme.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package ua.acclorite.book_story.presentation.theme.color
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
-import ua.acclorite.book_story.ui.main.model.ThemeContrast
+import ua.acclorite.book_story.presentation.main.model.ThemeContrast
 
 private val primaryLight = Color(0xFF8C4A60)
 private val onPrimaryLight = Color(0xFFFFFFFF)
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleGrayTheme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PurpleGrayTheme.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleGrayTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PurpleGrayTheme.kt
index dbf26d70..13760f1e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleGrayTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PurpleGrayTheme.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package ua.acclorite.book_story.presentation.theme.color
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleTheme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PurpleTheme.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PurpleTheme.kt
index 3078837d..1f59c330 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PurpleTheme.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package ua.acclorite.book_story.presentation.theme.color
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
-import ua.acclorite.book_story.ui.main.model.ThemeContrast
+import ua.acclorite.book_story.presentation.main.model.ThemeContrast
 
 private val primaryLight = Color(0xFF725188)
 private val onPrimaryLight = Color(0xFFFFFFFF)
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedGrayTheme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/RedGrayTheme.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedGrayTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/color/RedGrayTheme.kt
index 79b240d8..51b45f8e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedGrayTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/RedGrayTheme.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package ua.acclorite.book_story.presentation.theme.color
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedTheme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/RedTheme.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/color/RedTheme.kt
index 4c95ab79..ed9b52e8 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/RedTheme.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package ua.acclorite.book_story.presentation.theme.color
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
-import ua.acclorite.book_story.ui.main.model.ThemeContrast
+import ua.acclorite.book_story.presentation.main.model.ThemeContrast
 
 private val primaryLight = Color(0xFF904A42)
 private val onPrimaryLight = Color(0xFFFFFFFF)
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/Yellow2Theme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Yellow2Theme.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/color/Yellow2Theme.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Yellow2Theme.kt
index 13eddd69..c13c822f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/Yellow2Theme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Yellow2Theme.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package ua.acclorite.book_story.presentation.theme.color
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/YellowTheme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/YellowTheme.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/color/YellowTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/theme/color/YellowTheme.kt
index 5714cd23..2a81b705 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/YellowTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/YellowTheme.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package ua.acclorite.book_story.presentation.theme.color
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
-import ua.acclorite.book_story.ui.main.model.ThemeContrast
+import ua.acclorite.book_story.presentation.main.model.ThemeContrast
 
 private val primaryLight = Color(0xFF845415)
 private val onPrimaryLight = Color(0xFFFFFFFF)
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutBadgeItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/about/AboutBadgeItem.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/presentation/about/AboutBadgeItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/about/AboutBadgeItem.kt
index 61189d17..f3f59407 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutBadgeItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/about/AboutBadgeItem.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.about
+package ua.acclorite.book_story.ui.about
 
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.about.model.Badge
-import ua.acclorite.book_story.presentation.common.components.common.IconButton
+import ua.acclorite.book_story.ui.about.model.Badge
+import ua.acclorite.book_story.ui.common.components.common.IconButton
 
 @Composable
 fun AboutBadgeItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutBadges.kt b/app/src/main/java/ua/acclorite/book_story/ui/about/AboutBadges.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/presentation/about/AboutBadges.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/about/AboutBadges.kt
index 549149f7..578777ee 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutBadges.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/about/AboutBadges.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.about
+package ua.acclorite.book_story.ui.about
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -18,9 +18,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.constants.provideAboutBadges
-import ua.acclorite.book_story.presentation.common.util.showToast
-import ua.acclorite.book_story.ui.about.AboutEvent
+import ua.acclorite.book_story.presentation.about.AboutEvent
+import ua.acclorite.book_story.ui.common.constants.provideAboutBadges
+import ua.acclorite.book_story.ui.common.util.showToast
 
 @Composable
 fun AboutBadges(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/about/AboutContent.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/presentation/about/AboutContent.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/about/AboutContent.kt
index 0592fd9c..37c20b1f 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/about/AboutContent.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.about
+package ua.acclorite.book_story.ui.about
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.ui.about.AboutEvent
+import ua.acclorite.book_story.presentation.about.AboutEvent
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/about/AboutItem.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/presentation/about/AboutItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/about/AboutItem.kt
index 6817428a..ab0d9d78 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/about/AboutItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.about
+package ua.acclorite.book_story.ui.about
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -16,7 +16,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun AboutItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/about/AboutLayout.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/presentation/about/AboutLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/about/AboutLayout.kt
index 73149f18..7ce9a4b5 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/about/AboutLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.about
+package ua.acclorite.book_story.ui.about
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
@@ -26,13 +26,13 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
-import ua.acclorite.book_story.presentation.common.constants.provideContributorsPage
-import ua.acclorite.book_story.presentation.common.constants.provideIssuesPage
-import ua.acclorite.book_story.presentation.common.constants.provideReleasesPage
-import ua.acclorite.book_story.presentation.common.constants.provideSupportPage
-import ua.acclorite.book_story.presentation.common.constants.provideTranslationPage
-import ua.acclorite.book_story.ui.about.AboutEvent
+import ua.acclorite.book_story.presentation.about.AboutEvent
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.constants.provideContributorsPage
+import ua.acclorite.book_story.ui.common.constants.provideIssuesPage
+import ua.acclorite.book_story.ui.common.constants.provideReleasesPage
+import ua.acclorite.book_story.ui.common.constants.provideSupportPage
+import ua.acclorite.book_story.ui.common.constants.provideTranslationPage
 
 @Composable
 fun AboutLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/about/AboutScaffold.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/about/AboutScaffold.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/about/AboutScaffold.kt
index 9698f490..23d0b5c2 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutScaffold.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/about/AboutScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.about
+package ua.acclorite.book_story.ui.about
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
@@ -18,7 +18,7 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import ua.acclorite.book_story.ui.about.AboutEvent
+import ua.acclorite.book_story.presentation.about.AboutEvent
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/about/AboutTopBar.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/presentation/about/AboutTopBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/about/AboutTopBar.kt
index 41afa8dd..4699dbc9 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutTopBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/about/AboutTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.about
+package ua.acclorite.book_story.ui.about
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LargeTopAppBar
@@ -14,8 +14,8 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/about/model/Badge.kt b/app/src/main/java/ua/acclorite/book_story/ui/about/model/Badge.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/presentation/about/model/Badge.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/about/model/Badge.kt
index c5d1d180..748f81f3 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/about/model/Badge.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/about/model/Badge.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.about.model
+package ua.acclorite.book_story.ui.about.model
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/about/model/Credit.kt b/app/src/main/java/ua/acclorite/book_story/ui/about/model/Credit.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/presentation/about/model/Credit.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/about/model/Credit.kt
index c9d403cf..c4caaf99 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/about/model/Credit.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/about/model/Credit.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.about.model
+package ua.acclorite.book_story.ui.about.model
 
 import androidx.compose.runtime.Immutable
 import ua.acclorite.book_story.core.ui.UIText
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoAuthorDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoAuthorDialog.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoAuthorDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoAuthorDialog.kt
index c1f2dba7..cdf6e86e 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoAuthorDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoAuthorDialog.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.core.ui.UIText
 import ua.acclorite.book_story.domain.library.Book
-import ua.acclorite.book_story.presentation.common.components.dialog.DialogWithTextField
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import ua.acclorite.book_story.ui.common.components.dialog.DialogWithTextField
 
 @Composable
 fun BookInfoAuthorDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoBackHandler.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoBackHandler.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoBackHandler.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoBackHandler.kt
index b2525c21..2f335e81 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoBackHandler.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoBackHandler.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoBottomSheet.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoBottomSheet.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoBottomSheet.kt
index 8d911c09..e84c1e5e 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoBottomSheet.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoBottomSheet.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.runtime.Composable
 import ua.acclorite.book_story.core.BottomSheet
 import ua.acclorite.book_story.domain.library.Book
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
-import ua.acclorite.book_story.ui.book_info.BookInfoScreen
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.book_info.BookInfoScreen
 
 @Composable
 fun BookInfoBottomSheet(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoChangeCoverBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoChangeCoverBottomSheet.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoChangeCoverBottomSheet.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoChangeCoverBottomSheet.kt
index a31fae4f..74770704 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoChangeCoverBottomSheet.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoChangeCoverBottomSheet.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.PickVisualMediaRequest
@@ -25,8 +25,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.domain.library.Book
-import ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet.ModalBottomSheet
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import ua.acclorite.book_story.ui.common.components.modal_bottom_sheet.ModalBottomSheet
 
 @Composable
 fun BookInfoChangeCoverBottomSheet(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoChangeCoverBottomSheetItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoChangeCoverBottomSheetItem.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoChangeCoverBottomSheetItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoChangeCoverBottomSheetItem.kt
index 9c4ac793..07972c8a 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoChangeCoverBottomSheetItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoChangeCoverBottomSheetItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -24,7 +24,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun LazyItemScope.BookInfoChangeCoverBottomSheetItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoContent.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoContent.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoContent.kt
index db44472f..b5ff5840 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Composable
@@ -12,7 +12,7 @@ import ua.acclorite.book_story.core.BottomSheet
 import ua.acclorite.book_story.core.Dialog
 import ua.acclorite.book_story.domain.library.Book
 import ua.acclorite.book_story.domain.library.Category
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
 
 @Composable
 fun BookInfoContent(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDeleteDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDeleteDialog.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDeleteDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDeleteDialog.kt
index 6310a8e7..fb34d878 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDeleteDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDeleteDialog.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.DeleteOutline
@@ -12,8 +12,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.dialog.Dialog
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import ua.acclorite.book_story.ui.common.components.dialog.Dialog
 
 @Composable
 fun BookInfoDeleteDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDescriptionDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDescriptionDialog.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDescriptionDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDescriptionDialog.kt
index d921fb31..0de0725b 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDescriptionDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDescriptionDialog.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import ua.acclorite.book_story.domain.library.Book
-import ua.acclorite.book_story.presentation.common.components.dialog.DialogWithTextField
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import ua.acclorite.book_story.ui.common.components.dialog.DialogWithTextField
 
 @Composable
 fun BookInfoDescriptionDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDetailsBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDetailsBottomSheet.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDetailsBottomSheet.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDetailsBottomSheet.kt
index 4ee6ebbb..165f4827 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDetailsBottomSheet.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDetailsBottomSheet.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
@@ -20,11 +20,11 @@ import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.data.model.file.CachedFileCompat
 import ua.acclorite.book_story.domain.library.Book
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
-import ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet.ModalBottomSheet
-import ua.acclorite.book_story.presentation.common.constants.provideExtensions
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryTitle
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.components.modal_bottom_sheet.ModalBottomSheet
+import ua.acclorite.book_story.ui.common.constants.provideExtensions
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDetailsBottomSheetItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDetailsBottomSheetItem.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDetailsBottomSheetItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDetailsBottomSheetItem.kt
index fd191a61..78b605b7 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDetailsBottomSheetItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDetailsBottomSheetItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.Arrangement
@@ -22,8 +22,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.IconButton
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.IconButton
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun BookInfoDetailsBottomSheetItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDialog.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDialog.kt
index 9c346dc8..de2de5e9 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDialog.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.runtime.Composable
 import ua.acclorite.book_story.core.Dialog
 import ua.acclorite.book_story.domain.library.Book
 import ua.acclorite.book_story.domain.library.Category
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
-import ua.acclorite.book_story.ui.book_info.BookInfoScreen
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.book_info.BookInfoScreen
 
 @Composable
 fun BookInfoDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayout.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayout.kt
index ac3cbb20..5a9815c8 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -18,9 +18,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.domain.library.Book
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
-import ua.acclorite.book_story.presentation.common.constants.providePrimaryScrollbar
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.constants.providePrimaryScrollbar
 
 @Composable
 fun BookInfoLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutActions.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutActions.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutActions.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutActions.kt
index b52e78b6..6ceb3109 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutActions.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutActions.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
@@ -21,7 +21,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
 
 @Composable
 fun BookInfoLayoutActions(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutActionsItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutActionsItem.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutActionsItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutActionsItem.kt
index 452d3542..fc9407e7 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutActionsItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutActionsItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -22,7 +22,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun BookInfoLayoutActionsItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutBackground.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutBackground.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutBackground.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutBackground.kt
index 10310b02..aa893ef4 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutBackground.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutBackground.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import android.net.Uri
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -18,7 +18,7 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.AsyncCoverImage
+import ua.acclorite.book_story.ui.common.components.common.AsyncCoverImage
 
 @Composable
 fun BookInfoLayoutBackground(height: Dp, image: Uri) {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutButton.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutButton.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutButton.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutButton.kt
index 197fce7f..f2cbe0e1 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutButton.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutButton.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -16,8 +16,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.domain.library.Book
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.util.calculateProgress
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.util.calculateProgress
 
 @Composable
 fun BookInfoLayoutButton(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutDescription.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutDescription.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutDescription.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutDescription.kt
index 28740afa..604f917b 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutDescription.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutDescription.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.animateColorAsState
@@ -40,9 +40,9 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.domain.library.Book
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.util.noRippleClickable
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.util.noRippleClickable
 
 @Composable
 fun BookInfoLayoutDescription(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfo.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfo.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfo.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfo.kt
index abeb2461..fb7aa214 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfo.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfo.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -16,7 +16,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.domain.library.Book
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
 
 @Composable
 fun BookInfoLayoutInfo(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoAuthor.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoAuthor.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoAuthor.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoAuthor.kt
index 2d776928..5379e05c 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoAuthor.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoAuthor.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
@@ -21,9 +21,9 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.domain.library.Book
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.util.noRippleClickable
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.util.noRippleClickable
 
 @Composable
 fun BookInfoLayoutInfoAuthor(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoCover.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoCover.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoCover.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoCover.kt
index aae70d67..149e229a 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoCover.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoCover.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -26,9 +26,9 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.domain.library.Book
-import ua.acclorite.book_story.presentation.common.components.common.AsyncCoverImage
-import ua.acclorite.book_story.presentation.common.util.noRippleClickable
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import ua.acclorite.book_story.ui.common.components.common.AsyncCoverImage
+import ua.acclorite.book_story.ui.common.util.noRippleClickable
 
 @Composable
 fun BookInfoLayoutInfoCover(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoProgress.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoProgress.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoProgress.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoProgress.kt
index 49b451c8..d90ec1c2 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoProgress.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoProgress.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
@@ -18,8 +18,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.domain.library.Book
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.util.calculateProgress
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.util.calculateProgress
 
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoTitle.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoTitle.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoTitle.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoTitle.kt
index 91f79d41..3a1f30bb 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoLayoutInfoTitle.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoTitle.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import ua.acclorite.book_story.domain.library.Book
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.util.noRippleClickable
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.util.noRippleClickable
 
 @Composable
 fun BookInfoLayoutInfoTitle(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoMoveDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoMoveDialog.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoMoveDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoMoveDialog.kt
index 8be09cb2..d6297a65 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoMoveDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoMoveDialog.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.items
@@ -20,10 +20,10 @@ import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.domain.library.Book
 import ua.acclorite.book_story.domain.library.Category
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.components.dialog.CheckboxDialogItem
-import ua.acclorite.book_story.presentation.common.components.dialog.Dialog
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.dialog.CheckboxDialogItem
+import ua.acclorite.book_story.ui.common.components.dialog.Dialog
 
 @Composable
 fun BookInfoMoveDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoPathDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoPathDialog.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoPathDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoPathDialog.kt
index eed31cf0..995ee971 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoPathDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoPathDialog.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import ua.acclorite.book_story.domain.library.Book
-import ua.acclorite.book_story.presentation.common.components.dialog.DialogWithTextField
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import ua.acclorite.book_story.ui.common.components.dialog.DialogWithTextField
 
 @Composable
 fun BookInfoPathDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoScaffold.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoScaffold.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoScaffold.kt
index 904c92f2..8394b2e2 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoScaffold.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
@@ -17,7 +17,7 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import ua.acclorite.book_story.domain.library.Book
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
 
 @Composable
 fun BookInfoScaffold(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoTitleDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTitleDialog.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoTitleDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTitleDialog.kt
index fc7d95a8..7a3972b3 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoTitleDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTitleDialog.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import ua.acclorite.book_story.domain.library.Book
-import ua.acclorite.book_story.presentation.common.components.dialog.DialogWithTextField
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import ua.acclorite.book_story.ui.common.components.dialog.DialogWithTextField
 
 @Composable
 fun BookInfoTitleDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTopBar.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoTopBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTopBar.kt
index 9b5313e9..9c838951 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoTopBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package ua.acclorite.book_story.ui.book_info
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material.icons.Icons
@@ -16,13 +16,13 @@ import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.remember
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.domain.library.Book
-import ua.acclorite.book_story.presentation.common.components.common.IconButton
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBar
-import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBarData
-import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton
-import ua.acclorite.book_story.ui.book_info.BookInfoEvent
-import ua.acclorite.book_story.ui.theme.DefaultTransition
+import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import ua.acclorite.book_story.presentation.theme.DefaultTransition
+import ua.acclorite.book_story.ui.common.components.common.IconButton
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.top_bar.TopAppBar
+import ua.acclorite.book_story.ui.common.components.top_bar.TopAppBarData
+import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseAddDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseAddDialog.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseAddDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseAddDialog.kt
index eeb8a584..feecef1e 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseAddDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseAddDialog.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -21,11 +21,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.data.model.common.NullableBook
-import ua.acclorite.book_story.presentation.common.components.dialog.Dialog
-import ua.acclorite.book_story.presentation.common.components.progress_indicator.CircularProgressIndicator
-import ua.acclorite.book_story.presentation.common.util.showToast
-import ua.acclorite.book_story.ui.browse.BrowseEvent
-import ua.acclorite.book_story.ui.library.model.SelectableNullableBook
+import ua.acclorite.book_story.presentation.browse.BrowseEvent
+import ua.acclorite.book_story.presentation.library.model.SelectableNullableBook
+import ua.acclorite.book_story.ui.common.components.dialog.Dialog
+import ua.acclorite.book_story.ui.common.components.progress_indicator.CircularProgressIndicator
+import ua.acclorite.book_story.ui.common.util.showToast
 import java.util.UUID
 
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseAddDialogItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseAddDialogItem.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseAddDialogItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseAddDialogItem.kt
index d0d7c087..d7920dc0 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseAddDialogItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseAddDialogItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
@@ -25,9 +25,9 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.data.model.common.NullableBook
-import ua.acclorite.book_story.presentation.common.components.common.CircularCheckbox
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.ui.library.model.SelectableNullableBook
+import ua.acclorite.book_story.presentation.library.model.SelectableNullableBook
+import ua.acclorite.book_story.ui.common.components.common.CircularCheckbox
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun BrowseAddDialogItem(result: SelectableNullableBook, onClick: (Boolean) -> Unit) {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseBackHandler.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseBackHandler.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseBackHandler.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseBackHandler.kt
index dcf1c2d7..c3553eb3 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseBackHandler.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseBackHandler.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.ui.browse.BrowseEvent
+import ua.acclorite.book_story.presentation.browse.BrowseEvent
 
 @Composable
 fun BrowseBackHandler(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseBottomSheet.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseBottomSheet.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseBottomSheet.kt
index c0fa19c1..8d9caf3b 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseBottomSheet.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseBottomSheet.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.runtime.Composable
 import ua.acclorite.book_story.core.BottomSheet
-import ua.acclorite.book_story.ui.browse.BrowseEvent
-import ua.acclorite.book_story.ui.browse.BrowseScreen
+import ua.acclorite.book_story.presentation.browse.BrowseEvent
+import ua.acclorite.book_story.presentation.browse.BrowseScreen
 
 @Composable
 fun BrowseBottomSheet(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseContent.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseContent.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseContent.kt
index 22dec398..580dbcf4 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.grid.LazyGridState
@@ -14,11 +14,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.focus.FocusRequester
 import ua.acclorite.book_story.core.BottomSheet
 import ua.acclorite.book_story.core.Dialog
-import ua.acclorite.book_story.ui.browse.BrowseEvent
-import ua.acclorite.book_story.ui.browse.model.BrowseLayout
-import ua.acclorite.book_story.ui.browse.model.SelectableFile
-import ua.acclorite.book_story.ui.library.model.SelectableNullableBook
-import ua.acclorite.book_story.ui.main.MainEvent
+import ua.acclorite.book_story.presentation.browse.BrowseEvent
+import ua.acclorite.book_story.presentation.browse.model.BrowseLayout
+import ua.acclorite.book_story.presentation.browse.model.SelectableFile
+import ua.acclorite.book_story.presentation.library.model.SelectableNullableBook
+import ua.acclorite.book_story.presentation.main.MainEvent
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseDialog.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseDialog.kt
index 5079cc69..273e35e5 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseDialog.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.runtime.Composable
 import ua.acclorite.book_story.core.Dialog
-import ua.acclorite.book_story.ui.browse.BrowseEvent
-import ua.acclorite.book_story.ui.browse.BrowseScreen
-import ua.acclorite.book_story.ui.library.model.SelectableNullableBook
+import ua.acclorite.book_story.presentation.browse.BrowseEvent
+import ua.acclorite.book_story.presentation.browse.BrowseScreen
+import ua.acclorite.book_story.presentation.library.model.SelectableNullableBook
 
 @Composable
 fun BrowseDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseEmptyPlaceholder.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEmptyPlaceholder.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseEmptyPlaceholder.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEmptyPlaceholder.kt
index a6a46d85..5f0ba6fb 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseEmptyPlaceholder.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEmptyPlaceholder.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.runtime.Composable
@@ -13,9 +13,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility
-import ua.acclorite.book_story.presentation.common.components.placeholder.EmptyPlaceholder
-import ua.acclorite.book_story.ui.theme.Transitions
+import ua.acclorite.book_story.presentation.theme.Transitions
+import ua.acclorite.book_story.ui.common.components.common.AnimatedVisibility
+import ua.acclorite.book_story.ui.common.components.placeholder.EmptyPlaceholder
 
 @Composable
 fun BoxScope.BrowseEmptyPlaceholder(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseFilterBottomSheet.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheet.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseFilterBottomSheet.kt
index 31287e11..b39510c8 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheet.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseFilterBottomSheet.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
@@ -16,12 +16,12 @@ import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import kotlinx.coroutines.launch
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
-import ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet.ModalBottomSheet
-import ua.acclorite.book_story.presentation.settings.browse.display.BrowseDisplaySubcategory
-import ua.acclorite.book_story.presentation.settings.browse.filter.BrowseFilterSubcategory
-import ua.acclorite.book_story.presentation.settings.browse.sort.BrowseSortSubcategory
-import ua.acclorite.book_story.ui.browse.BrowseEvent
+import ua.acclorite.book_story.presentation.browse.BrowseEvent
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.components.modal_bottom_sheet.ModalBottomSheet
+import ua.acclorite.book_story.ui.settings.browse.display.BrowseDisplaySubcategory
+import ua.acclorite.book_story.ui.settings.browse.filter.BrowseFilterSubcategory
+import ua.acclorite.book_story.ui.settings.browse.sort.BrowseSortSubcategory
 
 private var initialPage = 0
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheetTabRow.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseFilterBottomSheetTabRow.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheetTabRow.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseFilterBottomSheetTabRow.kt
index 7430064b..1a28b293 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheetTabRow.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseFilterBottomSheetTabRow.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet.ModalBottomSheetTabRow
+import ua.acclorite.book_story.ui.common.components.modal_bottom_sheet.ModalBottomSheetTabRow
 
 @Composable
 fun BrowseFilterBottomSheetTabRow(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridFileItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridFileItem.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridFileItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridFileItem.kt
index 19f13247..ce8a958e 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridFileItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridFileItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Box
@@ -28,10 +28,10 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.CircularCheckbox
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.ui.browse.model.SelectableFile
-import ua.acclorite.book_story.ui.theme.DefaultTransition
+import ua.acclorite.book_story.presentation.browse.model.SelectableFile
+import ua.acclorite.book_story.presentation.theme.DefaultTransition
+import ua.acclorite.book_story.ui.common.components.common.CircularCheckbox
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridItem.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridItem.kt
index ec0055fd..b42e9de2 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
@@ -18,7 +18,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.ui.browse.model.SelectableFile
+import ua.acclorite.book_story.presentation.browse.model.SelectableFile
 
 @Composable
 fun BrowseGridItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridLayout.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridLayout.kt
index be1d47a6..72e38701 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
@@ -17,11 +17,11 @@ import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.LazyVerticalGridWithScrollbar
-import ua.acclorite.book_story.presentation.common.components.common.header
-import ua.acclorite.book_story.presentation.common.constants.providePrimaryScrollbar
-import ua.acclorite.book_story.ui.browse.model.GroupedFiles
-import ua.acclorite.book_story.ui.browse.model.SelectableFile
+import ua.acclorite.book_story.presentation.browse.model.GroupedFiles
+import ua.acclorite.book_story.presentation.browse.model.SelectableFile
+import ua.acclorite.book_story.ui.common.components.common.LazyVerticalGridWithScrollbar
+import ua.acclorite.book_story.ui.common.components.common.header
+import ua.acclorite.book_story.ui.common.constants.providePrimaryScrollbar
 
 @Composable
 fun BrowseGridLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseItem.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseItem.kt
index 165e6f1d..755e566d 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseItem.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import ua.acclorite.book_story.ui.browse.model.BrowseLayout
-import ua.acclorite.book_story.ui.browse.model.SelectableFile
+import ua.acclorite.book_story.presentation.browse.model.BrowseLayout
+import ua.acclorite.book_story.presentation.browse.model.SelectableFile
 
 @Composable
 fun BrowseItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseLayout.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseLayout.kt
index 6c483117..1242fd48 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseLayout.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.grid.LazyGridState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import ua.acclorite.book_story.ui.browse.model.BrowseLayout
-import ua.acclorite.book_story.ui.browse.model.GroupedFiles
-import ua.acclorite.book_story.ui.browse.model.SelectableFile
+import ua.acclorite.book_story.presentation.browse.model.BrowseLayout
+import ua.acclorite.book_story.presentation.browse.model.GroupedFiles
+import ua.acclorite.book_story.presentation.browse.model.SelectableFile
 import java.io.File
 
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseLayoutHeader.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseLayoutHeader.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseLayoutHeader.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseLayoutHeader.kt
index 8da1ed9b..2bb2df12 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseLayoutHeader.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseLayoutHeader.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -23,8 +23,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.util.noRippleClickable
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.util.noRippleClickable
 
 @Composable
 fun BrowseLayoutHeader(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListFileItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListFileItem.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListFileItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListFileItem.kt
index 12764ca5..a85d8a6f 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListFileItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListFileItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
@@ -31,8 +31,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.ui.browse.model.SelectableFile
+import ua.acclorite.book_story.presentation.browse.model.SelectableFile
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListItem.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListItem.kt
index 4939a653..f9d9327c 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
@@ -21,9 +21,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.CircularCheckbox
-import ua.acclorite.book_story.ui.browse.model.SelectableFile
-import ua.acclorite.book_story.ui.theme.FadeTransitionPreservingSpace
+import ua.acclorite.book_story.presentation.browse.model.SelectableFile
+import ua.acclorite.book_story.presentation.theme.FadeTransitionPreservingSpace
+import ua.acclorite.book_story.ui.common.components.common.CircularCheckbox
 
 @Composable
 fun BrowseListItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListLayout.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListLayout.kt
index fa858980..a397ca3c 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
@@ -16,10 +16,10 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
-import ua.acclorite.book_story.presentation.common.constants.providePrimaryScrollbar
-import ua.acclorite.book_story.ui.browse.model.GroupedFiles
-import ua.acclorite.book_story.ui.browse.model.SelectableFile
+import ua.acclorite.book_story.presentation.browse.model.GroupedFiles
+import ua.acclorite.book_story.presentation.browse.model.SelectableFile
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.constants.providePrimaryScrollbar
 
 @Composable
 fun BrowseListLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseRefreshIndicator.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseRefreshIndicator.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseRefreshIndicator.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseRefreshIndicator.kt
index fd20c7ec..c69b796f 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseRefreshIndicator.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseRefreshIndicator.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.material.ExperimentalMaterialApi
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScaffold.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseScaffold.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScaffold.kt
index ae3b3d06..bab29ae4 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseScaffold.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
@@ -19,11 +19,11 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
-import ua.acclorite.book_story.ui.browse.BrowseEvent
-import ua.acclorite.book_story.ui.browse.model.BrowseLayout
-import ua.acclorite.book_story.ui.browse.model.SelectableFile
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.theme.DefaultTransition
+import ua.acclorite.book_story.presentation.browse.BrowseEvent
+import ua.acclorite.book_story.presentation.browse.model.BrowseLayout
+import ua.acclorite.book_story.presentation.browse.model.SelectableFile
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.theme.DefaultTransition
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseTopBar.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseTopBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseTopBar.kt
index 1aaf85a3..32a2b702 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseTopBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package ua.acclorite.book_story.ui.browse
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.material.icons.Icons
@@ -26,15 +26,15 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.IconButton
-import ua.acclorite.book_story.presentation.common.components.common.SearchTextField
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBar
-import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBarData
-import ua.acclorite.book_story.presentation.navigator.NavigatorIconButton
-import ua.acclorite.book_story.ui.browse.BrowseEvent
-import ua.acclorite.book_story.ui.browse.model.BrowseLayout
-import ua.acclorite.book_story.ui.browse.model.SelectableFile
+import ua.acclorite.book_story.presentation.browse.BrowseEvent
+import ua.acclorite.book_story.presentation.browse.model.BrowseLayout
+import ua.acclorite.book_story.presentation.browse.model.SelectableFile
+import ua.acclorite.book_story.ui.common.components.common.IconButton
+import ua.acclorite.book_story.ui.common.components.common.SearchTextField
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.top_bar.TopAppBar
+import ua.acclorite.book_story.ui.common.components.top_bar.TopAppBarData
+import ua.acclorite.book_story.ui.navigator.NavigatorIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/AnimatedVisibility.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/AnimatedVisibility.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/AnimatedVisibility.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/common/AnimatedVisibility.kt
index 66e9a9dd..099fc17e 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/AnimatedVisibility.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/AnimatedVisibility.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.common
+package ua.acclorite.book_story.ui.common.components.common
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.EnterTransition
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/AsyncCoverImage.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/AsyncCoverImage.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/AsyncCoverImage.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/common/AsyncCoverImage.kt
index 7cde982d..b6809962 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/AsyncCoverImage.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/AsyncCoverImage.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.common
+package ua.acclorite.book_story.ui.common.components.common
 
 import android.net.Uri
 import androidx.compose.runtime.Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/CircularCheckbox.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/CircularCheckbox.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/CircularCheckbox.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/common/CircularCheckbox.kt
index 0ea00ed5..abd37c49 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/CircularCheckbox.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/CircularCheckbox.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.common
+package ua.acclorite.book_story.ui.common.components.common
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/HighlightedText.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/HighlightedText.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/HighlightedText.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/common/HighlightedText.kt
index 8ab05b23..5374f7cc 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/HighlightedText.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/HighlightedText.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.common
+package ua.acclorite.book_story.ui.common.components.common
 
 import androidx.compose.foundation.text.BasicText
 import androidx.compose.runtime.Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/IconButton.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/IconButton.kt
similarity index 98%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/IconButton.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/common/IconButton.kt
index 8378b3be..4a57f9c7 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/IconButton.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/IconButton.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.common
+package ua.acclorite.book_story.ui.common.components.common
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/LazyColumnWithScrollbar.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/LazyColumnWithScrollbar.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/LazyColumnWithScrollbar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/common/LazyColumnWithScrollbar.kt
index 4cf2db2c..c51d49e5 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/LazyColumnWithScrollbar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/LazyColumnWithScrollbar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.common
+package ua.acclorite.book_story.ui.common.components.common
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -20,7 +20,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import my.nanihadesuka.compose.InternalLazyColumnScrollbar
 import my.nanihadesuka.compose.ScrollbarSettings
-import ua.acclorite.book_story.presentation.common.constants.provideSecondaryScrollbar
+import ua.acclorite.book_story.ui.common.constants.provideSecondaryScrollbar
 
 @Composable
 fun LazyColumnWithScrollbar(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/LazyGridHeader.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/LazyGridHeader.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/LazyGridHeader.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/common/LazyGridHeader.kt
index 8cbb637e..a3ec25d7 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/LazyGridHeader.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/LazyGridHeader.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.common
+package ua.acclorite.book_story.ui.common.components.common
 
 import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyGridItemScope
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/LazyVerticalGridWithScrollbar.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/LazyVerticalGridWithScrollbar.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/LazyVerticalGridWithScrollbar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/common/LazyVerticalGridWithScrollbar.kt
index a24fb872..41c7516c 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/LazyVerticalGridWithScrollbar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/LazyVerticalGridWithScrollbar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.common
+package ua.acclorite.book_story.ui.common.components.common
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -21,7 +21,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import my.nanihadesuka.compose.InternalLazyVerticalGridScrollbar
 import my.nanihadesuka.compose.ScrollbarSettings
-import ua.acclorite.book_story.presentation.common.constants.provideSecondaryScrollbar
+import ua.acclorite.book_story.ui.common.constants.provideSecondaryScrollbar
 
 @Composable
 fun LazyVerticalGridWithScrollbar(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/SearchTextField.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/SearchTextField.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/SearchTextField.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/common/SearchTextField.kt
index 365620dd..890a7d17 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/SearchTextField.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/SearchTextField.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.common
+package ua.acclorite.book_story.ui.common.components.common
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.text.BasicTextField
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/SelectionContainer.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/SelectionContainer.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/SelectionContainer.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/common/SelectionContainer.kt
index a79142b1..2e7f6b1a 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/SelectionContainer.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/SelectionContainer.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("DEPRECATION")
 
-package ua.acclorite.book_story.presentation.common.components.common
+package ua.acclorite.book_story.ui.common.components.common
 
 import android.content.ClipData
 import android.content.ClipboardManager
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/Snackbar.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/Snackbar.kt
similarity index 98%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/Snackbar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/common/Snackbar.kt
index 2c18a4e4..3a680bec 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/Snackbar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/Snackbar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.common
+package ua.acclorite.book_story.ui.common.components.common
 
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/SpacedItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/SpacedItem.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/SpacedItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/common/SpacedItem.kt
index 87bdf649..24154ace 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/SpacedItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/SpacedItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.common
+package ua.acclorite.book_story.ui.common.components.common
 
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/StyledText.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/StyledText.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/StyledText.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/common/StyledText.kt
index 1deefa61..6288d4f6 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/StyledText.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/StyledText.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.common
+package ua.acclorite.book_story.ui.common.components.common
 
 import androidx.compose.foundation.text.BasicText
 import androidx.compose.material3.LocalContentColor
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/Tooltip.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/Tooltip.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/Tooltip.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/common/Tooltip.kt
index 5c4cd49c..8be4f1b6 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/common/Tooltip.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/Tooltip.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.common
+package ua.acclorite.book_story.ui.common.components.common
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.PlainTooltip
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/CheckboxDialogItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/CheckboxDialogItem.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/CheckboxDialogItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/CheckboxDialogItem.kt
index 57d7e4e3..f809e0b2 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/CheckboxDialogItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/CheckboxDialogItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.dialog
+package ua.acclorite.book_story.ui.common.components.dialog
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
@@ -19,7 +19,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun CheckboxDialogItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/Dialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/Dialog.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/Dialog.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/Dialog.kt
index e1158b77..f1eb6fd4 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/Dialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/Dialog.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.dialog
+package ua.acclorite.book_story.ui.common.components.dialog
 
 import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.animateDpAsState
@@ -46,8 +46,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.DialogProperties
 import androidx.compose.ui.window.DialogWindowProvider
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 
 @OptIn(ExperimentalMaterial3Api::class)
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/DialogWithTextField.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/DialogWithTextField.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/DialogWithTextField.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/DialogWithTextField.kt
index e13397fb..6b7c3df6 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/DialogWithTextField.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/DialogWithTextField.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.dialog
+package ua.acclorite.book_story.ui.common.components.dialog
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -25,7 +25,7 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun DialogWithTextField(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/SelectableDialogItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/SelectableDialogItem.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/SelectableDialogItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/SelectableDialogItem.kt
index feb6c5b5..91e024cb 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/dialog/SelectableDialogItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/SelectableDialogItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.dialog
+package ua.acclorite.book_story.ui.common.components.dialog
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
@@ -21,7 +21,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun SelectableDialogItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_bottom_sheet/ModalBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_bottom_sheet/ModalBottomSheet.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_bottom_sheet/ModalBottomSheet.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_bottom_sheet/ModalBottomSheet.kt
index 899d68b4..b0513a10 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_bottom_sheet/ModalBottomSheet.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_bottom_sheet/ModalBottomSheet.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet
+package ua.acclorite.book_story.ui.common.components.modal_bottom_sheet
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.ColumnScope
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_bottom_sheet/ModalBottomSheetTabRow.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_bottom_sheet/ModalBottomSheetTabRow.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_bottom_sheet/ModalBottomSheetTabRow.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_bottom_sheet/ModalBottomSheetTabRow.kt
index 8bc01bc9..ff5d3855 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_bottom_sheet/ModalBottomSheetTabRow.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_bottom_sheet/ModalBottomSheetTabRow.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet
+package ua.acclorite.book_story.ui.common.components.modal_bottom_sheet
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -14,7 +14,7 @@ import androidx.compose.material3.Tab
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 /**
  * Primary Tab Row. Used in BottomSheet in pair with HorizontalPager.
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_drawer/ModalDrawer.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_drawer/ModalDrawer.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_drawer/ModalDrawer.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_drawer/ModalDrawer.kt
index 4398ebae..24f9ba90 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_drawer/ModalDrawer.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_drawer/ModalDrawer.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.modal_drawer
+package ua.acclorite.book_story.ui.common.components.modal_drawer
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.animation.core.animateDpAsState
@@ -39,10 +39,10 @@ import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
-import ua.acclorite.book_story.presentation.common.constants.providePrimaryScrollbar
-import ua.acclorite.book_story.presentation.common.util.noRippleClickable
+import ua.acclorite.book_story.ui.common.components.common.AnimatedVisibility
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.constants.providePrimaryScrollbar
+import ua.acclorite.book_story.ui.common.util.noRippleClickable
 
 /**
  * Modal Drawer.
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_drawer/ModalDrawerSelectableItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_drawer/ModalDrawerSelectableItem.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_drawer/ModalDrawerSelectableItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_drawer/ModalDrawerSelectableItem.kt
index a5105551..f86f3003 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_drawer/ModalDrawerSelectableItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_drawer/ModalDrawerSelectableItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.modal_drawer
+package ua.acclorite.book_story.ui.common.components.modal_drawer
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_drawer/ModalDrawerTitleItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_drawer/ModalDrawerTitleItem.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_drawer/ModalDrawerTitleItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_drawer/ModalDrawerTitleItem.kt
index 764142a0..60b43dbe 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/modal_drawer/ModalDrawerTitleItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_drawer/ModalDrawerTitleItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.modal_drawer
+package ua.acclorite.book_story.ui.common.components.modal_drawer
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
@@ -17,7 +17,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 /**
  * Modal Drawer Title Item.
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_bar/NavigationBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_bar/NavigationBar.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_bar/NavigationBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_bar/NavigationBar.kt
index 711a4eaf..dfdb2ec2 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_bar/NavigationBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_bar/NavigationBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.navigation_bar
+package ua.acclorite.book_story.ui.common.components.navigation_bar
 
 import androidx.compose.material3.NavigationBar
 import androidx.compose.runtime.Composable
@@ -12,8 +12,8 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import ua.acclorite.book_story.presentation.navigator.LocalNavigator
-import ua.acclorite.book_story.ui.navigator.NavigatorItem
+import ua.acclorite.book_story.presentation.navigator.NavigatorItem
+import ua.acclorite.book_story.ui.navigator.LocalNavigator
 
 @Composable
 fun NavigationBar(tabs: List<NavigatorItem>) {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_bar/NavigationBarItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_bar/NavigationBarItem.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_bar/NavigationBarItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_bar/NavigationBarItem.kt
index a9f1382a..2f8402ae 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_bar/NavigationBarItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_bar/NavigationBarItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.navigation_bar
+package ua.acclorite.book_story.ui.common.components.navigation_bar
 
 import androidx.compose.animation.Crossfade
 import androidx.compose.animation.core.tween
@@ -17,9 +17,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.components.common.Tooltip
-import ua.acclorite.book_story.ui.navigator.NavigatorItem
+import ua.acclorite.book_story.presentation.navigator.NavigatorItem
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.Tooltip
 
 @Composable
 fun RowScope.NavigationBarItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_rail/NavigationRail.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_rail/NavigationRail.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_rail/NavigationRail.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_rail/NavigationRail.kt
index 96a138d4..210f6c44 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_rail/NavigationRail.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_rail/NavigationRail.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.navigation_rail
+package ua.acclorite.book_story.ui.common.components.navigation_rail
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -28,8 +28,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import ua.acclorite.book_story.presentation.navigator.LocalNavigator
-import ua.acclorite.book_story.ui.navigator.NavigatorItem
+import ua.acclorite.book_story.presentation.navigator.NavigatorItem
+import ua.acclorite.book_story.ui.navigator.LocalNavigator
 
 @Composable
 fun NavigationRail(tabs: List<NavigatorItem>) {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_rail/NavigationRailItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_rail/NavigationRailItem.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_rail/NavigationRailItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_rail/NavigationRailItem.kt
index a2c5796a..9c010a69 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/navigation_rail/NavigationRailItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_rail/NavigationRailItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.navigation_rail
+package ua.acclorite.book_story.ui.common.components.navigation_rail
 
 import androidx.compose.animation.Crossfade
 import androidx.compose.animation.core.tween
@@ -16,9 +16,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.components.common.Tooltip
-import ua.acclorite.book_story.ui.navigator.NavigatorItem
+import ua.acclorite.book_story.presentation.navigator.NavigatorItem
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.Tooltip
 
 @Composable
 fun NavigationRailItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/placeholder/EmptyPlaceholder.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/placeholder/EmptyPlaceholder.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/placeholder/EmptyPlaceholder.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/placeholder/EmptyPlaceholder.kt
index 72c2c79b..70cb93ac 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/placeholder/EmptyPlaceholder.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/placeholder/EmptyPlaceholder.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.placeholder
+package ua.acclorite.book_story.ui.common.components.placeholder
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -24,7 +24,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 
 /**
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/placeholder/ErrorPlaceholder.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/placeholder/ErrorPlaceholder.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/placeholder/ErrorPlaceholder.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/placeholder/ErrorPlaceholder.kt
index 5c0339a3..6aebe99b 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/placeholder/ErrorPlaceholder.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/placeholder/ErrorPlaceholder.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.placeholder
+package ua.acclorite.book_story.ui.common.components.placeholder
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -24,7 +24,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 /**
  * Empty placeholder.
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/progress_indicator/CircularProgressIndicator.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/progress_indicator/CircularProgressIndicator.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/progress_indicator/CircularProgressIndicator.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/progress_indicator/CircularProgressIndicator.kt
index b4b1d80f..5ef6e3cb 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/progress_indicator/CircularProgressIndicator.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/progress_indicator/CircularProgressIndicator.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.progress_indicator
+package ua.acclorite.book_story.ui.common.components.progress_indicator
 
 import androidx.compose.material3.CircularWavyProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/ChipsWithTitle.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/ChipsWithTitle.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/ChipsWithTitle.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/ChipsWithTitle.kt
index f83d832c..9ddadd58 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/ChipsWithTitle.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/ChipsWithTitle.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.settings
+package ua.acclorite.book_story.ui.common.components.settings
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -18,9 +18,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryTitle
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.model.ButtonItem
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle
 
 /**
  * Chips with title. Use list of [ButtonItem]s to display chips.
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/ColorPickerWithTitle.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/ColorPickerWithTitle.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/ColorPickerWithTitle.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/ColorPickerWithTitle.kt
index a519fddd..06ee45d0 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/ColorPickerWithTitle.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/ColorPickerWithTitle.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.settings
+package ua.acclorite.book_story.ui.common.components.settings
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -36,8 +36,8 @@ import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.debounce
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.IconButton
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryTitle
+import ua.acclorite.book_story.ui.common.components.common.IconButton
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle
 
 @OptIn(FlowPreview::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/SegmentedButtonWithTitle.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/SegmentedButtonWithTitle.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/SegmentedButtonWithTitle.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/SegmentedButtonWithTitle.kt
index a1c8aa72..cb5dcffa 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/SegmentedButtonWithTitle.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/SegmentedButtonWithTitle.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.settings
+package ua.acclorite.book_story.ui.common.components.settings
 
 import androidx.compose.animation.expandHorizontally
 import androidx.compose.animation.fadeIn
@@ -42,10 +42,10 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryTitle
+import ua.acclorite.book_story.ui.common.components.common.AnimatedVisibility
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.model.ButtonItem
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle
 
 /**
  * Segmented Button with Title.
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/SliderWithTitle.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/SliderWithTitle.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/SliderWithTitle.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/SliderWithTitle.kt
index 5bdc5ece..37e040b2 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/SliderWithTitle.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/SliderWithTitle.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.settings
+package ua.acclorite.book_story.ui.common.components.settings
 
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Column
@@ -29,8 +29,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryTitle
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle
 import kotlin.math.roundToInt
 
 /**
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/SwitchWIthTitle.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/SwitchWIthTitle.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/SwitchWIthTitle.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/SwitchWIthTitle.kt
index 617b1cd2..7249f01f 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/settings/SwitchWIthTitle.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/SwitchWIthTitle.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.settings
+package ua.acclorite.book_story.ui.common.components.settings
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -23,7 +23,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 /**
  * Checkbox with title.
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/top_bar/CollapsibleTopAppBarScrollBehavior.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/top_bar/CollapsibleTopAppBarScrollBehavior.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/top_bar/CollapsibleTopAppBarScrollBehavior.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/top_bar/CollapsibleTopAppBarScrollBehavior.kt
index c3e54ce5..05d3d2fc 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/top_bar/CollapsibleTopAppBarScrollBehavior.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/top_bar/CollapsibleTopAppBarScrollBehavior.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.top_bar
+package ua.acclorite.book_story.ui.common.components.top_bar
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.rememberLazyListState
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/top_bar/TopAppBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/components/top_bar/TopAppBar.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/components/top_bar/TopAppBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/components/top_bar/TopAppBar.kt
index 79ea17f6..493b0608 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/components/top_bar/TopAppBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/components/top_bar/TopAppBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.components.top_bar
+package ua.acclorite.book_story.ui.common.components.top_bar
 
 import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.animateFloatAsState
@@ -29,7 +29,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.lerp
 import ua.acclorite.book_story.core.ID
-import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility
+import ua.acclorite.book_story.ui.common.components.common.AnimatedVisibility
 
 data class TopAppBarData(
     val contentID: ID,
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/AboutBadgeConstants.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/AboutBadgeConstants.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/constants/AboutBadgeConstants.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/constants/AboutBadgeConstants.kt
index 5a4c18b6..24b83725 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/AboutBadgeConstants.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/AboutBadgeConstants.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.constants
+package ua.acclorite.book_story.ui.common.constants
 
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.about.model.Badge
+import ua.acclorite.book_story.ui.about.model.Badge
 
 fun provideAboutBadges() = listOf(
     Badge(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/CommonConstants.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/CommonConstants.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/constants/CommonConstants.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/constants/CommonConstants.kt
index d559e618..679787a6 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/CommonConstants.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/CommonConstants.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("SameReturnValue")
 
-package ua.acclorite.book_story.presentation.common.constants
+package ua.acclorite.book_story.ui.common.constants
 
 import androidx.compose.ui.graphics.Color
 import ua.acclorite.book_story.core.ui.UIText
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/CreditConstants.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/CreditConstants.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/constants/CreditConstants.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/constants/CreditConstants.kt
index 50c4aeb5..2e70e92f 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/CreditConstants.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/CreditConstants.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.constants
+package ua.acclorite.book_story.ui.common.constants
 
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.core.ui.UIText
-import ua.acclorite.book_story.presentation.about.model.Credit
+import ua.acclorite.book_story.ui.about.model.Credit
 
 fun provideCredits() = listOf(
     Credit(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/DataStoreConstants.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/DataStoreConstants.kt
similarity index 98%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/constants/DataStoreConstants.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/constants/DataStoreConstants.kt
index b697b935..2d8d8217 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/DataStoreConstants.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/DataStoreConstants.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.constants
+package ua.acclorite.book_story.ui.common.constants
 
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.doublePreferencesKey
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/FontConstants.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/FontConstants.kt
similarity index 98%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/constants/FontConstants.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/constants/FontConstants.kt
index eefac181..a24cf1e4 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/FontConstants.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/FontConstants.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.constants
+package ua.acclorite.book_story.ui.common.constants
 
 import androidx.annotation.FontRes
 import androidx.compose.ui.text.ExperimentalTextApi
@@ -15,7 +15,7 @@ import androidx.compose.ui.text.font.FontVariation
 import androidx.compose.ui.text.font.FontWeight
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.core.ui.UIText
-import ua.acclorite.book_story.presentation.reader.model.FontWithName
+import ua.acclorite.book_story.ui.reader.model.FontWithName
 
 fun provideFonts(): List<FontWithName> {
     return mutableListOf(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/HelpTipConstants.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/HelpTipConstants.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/constants/HelpTipConstants.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/constants/HelpTipConstants.kt
index 17d1cc88..b9762dc6 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/HelpTipConstants.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/HelpTipConstants.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.constants
+package ua.acclorite.book_story.ui.common.constants
 
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.help.HelpAnnotation
-import ua.acclorite.book_story.presentation.help.model.HelpTip
+import ua.acclorite.book_story.ui.help.HelpAnnotation
+import ua.acclorite.book_story.ui.help.model.HelpTip
 
 fun provideHelpTips() = listOf(
     HelpTip(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/LanguageConstants.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/LanguageConstants.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/constants/LanguageConstants.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/constants/LanguageConstants.kt
index 285272e0..2e41e677 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/LanguageConstants.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/LanguageConstants.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.constants
+package ua.acclorite.book_story.ui.common.constants
 
 fun provideLanguages() = listOf(
     Pair("en", "English"),
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/LinkConstants.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/LinkConstants.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/constants/LinkConstants.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/constants/LinkConstants.kt
index 25e38b20..0b90e221 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/LinkConstants.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/LinkConstants.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("SameReturnValue")
 
-package ua.acclorite.book_story.presentation.common.constants
+package ua.acclorite.book_story.ui.common.constants
 
 fun provideReleasesPage() =
     "https://www.github.com/Acclorite/book-story/releases/latest"
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/ScrollbarConstants.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/ScrollbarConstants.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/constants/ScrollbarConstants.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/constants/ScrollbarConstants.kt
index 6c907d20..6158ef35 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/ScrollbarConstants.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/ScrollbarConstants.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.constants
+package ua.acclorite.book_story.ui.common.constants
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/SupportedExtensionConstants.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/SupportedExtensionConstants.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/constants/SupportedExtensionConstants.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/constants/SupportedExtensionConstants.kt
index f4a38bd2..6ea585c4 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/constants/SupportedExtensionConstants.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/constants/SupportedExtensionConstants.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.constants
+package ua.acclorite.book_story.ui.common.constants
 
 fun provideExtensions() = listOf(
     ".epub",
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/model/ButtonItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/model/ButtonItem.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/model/ButtonItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/model/ButtonItem.kt
index 5984f473..a8db6cff 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/model/ButtonItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/model/ButtonItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.model
+package ua.acclorite.book_story.ui.common.model
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.text.TextStyle
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/model/Direction.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/model/Direction.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/model/Direction.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/model/Direction.kt
index fbca8c28..fb43203d 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/model/Direction.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/model/Direction.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.model
+package ua.acclorite.book_story.ui.common.model
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/model/Position.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/model/Position.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/model/Position.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/model/Position.kt
index 83c1c737..b5968a23 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/model/Position.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/model/Position.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.model
+package ua.acclorite.book_story.ui.common.model
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/util/CollectionExtensions.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/util/CollectionExtensions.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/util/CollectionExtensions.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/util/CollectionExtensions.kt
index 4710a9a2..81887970 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/util/CollectionExtensions.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/util/CollectionExtensions.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.util
+package ua.acclorite.book_story.ui.common.util
 
 fun <T> MutableList<T>.addAll(calculation: () -> List<T>) {
     addAll(calculation())
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/util/LifecycleExtensions.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/util/LifecycleExtensions.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/util/LifecycleExtensions.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/util/LifecycleExtensions.kt
index 98958d23..0d0c21e7 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/util/LifecycleExtensions.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/util/LifecycleExtensions.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.util
+package ua.acclorite.book_story.ui.common.util
 
 import android.annotation.SuppressLint
 import android.content.Intent
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/util/ModifierExtensions.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/util/ModifierExtensions.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/util/ModifierExtensions.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/util/ModifierExtensions.kt
index 74357efb..d44cafc9 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/util/ModifierExtensions.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/util/ModifierExtensions.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.util
+package ua.acclorite.book_story.ui.common.util
 
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.ui.Modifier
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/util/PrimitiveExtensions.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/util/PrimitiveExtensions.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/util/PrimitiveExtensions.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/util/PrimitiveExtensions.kt
index bafe5333..a1623622 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/util/PrimitiveExtensions.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/util/PrimitiveExtensions.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.util
+package ua.acclorite.book_story.ui.common.util
 
 fun String.removeTrailingZero(): String {
     if (!this.contains('.'))
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/common/util/ToastExtensions.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/util/ToastExtensions.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/presentation/common/util/ToastExtensions.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/common/util/ToastExtensions.kt
index 3d76f3ee..70bab32c 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/common/util/ToastExtensions.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/util/ToastExtensions.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.common.util
+package ua.acclorite.book_story.ui.common.util
 
 import android.content.Context
 import android.widget.Toast
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashBottomBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashBottomBar.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashBottomBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/crash/CrashBottomBar.kt
index 8141674e..ca450261 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashBottomBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashBottomBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.crash
+package ua.acclorite.book_story.ui.crash
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
@@ -23,7 +23,7 @@ import androidx.compose.ui.platform.LocalWindowInfo
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun CrashBottomBar(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashContent.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashContent.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/crash/CrashContent.kt
index d4c8b662..94564b1e 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.crash
+package ua.acclorite.book_story.ui.crash
 
 import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.rememberScrollState
@@ -12,7 +12,7 @@ import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun CrashContent(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashLayout.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/crash/CrashLayout.kt
index 7ab9fb45..f3fd7921 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.crash
+package ua.acclorite.book_story.ui.crash
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
@@ -12,7 +12,7 @@ import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun CrashLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashScaffold.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashScaffold.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/crash/CrashScaffold.kt
index 59e52742..c16bfe2f 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashScaffold.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.crash
+package ua.acclorite.book_story.ui.crash
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -25,7 +25,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun CrashScaffold(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditItem.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/credits/CreditItem.kt
index 8c2c0743..2b03fc96 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.credits
+package ua.acclorite.book_story.ui.credits
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -22,8 +22,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.about.model.Credit
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.about.model.Credit
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun CreditItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsContent.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsContent.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsContent.kt
index 1117d0a1..1283c2a6 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsContent.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.credits
+package ua.acclorite.book_story.ui.credits
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.ui.about.AboutEvent
+import ua.acclorite.book_story.presentation.about.AboutEvent
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsLayout.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsLayout.kt
index b14f64ac..09e2e537 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.credits
+package ua.acclorite.book_story.ui.credits
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
@@ -14,9 +14,9 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
-import ua.acclorite.book_story.presentation.common.constants.provideCredits
-import ua.acclorite.book_story.ui.about.AboutEvent
+import ua.acclorite.book_story.presentation.about.AboutEvent
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.constants.provideCredits
 
 @Composable
 fun CreditsLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsScaffold.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsScaffold.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsScaffold.kt
index 3c7137fe..257cc027 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsScaffold.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.credits
+package ua.acclorite.book_story.ui.credits
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
@@ -18,7 +18,7 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import ua.acclorite.book_story.ui.about.AboutEvent
+import ua.acclorite.book_story.presentation.about.AboutEvent
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsTopBar.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsTopBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsTopBar.kt
index f9096fb4..79d6812e 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsTopBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.credits
+package ua.acclorite.book_story.ui.credits
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LargeTopAppBar
@@ -14,8 +14,8 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpAnnotation.kt b/app/src/main/java/ua/acclorite/book_story/ui/help/HelpAnnotation.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/help/HelpAnnotation.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/help/HelpAnnotation.kt
index ba6f771c..9cda36c2 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpAnnotation.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/help/HelpAnnotation.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.help
+package ua.acclorite.book_story.ui.help
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpBottomBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/help/HelpBottomBar.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/presentation/help/HelpBottomBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/help/HelpBottomBar.kt
index 468dcde3..127f3b60 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpBottomBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/help/HelpBottomBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.help
+package ua.acclorite.book_story.ui.help
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -18,9 +18,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.ui.browse.BrowseScreen
-import ua.acclorite.book_story.ui.main.MainEvent
+import ua.acclorite.book_story.presentation.browse.BrowseScreen
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun HelpBottomBar(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/help/HelpContent.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/presentation/help/HelpContent.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/help/HelpContent.kt
index 7d0dfbc9..3fea2274 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/help/HelpContent.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.help
+package ua.acclorite.book_story.ui.help
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.ui.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainEvent
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/help/HelpItem.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/help/HelpItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/help/HelpItem.kt
index 80757c26..6ec84580 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/help/HelpItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.help
+package ua.acclorite.book_story.ui.help
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.animateFloatAsState
@@ -38,11 +38,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.model.Position
-import ua.acclorite.book_story.presentation.common.util.noRippleClickable
-import ua.acclorite.book_story.presentation.help.model.HelpTip
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.model.Position
+import ua.acclorite.book_story.ui.common.util.noRippleClickable
+import ua.acclorite.book_story.ui.help.model.HelpTip
 
 @Composable
 fun HelpItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/help/HelpLayout.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/presentation/help/HelpLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/help/HelpLayout.kt
index 6be890be..19bbe26d 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/help/HelpLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.help
+package ua.acclorite.book_story.ui.help
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
@@ -14,9 +14,9 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
-import ua.acclorite.book_story.presentation.common.constants.provideHelpTips
-import ua.acclorite.book_story.presentation.common.model.Position
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.constants.provideHelpTips
+import ua.acclorite.book_story.ui.common.model.Position
 
 @Composable
 fun HelpLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/help/HelpScaffold.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/help/HelpScaffold.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/help/HelpScaffold.kt
index c1b53f3c..80d54161 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpScaffold.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/help/HelpScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.help
+package ua.acclorite.book_story.ui.help
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
@@ -18,7 +18,7 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import ua.acclorite.book_story.ui.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainEvent
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/help/HelpTopBar.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/presentation/help/HelpTopBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/help/HelpTopBar.kt
index 5a9feb4f..7aca4824 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/help/HelpTopBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/help/HelpTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.help
+package ua.acclorite.book_story.ui.help
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.RestartAlt
@@ -16,9 +16,9 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.IconButton
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton
+import ua.acclorite.book_story.ui.common.components.common.IconButton
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/help/model/HelpTip.kt b/app/src/main/java/ua/acclorite/book_story/ui/help/model/HelpTip.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/presentation/help/model/HelpTip.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/help/model/HelpTip.kt
index 8408e614..ce05362c 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/help/model/HelpTip.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/help/model/HelpTip.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.help.model
+package ua.acclorite.book_story.ui.help.model
 
 import androidx.annotation.StringRes
 import androidx.compose.runtime.Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryBackHandler.kt b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryBackHandler.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryBackHandler.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/history/HistoryBackHandler.kt
index 062bffe2..7d3cbac5 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryBackHandler.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryBackHandler.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.history
+package ua.acclorite.book_story.ui.history
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.ui.history.HistoryEvent
+import ua.acclorite.book_story.presentation.history.HistoryEvent
 
 @Composable
 fun HistoryBackHandler(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryContent.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryContent.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/history/HistoryContent.kt
index b855da51..b22092d4 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.history
+package ua.acclorite.book_story.ui.history
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material.ExperimentalMaterialApi
@@ -13,8 +13,8 @@ import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.focus.FocusRequester
 import ua.acclorite.book_story.core.Dialog
-import ua.acclorite.book_story.ui.history.HistoryEvent
-import ua.acclorite.book_story.ui.history.model.GroupedHistory
+import ua.acclorite.book_story.presentation.history.HistoryEvent
+import ua.acclorite.book_story.presentation.history.model.GroupedHistory
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryDeleteWholeHistoryDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryDeleteWholeHistoryDialog.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryDeleteWholeHistoryDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/history/HistoryDeleteWholeHistoryDialog.kt
index 4fc1eef4..2d6528ca 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryDeleteWholeHistoryDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryDeleteWholeHistoryDialog.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.history
+package ua.acclorite.book_story.ui.history
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.DeleteOutline
@@ -12,8 +12,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.dialog.Dialog
-import ua.acclorite.book_story.ui.history.HistoryEvent
+import ua.acclorite.book_story.presentation.history.HistoryEvent
+import ua.acclorite.book_story.ui.common.components.dialog.Dialog
 
 @Composable
 fun HistoryDeleteWholeHistoryDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryDialog.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/history/HistoryDialog.kt
index 6751768c..3c1b9dbb 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryDialog.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.history
+package ua.acclorite.book_story.ui.history
 
 import androidx.compose.runtime.Composable
 import ua.acclorite.book_story.core.Dialog
-import ua.acclorite.book_story.ui.history.HistoryEvent
-import ua.acclorite.book_story.ui.history.HistoryScreen
+import ua.acclorite.book_story.presentation.history.HistoryEvent
+import ua.acclorite.book_story.presentation.history.HistoryScreen
 
 @Composable
 fun HistoryDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEmptyPlaceholder.kt b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryEmptyPlaceholder.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEmptyPlaceholder.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/history/HistoryEmptyPlaceholder.kt
index 81daeccb..683badf7 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEmptyPlaceholder.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryEmptyPlaceholder.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.history
+package ua.acclorite.book_story.ui.history
 
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeOut
@@ -15,9 +15,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility
-import ua.acclorite.book_story.presentation.common.components.placeholder.EmptyPlaceholder
-import ua.acclorite.book_story.ui.theme.Transitions
+import ua.acclorite.book_story.presentation.theme.Transitions
+import ua.acclorite.book_story.ui.common.components.common.AnimatedVisibility
+import ua.acclorite.book_story.ui.common.components.placeholder.EmptyPlaceholder
 
 @Composable
 fun BoxScope.HistoryEmptyPlaceholder(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryItem.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/history/HistoryItem.kt
index 8989e215..582201a5 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.history
+package ua.acclorite.book_story.ui.history
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -37,10 +37,10 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.domain.history.History
-import ua.acclorite.book_story.presentation.common.components.common.AsyncCoverImage
-import ua.acclorite.book_story.presentation.common.components.common.IconButton
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.util.noRippleClickable
+import ua.acclorite.book_story.ui.common.components.common.AsyncCoverImage
+import ua.acclorite.book_story.ui.common.components.common.IconButton
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.util.noRippleClickable
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryLayout.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/history/HistoryLayout.kt
index 1603dadf..0a5d6899 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.history
+package ua.acclorite.book_story.ui.history
 
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -17,13 +17,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
-import ua.acclorite.book_story.presentation.common.constants.providePrimaryScrollbar
-import ua.acclorite.book_story.presentation.common.util.LocalActivity
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryTitle
-import ua.acclorite.book_story.ui.history.HistoryEvent
-import ua.acclorite.book_story.ui.history.model.GroupedHistory
-import ua.acclorite.book_story.ui.theme.DefaultTransition
+import ua.acclorite.book_story.presentation.history.HistoryEvent
+import ua.acclorite.book_story.presentation.history.model.GroupedHistory
+import ua.acclorite.book_story.presentation.theme.DefaultTransition
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.constants.providePrimaryScrollbar
+import ua.acclorite.book_story.ui.common.util.LocalActivity
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle
 
 @Composable
 fun HistoryLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryRefreshIndicator.kt b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryRefreshIndicator.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryRefreshIndicator.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/history/HistoryRefreshIndicator.kt
index 0ff86ed1..b7ad05f7 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryRefreshIndicator.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryRefreshIndicator.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.history
+package ua.acclorite.book_story.ui.history
 
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.material.ExperimentalMaterialApi
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryScaffold.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryScaffold.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/history/HistoryScaffold.kt
index 0d91e723..a4871aca 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryScaffold.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.history
+package ua.acclorite.book_story.ui.history
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
@@ -19,9 +19,9 @@ import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
-import ua.acclorite.book_story.presentation.common.components.common.Snackbar
-import ua.acclorite.book_story.ui.history.HistoryEvent
-import ua.acclorite.book_story.ui.history.model.GroupedHistory
+import ua.acclorite.book_story.presentation.history.HistoryEvent
+import ua.acclorite.book_story.presentation.history.model.GroupedHistory
+import ua.acclorite.book_story.ui.common.components.common.Snackbar
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryTopBar.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryTopBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/history/HistoryTopBar.kt
index 0bd8e819..fccfc084 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryTopBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.history
+package ua.acclorite.book_story.ui.history
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
@@ -18,13 +18,13 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.IconButton
-import ua.acclorite.book_story.presentation.common.components.common.SearchTextField
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBar
-import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBarData
-import ua.acclorite.book_story.presentation.navigator.NavigatorIconButton
-import ua.acclorite.book_story.ui.history.HistoryEvent
+import ua.acclorite.book_story.presentation.history.HistoryEvent
+import ua.acclorite.book_story.ui.common.components.common.IconButton
+import ua.acclorite.book_story.ui.common.components.common.SearchTextField
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.top_bar.TopAppBar
+import ua.acclorite.book_story.ui.common.components.top_bar.TopAppBarData
+import ua.acclorite.book_story.ui.navigator.NavigatorIconButton
 
 
 @OptIn(ExperimentalMaterial3Api::class)
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryBackHandler.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryBackHandler.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryBackHandler.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryBackHandler.kt
index 50931fd0..4cba5d20 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryBackHandler.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryBackHandler.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.pager.PagerState
@@ -14,9 +14,9 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.util.LocalActivity
-import ua.acclorite.book_story.presentation.common.util.showToast
-import ua.acclorite.book_story.ui.library.LibraryEvent
+import ua.acclorite.book_story.presentation.library.LibraryEvent
+import ua.acclorite.book_story.ui.common.util.LocalActivity
+import ua.acclorite.book_story.ui.common.util.showToast
 
 @Composable
 fun LibraryBackHandler(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryBottomSheet.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryBottomSheet.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryBottomSheet.kt
index f46213d4..9c038893 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryBottomSheet.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryBottomSheet.kt
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.runtime.Composable
 import ua.acclorite.book_story.core.BottomSheet
 import ua.acclorite.book_story.domain.library.Category
 import ua.acclorite.book_story.domain.library.CategorySort
-import ua.acclorite.book_story.ui.library.LibraryEvent
-import ua.acclorite.book_story.ui.library.LibraryScreen
-import ua.acclorite.book_story.ui.library.model.LibrarySortOrder
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.settings.SettingsEvent
+import ua.acclorite.book_story.presentation.library.LibraryEvent
+import ua.acclorite.book_story.presentation.library.LibraryScreen
+import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.settings.SettingsEvent
 
 @Composable
 fun LibraryBottomSheet(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryContent.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryContent.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryContent.kt
index b27cfa9d..05a932b2 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.material.ExperimentalMaterialApi
@@ -15,13 +15,13 @@ import ua.acclorite.book_story.core.BottomSheet
 import ua.acclorite.book_story.core.Dialog
 import ua.acclorite.book_story.domain.library.Category
 import ua.acclorite.book_story.domain.library.CategorySort
-import ua.acclorite.book_story.ui.library.LibraryEvent
-import ua.acclorite.book_story.ui.library.model.LibraryLayout
-import ua.acclorite.book_story.ui.library.model.LibrarySortOrder
-import ua.acclorite.book_story.ui.library.model.LibraryTitlePosition
-import ua.acclorite.book_story.ui.library.model.SelectableBook
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.settings.SettingsEvent
+import ua.acclorite.book_story.presentation.library.LibraryEvent
+import ua.acclorite.book_story.presentation.library.model.LibraryLayout
+import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder
+import ua.acclorite.book_story.presentation.library.model.LibraryTitlePosition
+import ua.acclorite.book_story.presentation.library.model.SelectableBook
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.settings.SettingsEvent
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryDeleteDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryDeleteDialog.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryDeleteDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryDeleteDialog.kt
index 7616edf0..e7c0ea90 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryDeleteDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryDeleteDialog.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.DeleteOutline
@@ -12,8 +12,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.dialog.Dialog
-import ua.acclorite.book_story.ui.library.LibraryEvent
+import ua.acclorite.book_story.presentation.library.LibraryEvent
+import ua.acclorite.book_story.ui.common.components.dialog.Dialog
 
 @Composable
 fun LibraryDeleteDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryDialog.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryDialog.kt
index 37e5696b..bf01e7ff 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryDialog.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.compose.runtime.Composable
 import ua.acclorite.book_story.core.Dialog
 import ua.acclorite.book_story.domain.library.Category
-import ua.acclorite.book_story.ui.library.LibraryEvent
-import ua.acclorite.book_story.ui.library.LibraryScreen
-import ua.acclorite.book_story.ui.library.model.SelectableBook
+import ua.acclorite.book_story.presentation.library.LibraryEvent
+import ua.acclorite.book_story.presentation.library.LibraryScreen
+import ua.acclorite.book_story.presentation.library.model.SelectableBook
 
 @Composable
 fun LibraryDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEmptyPlaceholder.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEmptyPlaceholder.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEmptyPlaceholder.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEmptyPlaceholder.kt
index 87376563..6820d963 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEmptyPlaceholder.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEmptyPlaceholder.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.tween
@@ -16,8 +16,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.placeholder.EmptyPlaceholder
-import ua.acclorite.book_story.ui.theme.Transitions
+import ua.acclorite.book_story.presentation.theme.Transitions
+import ua.acclorite.book_story.ui.common.components.placeholder.EmptyPlaceholder
 
 @Composable
 fun BoxScope.LibraryEmptyPlaceholder(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryFilterBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryFilterBottomSheet.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryFilterBottomSheet.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryFilterBottomSheet.kt
index 6deaa11a..6571c8f5 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryFilterBottomSheet.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryFilterBottomSheet.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxHeight
@@ -24,15 +24,15 @@ import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
 import ua.acclorite.book_story.domain.library.Category
 import ua.acclorite.book_story.domain.library.CategorySort
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
-import ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet.ModalBottomSheet
-import ua.acclorite.book_story.presentation.settings.library.display.LibraryDisplaySubcategory
-import ua.acclorite.book_story.presentation.settings.library.sort.components.LibrarySortOption
-import ua.acclorite.book_story.presentation.settings.library.tabs.LibraryTabsSubcategory
-import ua.acclorite.book_story.ui.library.LibraryEvent
-import ua.acclorite.book_story.ui.library.model.LibrarySortOrder
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.settings.SettingsEvent
+import ua.acclorite.book_story.presentation.library.LibraryEvent
+import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.settings.SettingsEvent
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.components.modal_bottom_sheet.ModalBottomSheet
+import ua.acclorite.book_story.ui.settings.library.display.LibraryDisplaySubcategory
+import ua.acclorite.book_story.ui.settings.library.sort.components.LibrarySortOption
+import ua.acclorite.book_story.ui.settings.library.tabs.LibraryTabsSubcategory
 
 private var initialPage = 0
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryFilterBottomSheetTabRow.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryFilterBottomSheetTabRow.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryFilterBottomSheetTabRow.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryFilterBottomSheetTabRow.kt
index fa25bb27..a6137384 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryFilterBottomSheetTabRow.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryFilterBottomSheetTabRow.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet.ModalBottomSheetTabRow
+import ua.acclorite.book_story.ui.common.components.modal_bottom_sheet.ModalBottomSheetTabRow
 
 @Composable
 fun LibraryFilterBottomSheetTabRow(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryGridItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryGridItem.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryGridItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryGridItem.kt
index b451d448..5e1d2538 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryGridItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryGridItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
@@ -39,11 +39,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.AsyncCoverImage
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.util.calculateProgress
-import ua.acclorite.book_story.ui.library.model.LibraryTitlePosition
-import ua.acclorite.book_story.ui.library.model.SelectableBook
+import ua.acclorite.book_story.presentation.library.model.LibraryTitlePosition
+import ua.acclorite.book_story.presentation.library.model.SelectableBook
+import ua.acclorite.book_story.ui.common.components.common.AsyncCoverImage
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.util.calculateProgress
 
 @Composable
 fun LibraryGridItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryGridLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryGridLayout.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryGridLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryGridLayout.kt
index 11c483c4..12ccdd85 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryGridLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryGridLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
@@ -14,9 +14,9 @@ import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.LazyVerticalGridWithScrollbar
-import ua.acclorite.book_story.presentation.common.constants.providePrimaryScrollbar
-import ua.acclorite.book_story.ui.library.model.SelectableBook
+import ua.acclorite.book_story.presentation.library.model.SelectableBook
+import ua.acclorite.book_story.ui.common.components.common.LazyVerticalGridWithScrollbar
+import ua.acclorite.book_story.ui.common.constants.providePrimaryScrollbar
 
 @Composable
 fun LibraryGridLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryItem.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryItem.kt
index ad6e1b4e..e62ebc37 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryItem.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.ui.library.model.LibraryLayout
-import ua.acclorite.book_story.ui.library.model.LibraryTitlePosition
-import ua.acclorite.book_story.ui.library.model.SelectableBook
+import ua.acclorite.book_story.presentation.library.model.LibraryLayout
+import ua.acclorite.book_story.presentation.library.model.LibraryTitlePosition
+import ua.acclorite.book_story.presentation.library.model.SelectableBook
 
 @Composable
 fun LibraryItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryLayout.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryLayout.kt
index 9a72ee89..695187ce 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryLayout.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.ui.library.model.LibraryLayout
-import ua.acclorite.book_story.ui.library.model.SelectableBook
+import ua.acclorite.book_story.presentation.library.model.LibraryLayout
+import ua.acclorite.book_story.presentation.library.model.SelectableBook
 
 @Composable
 fun LibraryLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryListItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryListItem.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryListItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryListItem.kt
index c29cdd69..926dc8be 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryListItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryListItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
@@ -33,10 +33,10 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.AsyncCoverImage
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.util.calculateProgress
-import ua.acclorite.book_story.ui.library.model.SelectableBook
+import ua.acclorite.book_story.presentation.library.model.SelectableBook
+import ua.acclorite.book_story.ui.common.components.common.AsyncCoverImage
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.util.calculateProgress
 
 @Composable
 fun LibraryListItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryListLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryListLayout.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryListLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryListLayout.kt
index 0ebdd8fd..222bae43 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryListLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryListLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
@@ -13,9 +13,9 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
-import ua.acclorite.book_story.presentation.common.constants.providePrimaryScrollbar
-import ua.acclorite.book_story.ui.library.model.SelectableBook
+import ua.acclorite.book_story.presentation.library.model.SelectableBook
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.constants.providePrimaryScrollbar
 
 @Composable
 fun LibraryListLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryMoveDialog.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryMoveDialog.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryMoveDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryMoveDialog.kt
index fd23d79d..61712c51 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryMoveDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryMoveDialog.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.items
@@ -19,11 +19,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.domain.library.Category
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.components.dialog.CheckboxDialogItem
-import ua.acclorite.book_story.presentation.common.components.dialog.Dialog
-import ua.acclorite.book_story.ui.library.LibraryEvent
-import ua.acclorite.book_story.ui.library.model.SelectableBook
+import ua.acclorite.book_story.presentation.library.LibraryEvent
+import ua.acclorite.book_story.presentation.library.model.SelectableBook
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.dialog.CheckboxDialogItem
+import ua.acclorite.book_story.ui.common.components.dialog.Dialog
 
 @Composable
 fun LibraryMoveDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryPager.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryPager.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryPager.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryPager.kt
index 8a5fdc53..cbfcdc35 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryPager.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryPager.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
@@ -16,13 +16,13 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import ua.acclorite.book_story.domain.library.Category
 import ua.acclorite.book_story.domain.library.CategorySort
-import ua.acclorite.book_story.presentation.common.util.compareByWithOrder
-import ua.acclorite.book_story.ui.library.LibraryEvent
-import ua.acclorite.book_story.ui.library.model.LibraryLayout
-import ua.acclorite.book_story.ui.library.model.LibrarySortOrder
-import ua.acclorite.book_story.ui.library.model.LibraryTitlePosition
-import ua.acclorite.book_story.ui.library.model.SelectableBook
-import ua.acclorite.book_story.ui.theme.DefaultTransition
+import ua.acclorite.book_story.presentation.library.LibraryEvent
+import ua.acclorite.book_story.presentation.library.model.LibraryLayout
+import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder
+import ua.acclorite.book_story.presentation.library.model.LibraryTitlePosition
+import ua.acclorite.book_story.presentation.library.model.SelectableBook
+import ua.acclorite.book_story.presentation.theme.DefaultTransition
+import ua.acclorite.book_story.ui.common.util.compareByWithOrder
 
 @Composable
 fun LibraryPager(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryRefreshIndicator.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryRefreshIndicator.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryRefreshIndicator.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryRefreshIndicator.kt
index a8bbc650..04baaa75 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryRefreshIndicator.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryRefreshIndicator.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.material.ExperimentalMaterialApi
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryScaffold.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryScaffold.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryScaffold.kt
index 20649e52..a26c736e 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryScaffold.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
@@ -20,11 +20,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import ua.acclorite.book_story.domain.library.Category
 import ua.acclorite.book_story.domain.library.CategorySort
-import ua.acclorite.book_story.ui.library.LibraryEvent
-import ua.acclorite.book_story.ui.library.model.LibraryLayout
-import ua.acclorite.book_story.ui.library.model.LibrarySortOrder
-import ua.acclorite.book_story.ui.library.model.LibraryTitlePosition
-import ua.acclorite.book_story.ui.library.model.SelectableBook
+import ua.acclorite.book_story.presentation.library.LibraryEvent
+import ua.acclorite.book_story.presentation.library.model.LibraryLayout
+import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder
+import ua.acclorite.book_story.presentation.library.model.LibraryTitlePosition
+import ua.acclorite.book_story.presentation.library.model.SelectableBook
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryTabs.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTabs.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryTabs.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTabs.kt
index a4e0ec83..9cde6e16 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryTabs.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTabs.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.foundation.background
@@ -30,7 +30,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
 import ua.acclorite.book_story.domain.library.Category
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun LibraryTabs(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTopBar.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryTopBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTopBar.kt
index eead481c..a3f8762f 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryTopBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package ua.acclorite.book_story.ui.library
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.Spring
@@ -41,15 +41,15 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.domain.library.Category
-import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility
-import ua.acclorite.book_story.presentation.common.components.common.IconButton
-import ua.acclorite.book_story.presentation.common.components.common.SearchTextField
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBar
-import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBarData
-import ua.acclorite.book_story.presentation.navigator.NavigatorIconButton
-import ua.acclorite.book_story.ui.library.LibraryEvent
-import ua.acclorite.book_story.ui.library.model.SelectableBook
+import ua.acclorite.book_story.presentation.library.LibraryEvent
+import ua.acclorite.book_story.presentation.library.model.SelectableBook
+import ua.acclorite.book_story.ui.common.components.common.AnimatedVisibility
+import ua.acclorite.book_story.ui.common.components.common.IconButton
+import ua.acclorite.book_story.ui.common.components.common.SearchTextField
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.top_bar.TopAppBar
+import ua.acclorite.book_story.ui.common.components.top_bar.TopAppBarData
+import ua.acclorite.book_story.ui.navigator.NavigatorIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoContent.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoContent.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoContent.kt
index 9920e87a..84024a68 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoContent.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.license_info
+package ua.acclorite.book_story.ui.license_info
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import com.mikepenz.aboutlibraries.entity.Library
-import ua.acclorite.book_story.ui.about.AboutEvent
+import ua.acclorite.book_story.presentation.about.AboutEvent
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoItem.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoItem.kt
index 2aa2a6f6..b6e8a67c 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.license_info
+package ua.acclorite.book_story.ui.license_info
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -22,8 +22,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
 import com.mikepenz.aboutlibraries.entity.License
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.ui.theme.SlidingTransition
+import ua.acclorite.book_story.presentation.theme.SlidingTransition
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun LazyItemScope.LicenseInfoItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoLayout.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoLayout.kt
index 991ca632..5b03c8e0 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.license_info
+package ua.acclorite.book_story.ui.license_info
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
@@ -16,7 +16,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.mikepenz.aboutlibraries.entity.Library
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun LicenseInfoLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoScaffold.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoScaffold.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoScaffold.kt
index b05047cc..79e8c54f 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoScaffold.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.license_info
+package ua.acclorite.book_story.ui.license_info
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
@@ -19,8 +19,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import com.mikepenz.aboutlibraries.entity.Library
-import ua.acclorite.book_story.ui.about.AboutEvent
-import ua.acclorite.book_story.ui.theme.DefaultTransition
+import ua.acclorite.book_story.presentation.about.AboutEvent
+import ua.acclorite.book_story.presentation.theme.DefaultTransition
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoTopBar.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoTopBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoTopBar.kt
index 38aea410..805e68e4 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoTopBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.license_info
+package ua.acclorite.book_story.ui.license_info
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Language
@@ -17,10 +17,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import com.mikepenz.aboutlibraries.entity.Library
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.IconButton
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton
-import ua.acclorite.book_story.ui.about.AboutEvent
+import ua.acclorite.book_story.presentation.about.AboutEvent
+import ua.acclorite.book_story.ui.common.components.common.IconButton
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesContent.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesContent.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesContent.kt
index cc4de6a1..2152c15d 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.licenses
+package ua.acclorite.book_story.ui.licenses
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesItem.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesItem.kt
index 9b1a9c47..049ea6b9 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.licenses
+package ua.acclorite.book_story.ui.licenses
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -29,7 +29,7 @@ import androidx.compose.ui.unit.dp
 import com.mikepenz.aboutlibraries.entity.Library
 import com.mikepenz.aboutlibraries.ui.compose.m3.util.author
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun LicensesItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesLayout.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesLayout.kt
index d8f15fa5..044c352d 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.licenses
+package ua.acclorite.book_story.ui.licenses
 
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
@@ -17,8 +17,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.mikepenz.aboutlibraries.entity.Library
-import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.components.common.AnimatedVisibility
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun LicensesLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesScaffold.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesScaffold.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesScaffold.kt
index 62db9ebc..432a6b5c 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesScaffold.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.licenses
+package ua.acclorite.book_story.ui.licenses
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesTopBar.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesTopBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesTopBar.kt
index fbdb180d..946c298f 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesTopBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.licenses
+package ua.acclorite.book_story.ui.licenses
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LargeTopAppBar
@@ -14,8 +14,8 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/main/MainActivityKeyboardManager.kt b/app/src/main/java/ua/acclorite/book_story/ui/main/MainActivityKeyboardManager.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/main/MainActivityKeyboardManager.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/main/MainActivityKeyboardManager.kt
index e9ebb3f3..faf65d2e 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/main/MainActivityKeyboardManager.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/main/MainActivityKeyboardManager.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.main
+package ua.acclorite.book_story.ui.main
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.ime
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/navigator/Navigator.kt b/app/src/main/java/ua/acclorite/book_story/ui/navigator/Navigator.kt
index 49b6352d..ae5b165b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/navigator/Navigator.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/navigator/Navigator.kt
@@ -6,76 +6,70 @@
 
 package ua.acclorite.book_story.ui.navigator
 
-import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
+import androidx.activity.compose.BackHandler
+import androidx.activity.viewModels
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.ContentTransform
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.Modifier
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import dagger.hilt.android.lifecycle.withCreationCallback
+import kotlinx.coroutines.Dispatchers
+import ua.acclorite.book_story.presentation.navigator.Navigator
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.presentation.navigator.StackEvent
+import ua.acclorite.book_story.ui.common.util.LocalActivity
 
-@HiltViewModel(assistedFactory = Navigator.Factory::class)
-class Navigator @AssistedInject constructor(
-    private val savedStateHandle: SavedStateHandle,
-    @Assisted private val initialScreen: Screen
-) : ViewModel() {
+@Composable
+fun rememberNavigator(initialScreen: Screen): Navigator {
+    val activity = LocalActivity.current
+    return activity.viewModels<Navigator>(
+        extrasProducer = {
+            activity.defaultViewModelCreationExtras
+                .withCreationCallback<Navigator.Factory> { factory ->
+                    factory.create(initialScreen)
+                }
+        }
+    ).value
+}
 
-    val items = savedStateHandle.getStateFlow("items", mutableListOf(initialScreen))
-    private fun StateFlow<MutableList<Screen>>.removeLast() {
-        savedStateHandle["items"] = value.dropLast(1)
-    }
-
-    private fun StateFlow<MutableList<Screen>>.add(item: Screen) {
-        savedStateHandle["items"] = value + item
-    }
-
-    val lastItem = items.map {
-        it.lastOrNull() ?: initialScreen
-    }.stateIn(
-        scope = viewModelScope,
-        started = SharingStarted.Eagerly,
-        initialValue = initialScreen
+@Composable
+fun Navigator(
+    modifier: Modifier = Modifier,
+    initialScreen: Screen,
+    transitionSpec: AnimatedContentTransitionScope<Screen>.(lastEvent: StackEvent) -> ContentTransform,
+    contentKey: (Screen) -> Any? = { it },
+    backHandlerEnabled: (Screen) -> Boolean = { true },
+    content: @Composable (currentScreen: Screen) -> Unit
+) {
+    val navigator = rememberNavigator(initialScreen = initialScreen)
+    val currentScreen = navigator.lastItem.collectAsStateWithLifecycle(
+        context = Dispatchers.Main.immediate
+    )
+    val lastEvent = navigator.lastEvent.collectAsStateWithLifecycle(
+        context = Dispatchers.Main.immediate
     )
 
-    val lastEvent = savedStateHandle.getStateFlow("stack_event", StackEvent.Default)
-    private fun changeStackEvent(stackEvent: StackEvent) {
-        savedStateHandle["stack_event"] = stackEvent
-    }
-
-
-    fun push(
-        targetScreen: Screen,
-        popping: Boolean = false,
-        saveInBackStack: Boolean = true
-    ) {
-        if (lastItem.value::class == targetScreen::class) return
-        if (!saveInBackStack) items.removeLast()
-
-        changeStackEvent(
-            if (popping) StackEvent.Pop
-            else StackEvent.Default
+    CompositionLocalProvider(LocalNavigator provides navigator) {
+        AnimatedContent(
+            modifier = modifier
+                .fillMaxSize()
+                .background(MaterialTheme.colorScheme.surface),
+            targetState = currentScreen.value,
+            transitionSpec = {
+                transitionSpec(this, lastEvent.value)
+            },
+            contentKey = contentKey,
+            content = { content(it) }
         )
-
-        if (lastItem.value::class == targetScreen::class) items.removeLast()
-        items.add(targetScreen)
     }
 
-    fun pop(popping: Boolean = true) {
-        if (items.value.count() > 1) {
-            changeStackEvent(
-                if (popping) StackEvent.Pop
-                else StackEvent.Default
-            )
-            items.removeLast()
-        }
-    }
-
-    @AssistedFactory
-    interface Factory {
-        fun create(startScreen: Screen): Navigator
+    BackHandler(enabled = backHandlerEnabled.invoke(currentScreen.value)) {
+        navigator.pop()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBackIconButton.kt b/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorBackIconButton.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBackIconButton.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorBackIconButton.kt
index 228fded7..3ccf7889 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBackIconButton.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorBackIconButton.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.navigator
+package ua.acclorite.book_story.ui.navigator
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.ArrowBack
 import androidx.compose.runtime.Composable
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.IconButton
+import ua.acclorite.book_story.ui.common.components.common.IconButton
 
 @Composable
 fun NavigatorBackIconButton(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorBottomSheet.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBottomSheet.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorBottomSheet.kt
index cf7e430f..56253af7 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBottomSheet.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorBottomSheet.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.navigator
+package ua.acclorite.book_story.ui.navigator
 
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -16,11 +16,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.channels.Channel
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet.ModalBottomSheet
-import ua.acclorite.book_story.presentation.common.model.Position
-import ua.acclorite.book_story.ui.about.AboutScreen
-import ua.acclorite.book_story.ui.help.HelpScreen
-import ua.acclorite.book_story.ui.settings.SettingsScreen
+import ua.acclorite.book_story.presentation.about.AboutScreen
+import ua.acclorite.book_story.presentation.help.HelpScreen
+import ua.acclorite.book_story.presentation.settings.SettingsScreen
+import ua.acclorite.book_story.ui.common.components.modal_bottom_sheet.ModalBottomSheet
+import ua.acclorite.book_story.ui.common.model.Position
 
 val navigatorBottomSheetChannel = Channel<Boolean>(Channel.CONFLATED)
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBottomSheetItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorBottomSheetItem.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBottomSheetItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorBottomSheetItem.kt
index de52b5aa..b728b759 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorBottomSheetItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorBottomSheetItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.navigator
+package ua.acclorite.book_story.ui.navigator
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -21,8 +21,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.model.Position
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.model.Position
 
 @Composable
 fun NavigatorBottomSheetItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorComposition.kt b/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorComposition.kt
similarity index 73%
rename from app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorComposition.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorComposition.kt
index fa3f731d..b89c2218 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorComposition.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorComposition.kt
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.navigator
+package ua.acclorite.book_story.ui.navigator
 
 import androidx.compose.runtime.compositionLocalOf
-import ua.acclorite.book_story.ui.navigator.Navigator
+import ua.acclorite.book_story.presentation.navigator.Navigator
 
 val LocalNavigator = compositionLocalOf<Navigator> { error("Navigator was not passed.") }
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorIconButton.kt b/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorIconButton.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorIconButton.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorIconButton.kt
index 9e375062..42351d5f 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorIconButton.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorIconButton.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.navigator
+package ua.acclorite.book_story.ui.navigator
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.runtime.Composable
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.IconButton
+import ua.acclorite.book_story.ui.common.components.common.IconButton
 
 @Composable
 fun NavigatorIconButton(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorTabs.kt b/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorTabs.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorTabs.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorTabs.kt
index a31a2139..d181c2a8 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorTabs.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorTabs.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.navigator
+package ua.acclorite.book_story.ui.navigator
 
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedContentTransitionScope
@@ -26,8 +26,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.coroutines.flow.receiveAsFlow
-import ua.acclorite.book_story.presentation.common.util.LocalActivity
-import ua.acclorite.book_story.ui.navigator.Screen
+import ua.acclorite.book_story.presentation.navigator.Screen
+import ua.acclorite.book_story.ui.common.util.LocalActivity
 
 @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBackHandler.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBackHandler.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBackHandler.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBackHandler.kt
index 1d52c3eb..f603c853 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBackHandler.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBackHandler.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.presentation.common.util.LocalActivity
-import ua.acclorite.book_story.ui.reader.ReaderEvent
+import ua.acclorite.book_story.presentation.reader.ReaderEvent
+import ua.acclorite.book_story.ui.common.util.LocalActivity
 
 @Composable
 fun ReaderBackHandler(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBar.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBar.kt
index c0c288ec..908102c0 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -32,14 +32,14 @@ import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.domain.library.Book
 import ua.acclorite.book_story.domain.reader.ReaderText
-import ua.acclorite.book_story.presentation.common.components.common.IconButton
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.model.Direction
-import ua.acclorite.book_story.presentation.common.util.noRippleClickable
-import ua.acclorite.book_story.ui.reader.ReaderEvent
-import ua.acclorite.book_story.ui.reader.model.Checkpoint
-import ua.acclorite.book_story.ui.theme.HorizontalExpandingTransition
-import ua.acclorite.book_story.ui.theme.readerBarsColor
+import ua.acclorite.book_story.presentation.reader.ReaderEvent
+import ua.acclorite.book_story.presentation.reader.model.Checkpoint
+import ua.acclorite.book_story.presentation.theme.HorizontalExpandingTransition
+import ua.acclorite.book_story.presentation.theme.readerBarsColor
+import ua.acclorite.book_story.ui.common.components.common.IconButton
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.model.Direction
+import ua.acclorite.book_story.ui.common.util.noRippleClickable
 
 @Composable
 fun ReaderBottomBar(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomBarSlider.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBarSlider.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomBarSlider.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBarSlider.kt
index fddc0cc4..f7097f31 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomBarSlider.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBarSlider.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material3.MaterialTheme
@@ -12,7 +12,7 @@ import androidx.compose.material3.Slider
 import androidx.compose.material3.SliderDefaults
 import androidx.compose.runtime.Composable
 import ua.acclorite.book_story.domain.library.Book
-import ua.acclorite.book_story.ui.reader.ReaderEvent
+import ua.acclorite.book_story.presentation.reader.ReaderEvent
 
 @Composable
 fun ReaderBottomBarSlider(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomBarSliderIndicator.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBarSliderIndicator.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomBarSliderIndicator.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBarSliderIndicator.kt
index bf8654b5..27504a6c 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomBarSliderIndicator.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBarSliderIndicator.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomSheet.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomSheet.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomSheet.kt
index a71e545b..3f472eae 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderBottomSheet.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomSheet.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.compose.runtime.Composable
 import ua.acclorite.book_story.core.BottomSheet
-import ua.acclorite.book_story.ui.reader.ReaderEvent
-import ua.acclorite.book_story.ui.reader.ReaderScreen
+import ua.acclorite.book_story.presentation.reader.ReaderEvent
+import ua.acclorite.book_story.presentation.reader.ReaderScreen
 
 @Composable
 fun ReaderBottomSheet(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderChaptersDrawer.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderChaptersDrawer.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderChaptersDrawer.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderChaptersDrawer.kt
index 3ef2c33e..8c6c6a6f 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderChaptersDrawer.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderChaptersDrawer.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.layout.Spacer
@@ -23,15 +23,15 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.domain.reader.ReaderText.Chapter
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.components.modal_drawer.ModalDrawer
-import ua.acclorite.book_story.presentation.common.components.modal_drawer.ModalDrawerSelectableItem
-import ua.acclorite.book_story.presentation.common.components.modal_drawer.ModalDrawerTitleItem
-import ua.acclorite.book_story.presentation.common.util.calculateProgress
-import ua.acclorite.book_story.presentation.common.util.noRippleClickable
-import ua.acclorite.book_story.presentation.reader.model.ExpandableChapter
-import ua.acclorite.book_story.ui.reader.ReaderEvent
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.reader.ReaderEvent
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.modal_drawer.ModalDrawer
+import ua.acclorite.book_story.ui.common.components.modal_drawer.ModalDrawerSelectableItem
+import ua.acclorite.book_story.ui.common.components.modal_drawer.ModalDrawerTitleItem
+import ua.acclorite.book_story.ui.common.util.calculateProgress
+import ua.acclorite.book_story.ui.common.util.noRippleClickable
+import ua.acclorite.book_story.ui.reader.model.ExpandableChapter
 
 @Composable
 fun ReaderChaptersDrawer(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderColorPresetChange.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderColorPresetChange.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderColorPresetChange.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderColorPresetChange.kt
index 03a88de3..d3ed74ef 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderColorPresetChange.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderColorPresetChange.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.compose.foundation.gestures.detectHorizontalDragGestures
 import androidx.compose.runtime.Composable
@@ -13,7 +13,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalContext
-import ua.acclorite.book_story.ui.settings.SettingsEvent
+import ua.acclorite.book_story.presentation.settings.SettingsEvent
 
 @Composable
 fun Modifier.readerColorPresetChange(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderContent.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderContent.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderContent.kt
index c01ad57a..58369ae3 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.lazy.LazyListState
@@ -24,14 +24,14 @@ import ua.acclorite.book_story.core.ui.UIText
 import ua.acclorite.book_story.domain.library.Book
 import ua.acclorite.book_story.domain.reader.ReaderText
 import ua.acclorite.book_story.domain.reader.ReaderText.Chapter
-import ua.acclorite.book_story.presentation.reader.model.FontWithName
-import ua.acclorite.book_story.ui.main.model.HorizontalAlignment
-import ua.acclorite.book_story.ui.reader.ReaderEvent
-import ua.acclorite.book_story.ui.reader.model.Checkpoint
-import ua.acclorite.book_story.ui.reader.model.ReaderFontThickness
-import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture
-import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment
-import ua.acclorite.book_story.ui.settings.SettingsEvent
+import ua.acclorite.book_story.presentation.main.model.HorizontalAlignment
+import ua.acclorite.book_story.presentation.reader.ReaderEvent
+import ua.acclorite.book_story.presentation.reader.model.Checkpoint
+import ua.acclorite.book_story.presentation.reader.model.ReaderFontThickness
+import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture
+import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment
+import ua.acclorite.book_story.presentation.settings.SettingsEvent
+import ua.acclorite.book_story.ui.reader.model.FontWithName
 
 @Composable
 fun ReaderContent(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderDrawer.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderDrawer.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderDrawer.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderDrawer.kt
index 8c9e48a2..c71e1450 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderDrawer.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderDrawer.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.compose.runtime.Composable
 import ua.acclorite.book_story.core.Drawer
 import ua.acclorite.book_story.domain.reader.ReaderText.Chapter
-import ua.acclorite.book_story.ui.reader.ReaderEvent
-import ua.acclorite.book_story.ui.reader.ReaderScreen
+import ua.acclorite.book_story.presentation.reader.ReaderEvent
+import ua.acclorite.book_story.presentation.reader.ReaderScreen
 
 @Composable
 fun ReaderDrawer(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderErrorPlaceholder.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderErrorPlaceholder.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderErrorPlaceholder.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderErrorPlaceholder.kt
index d4ae9479..3ceb5111 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderErrorPlaceholder.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderErrorPlaceholder.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import android.annotation.SuppressLint
 import androidx.compose.foundation.layout.Box
@@ -20,12 +20,12 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.core.ui.UIText
-import ua.acclorite.book_story.presentation.common.components.placeholder.ErrorPlaceholder
-import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBar
-import ua.acclorite.book_story.presentation.common.components.top_bar.TopAppBarData
-import ua.acclorite.book_story.presentation.common.util.LocalActivity
-import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton
-import ua.acclorite.book_story.ui.reader.ReaderEvent
+import ua.acclorite.book_story.presentation.reader.ReaderEvent
+import ua.acclorite.book_story.ui.common.components.placeholder.ErrorPlaceholder
+import ua.acclorite.book_story.ui.common.components.top_bar.TopAppBar
+import ua.acclorite.book_story.ui.common.components.top_bar.TopAppBarData
+import ua.acclorite.book_story.ui.common.util.LocalActivity
+import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderHorizontalGesture.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderHorizontalGesture.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderHorizontalGesture.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderHorizontalGesture.kt
index a90c5a1c..f632180f 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderHorizontalGesture.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderHorizontalGesture.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.gestures.detectHorizontalDragGestures
@@ -24,7 +24,7 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntOffset
 import kotlinx.coroutines.launch
-import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture
+import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture
 import kotlin.math.abs
 import kotlin.math.roundToInt
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayout.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayout.kt
index 7a4efc2b..aad18fdd 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import android.os.Build
 import androidx.compose.animation.expandVertically
@@ -34,19 +34,19 @@ import androidx.compose.ui.unit.coerceAtLeast
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.domain.reader.ReaderText
-import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
-import ua.acclorite.book_story.presentation.common.components.common.SelectionContainer
-import ua.acclorite.book_story.presentation.common.components.common.SpacedItem
-import ua.acclorite.book_story.presentation.common.util.LocalActivity
-import ua.acclorite.book_story.presentation.common.util.noRippleClickable
-import ua.acclorite.book_story.presentation.common.util.showToast
-import ua.acclorite.book_story.presentation.reader.model.FontWithName
-import ua.acclorite.book_story.ui.main.model.HorizontalAlignment
-import ua.acclorite.book_story.ui.reader.ReaderEvent
-import ua.acclorite.book_story.ui.reader.model.ReaderFontThickness
-import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture
-import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment
+import ua.acclorite.book_story.presentation.main.model.HorizontalAlignment
+import ua.acclorite.book_story.presentation.reader.ReaderEvent
+import ua.acclorite.book_story.presentation.reader.model.ReaderFontThickness
+import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture
+import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment
+import ua.acclorite.book_story.ui.common.components.common.AnimatedVisibility
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.components.common.SelectionContainer
+import ua.acclorite.book_story.ui.common.components.common.SpacedItem
+import ua.acclorite.book_story.ui.common.util.LocalActivity
+import ua.acclorite.book_story.ui.common.util.noRippleClickable
+import ua.acclorite.book_story.ui.common.util.showToast
+import ua.acclorite.book_story.ui.reader.model.FontWithName
 
 @Composable
 fun ReaderLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutText.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutText.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutText.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutText.kt
index 4fe647a2..68e29160 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutText.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutText.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.activity.ComponentActivity
 import androidx.compose.foundation.lazy.LazyItemScope
@@ -17,11 +17,11 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.TextUnit
 import ua.acclorite.book_story.domain.reader.ReaderText
-import ua.acclorite.book_story.presentation.reader.model.FontWithName
-import ua.acclorite.book_story.ui.main.model.HorizontalAlignment
-import ua.acclorite.book_story.ui.reader.ReaderEvent
-import ua.acclorite.book_story.ui.reader.model.ReaderFontThickness
-import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment
+import ua.acclorite.book_story.presentation.main.model.HorizontalAlignment
+import ua.acclorite.book_story.presentation.reader.ReaderEvent
+import ua.acclorite.book_story.presentation.reader.model.ReaderFontThickness
+import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment
+import ua.acclorite.book_story.ui.reader.model.FontWithName
 
 @Composable
 fun LazyItemScope.ReaderLayoutText(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextChapter.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextChapter.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextChapter.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextChapter.kt
index 8da0d615..74f86661 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextChapter.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextChapter.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -22,8 +22,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.domain.reader.ReaderText.Chapter
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment
+import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun LazyItemScope.ReaderLayoutTextChapter(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextImage.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextImage.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextImage.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextImage.kt
index 83c0e6f3..fefe373b 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextImage.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextImage.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
@@ -19,7 +19,7 @@ import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.Dp
 import ua.acclorite.book_story.domain.reader.ReaderText
-import ua.acclorite.book_story.ui.main.model.HorizontalAlignment
+import ua.acclorite.book_story.presentation.main.model.HorizontalAlignment
 
 @Composable
 fun LazyItemScope.ReaderLayoutTextImage(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextParagraph.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextParagraph.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextParagraph.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextParagraph.kt
index 6e4d7cf1..1f9687bf 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextParagraph.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextParagraph.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.activity.ComponentActivity
 import androidx.compose.foundation.layout.Arrangement
@@ -24,12 +24,12 @@ import androidx.compose.ui.text.style.TextIndent
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.TextUnit
 import ua.acclorite.book_story.domain.reader.ReaderText.Text
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.util.noRippleClickable
-import ua.acclorite.book_story.presentation.reader.model.FontWithName
-import ua.acclorite.book_story.ui.reader.ReaderEvent
-import ua.acclorite.book_story.ui.reader.model.ReaderFontThickness
-import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment
+import ua.acclorite.book_story.presentation.reader.ReaderEvent
+import ua.acclorite.book_story.presentation.reader.model.ReaderFontThickness
+import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.util.noRippleClickable
+import ua.acclorite.book_story.ui.reader.model.FontWithName
 
 @Composable
 fun LazyItemScope.ReaderLayoutTextParagraph(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextSeparator.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextSeparator.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextSeparator.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextSeparator.kt
index d30206c9..72f24133 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLayoutTextSeparator.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextSeparator.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyItemScope
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLoadingPlaceholder.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLoadingPlaceholder.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLoadingPlaceholder.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLoadingPlaceholder.kt
index dd26d43b..1ba6229b 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderLoadingPlaceholder.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLoadingPlaceholder.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -15,7 +15,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.common.components.progress_indicator.CircularProgressIndicator
+import ua.acclorite.book_story.ui.common.components.progress_indicator.CircularProgressIndicator
 
 @Composable
 fun ReaderLoadingPlaceholder() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderPerceptionExpander.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderPerceptionExpander.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderPerceptionExpander.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderPerceptionExpander.kt
index 4e0fcbb3..a490d1ba 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderPerceptionExpander.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderPerceptionExpander.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderProgressBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderProgressBar.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderProgressBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderProgressBar.kt
index f0d0dc4a..2c4ea75b 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderProgressBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderProgressBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -16,8 +16,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.TextUnit
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.ui.main.model.HorizontalAlignment
+import ua.acclorite.book_story.presentation.main.model.HorizontalAlignment
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun ReaderProgressBar(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScaffold.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderScaffold.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScaffold.kt
index 366b8dbd..cd7861ad 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderScaffold.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import android.annotation.SuppressLint
 import androidx.compose.animation.slideInVertically
@@ -29,15 +29,15 @@ import androidx.compose.ui.unit.TextUnit
 import ua.acclorite.book_story.domain.library.Book
 import ua.acclorite.book_story.domain.reader.ReaderText
 import ua.acclorite.book_story.domain.reader.ReaderText.Chapter
-import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility
-import ua.acclorite.book_story.presentation.reader.model.FontWithName
-import ua.acclorite.book_story.ui.main.model.HorizontalAlignment
-import ua.acclorite.book_story.ui.reader.ReaderEvent
-import ua.acclorite.book_story.ui.reader.model.Checkpoint
-import ua.acclorite.book_story.ui.reader.model.ReaderFontThickness
-import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture
-import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment
-import ua.acclorite.book_story.ui.settings.SettingsEvent
+import ua.acclorite.book_story.presentation.main.model.HorizontalAlignment
+import ua.acclorite.book_story.presentation.reader.ReaderEvent
+import ua.acclorite.book_story.presentation.reader.model.Checkpoint
+import ua.acclorite.book_story.presentation.reader.model.ReaderFontThickness
+import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture
+import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment
+import ua.acclorite.book_story.presentation.settings.SettingsEvent
+import ua.acclorite.book_story.ui.common.components.common.AnimatedVisibility
+import ua.acclorite.book_story.ui.reader.model.FontWithName
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderSettingsBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderSettingsBottomSheet.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderSettingsBottomSheet.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderSettingsBottomSheet.kt
index c1c9ace5..1535988d 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderSettingsBottomSheet.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderSettingsBottomSheet.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.animateFloatAsState
@@ -25,22 +25,22 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import kotlinx.coroutines.launch
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
-import ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet.ModalBottomSheet
-import ua.acclorite.book_story.presentation.common.util.LocalActivity
-import ua.acclorite.book_story.presentation.settings.appearance.colors.ColorsSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.chapters.ChaptersSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.font.FontSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.images.ImagesSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.misc.MiscSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.padding.PaddingSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.progress.ProgressSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.reading_mode.ReadingModeSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.reading_speed.ReadingSpeedSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.system.SystemSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.text.TextSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.translator.TranslatorSubcategory
-import ua.acclorite.book_story.ui.reader.ReaderEvent
+import ua.acclorite.book_story.presentation.reader.ReaderEvent
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.components.modal_bottom_sheet.ModalBottomSheet
+import ua.acclorite.book_story.ui.common.util.LocalActivity
+import ua.acclorite.book_story.ui.settings.appearance.colors.ColorsSubcategory
+import ua.acclorite.book_story.ui.settings.reader.chapters.ChaptersSubcategory
+import ua.acclorite.book_story.ui.settings.reader.font.FontSubcategory
+import ua.acclorite.book_story.ui.settings.reader.images.ImagesSubcategory
+import ua.acclorite.book_story.ui.settings.reader.misc.MiscSubcategory
+import ua.acclorite.book_story.ui.settings.reader.padding.PaddingSubcategory
+import ua.acclorite.book_story.ui.settings.reader.progress.ProgressSubcategory
+import ua.acclorite.book_story.ui.settings.reader.reading_mode.ReadingModeSubcategory
+import ua.acclorite.book_story.ui.settings.reader.reading_speed.ReadingSpeedSubcategory
+import ua.acclorite.book_story.ui.settings.reader.system.SystemSubcategory
+import ua.acclorite.book_story.ui.settings.reader.text.TextSubcategory
+import ua.acclorite.book_story.ui.settings.reader.translator.TranslatorSubcategory
 
 private var initialPage = 0
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderSettingsBottomSheetTabRow.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderSettingsBottomSheetTabRow.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderSettingsBottomSheetTabRow.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderSettingsBottomSheetTabRow.kt
index 7ba61fc4..fe497395 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderSettingsBottomSheetTabRow.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderSettingsBottomSheetTabRow.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.modal_bottom_sheet.ModalBottomSheetTabRow
+import ua.acclorite.book_story.ui.common.components.modal_bottom_sheet.ModalBottomSheetTabRow
 
 @Composable
 fun ReaderSettingsBottomSheetTabRow(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderTopBar.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderTopBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderTopBar.kt
index 7215daec..af7bdf4f 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderTopBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package ua.acclorite.book_story.ui.reader
 
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
@@ -31,13 +31,13 @@ import androidx.compose.ui.unit.sp
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.domain.library.Book
 import ua.acclorite.book_story.domain.reader.ReaderText.Chapter
-import ua.acclorite.book_story.presentation.common.components.common.IconButton
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.util.LocalActivity
-import ua.acclorite.book_story.presentation.common.util.noRippleClickable
-import ua.acclorite.book_story.ui.reader.ReaderEvent
-import ua.acclorite.book_story.ui.settings.SettingsEvent
-import ua.acclorite.book_story.ui.theme.readerBarsColor
+import ua.acclorite.book_story.presentation.reader.ReaderEvent
+import ua.acclorite.book_story.presentation.settings.SettingsEvent
+import ua.acclorite.book_story.presentation.theme.readerBarsColor
+import ua.acclorite.book_story.ui.common.components.common.IconButton
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.util.LocalActivity
+import ua.acclorite.book_story.ui.common.util.noRippleClickable
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ExpandableChapter.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ExpandableChapter.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ExpandableChapter.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/model/ExpandableChapter.kt
index 3d4529ca..56995e46 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ExpandableChapter.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ExpandableChapter.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader.model
+package ua.acclorite.book_story.ui.reader.model
 
 import androidx.compose.runtime.Immutable
 import ua.acclorite.book_story.domain.reader.ReaderText
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/FontWithName.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/FontWithName.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/model/FontWithName.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/reader/model/FontWithName.kt
index dbcdb6a2..aa320eed 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/FontWithName.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/model/FontWithName.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader.model
+package ua.acclorite.book_story.ui.reader.model
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.text.font.FontFamily
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsContent.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsContent.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsContent.kt
index 8ad91d9e..885e557b 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings
+package ua.acclorite.book_story.ui.settings
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsLayout.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsLayout.kt
index 4574c597..57051489 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings
+package ua.acclorite.book_story.ui.settings
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
@@ -21,7 +21,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun SettingsLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsLayoutItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsLayoutItem.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsLayoutItem.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsLayoutItem.kt
index 17b29de4..eb9b5a74 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsLayoutItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsLayoutItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings
+package ua.acclorite.book_story.ui.settings
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -25,8 +25,8 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.ui.theme.dynamicListItemColor
+import ua.acclorite.book_story.presentation.theme.dynamicListItemColor
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun SettingsLayoutItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsScaffold.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsScaffold.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsScaffold.kt
index be3e798d..0f71c5c0 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsScaffold.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings
+package ua.acclorite.book_story.ui.settings
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsTopBar.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsTopBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsTopBar.kt
index 1fcd5280..ac141e63 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsTopBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings
+package ua.acclorite.book_story.ui.settings
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LargeTopAppBar
@@ -14,8 +14,8 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsCategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsCategory.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsCategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsCategory.kt
index a6acd123..80f56966 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsCategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsCategory.kt
@@ -6,14 +6,14 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.appearance
+package ua.acclorite.book_story.ui.settings.appearance
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
-import ua.acclorite.book_story.presentation.settings.appearance.colors.ColorsSubcategory
-import ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.ThemePreferencesSubcategory
+import ua.acclorite.book_story.ui.settings.appearance.colors.ColorsSubcategory
+import ua.acclorite.book_story.ui.settings.appearance.theme_preferences.ThemePreferencesSubcategory
 
 fun LazyListScope.AppearanceSettingsCategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsContent.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsContent.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsContent.kt
index 93474a73..57267dd7 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.appearance
+package ua.acclorite.book_story.ui.settings.appearance
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsLayout.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsLayout.kt
index 2b32cc22..534f899c 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.appearance
+package ua.acclorite.book_story.ui.settings.appearance
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
@@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun AppearanceSettingsLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsScaffold.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsScaffold.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsScaffold.kt
index 0cbc22b9..097ed55c 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsScaffold.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.appearance
+package ua.acclorite.book_story.ui.settings.appearance
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsTopBar.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsTopBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsTopBar.kt
index 2db30d54..58ccdead 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsTopBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.appearance
+package ua.acclorite.book_story.ui.settings.appearance
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LargeTopAppBar
@@ -14,8 +14,8 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/ColorsSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/ColorsSubcategory.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/ColorsSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/ColorsSubcategory.kt
index ce8eddcf..bfae4a47 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/ColorsSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/ColorsSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.appearance.colors
+package ua.acclorite.book_story.ui.settings.appearance.colors
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,9 +14,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.appearance.colors.components.ColorPresetOption
-import ua.acclorite.book_story.presentation.settings.appearance.colors.components.FastColorPresetChangeOption
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.appearance.colors.components.ColorPresetOption
+import ua.acclorite.book_story.ui.settings.appearance.colors.components.FastColorPresetChangeOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
 
 fun LazyListScope.ColorsSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/components/ColorPresetOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/ColorPresetOption.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/components/ColorPresetOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/ColorPresetOption.kt
index c935e6cb..ed344b97 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/components/ColorPresetOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/ColorPresetOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.appearance.colors.components
+package ua.acclorite.book_story.ui.settings.appearance.colors.components
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.expandHorizontally
@@ -65,15 +65,15 @@ import sh.calvin.reorderable.rememberReorderableLazyListState
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.core.Selected
 import ua.acclorite.book_story.domain.reader.ColorPreset
-import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility
-import ua.acclorite.book_story.presentation.common.components.common.IconButton
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.components.settings.ColorPickerWithTitle
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryTitle
-import ua.acclorite.book_story.ui.settings.SettingsEvent
-import ua.acclorite.book_story.ui.settings.SettingsModel
-import ua.acclorite.book_story.ui.theme.FadeTransitionPreservingSpace
-import ua.acclorite.book_story.ui.theme.Transitions
+import ua.acclorite.book_story.presentation.settings.SettingsEvent
+import ua.acclorite.book_story.presentation.settings.SettingsModel
+import ua.acclorite.book_story.presentation.theme.FadeTransitionPreservingSpace
+import ua.acclorite.book_story.presentation.theme.Transitions
+import ua.acclorite.book_story.ui.common.components.common.AnimatedVisibility
+import ua.acclorite.book_story.ui.common.components.common.IconButton
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.settings.ColorPickerWithTitle
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle
 
 @Composable
 fun ColorPresetOption(backgroundColor: Color) {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/components/FastColorPresetChangeOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/FastColorPresetChangeOption.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/components/FastColorPresetChangeOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/FastColorPresetChangeOption.kt
index 98b5a4ca..8f57b8ac 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/components/FastColorPresetChangeOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/FastColorPresetChangeOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.appearance.colors.components
+package ua.acclorite.book_story.ui.settings.appearance.colors.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun FastColorPresetChangeOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/ThemePreferencesSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/ThemePreferencesSubcategory.kt
similarity index 62%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/ThemePreferencesSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/ThemePreferencesSubcategory.kt
index 817b425d..c50861fb 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/ThemePreferencesSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/ThemePreferencesSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.appearance.theme_preferences
+package ua.acclorite.book_story.ui.settings.appearance.theme_preferences
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,12 +14,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.components.AbsoluteDarkOption
-import ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.components.AppThemeOption
-import ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.components.DarkThemeOption
-import ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.components.PureDarkOption
-import ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.components.ThemeContrastOption
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.appearance.theme_preferences.components.AbsoluteDarkOption
+import ua.acclorite.book_story.ui.settings.appearance.theme_preferences.components.AppThemeOption
+import ua.acclorite.book_story.ui.settings.appearance.theme_preferences.components.DarkThemeOption
+import ua.acclorite.book_story.ui.settings.appearance.theme_preferences.components.PureDarkOption
+import ua.acclorite.book_story.ui.settings.appearance.theme_preferences.components.ThemeContrastOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
 
 fun LazyListScope.ThemePreferencesSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt
similarity index 72%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt
index a04dc5f1..57acfa26 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.components
+package ua.acclorite.book_story.ui.settings.appearance.theme_preferences.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
@@ -12,12 +12,12 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.main.model.isDark
-import ua.acclorite.book_story.ui.main.model.isPureDark
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.main.model.isDark
+import ua.acclorite.book_story.presentation.main.model.isPureDark
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun AbsoluteDarkOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/AppThemeOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AppThemeOption.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/AppThemeOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AppThemeOption.kt
index 80c74cc9..4c35ada9 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/AppThemeOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AppThemeOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.components
+package ua.acclorite.book_story.ui.settings.appearance.theme_preferences.components
 
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
@@ -42,16 +42,16 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.AnimatedVisibility
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.main.model.ThemeContrast
-import ua.acclorite.book_story.ui.main.model.isDark
-import ua.acclorite.book_story.ui.main.model.isPureDark
-import ua.acclorite.book_story.ui.theme.Theme
-import ua.acclorite.book_story.ui.theme.animatedColorScheme
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.main.model.ThemeContrast
+import ua.acclorite.book_story.presentation.main.model.isDark
+import ua.acclorite.book_story.presentation.main.model.isPureDark
+import ua.acclorite.book_story.presentation.theme.Theme
+import ua.acclorite.book_story.presentation.theme.animatedColorScheme
+import ua.acclorite.book_story.ui.common.components.common.AnimatedVisibility
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle
 
 @Composable
 fun AppThemeOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/DarkThemeOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/DarkThemeOption.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/DarkThemeOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/DarkThemeOption.kt
index 1921c586..d8bd17c5 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/DarkThemeOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/DarkThemeOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.components
+package ua.acclorite.book_story.ui.settings.appearance.theme_preferences.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -12,11 +12,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.main.model.DarkTheme
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.main.model.DarkTheme
+import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun DarkThemeOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/PureDarkOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/PureDarkOption.kt
similarity index 73%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/PureDarkOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/PureDarkOption.kt
index 6297a3e2..64b5ab1d 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/PureDarkOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/PureDarkOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.components
+package ua.acclorite.book_story.ui.settings.appearance.theme_preferences.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -12,13 +12,13 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.main.model.PureDark
-import ua.acclorite.book_story.ui.main.model.isDark
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.main.model.PureDark
+import ua.acclorite.book_story.presentation.main.model.isDark
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun PureDarkOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/ThemeContrastOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/ThemeContrastOption.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/ThemeContrastOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/ThemeContrastOption.kt
index 5fbee181..7d52d05e 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/components/ThemeContrastOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/ThemeContrastOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.components
+package ua.acclorite.book_story.ui.settings.appearance.theme_preferences.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -16,15 +16,15 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.main.model.ThemeContrast
-import ua.acclorite.book_story.ui.main.model.isDark
-import ua.acclorite.book_story.ui.main.model.isPureDark
-import ua.acclorite.book_story.ui.theme.BookStoryTheme
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.main.model.ThemeContrast
+import ua.acclorite.book_story.presentation.main.model.isDark
+import ua.acclorite.book_story.presentation.main.model.isPureDark
+import ua.acclorite.book_story.presentation.theme.BookStoryTheme
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun ThemeContrastOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsCategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsCategory.kt
similarity index 61%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsCategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsCategory.kt
index ab3bd0cb..9ca4ca82 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsCategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsCategory.kt
@@ -6,11 +6,11 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.browse
+package ua.acclorite.book_story.ui.settings.browse
 
 import androidx.compose.foundation.lazy.LazyListScope
-import ua.acclorite.book_story.presentation.settings.browse.display.BrowseDisplaySubcategory
-import ua.acclorite.book_story.presentation.settings.browse.scan.BrowseScanSubcategory
+import ua.acclorite.book_story.ui.settings.browse.display.BrowseDisplaySubcategory
+import ua.acclorite.book_story.ui.settings.browse.scan.BrowseScanSubcategory
 
 fun LazyListScope.BrowseSettingsCategory() {
     BrowseScanSubcategory()
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsContent.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsContent.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsContent.kt
index 3513982c..5cab1934 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.browse
+package ua.acclorite.book_story.ui.settings.browse
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsLayout.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsLayout.kt
index 7402931d..d23d3851 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.browse
+package ua.acclorite.book_story.ui.settings.browse
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
@@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun BrowseSettingsLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsScaffold.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsScaffold.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsScaffold.kt
index 3791e98c..1a06796a 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsScaffold.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.browse
+package ua.acclorite.book_story.ui.settings.browse
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsTopBar.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsTopBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsTopBar.kt
index 0d0ec101..0174c336 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsTopBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.browse
+package ua.acclorite.book_story.ui.settings.browse
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LargeTopAppBar
@@ -14,8 +14,8 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/BrowseDisplaySubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/BrowseDisplaySubcategory.kt
similarity index 74%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/BrowseDisplaySubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/BrowseDisplaySubcategory.kt
index 82c4dbc7..20452108 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/BrowseDisplaySubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/BrowseDisplaySubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.browse.display
+package ua.acclorite.book_story.ui.settings.browse.display
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,9 +14,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.browse.display.components.BrowseGridSizeOption
-import ua.acclorite.book_story.presentation.settings.browse.display.components.BrowseLayoutOption
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.browse.display.components.BrowseGridSizeOption
+import ua.acclorite.book_story.ui.settings.browse.display.components.BrowseLayoutOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
 
 fun LazyListScope.BrowseDisplaySubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseGridSizeOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/components/BrowseGridSizeOption.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseGridSizeOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/components/BrowseGridSizeOption.kt
index cb7ae8cf..4d297eed 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseGridSizeOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/components/BrowseGridSizeOption.kt
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.browse.display.components
+package ua.acclorite.book_story.ui.settings.browse.display.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.browse.model.BrowseLayout
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.browse.model.BrowseLayout
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun BrowseGridSizeOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseLayoutOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/components/BrowseLayoutOption.kt
similarity index 75%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseLayoutOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/components/BrowseLayoutOption.kt
index ba709d83..9d259da6 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseLayoutOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/components/BrowseLayoutOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.browse.display.components
+package ua.acclorite.book_story.ui.settings.browse.display.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -12,11 +12,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.browse.model.BrowseLayout
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.browse.model.BrowseLayout
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun BrowseLayoutOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/filter/BrowseFilterSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/filter/BrowseFilterSubcategory.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/filter/BrowseFilterSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/browse/filter/BrowseFilterSubcategory.kt
index 1aaaacb7..977aa740 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/filter/BrowseFilterSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/filter/BrowseFilterSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.browse.filter
+package ua.acclorite.book_story.ui.settings.browse.filter
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,8 +14,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.browse.filter.components.BrowseFilterOption
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.browse.filter.components.BrowseFilterOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
 
 fun LazyListScope.BrowseFilterSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/filter/components/BrowseFilterOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/filter/components/BrowseFilterOption.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/filter/components/BrowseFilterOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/browse/filter/components/BrowseFilterOption.kt
index 9fd1be16..74ea515c 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/filter/components/BrowseFilterOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/filter/components/BrowseFilterOption.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.browse.filter.components
+package ua.acclorite.book_story.ui.settings.browse.filter.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
@@ -25,10 +25,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.constants.provideExtensions
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.constants.provideExtensions
 
 fun LazyListScope.BrowseFilterOption() {
     items(provideExtensions(), key = { it }) {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/scan/BrowseScanSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/BrowseScanSubcategory.kt
similarity index 74%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/scan/BrowseScanSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/BrowseScanSubcategory.kt
index 20042ee9..96f56e41 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/scan/BrowseScanSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/BrowseScanSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.browse.scan
+package ua.acclorite.book_story.ui.settings.browse.scan
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,9 +14,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.browse.scan.components.BrowseScanOption
-import ua.acclorite.book_story.presentation.settings.browse.scan.components.BrowseScanOptionNote
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.browse.scan.components.BrowseScanOption
+import ua.acclorite.book_story.ui.settings.browse.scan.components.BrowseScanOptionNote
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
 
 fun LazyListScope.BrowseScanSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/scan/components/BrowseScanOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/components/BrowseScanOption.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/scan/components/BrowseScanOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/components/BrowseScanOption.kt
index f150bcc8..48e2a3fb 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/scan/components/BrowseScanOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/components/BrowseScanOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.browse.scan.components
+package ua.acclorite.book_story.ui.settings.browse.scan.components
 
 import android.content.Context
 import android.content.UriPermission
@@ -39,14 +39,14 @@ import com.anggrayudi.storage.file.DocumentFileCompat
 import com.anggrayudi.storage.file.getBasePath
 import com.anggrayudi.storage.file.getRootPath
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.IconButton
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.util.noRippleClickable
-import ua.acclorite.book_story.presentation.common.util.showToast
-import ua.acclorite.book_story.ui.browse.BrowseScreen
-import ua.acclorite.book_story.ui.settings.SettingsEvent
-import ua.acclorite.book_story.ui.settings.SettingsModel
-import ua.acclorite.book_story.ui.theme.dynamicListItemColor
+import ua.acclorite.book_story.presentation.browse.BrowseScreen
+import ua.acclorite.book_story.presentation.settings.SettingsEvent
+import ua.acclorite.book_story.presentation.settings.SettingsModel
+import ua.acclorite.book_story.presentation.theme.dynamicListItemColor
+import ua.acclorite.book_story.ui.common.components.common.IconButton
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.util.noRippleClickable
+import ua.acclorite.book_story.ui.common.util.showToast
 
 @Composable
 fun BrowseScanOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/scan/components/BrowseScanOptionNote.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/components/BrowseScanOptionNote.kt
similarity index 72%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/scan/components/BrowseScanOptionNote.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/components/BrowseScanOptionNote.kt
index b48c55e5..e7ba1c61 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/scan/components/BrowseScanOptionNote.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/components/BrowseScanOptionNote.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.browse.scan.components
+package ua.acclorite.book_story.ui.settings.browse.scan.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryNote
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryNote
 
 @Composable
 fun BrowseScanOptionNote() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/sort/BrowseSortSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/sort/BrowseSortSubcategory.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/sort/BrowseSortSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/browse/sort/BrowseSortSubcategory.kt
index 4ad99871..e425423c 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/sort/BrowseSortSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/sort/BrowseSortSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.browse.sort
+package ua.acclorite.book_story.ui.settings.browse.sort
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,8 +14,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.browse.sort.components.BrowseSortOption
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.browse.sort.components.BrowseSortOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
 
 fun LazyListScope.BrowseSortSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/sort/components/BrowseSortOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/sort/components/BrowseSortOption.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/sort/components/BrowseSortOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/browse/sort/components/BrowseSortOption.kt
index d1cd4acf..a287548c 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/sort/components/BrowseSortOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/sort/components/BrowseSortOption.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.browse.sort.components
+package ua.acclorite.book_story.ui.settings.browse.sort.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
@@ -31,10 +31,10 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.ui.browse.model.BrowseSortOrder
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.browse.model.BrowseSortOrder
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 fun LazyListScope.BrowseSortOption() {
     items(BrowseSortOrder.entries, key = { it.name }) {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/components/SettingsSubcategory.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/components/SettingsSubcategory.kt
index 09cba886..96b567d5 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/components/SettingsSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.components
+package ua.acclorite.book_story.ui.settings.components
 
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategoryNote.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/components/SettingsSubcategoryNote.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategoryNote.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/components/SettingsSubcategoryNote.kt
index 301572f5..39305d36 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategoryNote.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/components/SettingsSubcategoryNote.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.components
+package ua.acclorite.book_story.ui.settings.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -21,7 +21,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun SettingsSubcategoryNote(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategoryTitle.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/components/SettingsSubcategoryTitle.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategoryTitle.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/components/SettingsSubcategoryTitle.kt
index a5fc52c2..89afe310 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategoryTitle.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/components/SettingsSubcategoryTitle.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.components
+package ua.acclorite.book_story.ui.settings.components
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
@@ -18,7 +18,7 @@ import androidx.compose.ui.text.style.LineBreak
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun SettingsSubcategoryTitle(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsCategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsCategory.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsCategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsCategory.kt
index b642ca63..75f59c81 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsCategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsCategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.general
+package ua.acclorite.book_story.ui.settings.general
 
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
@@ -15,8 +15,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.coerceAtLeast
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.presentation.settings.general.components.AppLanguageOption
-import ua.acclorite.book_story.presentation.settings.general.components.DoublePressExitOption
+import ua.acclorite.book_story.ui.settings.general.components.AppLanguageOption
+import ua.acclorite.book_story.ui.settings.general.components.DoublePressExitOption
 
 fun LazyListScope.GeneralSettingsCategory(
     topPadding: Dp = 16.dp,
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsContent.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsContent.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsContent.kt
index 3e3e3578..b5cb2894 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.general
+package ua.acclorite.book_story.ui.settings.general
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsLayout.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsLayout.kt
index 856d5dd0..de3bd1f7 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.general
+package ua.acclorite.book_story.ui.settings.general
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
@@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun GeneralSettingsLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsScaffold.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsScaffold.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsScaffold.kt
index c9f10cc5..cec18528 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsScaffold.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.general
+package ua.acclorite.book_story.ui.settings.general
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsTopBar.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsTopBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsTopBar.kt
index c96d5411..95a696ed 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/GeneralSettingsTopBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.general
+package ua.acclorite.book_story.ui.settings.general
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LargeTopAppBar
@@ -14,8 +14,8 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/components/AppLanguageOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/general/components/AppLanguageOption.kt
similarity index 72%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/general/components/AppLanguageOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/general/components/AppLanguageOption.kt
index 37e34de0..8d1dca70 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/components/AppLanguageOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/general/components/AppLanguageOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.general.components
+package ua.acclorite.book_story.ui.settings.general.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -12,11 +12,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.ChipsWithTitle
-import ua.acclorite.book_story.presentation.common.constants.provideLanguages
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.ChipsWithTitle
+import ua.acclorite.book_story.ui.common.constants.provideLanguages
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun AppLanguageOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/components/DoublePressExitOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/general/components/DoublePressExitOption.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/general/components/DoublePressExitOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/general/components/DoublePressExitOption.kt
index e84c16b0..5a6dfbeb 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/general/components/DoublePressExitOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/general/components/DoublePressExitOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.general.components
+package ua.acclorite.book_story.ui.settings.general.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun DoublePressExitOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsCategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsCategory.kt
similarity index 50%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsCategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsCategory.kt
index 1aca1149..75d1d5b6 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsCategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsCategory.kt
@@ -6,13 +6,13 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.library
+package ua.acclorite.book_story.ui.settings.library
 
 import androidx.compose.foundation.lazy.LazyListScope
-import ua.acclorite.book_story.presentation.settings.library.categories.LibraryCategoriesSubcategory
-import ua.acclorite.book_story.presentation.settings.library.display.LibraryDisplaySubcategory
-import ua.acclorite.book_story.presentation.settings.library.sort.LibrarySortSubcategory
-import ua.acclorite.book_story.presentation.settings.library.tabs.LibraryTabsSubcategory
+import ua.acclorite.book_story.ui.settings.library.categories.LibraryCategoriesSubcategory
+import ua.acclorite.book_story.ui.settings.library.display.LibraryDisplaySubcategory
+import ua.acclorite.book_story.ui.settings.library.sort.LibrarySortSubcategory
+import ua.acclorite.book_story.ui.settings.library.tabs.LibraryTabsSubcategory
 
 fun LazyListScope.LibrarySettingsCategory() {
     LibraryCategoriesSubcategory()
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsContent.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsContent.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsContent.kt
index 7ad2fd53..53d1c9db 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.library
+package ua.acclorite.book_story.ui.settings.library
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsLayout.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsLayout.kt
index fd9b40f0..d23a707d 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.library
+package ua.acclorite.book_story.ui.settings.library
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
@@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun LibrarySettingsLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsScaffold.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsScaffold.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsScaffold.kt
index 0a5c7a90..1da75dad 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsScaffold.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.library
+package ua.acclorite.book_story.ui.settings.library
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsTopBar.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsTopBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsTopBar.kt
index 2d939c93..e8312d6a 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/LibrarySettingsTopBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.library
+package ua.acclorite.book_story.ui.settings.library
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LargeTopAppBar
@@ -14,8 +14,8 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/categories/LibraryCategoriesSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/LibraryCategoriesSubcategory.kt
similarity index 73%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/categories/LibraryCategoriesSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/LibraryCategoriesSubcategory.kt
index 305d8fe6..c7d150e5 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/categories/LibraryCategoriesSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/LibraryCategoriesSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.library.categories
+package ua.acclorite.book_story.ui.settings.library.categories
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,9 +14,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
-import ua.acclorite.book_story.presentation.settings.library.categories.components.LibraryCategoriesOption
-import ua.acclorite.book_story.presentation.settings.library.categories.components.LibraryCategoriesOptionNote
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.library.categories.components.LibraryCategoriesOption
+import ua.acclorite.book_story.ui.settings.library.categories.components.LibraryCategoriesOptionNote
 
 fun LazyListScope.LibraryCategoriesSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/categories/components/LibraryCategoriesOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/components/LibraryCategoriesOption.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/categories/components/LibraryCategoriesOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/components/LibraryCategoriesOption.kt
index 0fc112fd..c9f2ebbd 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/categories/components/LibraryCategoriesOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/components/LibraryCategoriesOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.library.categories.components
+package ua.acclorite.book_story.ui.settings.library.categories.components
 
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.background
@@ -48,16 +48,16 @@ import sh.calvin.reorderable.ReorderableColumn
 import sh.calvin.reorderable.ReorderableScope
 import ua.acclorite.book_story.R
 import ua.acclorite.book_story.domain.library.Category
-import ua.acclorite.book_story.presentation.common.components.common.IconButton
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.common.components.dialog.Dialog
-import ua.acclorite.book_story.presentation.common.components.dialog.DialogWithTextField
-import ua.acclorite.book_story.presentation.common.util.noRippleClickable
-import ua.acclorite.book_story.ui.library.LibraryScreen
-import ua.acclorite.book_story.ui.settings.SettingsEvent
-import ua.acclorite.book_story.ui.settings.SettingsModel
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
-import ua.acclorite.book_story.ui.theme.dynamicListItemColor
+import ua.acclorite.book_story.presentation.library.LibraryScreen
+import ua.acclorite.book_story.presentation.settings.SettingsEvent
+import ua.acclorite.book_story.presentation.settings.SettingsModel
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.theme.dynamicListItemColor
+import ua.acclorite.book_story.ui.common.components.common.IconButton
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.dialog.Dialog
+import ua.acclorite.book_story.ui.common.components.dialog.DialogWithTextField
+import ua.acclorite.book_story.ui.common.util.noRippleClickable
 
 private const val CREATE_DIALOG = "create_dialog"
 private const val EDIT_DIALOG = "edit_dialog"
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/categories/components/LibraryCategoriesOptionNote.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/components/LibraryCategoriesOptionNote.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/categories/components/LibraryCategoriesOptionNote.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/components/LibraryCategoriesOptionNote.kt
index d0bf5689..3938f0d0 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/categories/components/LibraryCategoriesOptionNote.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/components/LibraryCategoriesOptionNote.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.library.categories.components
+package ua.acclorite.book_story.ui.settings.library.categories.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryNote
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryNote
 
 @Composable
 fun LibraryCategoriesOptionNote() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/LibraryDisplaySubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/LibraryDisplaySubcategory.kt
similarity index 64%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/LibraryDisplaySubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/LibraryDisplaySubcategory.kt
index 10c7e103..fd7d67a8 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/LibraryDisplaySubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/LibraryDisplaySubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.library.display
+package ua.acclorite.book_story.ui.settings.library.display
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,12 +14,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
-import ua.acclorite.book_story.presentation.settings.library.display.components.LibraryGridSizeOption
-import ua.acclorite.book_story.presentation.settings.library.display.components.LibraryLayoutOption
-import ua.acclorite.book_story.presentation.settings.library.display.components.LibraryReadButtonOption
-import ua.acclorite.book_story.presentation.settings.library.display.components.LibraryShowProgressOption
-import ua.acclorite.book_story.presentation.settings.library.display.components.LibraryTitlePositionOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.library.display.components.LibraryGridSizeOption
+import ua.acclorite.book_story.ui.settings.library.display.components.LibraryLayoutOption
+import ua.acclorite.book_story.ui.settings.library.display.components.LibraryReadButtonOption
+import ua.acclorite.book_story.ui.settings.library.display.components.LibraryShowProgressOption
+import ua.acclorite.book_story.ui.settings.library.display.components.LibraryTitlePositionOption
 
 fun LazyListScope.LibraryDisplaySubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryGridSizeOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryGridSizeOption.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryGridSizeOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryGridSizeOption.kt
index aef0a1fe..3fc4f3c5 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryGridSizeOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryGridSizeOption.kt
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.library.display.components
+package ua.acclorite.book_story.ui.settings.library.display.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.library.model.LibraryLayout
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.library.model.LibraryLayout
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun LibraryGridSizeOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryLayoutOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryLayoutOption.kt
similarity index 75%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryLayoutOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryLayoutOption.kt
index e3177fdd..c2540783 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryLayoutOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryLayoutOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.library.display.components
+package ua.acclorite.book_story.ui.settings.library.display.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -12,11 +12,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.library.model.LibraryLayout
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.library.model.LibraryLayout
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun LibraryLayoutOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryReadButtonOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryReadButtonOption.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryReadButtonOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryReadButtonOption.kt
index db30b36d..5be090e3 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryReadButtonOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryReadButtonOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.library.display.components
+package ua.acclorite.book_story.ui.settings.library.display.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun LibraryReadButtonOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryShowProgressOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryShowProgressOption.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryShowProgressOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryShowProgressOption.kt
index 28efa9bc..7ac29d8c 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryShowProgressOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryShowProgressOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.library.display.components
+package ua.acclorite.book_story.ui.settings.library.display.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun LibraryShowProgressOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryTitlePositionOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryTitlePositionOption.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryTitlePositionOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryTitlePositionOption.kt
index a37d605a..aa926e26 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/display/components/LibraryTitlePositionOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryTitlePositionOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.library.display.components
+package ua.acclorite.book_story.ui.settings.library.display.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -12,13 +12,13 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.ChipsWithTitle
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.library.model.LibraryLayout
-import ua.acclorite.book_story.ui.library.model.LibraryTitlePosition
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.library.model.LibraryLayout
+import ua.acclorite.book_story.presentation.library.model.LibraryTitlePosition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.ChipsWithTitle
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun LibraryTitlePositionOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/sort/LibrarySortSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/LibrarySortSubcategory.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/sort/LibrarySortSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/LibrarySortSubcategory.kt
index 74078ab5..c084f183 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/sort/LibrarySortSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/LibrarySortSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.library.sort
+package ua.acclorite.book_story.ui.settings.library.sort
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,8 +14,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
-import ua.acclorite.book_story.presentation.settings.library.sort.components.LibraryPerCategorySortOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.library.sort.components.LibraryPerCategorySortOption
 
 fun LazyListScope.LibrarySortSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/sort/components/LibraryPerCategorySortOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/components/LibraryPerCategorySortOption.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/sort/components/LibraryPerCategorySortOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/components/LibraryPerCategorySortOption.kt
index d425c680..adef17f3 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/sort/components/LibraryPerCategorySortOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/components/LibraryPerCategorySortOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.library.sort.components
+package ua.acclorite.book_story.ui.settings.library.sort.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun LibraryPerCategorySortOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/sort/components/LibrarySortOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/components/LibrarySortOption.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/sort/components/LibrarySortOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/components/LibrarySortOption.kt
index 8a48bb1f..e00e5fcb 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/sort/components/LibrarySortOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/components/LibrarySortOption.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.library.sort.components
+package ua.acclorite.book_story.ui.settings.library.sort.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
@@ -29,8 +29,8 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.ui.library.model.LibrarySortOrder
+import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 fun LazyListScope.LibrarySortOption(
     sortOrder: LibrarySortOrder,
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/LibraryTabsSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/LibraryTabsSubcategory.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/LibraryTabsSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/LibraryTabsSubcategory.kt
index af7315e5..dc38a4af 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/LibraryTabsSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/LibraryTabsSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.library.tabs
+package ua.acclorite.book_story.ui.settings.library.tabs
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,10 +14,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
-import ua.acclorite.book_story.presentation.settings.library.tabs.components.LibraryAlwaysShowDefaultTabOption
-import ua.acclorite.book_story.presentation.settings.library.tabs.components.LibraryShowBookCountOption
-import ua.acclorite.book_story.presentation.settings.library.tabs.components.LibraryShowCategoryTabsOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.library.tabs.components.LibraryAlwaysShowDefaultTabOption
+import ua.acclorite.book_story.ui.settings.library.tabs.components.LibraryShowBookCountOption
+import ua.acclorite.book_story.ui.settings.library.tabs.components.LibraryShowCategoryTabsOption
 
 fun LazyListScope.LibraryTabsSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryAlwaysShowDefaultTabOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/components/LibraryAlwaysShowDefaultTabOption.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryAlwaysShowDefaultTabOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/components/LibraryAlwaysShowDefaultTabOption.kt
index 8a6353be..6b3af0f3 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryAlwaysShowDefaultTabOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/components/LibraryAlwaysShowDefaultTabOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.library.tabs.components
+package ua.acclorite.book_story.ui.settings.library.tabs.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun LibraryAlwaysShowDefaultTabOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryShowBookCountOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/components/LibraryShowBookCountOption.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryShowBookCountOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/components/LibraryShowBookCountOption.kt
index 3aa60fb3..d54d4c64 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryShowBookCountOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/components/LibraryShowBookCountOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.library.tabs.components
+package ua.acclorite.book_story.ui.settings.library.tabs.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun LibraryShowBookCountOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryShowCategoryTabsOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/components/LibraryShowCategoryTabsOption.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryShowCategoryTabsOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/components/LibraryShowCategoryTabsOption.kt
index e85f63e9..34a936a6 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/library/tabs/components/LibraryShowCategoryTabsOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/components/LibraryShowCategoryTabsOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.library.tabs.components
+package ua.acclorite.book_story.ui.settings.library.tabs.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun LibraryShowCategoryTabsOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsCategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsCategory.kt
similarity index 54%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsCategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsCategory.kt
index 64f0f1d5..b8a29259 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsCategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsCategory.kt
@@ -6,23 +6,23 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.reader
+package ua.acclorite.book_story.ui.settings.reader
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
-import ua.acclorite.book_story.presentation.settings.reader.chapters.ChaptersSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.font.FontSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.images.ImagesSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.misc.MiscSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.padding.PaddingSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.progress.ProgressSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.reading_mode.ReadingModeSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.reading_speed.ReadingSpeedSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.system.SystemSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.text.TextSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.translator.TranslatorSubcategory
+import ua.acclorite.book_story.ui.settings.reader.chapters.ChaptersSubcategory
+import ua.acclorite.book_story.ui.settings.reader.font.FontSubcategory
+import ua.acclorite.book_story.ui.settings.reader.images.ImagesSubcategory
+import ua.acclorite.book_story.ui.settings.reader.misc.MiscSubcategory
+import ua.acclorite.book_story.ui.settings.reader.padding.PaddingSubcategory
+import ua.acclorite.book_story.ui.settings.reader.progress.ProgressSubcategory
+import ua.acclorite.book_story.ui.settings.reader.reading_mode.ReadingModeSubcategory
+import ua.acclorite.book_story.ui.settings.reader.reading_speed.ReadingSpeedSubcategory
+import ua.acclorite.book_story.ui.settings.reader.system.SystemSubcategory
+import ua.acclorite.book_story.ui.settings.reader.text.TextSubcategory
+import ua.acclorite.book_story.ui.settings.reader.translator.TranslatorSubcategory
 
 fun LazyListScope.ReaderSettingsCategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsContent.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsContent.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsContent.kt
index 5a5bb157..1b9371c3 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader
+package ua.acclorite.book_story.ui.settings.reader
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsLayout.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsLayout.kt
index b144e108..a081c6b9 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader
+package ua.acclorite.book_story.ui.settings.reader
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
@@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun ReaderSettingsLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsScaffold.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsScaffold.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsScaffold.kt
index 15d6bfec..62eb8e3a 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsScaffold.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader
+package ua.acclorite.book_story.ui.settings.reader
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsTopBar.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsTopBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsTopBar.kt
index 43ae6e4f..81eb33fc 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsTopBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader
+package ua.acclorite.book_story.ui.settings.reader
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LargeTopAppBar
@@ -14,8 +14,8 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
-import ua.acclorite.book_story.presentation.navigator.NavigatorBackIconButton
+import ua.acclorite.book_story.ui.common.components.common.StyledText
+import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/ChaptersSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/chapters/ChaptersSubcategory.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/ChaptersSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/chapters/ChaptersSubcategory.kt
index b92270c2..be733f7b 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/ChaptersSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/chapters/ChaptersSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.reader.chapters
+package ua.acclorite.book_story.ui.settings.reader.chapters
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,8 +14,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.chapters.components.ChapterTitleAlignmentOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.reader.chapters.components.ChapterTitleAlignmentOption
 
 fun LazyListScope.ChaptersSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt
index a166f01f..5993e681 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.chapters.components
+package ua.acclorite.book_story.ui.settings.reader.chapters.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -12,11 +12,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment
+import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun ChapterTitleAlignmentOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/FontSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/FontSubcategory.kt
similarity index 65%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/FontSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/FontSubcategory.kt
index 7a570604..da24b5f2 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/FontSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/FontSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.reader.font
+package ua.acclorite.book_story.ui.settings.reader.font
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,12 +14,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.font.components.FontFamilyOption
-import ua.acclorite.book_story.presentation.settings.reader.font.components.FontSizeOption
-import ua.acclorite.book_story.presentation.settings.reader.font.components.FontStyleOption
-import ua.acclorite.book_story.presentation.settings.reader.font.components.FontThicknessOption
-import ua.acclorite.book_story.presentation.settings.reader.font.components.LetterSpacingOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.reader.font.components.FontFamilyOption
+import ua.acclorite.book_story.ui.settings.reader.font.components.FontSizeOption
+import ua.acclorite.book_story.ui.settings.reader.font.components.FontStyleOption
+import ua.acclorite.book_story.ui.settings.reader.font.components.FontThicknessOption
+import ua.acclorite.book_story.ui.settings.reader.font.components.LetterSpacingOption
 
 fun LazyListScope.FontSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontFamilyOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontFamilyOption.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontFamilyOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontFamilyOption.kt
index 01cdda94..b04726ea 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontFamilyOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontFamilyOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.font.components
+package ua.acclorite.book_story.ui.settings.reader.font.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -13,11 +13,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.ChipsWithTitle
-import ua.acclorite.book_story.presentation.common.constants.provideFonts
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.ChipsWithTitle
+import ua.acclorite.book_story.ui.common.constants.provideFonts
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun FontFamilyOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontSizeOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontSizeOption.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontSizeOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontSizeOption.kt
index 8f1590e7..67bc5432 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontSizeOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontSizeOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.font.components
+package ua.acclorite.book_story.ui.settings.reader.font.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun FontSizeOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontStyleOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontStyleOption.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontStyleOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontStyleOption.kt
index 258403c6..c5aeaa79 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontStyleOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontStyleOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.font.components
+package ua.acclorite.book_story.ui.settings.reader.font.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -14,11 +14,11 @@ import androidx.compose.ui.text.font.FontStyle
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle
-import ua.acclorite.book_story.presentation.common.constants.provideFonts
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle
+import ua.acclorite.book_story.ui.common.constants.provideFonts
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun FontStyleOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontThicknessOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontThicknessOption.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontThicknessOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontThicknessOption.kt
index 1a696e91..447497c3 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/FontThicknessOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontThicknessOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.font.components
+package ua.acclorite.book_story.ui.settings.reader.font.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -13,12 +13,12 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.ChipsWithTitle
-import ua.acclorite.book_story.presentation.common.constants.provideFonts
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.reader.model.ReaderFontThickness
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.reader.model.ReaderFontThickness
+import ua.acclorite.book_story.ui.common.components.settings.ChipsWithTitle
+import ua.acclorite.book_story.ui.common.constants.provideFonts
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun FontThicknessOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/LetterSpacingOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/LetterSpacingOption.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/LetterSpacingOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/LetterSpacingOption.kt
index 43950460..0925d3f7 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/components/LetterSpacingOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/LetterSpacingOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.font.components
+package ua.acclorite.book_story.ui.settings.reader.font.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun LetterSpacingOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/ImagesSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/ImagesSubcategory.kt
similarity index 64%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/ImagesSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/ImagesSubcategory.kt
index 42499889..69f60e60 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/ImagesSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/ImagesSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.reader.images
+package ua.acclorite.book_story.ui.settings.reader.images
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,12 +14,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.images.components.ImagesAlignmentOption
-import ua.acclorite.book_story.presentation.settings.reader.images.components.ImagesColorEffectsOption
-import ua.acclorite.book_story.presentation.settings.reader.images.components.ImagesCornersRoundnessOption
-import ua.acclorite.book_story.presentation.settings.reader.images.components.ImagesOption
-import ua.acclorite.book_story.presentation.settings.reader.images.components.ImagesWidthOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.reader.images.components.ImagesAlignmentOption
+import ua.acclorite.book_story.ui.settings.reader.images.components.ImagesColorEffectsOption
+import ua.acclorite.book_story.ui.settings.reader.images.components.ImagesCornersRoundnessOption
+import ua.acclorite.book_story.ui.settings.reader.images.components.ImagesOption
+import ua.acclorite.book_story.ui.settings.reader.images.components.ImagesWidthOption
 
 fun LazyListScope.ImagesSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesAlignmentOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesAlignmentOption.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesAlignmentOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesAlignmentOption.kt
index ee922120..4ddf0e61 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesAlignmentOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesAlignmentOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.images.components
+package ua.acclorite.book_story.ui.settings.reader.images.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -12,12 +12,12 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.main.model.HorizontalAlignment
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.main.model.HorizontalAlignment
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun ImagesAlignmentOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesColorEffectsOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesColorEffectsOption.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesColorEffectsOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesColorEffectsOption.kt
index 7740241b..f597b76a 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesColorEffectsOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesColorEffectsOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.images.components
+package ua.acclorite.book_story.ui.settings.reader.images.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -12,12 +12,12 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.ChipsWithTitle
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.reader.model.ReaderColorEffects
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.reader.model.ReaderColorEffects
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.ChipsWithTitle
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun ImagesColorEffectsOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesCornersRoundnessOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesCornersRoundnessOption.kt
similarity index 75%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesCornersRoundnessOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesCornersRoundnessOption.kt
index 214a8e67..34333ac9 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesCornersRoundnessOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesCornersRoundnessOption.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.images.components
+package ua.acclorite.book_story.ui.settings.reader.images.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun ImagesCornersRoundnessOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesOption.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesOption.kt
index 3821b6ac..e8727907 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.images.components
+package ua.acclorite.book_story.ui.settings.reader.images.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun ImagesOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesWidthOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesWidthOption.kt
similarity index 73%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesWidthOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesWidthOption.kt
index 6e81c4c7..53c2c5d8 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/images/components/ImagesWidthOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesWidthOption.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.images.components
+package ua.acclorite.book_story.ui.settings.reader.images.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun ImagesWidthOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/MiscSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/MiscSubcategory.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/MiscSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/MiscSubcategory.kt
index d71be456..be5f2d12 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/MiscSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/MiscSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.reader.misc
+package ua.acclorite.book_story.ui.settings.reader.misc
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,10 +14,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.misc.components.FullscreenOption
-import ua.acclorite.book_story.presentation.settings.reader.misc.components.HideBarsOnFastScrollOption
-import ua.acclorite.book_story.presentation.settings.reader.misc.components.KeepScreenOnOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.reader.misc.components.FullscreenOption
+import ua.acclorite.book_story.ui.settings.reader.misc.components.HideBarsOnFastScrollOption
+import ua.acclorite.book_story.ui.settings.reader.misc.components.KeepScreenOnOption
 
 fun LazyListScope.MiscSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/FullscreenOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/components/FullscreenOption.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/FullscreenOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/components/FullscreenOption.kt
index cf3c4641..29fcd838 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/FullscreenOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/components/FullscreenOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.misc.components
+package ua.acclorite.book_story.ui.settings.reader.misc.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun FullscreenOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/HideBarsOnFastScrollOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/components/HideBarsOnFastScrollOption.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/HideBarsOnFastScrollOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/components/HideBarsOnFastScrollOption.kt
index b20c1360..46e6d780 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/HideBarsOnFastScrollOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/components/HideBarsOnFastScrollOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.misc.components
+package ua.acclorite.book_story.ui.settings.reader.misc.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun HideBarsOnFastScrollOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/KeepScreenOnOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/components/KeepScreenOnOption.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/KeepScreenOnOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/components/KeepScreenOnOption.kt
index 0d9898a6..ce045704 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/components/KeepScreenOnOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/components/KeepScreenOnOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.misc.components
+package ua.acclorite.book_story.ui.settings.reader.misc.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun KeepScreenOnOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/PaddingSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/PaddingSubcategory.kt
similarity index 67%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/PaddingSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/PaddingSubcategory.kt
index fa6dc7ca..7cc269e4 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/PaddingSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/PaddingSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.reader.padding
+package ua.acclorite.book_story.ui.settings.reader.padding
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,11 +14,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.padding.components.BottomBarPaddingOption
-import ua.acclorite.book_story.presentation.settings.reader.padding.components.CutoutPaddingOption
-import ua.acclorite.book_story.presentation.settings.reader.padding.components.SidePaddingOption
-import ua.acclorite.book_story.presentation.settings.reader.padding.components.VerticalPaddingOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.reader.padding.components.BottomBarPaddingOption
+import ua.acclorite.book_story.ui.settings.reader.padding.components.CutoutPaddingOption
+import ua.acclorite.book_story.ui.settings.reader.padding.components.SidePaddingOption
+import ua.acclorite.book_story.ui.settings.reader.padding.components.VerticalPaddingOption
 
 fun LazyListScope.PaddingSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/BottomBarPaddingOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/BottomBarPaddingOption.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/BottomBarPaddingOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/BottomBarPaddingOption.kt
index 7c892e06..925c61bb 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/BottomBarPaddingOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/BottomBarPaddingOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.padding.components
+package ua.acclorite.book_story.ui.settings.reader.padding.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun BottomBarPaddingOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/CutoutPaddingOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/CutoutPaddingOption.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/CutoutPaddingOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/CutoutPaddingOption.kt
index 1c0b272d..f9da8be8 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/CutoutPaddingOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/CutoutPaddingOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.padding.components
+package ua.acclorite.book_story.ui.settings.reader.padding.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun CutoutPaddingOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/SidePaddingOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/SidePaddingOption.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/SidePaddingOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/SidePaddingOption.kt
index d219ca61..51abcdd8 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/SidePaddingOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/SidePaddingOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.padding.components
+package ua.acclorite.book_story.ui.settings.reader.padding.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun SidePaddingOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/VerticalPaddingOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/VerticalPaddingOption.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/VerticalPaddingOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/VerticalPaddingOption.kt
index 7a67c910..21fa45ba 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/components/VerticalPaddingOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/VerticalPaddingOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.padding.components
+package ua.acclorite.book_story.ui.settings.reader.padding.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun VerticalPaddingOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/ProgressSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/ProgressSubcategory.kt
similarity index 64%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/ProgressSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/ProgressSubcategory.kt
index fca1eb92..17881ee9 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/ProgressSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/ProgressSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.reader.progress
+package ua.acclorite.book_story.ui.settings.reader.progress
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,12 +14,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.progress.components.ProgressBarAlignmentOption
-import ua.acclorite.book_story.presentation.settings.reader.progress.components.ProgressBarFontSizeOption
-import ua.acclorite.book_story.presentation.settings.reader.progress.components.ProgressBarOption
-import ua.acclorite.book_story.presentation.settings.reader.progress.components.ProgressBarPaddingOption
-import ua.acclorite.book_story.presentation.settings.reader.progress.components.ProgressCountOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.reader.progress.components.ProgressBarAlignmentOption
+import ua.acclorite.book_story.ui.settings.reader.progress.components.ProgressBarFontSizeOption
+import ua.acclorite.book_story.ui.settings.reader.progress.components.ProgressBarOption
+import ua.acclorite.book_story.ui.settings.reader.progress.components.ProgressBarPaddingOption
+import ua.acclorite.book_story.ui.settings.reader.progress.components.ProgressCountOption
 
 fun LazyListScope.ProgressSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarAlignmentOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarAlignmentOption.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarAlignmentOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarAlignmentOption.kt
index b33d5b2a..61a331eb 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarAlignmentOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarAlignmentOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.progress.components
+package ua.acclorite.book_story.ui.settings.reader.progress.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -12,12 +12,12 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.main.model.HorizontalAlignment
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.main.model.HorizontalAlignment
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun ProgressBarAlignmentOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarFontSizeOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarFontSizeOption.kt
similarity index 74%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarFontSizeOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarFontSizeOption.kt
index a137dc58..16ec5d34 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarFontSizeOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarFontSizeOption.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.progress.components
+package ua.acclorite.book_story.ui.settings.reader.progress.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun ProgressBarFontSizeOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarOption.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarOption.kt
index acb93982..8e261a32 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.progress.components
+package ua.acclorite.book_story.ui.settings.reader.progress.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun ProgressBarOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarPaddingOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarPaddingOption.kt
similarity index 74%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarPaddingOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarPaddingOption.kt
index ef00c68a..6ddca172 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressBarPaddingOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarPaddingOption.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.progress.components
+package ua.acclorite.book_story.ui.settings.reader.progress.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun ProgressBarPaddingOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressCountOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressCountOption.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressCountOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressCountOption.kt
index a522e2aa..3fe52c5a 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/progress/components/ProgressCountOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressCountOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.progress.components
+package ua.acclorite.book_story.ui.settings.reader.progress.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -12,11 +12,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.reader.model.ReaderProgressCount
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.reader.model.ReaderProgressCount
+import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun ProgressCountOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/ReadingModeSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/ReadingModeSubcategory.kt
similarity index 63%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/ReadingModeSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/ReadingModeSubcategory.kt
index 327b3e57..a2f657b8 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/ReadingModeSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/ReadingModeSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.reader.reading_mode
+package ua.acclorite.book_story.ui.settings.reader.reading_mode
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,12 +14,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.reading_mode.components.HorizontalGestureAlphaAnimOption
-import ua.acclorite.book_story.presentation.settings.reader.reading_mode.components.HorizontalGestureOption
-import ua.acclorite.book_story.presentation.settings.reader.reading_mode.components.HorizontalGesturePullAnimOption
-import ua.acclorite.book_story.presentation.settings.reader.reading_mode.components.HorizontalGestureScrollOption
-import ua.acclorite.book_story.presentation.settings.reader.reading_mode.components.HorizontalGestureSensitivityOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.reader.reading_mode.components.HorizontalGestureAlphaAnimOption
+import ua.acclorite.book_story.ui.settings.reader.reading_mode.components.HorizontalGestureOption
+import ua.acclorite.book_story.ui.settings.reader.reading_mode.components.HorizontalGesturePullAnimOption
+import ua.acclorite.book_story.ui.settings.reader.reading_mode.components.HorizontalGestureScrollOption
+import ua.acclorite.book_story.ui.settings.reader.reading_mode.components.HorizontalGestureSensitivityOption
 
 fun LazyListScope.ReadingModeSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt
similarity index 75%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt
index 9fca7f6b..b6187324 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.reading_mode.components
+package ua.acclorite.book_story.ui.settings.reader.reading_mode.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun HorizontalGestureAlphaAnimOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureOption.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureOption.kt
index 5e0dc59c..49c9e9df 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.reading_mode.components
+package ua.acclorite.book_story.ui.settings.reader.reading_mode.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -12,11 +12,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.ChipsWithTitle
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture
+import ua.acclorite.book_story.ui.common.components.settings.ChipsWithTitle
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun HorizontalGestureOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt
similarity index 74%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt
index dd7c99b7..859b947b 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.reading_mode.components
+package ua.acclorite.book_story.ui.settings.reader.reading_mode.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun HorizontalGesturePullAnimOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt
similarity index 72%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt
index 1e01f2e6..22fe9875 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.reading_mode.components
+package ua.acclorite.book_story.ui.settings.reader.reading_mode.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun HorizontalGestureScrollOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt
similarity index 72%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt
index 33eac541..6c114a87 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.reading_mode.components
+package ua.acclorite.book_story.ui.settings.reader.reading_mode.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.reader.model.ReaderHorizontalGesture
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun HorizontalGestureSensitivityOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/ReadingSpeedSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/ReadingSpeedSubcategory.kt
similarity index 63%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/ReadingSpeedSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/ReadingSpeedSubcategory.kt
index ac175962..f9f5f414 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/ReadingSpeedSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/ReadingSpeedSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.reader.reading_speed
+package ua.acclorite.book_story.ui.settings.reader.reading_speed
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,12 +14,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.reading_speed.components.HighlightedReadingOption
-import ua.acclorite.book_story.presentation.settings.reader.reading_speed.components.HighlightedReadingThicknessOption
-import ua.acclorite.book_story.presentation.settings.reader.reading_speed.components.PerceptionExpanderOption
-import ua.acclorite.book_story.presentation.settings.reader.reading_speed.components.PerceptionExpanderPaddingOption
-import ua.acclorite.book_story.presentation.settings.reader.reading_speed.components.PerceptionExpanderThicknessOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.reader.reading_speed.components.HighlightedReadingOption
+import ua.acclorite.book_story.ui.settings.reader.reading_speed.components.HighlightedReadingThicknessOption
+import ua.acclorite.book_story.ui.settings.reader.reading_speed.components.PerceptionExpanderOption
+import ua.acclorite.book_story.ui.settings.reader.reading_speed.components.PerceptionExpanderPaddingOption
+import ua.acclorite.book_story.ui.settings.reader.reading_speed.components.PerceptionExpanderThicknessOption
 
 fun LazyListScope.ReadingSpeedSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/HighlightedReadingOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HighlightedReadingOption.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/HighlightedReadingOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HighlightedReadingOption.kt
index e188d223..fc79c390 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/HighlightedReadingOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HighlightedReadingOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.reading_speed.components
+package ua.acclorite.book_story.ui.settings.reader.reading_speed.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun HighlightedReadingOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt
index 133e62bb..82e1b80f 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.reading_speed.components
+package ua.acclorite.book_story.ui.settings.reader.reading_speed.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun HighlightedReadingThicknessOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderOption.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderOption.kt
index 4671cff9..63a1d6d8 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.reading_speed.components
+package ua.acclorite.book_story.ui.settings.reader.reading_speed.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun PerceptionExpanderOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt
similarity index 75%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt
index b62c3b30..5ea59da7 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.reading_speed.components
+package ua.acclorite.book_story.ui.settings.reader.reading_speed.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun PerceptionExpanderPaddingOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt
similarity index 75%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt
index b3ede84f..bd76133b 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.reading_speed.components
+package ua.acclorite.book_story.ui.settings.reader.reading_speed.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun PerceptionExpanderThicknessOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/SystemSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/SystemSubcategory.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/SystemSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/SystemSubcategory.kt
index e0ca2fea..9baa99d2 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/SystemSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/SystemSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.reader.system
+package ua.acclorite.book_story.ui.settings.reader.system
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,10 +14,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.system.components.CustomScreenBrightnessOption
-import ua.acclorite.book_story.presentation.settings.reader.system.components.ScreenBrightnessOption
-import ua.acclorite.book_story.presentation.settings.reader.system.components.ScreenOrientationOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.reader.system.components.CustomScreenBrightnessOption
+import ua.acclorite.book_story.ui.settings.reader.system.components.ScreenBrightnessOption
+import ua.acclorite.book_story.ui.settings.reader.system.components.ScreenOrientationOption
 
 fun LazyListScope.SystemSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/CustomScreenBrightnessOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/CustomScreenBrightnessOption.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/CustomScreenBrightnessOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/CustomScreenBrightnessOption.kt
index 3e8b41f9..7f3270f3 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/CustomScreenBrightnessOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/CustomScreenBrightnessOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.system.components
+package ua.acclorite.book_story.ui.settings.reader.system.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun CustomScreenBrightnessOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/ScreenBrightnessOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/ScreenBrightnessOption.kt
similarity index 74%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/ScreenBrightnessOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/ScreenBrightnessOption.kt
index 069fa167..e9c5d856 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/ScreenBrightnessOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/ScreenBrightnessOption.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.system.components
+package ua.acclorite.book_story.ui.settings.reader.system.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun ScreenBrightnessOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/ScreenOrientationOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/ScreenOrientationOption.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/ScreenOrientationOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/ScreenOrientationOption.kt
index 6f901477..90604fb6 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/components/ScreenOrientationOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/ScreenOrientationOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.system.components
+package ua.acclorite.book_story.ui.settings.reader.system.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -12,11 +12,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.ChipsWithTitle
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.reader.model.ReaderScreenOrientation
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.reader.model.ReaderScreenOrientation
+import ua.acclorite.book_story.ui.common.components.settings.ChipsWithTitle
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun ScreenOrientationOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/TextSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/TextSubcategory.kt
similarity index 67%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/TextSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/TextSubcategory.kt
index 273678dc..042b473b 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/TextSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/TextSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.reader.text
+package ua.acclorite.book_story.ui.settings.reader.text
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,11 +14,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.text.components.LineHeightOption
-import ua.acclorite.book_story.presentation.settings.reader.text.components.ParagraphHeightOption
-import ua.acclorite.book_story.presentation.settings.reader.text.components.ParagraphIndentationOption
-import ua.acclorite.book_story.presentation.settings.reader.text.components.TextAlignmentOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.reader.text.components.LineHeightOption
+import ua.acclorite.book_story.ui.settings.reader.text.components.ParagraphHeightOption
+import ua.acclorite.book_story.ui.settings.reader.text.components.ParagraphIndentationOption
+import ua.acclorite.book_story.ui.settings.reader.text.components.TextAlignmentOption
 
 fun LazyListScope.TextSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/LineHeightOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/LineHeightOption.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/LineHeightOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/LineHeightOption.kt
index 7af599c1..f0eb1cda 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/LineHeightOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/LineHeightOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.text.components
+package ua.acclorite.book_story.ui.settings.reader.text.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun LineHeightOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/ParagraphHeightOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/ParagraphHeightOption.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/ParagraphHeightOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/ParagraphHeightOption.kt
index 7852ef13..86cbea00 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/ParagraphHeightOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/ParagraphHeightOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.text.components
+package ua.acclorite.book_story.ui.settings.reader.text.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun ParagraphHeightOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/ParagraphIndentationOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/ParagraphIndentationOption.kt
similarity index 73%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/ParagraphIndentationOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/ParagraphIndentationOption.kt
index 4d9831f0..9440c911 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/ParagraphIndentationOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/ParagraphIndentationOption.kt
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.text.components
+package ua.acclorite.book_story.ui.settings.reader.text.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment
+import ua.acclorite.book_story.presentation.theme.ExpandingTransition
+import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
 
 @Composable
 fun ParagraphIndentationOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/TextAlignmentOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/TextAlignmentOption.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/TextAlignmentOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/TextAlignmentOption.kt
index e86521bc..fbd7c4ee 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/TextAlignmentOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/TextAlignmentOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.text.components
+package ua.acclorite.book_story.ui.settings.reader.text.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -12,11 +12,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SegmentedButtonWithTitle
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
-import ua.acclorite.book_story.ui.reader.model.ReaderTextAlignment
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment
+import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun TextAlignmentOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/translator/TranslatorSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/translator/TranslatorSubcategory.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/translator/TranslatorSubcategory.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/translator/TranslatorSubcategory.kt
index fd89dc4e..7d87047a 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/translator/TranslatorSubcategory.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/translator/TranslatorSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.settings.reader.translator
+package ua.acclorite.book_story.ui.settings.reader.translator
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
@@ -14,8 +14,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
-import ua.acclorite.book_story.presentation.settings.reader.translator.components.DoubleClickTranslationOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.ui.settings.reader.translator.components.DoubleClickTranslationOption
 
 fun LazyListScope.TranslatorSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/translator/components/DoubleClickTranslationOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/translator/components/DoubleClickTranslationOption.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/translator/components/DoubleClickTranslationOption.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/settings/reader/translator/components/DoubleClickTranslationOption.kt
index d2ac4e76..8945e2ee 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/translator/components/DoubleClickTranslationOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/translator/components/DoubleClickTranslationOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings.reader.translator.components
+package ua.acclorite.book_story.ui.settings.reader.translator.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.main.MainModel
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainModel
+import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
 
 @Composable
 fun DoubleClickTranslationOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartBackHandler.kt b/app/src/main/java/ua/acclorite/book_story/ui/start/StartBackHandler.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/presentation/start/StartBackHandler.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/start/StartBackHandler.kt
index 3db543ea..0a9882bb 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartBackHandler.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/start/StartBackHandler.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.start
+package ua.acclorite.book_story.ui.start
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartContent.kt b/app/src/main/java/ua/acclorite/book_story/ui/start/StartContent.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/presentation/start/StartContent.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/start/StartContent.kt
index 75caf364..13d7195f 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/start/StartContent.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.start
+package ua.acclorite.book_story.ui.start
 
 import androidx.compose.foundation.background
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.navigator.StackEvent
-import ua.acclorite.book_story.ui.start.StartScreen
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.navigator.StackEvent
+import ua.acclorite.book_story.presentation.start.StartScreen
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun StartContent(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartContentTransition.kt b/app/src/main/java/ua/acclorite/book_story/ui/start/StartContentTransition.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/presentation/start/StartContentTransition.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/start/StartContentTransition.kt
index dc6fb804..cee0dbec 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartContentTransition.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/start/StartContentTransition.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.start
+package ua.acclorite.book_story.ui.start
 
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import ua.acclorite.book_story.ui.navigator.StackEvent
-import ua.acclorite.book_story.ui.theme.Transitions
+import ua.acclorite.book_story.presentation.navigator.StackEvent
+import ua.acclorite.book_story.presentation.theme.Transitions
 
 @Composable
 fun StartContentTransition(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartDone.kt b/app/src/main/java/ua/acclorite/book_story/ui/start/StartDone.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/presentation/start/StartDone.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/start/StartDone.kt
index aa5f100f..d9a13fce 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartDone.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/start/StartDone.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.start
+package ua.acclorite.book_story.ui.start
 
 import androidx.compose.runtime.Composable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartDoneBottomBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/start/StartDoneBottomBar.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/start/StartDoneBottomBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/start/StartDoneBottomBar.kt
index c98c09d4..c76882ce 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartDoneBottomBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/start/StartDoneBottomBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.start
+package ua.acclorite.book_story.ui.start
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -25,7 +25,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun StartDoneBottomBar(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartDoneLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/start/StartDoneLayout.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/start/StartDoneLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/start/StartDoneLayout.kt
index 04984134..b7d36a4c 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartDoneLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/start/StartDoneLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.start
+package ua.acclorite.book_story.ui.start
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -26,7 +26,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun StartDoneLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartDoneScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/start/StartDoneScaffold.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/start/StartDoneScaffold.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/start/StartDoneScaffold.kt
index cbe21340..cbd0fcb2 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartDoneScaffold.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/start/StartDoneScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.start
+package ua.acclorite.book_story.ui.start
 
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettings.kt b/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettings.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettings.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/start/StartSettings.kt
index 264d41be..b4784a25 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettings.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettings.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.start
+package ua.acclorite.book_story.ui.start
 
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.ui.main.MainEvent
-import ua.acclorite.book_story.ui.navigator.StackEvent
-import ua.acclorite.book_story.ui.start.StartScreen
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.presentation.navigator.StackEvent
+import ua.acclorite.book_story.presentation.start.StartScreen
+import ua.acclorite.book_story.ui.common.model.ButtonItem
 
 @Composable
 fun StartSettings(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsBottomBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsBottomBar.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsBottomBar.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsBottomBar.kt
index 9575d986..726ce747 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsBottomBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsBottomBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.start
+package ua.acclorite.book_story.ui.start
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -18,7 +18,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun StartSettingsBottomBar(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayout.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayout.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayout.kt
index 653568ee..8e3ebc2b 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayout.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.start
+package ua.acclorite.book_story.ui.start
 
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import ua.acclorite.book_story.presentation.common.components.common.LazyColumnWithScrollbar
+import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun StartSettingsLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayoutAppearance.kt b/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayoutAppearance.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayoutAppearance.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayoutAppearance.kt
index 5cb1763e..0505672b 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayoutAppearance.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayoutAppearance.kt
@@ -6,13 +6,13 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.start
+package ua.acclorite.book_story.ui.start
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.ui.res.stringResource
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.ThemePreferencesSubcategory
+import ua.acclorite.book_story.ui.settings.appearance.theme_preferences.ThemePreferencesSubcategory
 
 fun LazyListScope.StartSettingsLayoutAppearance() {
     ThemePreferencesSubcategory(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayoutGeneral.kt b/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayoutGeneral.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayoutGeneral.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayoutGeneral.kt
index ee822786..f7233de2 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayoutGeneral.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayoutGeneral.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.start
+package ua.acclorite.book_story.ui.start
 
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
@@ -17,10 +17,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.dialog.SelectableDialogItem
-import ua.acclorite.book_story.presentation.common.model.ButtonItem
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryTitle
-import ua.acclorite.book_story.ui.main.MainEvent
+import ua.acclorite.book_story.presentation.main.MainEvent
+import ua.acclorite.book_story.ui.common.components.dialog.SelectableDialogItem
+import ua.acclorite.book_story.ui.common.model.ButtonItem
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle
 
 fun LazyListScope.StartSettingsLayoutGeneral(
     languages: List<ButtonItem>,
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayoutScan.kt b/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayoutScan.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayoutScan.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayoutScan.kt
index ebe9266a..254a1042 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayoutScan.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayoutScan.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.presentation.start
+package ua.acclorite.book_story.ui.start
 
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
@@ -16,8 +16,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.browse.scan.components.BrowseScanOption
-import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategoryTitle
+import ua.acclorite.book_story.ui.settings.browse.scan.components.BrowseScanOption
+import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle
 
 fun LazyListScope.StartSettingsLayoutScan() {
     item {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsScaffold.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsScaffold.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsScaffold.kt
index 74aa9af3..e30e14b5 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsScaffold.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.start
+package ua.acclorite.book_story.ui.start
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -25,7 +25,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.common.components.common.StyledText
+import ua.acclorite.book_story.ui.common.components.common.StyledText
 
 @Composable
 fun StartSettingsScaffold(