diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 00000000..def7640f
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,84 @@
+# Book's Story — Bookshelf Fork
+
+> Форк `Acclorite/book-story` под Bookshelf: audiobookshelf + bookshelf-api + TTS + offline.
+
+## Stack
+
+- **Язык:** Kotlin 100%
+- **UI:** Jetpack Compose + Material3
+- **DI:** Dagger Hilt
+- **БД:** Room
+- **Настройки:** DataStore
+- **Сеть:** Retrofit + OkHttp + Kotlinx Serialization
+- **Аудио:** ExoPlayer (Media3) + MediaSession
+- **Фоновые задачи:** WorkManager
+- **Читалка:** собственная Book's Story (jsoup, pdfbox, commonmark)
+- **minSdk:** 26 (план — поднять до 31 позже)
+- **compileSdk/targetSdk:** 36
+
+## Goal
+
+- Сохранить Material You reader Book's Story.
+- Добавить поддержку bookshelf-api: библиотеки, поиск, TTS, подкасты, Яндекс/YouTube.
+- Добавить аудиоплеер для аудиокниг из Audiobookshelf.
+- Добавить offline-кэш и синхронизацию прогресса.
+
+## Layout
+
+- `app/src/main/java/org/dueattendant149/bookshelf/` — основной код
+  - `core/` — crash handler, typealias, commonmark parser
+  - `data/` — repository, Room, DataStore, mappers, parsers, DI
+  - `domain/` — models, use cases, repository interfaces
+  - `presentation/` — ViewModels, MVI screens, navigator
+  - `ui/` — Compose UI
+- `bookshelf-api` backend находится в `~/bookshelf/bookshelf-api/` (отдельный проект)
+- Lissen (который дорабатывается параллельно) — `~/bookshelf/lissen/`
+
+## API endpoints
+
+- **bookshelf-api:** `http://bookshelf-api:8073` (или `https://tts.dueattendant149.org` после DNS)
+  - `GET /api/v1/books/libraries`
+  - `GET /api/v1/books/{item_id}`
+  - `GET /api/v1/books/library/{id}/search?q=...`
+  - `POST /api/v1/search`
+  - `POST /api/v1/tts`, `GET /api/v1/tts/{job_id}`, `GET /api/v1/tts/{job_id}/download`
+  - `GET /api/v1/tts/engines`, `GET /api/v1/tts/voices`
+  - `POST /api/v1/download`, `GET /api/v1/download/list`
+  - `POST /api/v1/podcasts`, `POST /api/v1/sources/yandex`
+- **Audiobookshelf (напрямую):** для аудио файлов и обложек
+  - `GET /api/items/{id}/file/{ino}`
+  - `GET /api/items/{id}/download`
+  - `GET /api/items/{id}/cover`
+
+## Git
+
+- **origin:** `https://git.dueattendant149.org/Atte149/book-story.git` (Forgejo)
+- **upstream:** `https://github.com/Acclorite/book-story.git`
+- **Лицензия:** GPL-3.0-only (как у оригинала)
+
+## Build
+
+```bash
+./gradlew :app:assembleDebug
+```
+
+## Current Status
+
+- Phase 1: fork + package rename completed.
+- Next: Phase 2 — network layer (Retrofit + bookshelf-api client).
+
+## WARNs
+
+- **Не пушить в `upstream` (Acclorite/book-story).** Только в `origin` (Forgejo).
+- **Lissen остаётся живым проектом.** Book's Story fork — отдельная ветка развития.
+- **Секреты** (ABS token, API keys) хранить только в `.env` / `credentials.json` / DataStore, никогда в коде.
+- **Package:** `org.dueattendant149.bookshelf`. Все ссылки на `ua.acclorite.book_story` в коде заменены; README оставлен с оригинальными F-Droid ссылками.
+
+## Typical tasks
+
+- Добавить новый endpoint bookshelf-api
+- Расширить `Book` / `BookEntity` для remote полей
+- Добавить аудиоплеер экран
+- Добавить TTS экран
+- Поднять minSdk, добавить новые разрешения
+- Обновить AGENTS.md при существенных изменениях архитектуры
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4e67b967..70f96ca2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -10,12 +10,12 @@ plugins {
 }
 
 android {
-    namespace = "ua.acclorite.book_story"
+    namespace = "org.dueattendant149.bookshelf"
     compileSdk = 36
 
     // Default configuration
     defaultConfig {
-        applicationId = "ua.acclorite.book_story"
+        applicationId = "org.dueattendant149.bookshelf"
         minSdk = 26
         targetSdk = 36
         versionCode = 14
diff --git a/app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/1.json b/app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/1.json
similarity index 100%
rename from app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/1.json
rename to app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/1.json
diff --git a/app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/10.json b/app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/10.json
similarity index 100%
rename from app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/10.json
rename to app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/10.json
diff --git a/app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/11.json b/app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/11.json
similarity index 100%
rename from app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/11.json
rename to app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/11.json
diff --git a/app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/12.json b/app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/12.json
similarity index 100%
rename from app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/12.json
rename to app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/12.json
diff --git a/app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/13.json b/app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/13.json
similarity index 100%
rename from app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/13.json
rename to app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/13.json
diff --git a/app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/14.json b/app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/14.json
similarity index 100%
rename from app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/14.json
rename to app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/14.json
diff --git a/app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/15.json b/app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/15.json
similarity index 100%
rename from app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/15.json
rename to app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/15.json
diff --git a/app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/16.json b/app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/16.json
similarity index 100%
rename from app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/16.json
rename to app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/16.json
diff --git a/app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/2.json b/app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/2.json
similarity index 100%
rename from app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/2.json
rename to app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/2.json
diff --git a/app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/3.json b/app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/3.json
similarity index 100%
rename from app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/3.json
rename to app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/3.json
diff --git a/app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/4.json b/app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/4.json
similarity index 100%
rename from app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/4.json
rename to app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/4.json
diff --git a/app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/5.json b/app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/5.json
similarity index 100%
rename from app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/5.json
rename to app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/5.json
diff --git a/app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/6.json b/app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/6.json
similarity index 100%
rename from app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/6.json
rename to app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/6.json
diff --git a/app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/7.json b/app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/7.json
similarity index 100%
rename from app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/7.json
rename to app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/7.json
diff --git a/app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/8.json b/app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/8.json
similarity index 100%
rename from app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/8.json
rename to app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/8.json
diff --git a/app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/9.json b/app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/9.json
similarity index 100%
rename from app/schemas/ua.acclorite.book_story.data.local.room.BookDatabase/9.json
rename to app/schemas/org.dueattendant149.bookshelf.data.local.room.BookDatabase/9.json
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 08742c3c..00225368 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,13 +3,13 @@
 
     <!-- Removing DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION, which is not used -->
     <uses-permission
-        android:name="ua.acclorite.book_story.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"
+        android:name="org.dueattendant149.bookshelf.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"
         tools:node="remove" />
     <uses-permission
-        android:name="ua.acclorite.book_story.debug.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"
+        android:name="org.dueattendant149.bookshelf.debug.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"
         tools:node="remove" />
     <uses-permission
-        android:name="ua.acclorite.book_story.release.debug.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"
+        android:name="org.dueattendant149.bookshelf.release.debug.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"
         tools:node="remove" />
 
     <!-- Removing READ_EXTERNAL_STORAGE and WRITE_EXTERNAL_STORAGE explicitly -->
diff --git a/app/src/main/java/ua/acclorite/book_story/Application.kt b/app/src/main/java/org/dueattendant149/bookshelf/Application.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/Application.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/Application.kt
index 1da2c109..a98d369d 100644
--- a/app/src/main/java/ua/acclorite/book_story/Application.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/Application.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story
+package org.dueattendant149.bookshelf
 
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
-import ua.acclorite.book_story.core.crash.CrashHandler
+import org.dueattendant149.bookshelf.core.crash.CrashHandler
 
 @HiltAndroidApp
 class Application : Application() {
diff --git a/app/src/main/java/ua/acclorite/book_story/core/Typealias.kt b/app/src/main/java/org/dueattendant149/bookshelf/core/Typealias.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/core/Typealias.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/core/Typealias.kt
index 8b12bb3f..f994520f 100644
--- a/app/src/main/java/ua/acclorite/book_story/core/Typealias.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/core/Typealias.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.core
+package org.dueattendant149.bookshelf.core
 
 import android.graphics.Bitmap
 
diff --git a/app/src/main/java/ua/acclorite/book_story/core/crash/CrashHandler.kt b/app/src/main/java/org/dueattendant149/bookshelf/core/crash/CrashHandler.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/core/crash/CrashHandler.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/core/crash/CrashHandler.kt
index 92b66e9e..3a62507b 100644
--- a/app/src/main/java/ua/acclorite/book_story/core/crash/CrashHandler.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/core/crash/CrashHandler.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.core.crash
+package org.dueattendant149.bookshelf.core.crash
 
 import android.content.Context
 import android.content.Intent
 import android.os.Process
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.presentation.crash.CrashActivity
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.presentation.crash.CrashActivity
 import kotlin.system.exitProcess
 
 private const val TAG = "CrashHandler"
diff --git a/app/src/main/java/ua/acclorite/book_story/core/crash/CrashUtils.kt b/app/src/main/java/org/dueattendant149/bookshelf/core/crash/CrashUtils.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/core/crash/CrashUtils.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/core/crash/CrashUtils.kt
index 3f8a8384..c7d9f649 100644
--- a/app/src/main/java/ua/acclorite/book_story/core/crash/CrashUtils.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/core/crash/CrashUtils.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.core.crash
+package org.dueattendant149.bookshelf.core.crash
 
 import android.content.Context
 import java.io.BufferedWriter
diff --git a/app/src/main/java/ua/acclorite/book_story/core/data/CoreData.kt b/app/src/main/java/org/dueattendant149/bookshelf/core/data/CoreData.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/core/data/CoreData.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/core/data/CoreData.kt
index da2722db..3ce07ef5 100644
--- a/app/src/main/java/ua/acclorite/book_story/core/data/CoreData.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/core/data/CoreData.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.core.data
+package org.dueattendant149.bookshelf.core.data
 
 import kotlinx.collections.immutable.toPersistentList
-import ua.acclorite.book_story.core.language.Language
+import org.dueattendant149.bookshelf.core.language.Language
 
 object CoreData {
     val defaultLanguage = Language.fromLanguageTag(languageTag = "en") // English
diff --git a/app/src/main/java/ua/acclorite/book_story/core/data/ExtensionsData.kt b/app/src/main/java/org/dueattendant149/bookshelf/core/data/ExtensionsData.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/core/data/ExtensionsData.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/core/data/ExtensionsData.kt
index 22e5d52b..badfb258 100644
--- a/app/src/main/java/ua/acclorite/book_story/core/data/ExtensionsData.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/core/data/ExtensionsData.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.core.data
+package org.dueattendant149.bookshelf.core.data
 
 import kotlinx.collections.immutable.persistentListOf
 
diff --git a/app/src/main/java/ua/acclorite/book_story/core/data/LinkData.kt b/app/src/main/java/org/dueattendant149/bookshelf/core/data/LinkData.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/core/data/LinkData.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/core/data/LinkData.kt
index 332e1fdb..80e01d1c 100644
--- a/app/src/main/java/ua/acclorite/book_story/core/data/LinkData.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/core/data/LinkData.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.core.data
+package org.dueattendant149.bookshelf.core.data
 
 object LinkData {
     const val RELEASES = "https://www.github.com/Acclorite/book-story/releases/latest"
diff --git a/app/src/main/java/ua/acclorite/book_story/core/helpers/CollectionHelpers.kt b/app/src/main/java/org/dueattendant149/bookshelf/core/helpers/CollectionHelpers.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/core/helpers/CollectionHelpers.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/core/helpers/CollectionHelpers.kt
index f4a7317f..02775003 100644
--- a/app/src/main/java/ua/acclorite/book_story/core/helpers/CollectionHelpers.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/core/helpers/CollectionHelpers.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.core.helpers
+package org.dueattendant149.bookshelf.core.helpers
 
 fun <T> MutableList<T>.addAll(calculation: () -> List<T>) {
     addAll(calculation())
diff --git a/app/src/main/java/ua/acclorite/book_story/core/helpers/PrimitiveHelpers.kt b/app/src/main/java/org/dueattendant149/bookshelf/core/helpers/PrimitiveHelpers.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/core/helpers/PrimitiveHelpers.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/core/helpers/PrimitiveHelpers.kt
index a6460d80..42da5a98 100644
--- a/app/src/main/java/ua/acclorite/book_story/core/helpers/PrimitiveHelpers.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/core/helpers/PrimitiveHelpers.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.core.helpers
+package org.dueattendant149.bookshelf.core.helpers
 
 fun String.removeTrailingZero(): String {
     if (!this.contains('.'))
diff --git a/app/src/main/java/ua/acclorite/book_story/core/helpers/SortHelpers.kt b/app/src/main/java/org/dueattendant149/bookshelf/core/helpers/SortHelpers.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/core/helpers/SortHelpers.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/core/helpers/SortHelpers.kt
index a6012e17..45d6111f 100644
--- a/app/src/main/java/ua/acclorite/book_story/core/helpers/SortHelpers.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/core/helpers/SortHelpers.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.core.helpers
+package org.dueattendant149.bookshelf.core.helpers
 
 fun <T> compareByWithOrder(
     descending: Boolean,
diff --git a/app/src/main/java/ua/acclorite/book_story/core/language/Language.kt b/app/src/main/java/org/dueattendant149/bookshelf/core/language/Language.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/core/language/Language.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/core/language/Language.kt
index 61bc16f6..0683fd44 100644
--- a/app/src/main/java/ua/acclorite/book_story/core/language/Language.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/core/language/Language.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.core.language
+package org.dueattendant149.bookshelf.core.language
 
 import androidx.compose.runtime.Immutable
 import java.util.Locale
diff --git a/app/src/main/java/ua/acclorite/book_story/core/language/LanguageUtils.kt b/app/src/main/java/org/dueattendant149/bookshelf/core/language/LanguageUtils.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/core/language/LanguageUtils.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/core/language/LanguageUtils.kt
index 0b0672b3..73966208 100644
--- a/app/src/main/java/ua/acclorite/book_story/core/language/LanguageUtils.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/core/language/LanguageUtils.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.core.language
+package org.dueattendant149.bookshelf.core.language
 
 import java.util.Locale
 
diff --git a/app/src/main/java/ua/acclorite/book_story/core/log/Log.kt b/app/src/main/java/org/dueattendant149/bookshelf/core/log/Log.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/core/log/Log.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/core/log/Log.kt
index cd2e8edc..e4942a2c 100644
--- a/app/src/main/java/ua/acclorite/book_story/core/log/Log.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/core/log/Log.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.core.log
+package org.dueattendant149.bookshelf.core.log
 
 import android.util.Log
 
diff --git a/app/src/main/java/ua/acclorite/book_story/core/ui/UIText.kt b/app/src/main/java/org/dueattendant149/bookshelf/core/ui/UIText.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/core/ui/UIText.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/core/ui/UIText.kt
index f93088bb..1bbb3f62 100644
--- a/app/src/main/java/ua/acclorite/book_story/core/ui/UIText.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/core/ui/UIText.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.core.ui
+package org.dueattendant149.bookshelf.core.ui
 
 import android.content.Context
 import android.os.Parcelable
diff --git a/app/src/main/java/ua/acclorite/book_story/data/converter/CategoryConverter.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/converter/CategoryConverter.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/data/converter/CategoryConverter.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/converter/CategoryConverter.kt
index 03a71f4d..7418e977 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/converter/CategoryConverter.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/converter/CategoryConverter.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.converter
+package org.dueattendant149.bookshelf.data.converter
 
 import androidx.room.TypeConverter
 import kotlinx.serialization.json.Json
diff --git a/app/src/main/java/ua/acclorite/book_story/data/di/AppModule.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/di/AppModule.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/data/di/AppModule.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/di/AppModule.kt
index 25af156b..40c47872 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/di/AppModule.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/di/AppModule.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.di
+package org.dueattendant149.bookshelf.data.di
 
 import android.app.Application
 import androidx.room.Room
@@ -19,8 +19,8 @@ import org.commonmark.node.HtmlBlock
 import org.commonmark.node.IndentedCodeBlock
 import org.commonmark.node.ThematicBreak
 import org.commonmark.parser.Parser
-import ua.acclorite.book_story.data.local.room.BookDatabase
-import ua.acclorite.book_story.data.local.room.DatabaseHelper
+import org.dueattendant149.bookshelf.data.local.room.BookDatabase
+import org.dueattendant149.bookshelf.data.local.room.DatabaseHelper
 import javax.inject.Singleton
 
 @Module
diff --git a/app/src/main/java/ua/acclorite/book_story/data/di/RepositoryModule.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/di/RepositoryModule.kt
similarity index 52%
rename from app/src/main/java/ua/acclorite/book_story/data/di/RepositoryModule.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/di/RepositoryModule.kt
index e7ba9e79..08b1cf60 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/di/RepositoryModule.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/di/RepositoryModule.kt
@@ -4,42 +4,42 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.di
+package org.dueattendant149.bookshelf.data.di
 
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import ua.acclorite.book_story.data.local.data_store.DataStore
-import ua.acclorite.book_story.data.local.data_store.DataStoreImpl
-import ua.acclorite.book_story.data.mapper.book.BookMapper
-import ua.acclorite.book_story.data.mapper.book.BookMapperImpl
-import ua.acclorite.book_story.data.mapper.category.CategoryMapper
-import ua.acclorite.book_story.data.mapper.category.CategoryMapperImpl
-import ua.acclorite.book_story.data.mapper.color_preset.ColorPresetMapper
-import ua.acclorite.book_story.data.mapper.color_preset.ColorPresetMapperImpl
-import ua.acclorite.book_story.data.mapper.file.FileMapper
-import ua.acclorite.book_story.data.mapper.file.FileMapperImpl
-import ua.acclorite.book_story.data.mapper.history.HistoryMapper
-import ua.acclorite.book_story.data.mapper.history.HistoryMapperImpl
-import ua.acclorite.book_story.data.parser.cover.CoverParser
-import ua.acclorite.book_story.data.parser.cover.CoverParserImpl
-import ua.acclorite.book_story.data.parser.file.FileParser
-import ua.acclorite.book_story.data.parser.file.FileParserImpl
-import ua.acclorite.book_story.data.parser.text.TextParser
-import ua.acclorite.book_story.data.parser.text.TextParserImpl
-import ua.acclorite.book_story.data.repository.BookRepositoryImpl
-import ua.acclorite.book_story.data.repository.CategoryRepositoryImpl
-import ua.acclorite.book_story.data.repository.ColorPresetRepositoryImpl
-import ua.acclorite.book_story.data.repository.FileSystemRepositoryImpl
-import ua.acclorite.book_story.data.repository.HistoryRepositoryImpl
-import ua.acclorite.book_story.data.repository.PermissionRepositoryImpl
-import ua.acclorite.book_story.domain.repository.BookRepository
-import ua.acclorite.book_story.domain.repository.CategoryRepository
-import ua.acclorite.book_story.domain.repository.ColorPresetRepository
-import ua.acclorite.book_story.domain.repository.FileSystemRepository
-import ua.acclorite.book_story.domain.repository.HistoryRepository
-import ua.acclorite.book_story.domain.repository.PermissionRepository
+import org.dueattendant149.bookshelf.data.local.data_store.DataStore
+import org.dueattendant149.bookshelf.data.local.data_store.DataStoreImpl
+import org.dueattendant149.bookshelf.data.mapper.book.BookMapper
+import org.dueattendant149.bookshelf.data.mapper.book.BookMapperImpl
+import org.dueattendant149.bookshelf.data.mapper.category.CategoryMapper
+import org.dueattendant149.bookshelf.data.mapper.category.CategoryMapperImpl
+import org.dueattendant149.bookshelf.data.mapper.color_preset.ColorPresetMapper
+import org.dueattendant149.bookshelf.data.mapper.color_preset.ColorPresetMapperImpl
+import org.dueattendant149.bookshelf.data.mapper.file.FileMapper
+import org.dueattendant149.bookshelf.data.mapper.file.FileMapperImpl
+import org.dueattendant149.bookshelf.data.mapper.history.HistoryMapper
+import org.dueattendant149.bookshelf.data.mapper.history.HistoryMapperImpl
+import org.dueattendant149.bookshelf.data.parser.cover.CoverParser
+import org.dueattendant149.bookshelf.data.parser.cover.CoverParserImpl
+import org.dueattendant149.bookshelf.data.parser.file.FileParser
+import org.dueattendant149.bookshelf.data.parser.file.FileParserImpl
+import org.dueattendant149.bookshelf.data.parser.text.TextParser
+import org.dueattendant149.bookshelf.data.parser.text.TextParserImpl
+import org.dueattendant149.bookshelf.data.repository.BookRepositoryImpl
+import org.dueattendant149.bookshelf.data.repository.CategoryRepositoryImpl
+import org.dueattendant149.bookshelf.data.repository.ColorPresetRepositoryImpl
+import org.dueattendant149.bookshelf.data.repository.FileSystemRepositoryImpl
+import org.dueattendant149.bookshelf.data.repository.HistoryRepositoryImpl
+import org.dueattendant149.bookshelf.data.repository.PermissionRepositoryImpl
+import org.dueattendant149.bookshelf.domain.repository.BookRepository
+import org.dueattendant149.bookshelf.domain.repository.CategoryRepository
+import org.dueattendant149.bookshelf.domain.repository.ColorPresetRepository
+import org.dueattendant149.bookshelf.domain.repository.FileSystemRepository
+import org.dueattendant149.bookshelf.domain.repository.HistoryRepository
+import org.dueattendant149.bookshelf.domain.repository.PermissionRepository
 import javax.inject.Singleton
 
 @Module
diff --git a/app/src/main/java/ua/acclorite/book_story/data/di/ServiceModule.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/di/ServiceModule.kt
similarity index 67%
rename from app/src/main/java/ua/acclorite/book_story/data/di/ServiceModule.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/di/ServiceModule.kt
index 665aa27c..d3ed5b92 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/di/ServiceModule.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/di/ServiceModule.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.di
+package org.dueattendant149.bookshelf.data.di
 
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import ua.acclorite.book_story.data.service.CoverImageHandlerImpl
-import ua.acclorite.book_story.data.service.FileProviderImpl
-import ua.acclorite.book_story.domain.service.CoverImageHandler
-import ua.acclorite.book_story.domain.service.FileProvider
+import org.dueattendant149.bookshelf.data.service.CoverImageHandlerImpl
+import org.dueattendant149.bookshelf.data.service.FileProviderImpl
+import org.dueattendant149.bookshelf.domain.service.CoverImageHandler
+import org.dueattendant149.bookshelf.domain.service.FileProvider
 import javax.inject.Singleton
 
 @Module
diff --git a/app/src/main/java/ua/acclorite/book_story/data/local/data_store/DataStore.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/local/data_store/DataStore.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/data/local/data_store/DataStore.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/local/data_store/DataStore.kt
index 9697b8be..7b4e461c 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/local/data_store/DataStore.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/local/data_store/DataStore.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.local.data_store
+package org.dueattendant149.bookshelf.data.local.data_store
 
 import androidx.datastore.preferences.core.Preferences
 
diff --git a/app/src/main/java/ua/acclorite/book_story/data/local/data_store/DataStoreImpl.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/local/data_store/DataStoreImpl.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/data/local/data_store/DataStoreImpl.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/local/data_store/DataStoreImpl.kt
index 1a8cb7f5..5439b6c0 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/local/data_store/DataStoreImpl.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/local/data_store/DataStoreImpl.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.local.data_store
+package org.dueattendant149.bookshelf.data.local.data_store
 
 import android.app.Application
 import android.content.Context
diff --git a/app/src/main/java/ua/acclorite/book_story/data/local/dto/BookEntity.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/local/dto/BookEntity.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/data/local/dto/BookEntity.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/local/dto/BookEntity.kt
index b16c58a4..7012f819 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/local/dto/BookEntity.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/local/dto/BookEntity.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.local.dto
+package org.dueattendant149.bookshelf.data.local.dto
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import androidx.room.TypeConverters
-import ua.acclorite.book_story.data.converter.CategoryConverter
+import org.dueattendant149.bookshelf.data.converter.CategoryConverter
 
 @Entity
 @TypeConverters(CategoryConverter::class)
diff --git a/app/src/main/java/ua/acclorite/book_story/data/local/dto/CategoryEntity.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/local/dto/CategoryEntity.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/data/local/dto/CategoryEntity.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/local/dto/CategoryEntity.kt
index a953f4d6..c221cd66 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/local/dto/CategoryEntity.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/local/dto/CategoryEntity.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.local.dto
+package org.dueattendant149.bookshelf.data.local.dto
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder
+import org.dueattendant149.bookshelf.presentation.library.model.LibrarySortOrder
 
 @Entity
 data class CategoryEntity(
diff --git a/app/src/main/java/ua/acclorite/book_story/data/local/dto/ColorPresetEntity.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/local/dto/ColorPresetEntity.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/data/local/dto/ColorPresetEntity.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/local/dto/ColorPresetEntity.kt
index 246feb76..849f5144 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/local/dto/ColorPresetEntity.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/local/dto/ColorPresetEntity.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.local.dto
+package org.dueattendant149.bookshelf.data.local.dto
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
diff --git a/app/src/main/java/ua/acclorite/book_story/data/local/dto/HistoryEntity.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/local/dto/HistoryEntity.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/data/local/dto/HistoryEntity.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/local/dto/HistoryEntity.kt
index 5ca115f5..e37ca715 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/local/dto/HistoryEntity.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/local/dto/HistoryEntity.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.local.dto
+package org.dueattendant149.bookshelf.data.local.dto
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
diff --git a/app/src/main/java/ua/acclorite/book_story/data/local/dto/HistoryWithBook.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/local/dto/HistoryWithBook.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/data/local/dto/HistoryWithBook.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/local/dto/HistoryWithBook.kt
index e27f0155..342d825b 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/local/dto/HistoryWithBook.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/local/dto/HistoryWithBook.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.local.dto
+package org.dueattendant149.bookshelf.data.local.dto
 
 import androidx.room.Embedded
 import androidx.room.Relation
diff --git a/app/src/main/java/ua/acclorite/book_story/data/local/room/BookDao.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/local/room/BookDao.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/data/local/room/BookDao.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/local/room/BookDao.kt
index ef1b11c1..60a98009 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/local/room/BookDao.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/local/room/BookDao.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.local.room
+package org.dueattendant149.bookshelf.data.local.room
 
 import androidx.room.Dao
 import androidx.room.Delete
@@ -12,7 +12,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
-import ua.acclorite.book_story.data.local.dto.BookEntity
+import org.dueattendant149.bookshelf.data.local.dto.BookEntity
 
 @Dao
 interface BookDao {
diff --git a/app/src/main/java/ua/acclorite/book_story/data/local/room/BookDatabase.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/local/room/BookDatabase.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/data/local/room/BookDatabase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/local/room/BookDatabase.kt
index e8420bce..4da49fb2 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/local/room/BookDatabase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/local/room/BookDatabase.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.local.room
+package org.dueattendant149.bookshelf.data.local.room
 
 import android.app.Application
 import androidx.room.AutoMigration
@@ -15,10 +15,10 @@ import androidx.room.RoomDatabase
 import androidx.room.migration.AutoMigrationSpec
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
-import ua.acclorite.book_story.data.local.dto.BookEntity
-import ua.acclorite.book_story.data.local.dto.CategoryEntity
-import ua.acclorite.book_story.data.local.dto.ColorPresetEntity
-import ua.acclorite.book_story.data.local.dto.HistoryEntity
+import org.dueattendant149.bookshelf.data.local.dto.BookEntity
+import org.dueattendant149.bookshelf.data.local.dto.CategoryEntity
+import org.dueattendant149.bookshelf.data.local.dto.ColorPresetEntity
+import org.dueattendant149.bookshelf.data.local.dto.HistoryEntity
 import java.io.File
 
 @Database(
diff --git a/app/src/main/java/ua/acclorite/book_story/data/local/room/CategoryDao.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/local/room/CategoryDao.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/data/local/room/CategoryDao.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/local/room/CategoryDao.kt
index af763a5e..dff53c03 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/local/room/CategoryDao.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/local/room/CategoryDao.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.local.room
+package org.dueattendant149.bookshelf.data.local.room
 
 import androidx.room.Dao
 import androidx.room.Delete
@@ -12,7 +12,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
-import ua.acclorite.book_story.data.local.dto.CategoryEntity
+import org.dueattendant149.bookshelf.data.local.dto.CategoryEntity
 
 @Dao
 interface CategoryDao {
diff --git a/app/src/main/java/ua/acclorite/book_story/data/local/room/ColorPresetDao.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/local/room/ColorPresetDao.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/data/local/room/ColorPresetDao.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/local/room/ColorPresetDao.kt
index 3e50e708..a51bec44 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/local/room/ColorPresetDao.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/local/room/ColorPresetDao.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.local.room
+package org.dueattendant149.bookshelf.data.local.room
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Query
 import androidx.room.Upsert
-import ua.acclorite.book_story.data.local.dto.ColorPresetEntity
+import org.dueattendant149.bookshelf.data.local.dto.ColorPresetEntity
 
 @Dao
 interface ColorPresetDao {
diff --git a/app/src/main/java/ua/acclorite/book_story/data/local/room/HistoryDao.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/local/room/HistoryDao.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/data/local/room/HistoryDao.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/local/room/HistoryDao.kt
index 5094cda7..45338fce 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/local/room/HistoryDao.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/local/room/HistoryDao.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.local.room
+package org.dueattendant149.bookshelf.data.local.room
 
 import androidx.room.Dao
 import androidx.room.Delete
@@ -12,8 +12,8 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Transaction
-import ua.acclorite.book_story.data.local.dto.HistoryEntity
-import ua.acclorite.book_story.data.local.dto.HistoryWithBook
+import org.dueattendant149.bookshelf.data.local.dto.HistoryEntity
+import org.dueattendant149.bookshelf.data.local.dto.HistoryWithBook
 
 @Dao
 interface HistoryDao {
diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/book/BookMapper.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/book/BookMapper.kt
similarity index 59%
rename from app/src/main/java/ua/acclorite/book_story/data/mapper/book/BookMapper.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/mapper/book/BookMapper.kt
index 21321cc5..85687082 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/mapper/book/BookMapper.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/book/BookMapper.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.mapper.book
+package org.dueattendant149.bookshelf.data.mapper.book
 
-import ua.acclorite.book_story.data.local.dto.BookEntity
-import ua.acclorite.book_story.domain.model.library.Book
+import org.dueattendant149.bookshelf.data.local.dto.BookEntity
+import org.dueattendant149.bookshelf.domain.model.library.Book
 
 interface BookMapper {
     fun toBookEntity(book: Book): BookEntity
diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/book/BookMapperImpl.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/book/BookMapperImpl.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/data/mapper/book/BookMapperImpl.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/mapper/book/BookMapperImpl.kt
index ea00efd3..1944dad7 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/mapper/book/BookMapperImpl.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/book/BookMapperImpl.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.mapper.book
+package org.dueattendant149.bookshelf.data.mapper.book
 
 import androidx.core.net.toUri
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.core.ui.UIText
-import ua.acclorite.book_story.data.local.dto.BookEntity
-import ua.acclorite.book_story.domain.model.library.Book
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.ui.UIText
+import org.dueattendant149.bookshelf.data.local.dto.BookEntity
+import org.dueattendant149.bookshelf.domain.model.library.Book
 import javax.inject.Inject
 
 class BookMapperImpl @Inject constructor() : BookMapper {
diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/category/CategoryMapper.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/category/CategoryMapper.kt
similarity index 61%
rename from app/src/main/java/ua/acclorite/book_story/data/mapper/category/CategoryMapper.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/mapper/category/CategoryMapper.kt
index 2d8f407e..745a7164 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/mapper/category/CategoryMapper.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/category/CategoryMapper.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.mapper.category
+package org.dueattendant149.bookshelf.data.mapper.category
 
-import ua.acclorite.book_story.data.local.dto.CategoryEntity
-import ua.acclorite.book_story.domain.model.library.Category
+import org.dueattendant149.bookshelf.data.local.dto.CategoryEntity
+import org.dueattendant149.bookshelf.domain.model.library.Category
 
 interface CategoryMapper {
     fun toCategoryEntity(category: Category): CategoryEntity
diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/category/CategoryMapperImpl.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/category/CategoryMapperImpl.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/data/mapper/category/CategoryMapperImpl.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/mapper/category/CategoryMapperImpl.kt
index 0dbd1380..a9055df0 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/mapper/category/CategoryMapperImpl.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/category/CategoryMapperImpl.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.mapper.category
+package org.dueattendant149.bookshelf.data.mapper.category
 
-import ua.acclorite.book_story.data.local.dto.CategoryEntity
-import ua.acclorite.book_story.domain.model.library.Category
+import org.dueattendant149.bookshelf.data.local.dto.CategoryEntity
+import org.dueattendant149.bookshelf.domain.model.library.Category
 import javax.inject.Inject
 
 class CategoryMapperImpl @Inject constructor() : CategoryMapper {
diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/color_preset/ColorPresetMapper.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/color_preset/ColorPresetMapper.kt
similarity index 63%
rename from app/src/main/java/ua/acclorite/book_story/data/mapper/color_preset/ColorPresetMapper.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/mapper/color_preset/ColorPresetMapper.kt
index 8e172a78..bd3d4d70 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/mapper/color_preset/ColorPresetMapper.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/color_preset/ColorPresetMapper.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.mapper.color_preset
+package org.dueattendant149.bookshelf.data.mapper.color_preset
 
-import ua.acclorite.book_story.data.local.dto.ColorPresetEntity
-import ua.acclorite.book_story.domain.model.reader.ColorPreset
+import org.dueattendant149.bookshelf.data.local.dto.ColorPresetEntity
+import org.dueattendant149.bookshelf.domain.model.reader.ColorPreset
 
 interface ColorPresetMapper {
     fun toColorPresetEntity(colorPreset: ColorPreset, order: Int): ColorPresetEntity
diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/color_preset/ColorPresetMapperImpl.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/color_preset/ColorPresetMapperImpl.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/data/mapper/color_preset/ColorPresetMapperImpl.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/mapper/color_preset/ColorPresetMapperImpl.kt
index d30e99eb..9730e06b 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/mapper/color_preset/ColorPresetMapperImpl.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/color_preset/ColorPresetMapperImpl.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.mapper.color_preset
+package org.dueattendant149.bookshelf.data.mapper.color_preset
 
 import androidx.compose.ui.graphics.Color
-import ua.acclorite.book_story.data.local.dto.ColorPresetEntity
-import ua.acclorite.book_story.domain.model.reader.ColorPreset
+import org.dueattendant149.bookshelf.data.local.dto.ColorPresetEntity
+import org.dueattendant149.bookshelf.domain.model.reader.ColorPreset
 import javax.inject.Inject
 
 class ColorPresetMapperImpl @Inject constructor() : ColorPresetMapper {
diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/file/FileMapper.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/file/FileMapper.kt
similarity index 60%
rename from app/src/main/java/ua/acclorite/book_story/data/mapper/file/FileMapper.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/mapper/file/FileMapper.kt
index 5209e3d4..e494bd62 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/mapper/file/FileMapper.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/file/FileMapper.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.mapper.file
+package org.dueattendant149.bookshelf.data.mapper.file
 
-import ua.acclorite.book_story.data.model.file.CachedFile
-import ua.acclorite.book_story.domain.model.file.File
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.domain.model.file.File
 
 interface FileMapper {
     fun toCachedFile(file: File): CachedFile
diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/file/FileMapperImpl.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/file/FileMapperImpl.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/data/mapper/file/FileMapperImpl.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/mapper/file/FileMapperImpl.kt
index bbe2353b..ae579304 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/mapper/file/FileMapperImpl.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/file/FileMapperImpl.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.mapper.file
+package org.dueattendant149.bookshelf.data.mapper.file
 
 import android.app.Application
 import androidx.core.net.toUri
-import ua.acclorite.book_story.data.model.file.CachedFile
-import ua.acclorite.book_story.data.model.file.CachedFileCompat
-import ua.acclorite.book_story.domain.model.file.File
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.data.model.file.CachedFileCompat
+import org.dueattendant149.bookshelf.domain.model.file.File
 import javax.inject.Inject
 
 class FileMapperImpl @Inject constructor(
diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/history/HistoryMapper.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/history/HistoryMapper.kt
similarity index 55%
rename from app/src/main/java/ua/acclorite/book_story/data/mapper/history/HistoryMapper.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/mapper/history/HistoryMapper.kt
index 6dec1cdb..291d621a 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/mapper/history/HistoryMapper.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/history/HistoryMapper.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.mapper.history
+package org.dueattendant149.bookshelf.data.mapper.history
 
-import ua.acclorite.book_story.data.local.dto.HistoryEntity
-import ua.acclorite.book_story.data.local.dto.HistoryWithBook
-import ua.acclorite.book_story.domain.model.history.History
+import org.dueattendant149.bookshelf.data.local.dto.HistoryEntity
+import org.dueattendant149.bookshelf.data.local.dto.HistoryWithBook
+import org.dueattendant149.bookshelf.domain.model.history.History
 
 interface HistoryMapper {
     suspend fun toHistoryEntity(history: History): HistoryEntity
diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/history/HistoryMapperImpl.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/history/HistoryMapperImpl.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/data/mapper/history/HistoryMapperImpl.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/mapper/history/HistoryMapperImpl.kt
index 2153e375..3005b1c6 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/mapper/history/HistoryMapperImpl.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/mapper/history/HistoryMapperImpl.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.mapper.history
+package org.dueattendant149.bookshelf.data.mapper.history
 
-import ua.acclorite.book_story.data.local.dto.HistoryEntity
-import ua.acclorite.book_story.data.local.dto.HistoryWithBook
-import ua.acclorite.book_story.data.mapper.book.BookMapper
-import ua.acclorite.book_story.domain.model.history.History
+import org.dueattendant149.bookshelf.data.local.dto.HistoryEntity
+import org.dueattendant149.bookshelf.data.local.dto.HistoryWithBook
+import org.dueattendant149.bookshelf.data.mapper.book.BookMapper
+import org.dueattendant149.bookshelf.domain.model.history.History
 import javax.inject.Inject
 
 class HistoryMapperImpl @Inject constructor(
diff --git a/app/src/main/java/ua/acclorite/book_story/data/model/file/CachedFile.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/model/file/CachedFile.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/data/model/file/CachedFile.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/model/file/CachedFile.kt
index fa3348ae..f7308ba7 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/model/file/CachedFile.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/model/file/CachedFile.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.model.file
+package org.dueattendant149.bookshelf.data.model.file
 
 import android.content.Context
 import android.net.Uri
diff --git a/app/src/main/java/ua/acclorite/book_story/data/model/file/CachedFileBuilder.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/model/file/CachedFileBuilder.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/data/model/file/CachedFileBuilder.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/model/file/CachedFileBuilder.kt
index 1293fff8..2415c500 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/model/file/CachedFileBuilder.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/model/file/CachedFileBuilder.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.model.file
+package org.dueattendant149.bookshelf.data.model.file
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/data/model/file/CachedFileCompat.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/model/file/CachedFileCompat.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/data/model/file/CachedFileCompat.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/model/file/CachedFileCompat.kt
index b674e4e9..70027ea9 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/model/file/CachedFileCompat.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/model/file/CachedFileCompat.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.model.file
+package org.dueattendant149.bookshelf.data.model.file
 
 import android.content.Context
 import android.net.Uri
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/cover/CoverParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/CoverParser.kt
similarity index 58%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/cover/CoverParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/CoverParser.kt
index 58aa7eb9..d43e2e86 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/cover/CoverParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/CoverParser.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.cover
+package org.dueattendant149.bookshelf.data.parser.cover
 
-import ua.acclorite.book_story.core.CoverImage
-import ua.acclorite.book_story.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.core.CoverImage
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
 
 interface CoverParser {
     suspend fun parse(cachedFile: CachedFile): CoverImage?
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/cover/CoverParserImpl.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/CoverParserImpl.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/cover/CoverParserImpl.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/CoverParserImpl.kt
index f66563e9..f0909d9e 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/cover/CoverParserImpl.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/CoverParserImpl.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.cover
+package org.dueattendant149.bookshelf.data.parser.cover
 
-import ua.acclorite.book_story.core.CoverImage
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.core.CoverImage
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
 import javax.inject.Inject
 
 private const val TAG = "CoverParser"
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/cover/EpubCoverParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/EpubCoverParser.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/cover/EpubCoverParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/EpubCoverParser.kt
index bfafb692..bbc01483 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/cover/EpubCoverParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/EpubCoverParser.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.cover
+package org.dueattendant149.bookshelf.data.parser.cover
 
 import android.graphics.BitmapFactory
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.jsoup.Jsoup
 import org.jsoup.parser.Parser
-import ua.acclorite.book_story.core.CoverImage
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.core.CoverImage
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
 import java.net.URLDecoder
 import java.nio.charset.StandardCharsets
 import java.util.zip.ZipFile
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/cover/Fb2CoverParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/Fb2CoverParser.kt
similarity index 66%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/cover/Fb2CoverParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/Fb2CoverParser.kt
index 854d1343..569c2027 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/cover/Fb2CoverParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/Fb2CoverParser.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.cover
+package org.dueattendant149.bookshelf.data.parser.cover
 
-import ua.acclorite.book_story.core.CoverImage
-import ua.acclorite.book_story.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.core.CoverImage
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
 import javax.inject.Inject
 
 class Fb2CoverParser @Inject constructor() : CoverParser {
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/cover/HtmlCoverParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/HtmlCoverParser.kt
similarity index 66%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/cover/HtmlCoverParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/HtmlCoverParser.kt
index bdb688e1..62a98e8a 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/cover/HtmlCoverParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/HtmlCoverParser.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.cover
+package org.dueattendant149.bookshelf.data.parser.cover
 
-import ua.acclorite.book_story.core.CoverImage
-import ua.acclorite.book_story.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.core.CoverImage
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
 import javax.inject.Inject
 
 class HtmlCoverParser @Inject constructor() : CoverParser {
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/cover/PdfCoverParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/PdfCoverParser.kt
similarity index 66%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/cover/PdfCoverParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/PdfCoverParser.kt
index 1b592d78..20beac40 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/cover/PdfCoverParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/PdfCoverParser.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.cover
+package org.dueattendant149.bookshelf.data.parser.cover
 
-import ua.acclorite.book_story.core.CoverImage
-import ua.acclorite.book_story.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.core.CoverImage
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
 import javax.inject.Inject
 
 class PdfCoverParser @Inject constructor() : CoverParser {
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/cover/TxtCoverParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/TxtCoverParser.kt
similarity index 66%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/cover/TxtCoverParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/TxtCoverParser.kt
index 39dfb7a8..0fbe58fc 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/cover/TxtCoverParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/cover/TxtCoverParser.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.cover
+package org.dueattendant149.bookshelf.data.parser.cover
 
-import ua.acclorite.book_story.core.CoverImage
-import ua.acclorite.book_story.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.core.CoverImage
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
 import javax.inject.Inject
 
 class TxtCoverParser @Inject constructor() : CoverParser {
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/document/DocumentParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/document/DocumentParser.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/document/DocumentParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/document/DocumentParser.kt
index 5c539cc8..9261733d 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/document/DocumentParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/document/DocumentParser.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.document
+package org.dueattendant149.bookshelf.data.parser.document
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import androidx.compose.ui.graphics.asImageBitmap
 import kotlinx.coroutines.yield
 import org.jsoup.nodes.Document
-import ua.acclorite.book_story.core.helpers.clearAllMarkdown
-import ua.acclorite.book_story.core.helpers.clearMarkdown
-import ua.acclorite.book_story.core.helpers.containsVisibleText
-import ua.acclorite.book_story.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.core.helpers.clearAllMarkdown
+import org.dueattendant149.bookshelf.core.helpers.clearMarkdown
+import org.dueattendant149.bookshelf.core.helpers.containsVisibleText
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
 import java.io.File
 import java.net.URLDecoder
 import java.nio.charset.StandardCharsets
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/document/MarkdownParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/document/MarkdownParser.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/document/MarkdownParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/document/MarkdownParser.kt
index 769dfa8a..4ccbf64d 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/document/MarkdownParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/document/MarkdownParser.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.document
+package org.dueattendant149.bookshelf.data.parser.document
 
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.LinkAnnotation
@@ -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.core.helpers.clearMarkdown
+import org.dueattendant149.bookshelf.core.helpers.clearMarkdown
 import javax.inject.Inject
 
 class MarkdownParser @Inject constructor(
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/file/EpubFileParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/EpubFileParser.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/file/EpubFileParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/EpubFileParser.kt
index 5679fe39..f1d442cb 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/file/EpubFileParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/EpubFileParser.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.file
+package org.dueattendant149.bookshelf.data.parser.file
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.jsoup.Jsoup
 import org.jsoup.parser.Parser
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.ui.UIText
-import ua.acclorite.book_story.data.model.file.CachedFile
-import ua.acclorite.book_story.domain.model.library.Book
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.ui.UIText
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.domain.model.library.Book
 import java.util.zip.ZipFile
 import javax.inject.Inject
 
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/file/Fb2FileParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/Fb2FileParser.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/file/Fb2FileParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/Fb2FileParser.kt
index ddbf83b7..ff43ad3e 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/file/Fb2FileParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/Fb2FileParser.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.file
+package org.dueattendant149.bookshelf.data.parser.file
 
 import org.jsoup.Jsoup
 import org.jsoup.parser.Parser
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.ui.UIText
-import ua.acclorite.book_story.data.model.file.CachedFile
-import ua.acclorite.book_story.domain.model.library.Book
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.ui.UIText
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.domain.model.library.Book
 import javax.inject.Inject
 
 private const val TAG = "Fb2FileParser"
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/file/FileParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/FileParser.kt
similarity index 56%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/file/FileParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/FileParser.kt
index 4b7d8030..3d04b8ef 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/file/FileParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/FileParser.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.file
+package org.dueattendant149.bookshelf.data.parser.file
 
-import ua.acclorite.book_story.data.model.file.CachedFile
-import ua.acclorite.book_story.domain.model.library.Book
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.domain.model.library.Book
 
 interface FileParser {
     suspend fun parse(cachedFile: CachedFile): Book?
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/file/FileParserImpl.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/FileParserImpl.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/file/FileParserImpl.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/FileParserImpl.kt
index 4ebb5cd7..4c66d089 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/file/FileParserImpl.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/FileParserImpl.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.file
+package org.dueattendant149.bookshelf.data.parser.file
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.data.model.file.CachedFile
-import ua.acclorite.book_story.domain.model.library.Book
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.domain.model.library.Book
 import javax.inject.Inject
 
 private const val TAG = "FileParser"
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/file/HtmlFileParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/HtmlFileParser.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/file/HtmlFileParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/HtmlFileParser.kt
index 3be2db75..bea70ee9 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/file/HtmlFileParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/HtmlFileParser.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.file
+package org.dueattendant149.bookshelf.data.parser.file
 
 import org.jsoup.Jsoup
 import org.jsoup.parser.Parser
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.ui.UIText
-import ua.acclorite.book_story.data.model.file.CachedFile
-import ua.acclorite.book_story.domain.model.library.Book
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.ui.UIText
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.domain.model.library.Book
 import javax.inject.Inject
 
 private const val TAG = "HtmlFileParser"
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/file/PdfFileParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/PdfFileParser.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/file/PdfFileParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/PdfFileParser.kt
index e94bf747..f94f0e8f 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/file/PdfFileParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/PdfFileParser.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.file
+package org.dueattendant149.bookshelf.data.parser.file
 
 import android.app.Application
 import com.tom_roush.pdfbox.android.PDFBoxResourceLoader
 import com.tom_roush.pdfbox.pdmodel.PDDocument
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.ui.UIText
-import ua.acclorite.book_story.data.model.file.CachedFile
-import ua.acclorite.book_story.domain.model.library.Book
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.ui.UIText
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.domain.model.library.Book
 import javax.inject.Inject
 
 private const val TAG = "PdfFileParser"
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/file/TxtFileParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/TxtFileParser.kt
similarity index 75%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/file/TxtFileParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/TxtFileParser.kt
index 6448dfbf..985043e8 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/file/TxtFileParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/file/TxtFileParser.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.file
+package org.dueattendant149.bookshelf.data.parser.file
 
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.ui.UIText
-import ua.acclorite.book_story.data.model.file.CachedFile
-import ua.acclorite.book_story.domain.model.library.Book
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.ui.UIText
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.domain.model.library.Book
 import javax.inject.Inject
 
 private const val TAG = "TxtFileParser"
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/text/EpubTextParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/EpubTextParser.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/text/EpubTextParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/EpubTextParser.kt
index add5d6b5..8c97c9bf 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/text/EpubTextParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/EpubTextParser.kt
@@ -6,7 +6,7 @@
 
 @file:OptIn(ExperimentalCoroutinesApi::class)
 
-package ua.acclorite.book_story.data.parser.text
+package org.dueattendant149.bookshelf.data.parser.text
 
 import androidx.core.net.toUri
 import kotlinx.coroutines.Dispatchers
@@ -17,15 +17,15 @@ import kotlinx.coroutines.withContext
 import kotlinx.coroutines.yield
 import org.jsoup.Jsoup
 import org.jsoup.parser.Parser
-import ua.acclorite.book_story.core.data.ExtensionsData
-import ua.acclorite.book_story.core.helpers.addAll
-import ua.acclorite.book_story.core.helpers.containsVisibleText
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.core.log.logW
-import ua.acclorite.book_story.data.model.file.CachedFile
-import ua.acclorite.book_story.data.parser.document.DocumentParser
-import ua.acclorite.book_story.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.core.data.ExtensionsData
+import org.dueattendant149.bookshelf.core.helpers.addAll
+import org.dueattendant149.bookshelf.core.helpers.containsVisibleText
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.core.log.logW
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.data.parser.document.DocumentParser
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
 import java.io.File
 import java.net.URLDecoder
 import java.nio.charset.StandardCharsets
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/text/HtmlTextParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/HtmlTextParser.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/text/HtmlTextParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/HtmlTextParser.kt
index 19d220e4..93d4915a 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/text/HtmlTextParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/HtmlTextParser.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.text
+package org.dueattendant149.bookshelf.data.parser.text
 
 import kotlinx.coroutines.yield
 import org.jsoup.Jsoup
 import org.jsoup.parser.Parser
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.data.model.file.CachedFile
-import ua.acclorite.book_story.data.parser.document.DocumentParser
-import ua.acclorite.book_story.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.data.parser.document.DocumentParser
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
 import javax.inject.Inject
 
 private const val TAG = "HtmlTextParser"
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/text/PdfTextParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/PdfTextParser.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/text/PdfTextParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/PdfTextParser.kt
index 56f4cc14..735f39c7 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/text/PdfTextParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/PdfTextParser.kt
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.text
+package org.dueattendant149.bookshelf.data.parser.text
 
 import android.app.Application
 import com.tom_roush.pdfbox.android.PDFBoxResourceLoader
 import com.tom_roush.pdfbox.pdmodel.PDDocument
 import com.tom_roush.pdfbox.text.PDFTextStripper
 import kotlinx.coroutines.yield
-import ua.acclorite.book_story.core.helpers.clearAllMarkdown
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.data.model.file.CachedFile
-import ua.acclorite.book_story.data.parser.document.MarkdownParser
-import ua.acclorite.book_story.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.core.helpers.clearAllMarkdown
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.data.parser.document.MarkdownParser
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
 import javax.inject.Inject
 
 private const val TAG = "PdfTextParser"
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/text/TextParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/TextParser.kt
similarity index 56%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/text/TextParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/TextParser.kt
index 5e17125c..44b8ac30 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/text/TextParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/TextParser.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.text
+package org.dueattendant149.bookshelf.data.parser.text
 
-import ua.acclorite.book_story.data.model.file.CachedFile
-import ua.acclorite.book_story.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
 
 interface TextParser {
     suspend fun parse(cachedFile: CachedFile): List<ReaderText>
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/text/TextParserImpl.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/TextParserImpl.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/text/TextParserImpl.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/TextParserImpl.kt
index 3808f9cc..ebbc3188 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/text/TextParserImpl.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/TextParserImpl.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.text
+package org.dueattendant149.bookshelf.data.parser.text
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.data.model.file.CachedFile
-import ua.acclorite.book_story.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
 import javax.inject.Inject
 
 private const val TAG = "TextParser"
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/text/TxtTextParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/TxtTextParser.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/text/TxtTextParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/TxtTextParser.kt
index 27a12a86..eff33380 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/text/TxtTextParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/TxtTextParser.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.text
+package org.dueattendant149.bookshelf.data.parser.text
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.yield
-import ua.acclorite.book_story.core.helpers.clearAllMarkdown
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.data.model.file.CachedFile
-import ua.acclorite.book_story.data.parser.document.MarkdownParser
-import ua.acclorite.book_story.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.core.helpers.clearAllMarkdown
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.data.parser.document.MarkdownParser
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
 import javax.inject.Inject
 
 private const val TAG = "TxtTextParser"
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/text/XmlTextParser.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/XmlTextParser.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/data/parser/text/XmlTextParser.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/XmlTextParser.kt
index 146b18f9..79c5d633 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/parser/text/XmlTextParser.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/parser/text/XmlTextParser.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.parser.text
+package org.dueattendant149.bookshelf.data.parser.text
 
 import kotlinx.coroutines.yield
 import org.jsoup.Jsoup
 import org.jsoup.parser.Parser
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.data.model.file.CachedFile
-import ua.acclorite.book_story.data.parser.document.DocumentParser
-import ua.acclorite.book_story.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.data.parser.document.DocumentParser
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
 import javax.inject.Inject
 
 private const val TAG = "XmlTextParser"
diff --git a/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/repository/BookRepositoryImpl.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/repository/BookRepositoryImpl.kt
index 3fa4b2cf..e3cc4dce 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/repository/BookRepositoryImpl.kt
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.repository
+package org.dueattendant149.bookshelf.data.repository
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import ua.acclorite.book_story.core.CoverImage
-import ua.acclorite.book_story.data.local.room.BookDatabase
-import ua.acclorite.book_story.data.mapper.book.BookMapper
-import ua.acclorite.book_story.data.mapper.file.FileMapper
-import ua.acclorite.book_story.data.parser.cover.CoverParser
-import ua.acclorite.book_story.data.parser.text.TextParser
-import ua.acclorite.book_story.domain.model.file.File
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.domain.model.reader.ReaderText
-import ua.acclorite.book_story.domain.repository.BookRepository
-import ua.acclorite.book_story.domain.service.FileProvider
+import org.dueattendant149.bookshelf.core.CoverImage
+import org.dueattendant149.bookshelf.data.local.room.BookDatabase
+import org.dueattendant149.bookshelf.data.mapper.book.BookMapper
+import org.dueattendant149.bookshelf.data.mapper.file.FileMapper
+import org.dueattendant149.bookshelf.data.parser.cover.CoverParser
+import org.dueattendant149.bookshelf.data.parser.text.TextParser
+import org.dueattendant149.bookshelf.domain.model.file.File
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.domain.repository.BookRepository
+import org.dueattendant149.bookshelf.domain.service.FileProvider
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/app/src/main/java/ua/acclorite/book_story/data/repository/CategoryRepositoryImpl.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/repository/CategoryRepositoryImpl.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/data/repository/CategoryRepositoryImpl.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/repository/CategoryRepositoryImpl.kt
index c7380216..ec9164cc 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/repository/CategoryRepositoryImpl.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/repository/CategoryRepositoryImpl.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.repository
+package org.dueattendant149.bookshelf.data.repository
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import ua.acclorite.book_story.data.local.room.BookDatabase
-import ua.acclorite.book_story.data.mapper.category.CategoryMapper
-import ua.acclorite.book_story.domain.model.library.Category
-import ua.acclorite.book_story.domain.repository.CategoryRepository
+import org.dueattendant149.bookshelf.data.local.room.BookDatabase
+import org.dueattendant149.bookshelf.data.mapper.category.CategoryMapper
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.domain.repository.CategoryRepository
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/app/src/main/java/ua/acclorite/book_story/data/repository/ColorPresetRepositoryImpl.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/repository/ColorPresetRepositoryImpl.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/data/repository/ColorPresetRepositoryImpl.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/repository/ColorPresetRepositoryImpl.kt
index b9d15eb4..dca6aed9 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/repository/ColorPresetRepositoryImpl.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/repository/ColorPresetRepositoryImpl.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.repository
+package org.dueattendant149.bookshelf.data.repository
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import ua.acclorite.book_story.data.local.room.BookDatabase
-import ua.acclorite.book_story.data.mapper.color_preset.ColorPresetMapper
-import ua.acclorite.book_story.domain.model.reader.ColorPreset
-import ua.acclorite.book_story.domain.repository.ColorPresetRepository
+import org.dueattendant149.bookshelf.data.local.room.BookDatabase
+import org.dueattendant149.bookshelf.data.mapper.color_preset.ColorPresetMapper
+import org.dueattendant149.bookshelf.domain.model.reader.ColorPreset
+import org.dueattendant149.bookshelf.domain.repository.ColorPresetRepository
 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/org/dueattendant149/bookshelf/data/repository/FileSystemRepositoryImpl.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/data/repository/FileSystemRepositoryImpl.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/repository/FileSystemRepositoryImpl.kt
index 105bcab6..c1233536 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/repository/FileSystemRepositoryImpl.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/repository/FileSystemRepositoryImpl.kt
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.repository
+package org.dueattendant149.bookshelf.data.repository
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import ua.acclorite.book_story.core.CoverImage
-import ua.acclorite.book_story.core.data.ExtensionsData
-import ua.acclorite.book_story.data.local.room.BookDatabase
-import ua.acclorite.book_story.data.mapper.file.FileMapper
-import ua.acclorite.book_story.data.model.file.CachedFile
-import ua.acclorite.book_story.data.parser.cover.CoverParser
-import ua.acclorite.book_story.data.parser.file.FileParser
-import ua.acclorite.book_story.domain.model.file.File
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.domain.repository.FileSystemRepository
-import ua.acclorite.book_story.domain.service.FileProvider
+import org.dueattendant149.bookshelf.core.CoverImage
+import org.dueattendant149.bookshelf.core.data.ExtensionsData
+import org.dueattendant149.bookshelf.data.local.room.BookDatabase
+import org.dueattendant149.bookshelf.data.mapper.file.FileMapper
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.data.parser.cover.CoverParser
+import org.dueattendant149.bookshelf.data.parser.file.FileParser
+import org.dueattendant149.bookshelf.domain.model.file.File
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.repository.FileSystemRepository
+import org.dueattendant149.bookshelf.domain.service.FileProvider
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/app/src/main/java/ua/acclorite/book_story/data/repository/HistoryRepositoryImpl.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/repository/HistoryRepositoryImpl.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/data/repository/HistoryRepositoryImpl.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/repository/HistoryRepositoryImpl.kt
index 4859327c..1ff40d7e 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/repository/HistoryRepositoryImpl.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/repository/HistoryRepositoryImpl.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.repository
+package org.dueattendant149.bookshelf.data.repository
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import ua.acclorite.book_story.data.local.room.BookDatabase
-import ua.acclorite.book_story.data.mapper.history.HistoryMapper
-import ua.acclorite.book_story.domain.model.history.History
-import ua.acclorite.book_story.domain.repository.HistoryRepository
+import org.dueattendant149.bookshelf.data.local.room.BookDatabase
+import org.dueattendant149.bookshelf.data.mapper.history.HistoryMapper
+import org.dueattendant149.bookshelf.domain.model.history.History
+import org.dueattendant149.bookshelf.domain.repository.HistoryRepository
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/app/src/main/java/ua/acclorite/book_story/data/repository/PermissionRepositoryImpl.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/repository/PermissionRepositoryImpl.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/data/repository/PermissionRepositoryImpl.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/repository/PermissionRepositoryImpl.kt
index 29ab56cc..90b0449c 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/repository/PermissionRepositoryImpl.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/repository/PermissionRepositoryImpl.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.repository
+package org.dueattendant149.bookshelf.data.repository
 
 import android.app.Application
 import android.content.Intent
 import androidx.core.net.toUri
-import ua.acclorite.book_story.domain.repository.PermissionRepository
+import org.dueattendant149.bookshelf.domain.repository.PermissionRepository
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/app/src/main/java/ua/acclorite/book_story/data/service/CoverImageHandlerImpl.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/service/CoverImageHandlerImpl.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/data/service/CoverImageHandlerImpl.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/service/CoverImageHandlerImpl.kt
index ffa2303a..522a3a99 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/service/CoverImageHandlerImpl.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/service/CoverImageHandlerImpl.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.service
+package org.dueattendant149.bookshelf.data.service
 
 import android.app.Application
 import android.graphics.Bitmap
@@ -13,8 +13,8 @@ import android.net.Uri
 import androidx.core.net.toFile
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import ua.acclorite.book_story.core.CoverImage
-import ua.acclorite.book_story.domain.service.CoverImageHandler
+import org.dueattendant149.bookshelf.core.CoverImage
+import org.dueattendant149.bookshelf.domain.service.CoverImageHandler
 import java.io.BufferedOutputStream
 import java.io.ByteArrayOutputStream
 import java.io.File
diff --git a/app/src/main/java/ua/acclorite/book_story/data/service/FileProviderImpl.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/service/FileProviderImpl.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/data/service/FileProviderImpl.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/service/FileProviderImpl.kt
index a61bb052..1db9bbd5 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/service/FileProviderImpl.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/service/FileProviderImpl.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.service
+package org.dueattendant149.bookshelf.data.service
 
 import android.app.Application
-import ua.acclorite.book_story.data.model.file.CachedFile
-import ua.acclorite.book_story.data.model.file.CachedFileCompat
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.domain.service.FileProvider
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.data.model.file.CachedFileCompat
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.service.FileProvider
 import javax.inject.Inject
 
 class FileProviderImpl @Inject constructor(
diff --git a/app/src/main/java/ua/acclorite/book_story/data/settings/SettingsManager.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/settings/SettingsManager.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/data/settings/SettingsManager.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/settings/SettingsManager.kt
index 8d4bf186..2a6165da 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/settings/SettingsManager.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/settings/SettingsManager.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("RemoveExplicitTypeArguments")
 
-package ua.acclorite.book_story.data.settings
+package org.dueattendant149.bookshelf.data.settings
 
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.booleanPreferencesKey
@@ -21,30 +21,30 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import ua.acclorite.book_story.core.data.CoreData
-import ua.acclorite.book_story.core.language.Language
-import ua.acclorite.book_story.core.language.LanguageUtils
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.data.local.data_store.DataStore
-import ua.acclorite.book_story.data.settings.model.Setting
-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.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.ui.reader.data.ReaderData
-import ua.acclorite.book_story.ui.reader.model.FontWithName
-import ua.acclorite.book_story.ui.theme.model.DarkTheme
-import ua.acclorite.book_story.ui.theme.model.HorizontalAlignment
-import ua.acclorite.book_story.ui.theme.model.PureDark
-import ua.acclorite.book_story.ui.theme.model.Theme
-import ua.acclorite.book_story.ui.theme.model.ThemeContrast
+import org.dueattendant149.bookshelf.core.data.CoreData
+import org.dueattendant149.bookshelf.core.language.Language
+import org.dueattendant149.bookshelf.core.language.LanguageUtils
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.data.local.data_store.DataStore
+import org.dueattendant149.bookshelf.data.settings.model.Setting
+import org.dueattendant149.bookshelf.presentation.browse.model.BrowseLayout
+import org.dueattendant149.bookshelf.presentation.browse.model.BrowseSortOrder
+import org.dueattendant149.bookshelf.presentation.library.model.LibraryLayout
+import org.dueattendant149.bookshelf.presentation.library.model.LibrarySortOrder
+import org.dueattendant149.bookshelf.presentation.library.model.LibraryTitlePosition
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderColorEffects
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderFontThickness
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderHorizontalGesture
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderProgressCount
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderScreenOrientation
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderTextAlignment
+import org.dueattendant149.bookshelf.ui.reader.data.ReaderData
+import org.dueattendant149.bookshelf.ui.reader.model.FontWithName
+import org.dueattendant149.bookshelf.ui.theme.model.DarkTheme
+import org.dueattendant149.bookshelf.ui.theme.model.HorizontalAlignment
+import org.dueattendant149.bookshelf.ui.theme.model.PureDark
+import org.dueattendant149.bookshelf.ui.theme.model.Theme
+import org.dueattendant149.bookshelf.ui.theme.model.ThemeContrast
 import java.util.Locale
 import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
diff --git a/app/src/main/java/ua/acclorite/book_story/data/settings/model/Setting.kt b/app/src/main/java/org/dueattendant149/bookshelf/data/settings/model/Setting.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/data/settings/model/Setting.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/data/settings/model/Setting.kt
index c8984f88..076d3cf6 100644
--- a/app/src/main/java/ua/acclorite/book_story/data/settings/model/Setting.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/data/settings/model/Setting.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.data.settings.model
+package org.dueattendant149.bookshelf.data.settings.model
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/model/file/File.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/model/file/File.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/domain/model/file/File.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/model/file/File.kt
index 7a98265f..fa9365fe 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/model/file/File.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/model/file/File.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.model.file
+package org.dueattendant149.bookshelf.domain.model.file
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/model/history/History.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/model/history/History.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/domain/model/history/History.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/model/history/History.kt
index 23e052d3..90b02773 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/model/history/History.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/model/history/History.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.model.history
+package org.dueattendant149.bookshelf.domain.model.history
 
 import androidx.compose.runtime.Immutable
-import ua.acclorite.book_story.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.model.library.Book
 
 @Immutable
 data class History(
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/model/library/Book.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/model/library/Book.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/domain/model/library/Book.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/model/library/Book.kt
index 020a29cc..ed0a2277 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/model/library/Book.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/model/library/Book.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.model.library
+package org.dueattendant149.bookshelf.domain.model.library
 
 import android.net.Uri
 import android.os.Parcelable
 import androidx.compose.runtime.Immutable
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.core.ui.UIText
+import org.dueattendant149.bookshelf.core.ui.UIText
 
 @Parcelize
 @Immutable
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/model/library/Category.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/model/library/Category.kt
similarity index 74%
rename from app/src/main/java/ua/acclorite/book_story/domain/model/library/Category.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/model/library/Category.kt
index 6aa5f519..11bfc960 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/model/library/Category.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/model/library/Category.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.model.library
+package org.dueattendant149.bookshelf.domain.model.library
 
 import androidx.compose.runtime.Immutable
-import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder
+import org.dueattendant149.bookshelf.presentation.library.model.LibrarySortOrder
 
 @Immutable
 data class Category(
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/model/reader/ColorPreset.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/model/reader/ColorPreset.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/domain/model/reader/ColorPreset.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/model/reader/ColorPreset.kt
index 209d2510..76dc5440 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/model/reader/ColorPreset.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/model/reader/ColorPreset.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.model.reader
+package org.dueattendant149.bookshelf.domain.model.reader
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.Color
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/model/reader/ReaderText.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/model/reader/ReaderText.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/domain/model/reader/ReaderText.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/model/reader/ReaderText.kt
index 87928602..183a0cb3 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/model/reader/ReaderText.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/model/reader/ReaderText.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.model.reader
+package org.dueattendant149.bookshelf.domain.model.reader
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.ImageBitmap
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/repository/BookRepository.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/repository/BookRepository.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/domain/repository/BookRepository.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/repository/BookRepository.kt
index 1bcd4a4e..35b71394 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/repository/BookRepository.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/repository/BookRepository.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.repository
+package org.dueattendant149.bookshelf.domain.repository
 
-import ua.acclorite.book_story.core.CoverImage
-import ua.acclorite.book_story.domain.model.file.File
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.core.CoverImage
+import org.dueattendant149.bookshelf.domain.model.file.File
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
 
 interface BookRepository {
     suspend fun searchBooks(
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/repository/CategoryRepository.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/repository/CategoryRepository.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/domain/repository/CategoryRepository.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/repository/CategoryRepository.kt
index 292c9be5..02c3b41b 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/repository/CategoryRepository.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/repository/CategoryRepository.kt
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.repository
+package org.dueattendant149.bookshelf.domain.repository
 
-import ua.acclorite.book_story.domain.model.library.Category
+import org.dueattendant149.bookshelf.domain.model.library.Category
 
 interface CategoryRepository {
     suspend fun addCategory(
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/repository/ColorPresetRepository.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/repository/ColorPresetRepository.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/domain/repository/ColorPresetRepository.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/repository/ColorPresetRepository.kt
index 4cec7762..e59b211f 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/repository/ColorPresetRepository.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/repository/ColorPresetRepository.kt
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.repository
+package org.dueattendant149.bookshelf.domain.repository
 
-import ua.acclorite.book_story.domain.model.reader.ColorPreset
+import org.dueattendant149.bookshelf.domain.model.reader.ColorPreset
 
 interface ColorPresetRepository {
     suspend fun getColorPresets(): Result<List<ColorPreset>>
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/repository/FileSystemRepository.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/repository/FileSystemRepository.kt
similarity index 61%
rename from app/src/main/java/ua/acclorite/book_story/domain/repository/FileSystemRepository.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/repository/FileSystemRepository.kt
index cf6e3dfa..640d5a76 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/repository/FileSystemRepository.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/repository/FileSystemRepository.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.repository
+package org.dueattendant149.bookshelf.domain.repository
 
-import ua.acclorite.book_story.core.CoverImage
-import ua.acclorite.book_story.domain.model.file.File
-import ua.acclorite.book_story.domain.model.library.Book
+import org.dueattendant149.bookshelf.core.CoverImage
+import org.dueattendant149.bookshelf.domain.model.file.File
+import org.dueattendant149.bookshelf.domain.model.library.Book
 
 interface FileSystemRepository {
     suspend fun searchFiles(
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/repository/HistoryRepository.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/repository/HistoryRepository.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/domain/repository/HistoryRepository.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/repository/HistoryRepository.kt
index 50737617..c799661a 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/repository/HistoryRepository.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/repository/HistoryRepository.kt
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.repository
+package org.dueattendant149.bookshelf.domain.repository
 
-import ua.acclorite.book_story.domain.model.history.History
+import org.dueattendant149.bookshelf.domain.model.history.History
 
 interface HistoryRepository {
     suspend fun getHistoryForBook(
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/repository/PermissionRepository.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/repository/PermissionRepository.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/domain/repository/PermissionRepository.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/repository/PermissionRepository.kt
index b0e97405..75ed8116 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/repository/PermissionRepository.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/repository/PermissionRepository.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.repository
+package org.dueattendant149.bookshelf.domain.repository
 
 interface PermissionRepository {
     suspend fun grantPersistableUriPermission(
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/service/CoverImageHandler.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/service/CoverImageHandler.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/domain/service/CoverImageHandler.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/service/CoverImageHandler.kt
index 3cd40af2..d41ca3a4 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/service/CoverImageHandler.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/service/CoverImageHandler.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.service
+package org.dueattendant149.bookshelf.domain.service
 
 import android.net.Uri
-import ua.acclorite.book_story.core.CoverImage
+import org.dueattendant149.bookshelf.core.CoverImage
 import java.io.File
 
 interface CoverImageHandler {
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/service/FileProvider.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/service/FileProvider.kt
similarity index 61%
rename from app/src/main/java/ua/acclorite/book_story/domain/service/FileProvider.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/service/FileProvider.kt
index 9b55aaf3..e1be08b9 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/service/FileProvider.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/service/FileProvider.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.service
+package org.dueattendant149.bookshelf.domain.service
 
-import ua.acclorite.book_story.data.model.file.CachedFile
-import ua.acclorite.book_story.domain.model.library.Book
+import org.dueattendant149.bookshelf.data.model.file.CachedFile
+import org.dueattendant149.bookshelf.domain.model.library.Book
 
 interface FileProvider {
     fun getFileFromBook(book: Book): Result<CachedFile>
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/AddBookUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/AddBookUseCase.kt
similarity index 73%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/book/AddBookUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/AddBookUseCase.kt
index 60fb955b..adf2dc0b 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/AddBookUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/AddBookUseCase.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.book
+package org.dueattendant149.bookshelf.domain.use_case.book
 
 import androidx.core.net.toUri
-import ua.acclorite.book_story.core.CoverImage
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.core.log.logW
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.domain.repository.BookRepository
-import ua.acclorite.book_story.domain.service.CoverImageHandler
+import org.dueattendant149.bookshelf.core.CoverImage
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.core.log.logW
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.repository.BookRepository
+import org.dueattendant149.bookshelf.domain.service.CoverImageHandler
 import javax.inject.Inject
 
 private const val TAG = "AddBook"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/CanResetCoverImageUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/CanResetCoverImageUseCase.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/book/CanResetCoverImageUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/CanResetCoverImageUseCase.kt
index 7b0a3f1f..6077d032 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/CanResetCoverImageUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/CanResetCoverImageUseCase.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.book
+package org.dueattendant149.bookshelf.domain.use_case.book
 
 import android.app.Application
 import android.graphics.BitmapFactory
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.repository.BookRepository
-import ua.acclorite.book_story.domain.service.CoverImageHandler
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.repository.BookRepository
+import org.dueattendant149.bookshelf.domain.service.CoverImageHandler
 import javax.inject.Inject
 
 private const val TAG = "CanResetCover"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/DeleteBookUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/DeleteBookUseCase.kt
similarity index 72%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/book/DeleteBookUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/DeleteBookUseCase.kt
index 25100dfc..f2fe913f 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/DeleteBookUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/DeleteBookUseCase.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.book
+package org.dueattendant149.bookshelf.domain.use_case.book
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.core.log.logW
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.domain.repository.BookRepository
-import ua.acclorite.book_story.domain.repository.HistoryRepository
-import ua.acclorite.book_story.domain.service.CoverImageHandler
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.core.log.logW
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.repository.BookRepository
+import org.dueattendant149.bookshelf.domain.repository.HistoryRepository
+import org.dueattendant149.bookshelf.domain.service.CoverImageHandler
 import javax.inject.Inject
 
 private const val TAG = "DeleteBook"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetBookUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/GetBookUseCase.kt
similarity index 72%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetBookUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/GetBookUseCase.kt
index 4252ba5d..eec6dad6 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetBookUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/GetBookUseCase.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.book
+package org.dueattendant149.bookshelf.domain.use_case.book
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.domain.repository.BookRepository
-import ua.acclorite.book_story.domain.repository.HistoryRepository
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.repository.BookRepository
+import org.dueattendant149.bookshelf.domain.repository.HistoryRepository
 import javax.inject.Inject
 
 private const val TAG = "GetBook"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetChapterProgressUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/GetChapterProgressUseCase.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetChapterProgressUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/GetChapterProgressUseCase.kt
index 19c0d4db..6ce49bde 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetChapterProgressUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/GetChapterProgressUseCase.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.book
+package org.dueattendant149.bookshelf.domain.use_case.book
 
-import ua.acclorite.book_story.core.helpers.coerceAndPreventNaN
-import ua.acclorite.book_story.domain.model.reader.ReaderText
-import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter
+import org.dueattendant149.bookshelf.core.helpers.coerceAndPreventNaN
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText.Chapter
 import javax.inject.Inject
 
 class GetChapterProgressUseCase @Inject constructor() {
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetFileFromBookUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/GetFileFromBookUseCase.kt
similarity index 73%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetFileFromBookUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/GetFileFromBookUseCase.kt
index d4f10b52..492f1fdc 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetFileFromBookUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/GetFileFromBookUseCase.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.book
+package org.dueattendant149.bookshelf.domain.use_case.book
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.file.File
-import ua.acclorite.book_story.domain.repository.BookRepository
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.file.File
+import org.dueattendant149.bookshelf.domain.repository.BookRepository
 import javax.inject.Inject
 
 private const val TAG = "GetFileFromBook"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetTextUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/GetTextUseCase.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetTextUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/GetTextUseCase.kt
index 768131b9..a4d1a3e1 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/GetTextUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/GetTextUseCase.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.book
+package org.dueattendant149.bookshelf.domain.use_case.book
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.reader.ReaderText
-import ua.acclorite.book_story.domain.repository.BookRepository
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.domain.repository.BookRepository
 import javax.inject.Inject
 
 private const val TAG = "GetText"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/ResetCoverImageUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/ResetCoverImageUseCase.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/book/ResetCoverImageUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/ResetCoverImageUseCase.kt
index 606fa041..d3b1db70 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/ResetCoverImageUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/ResetCoverImageUseCase.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.book
+package org.dueattendant149.bookshelf.domain.use_case.book
 
 import androidx.core.net.toUri
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.core.log.logW
-import ua.acclorite.book_story.domain.repository.BookRepository
-import ua.acclorite.book_story.domain.service.CoverImageHandler
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.core.log.logW
+import org.dueattendant149.bookshelf.domain.repository.BookRepository
+import org.dueattendant149.bookshelf.domain.service.CoverImageHandler
 import javax.inject.Inject
 
 private const val TAG = "ResetCoverImage"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/SearchBooksUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/SearchBooksUseCase.kt
similarity index 74%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/book/SearchBooksUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/SearchBooksUseCase.kt
index 1b56a094..e6e64e4b 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/SearchBooksUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/SearchBooksUseCase.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.book
+package org.dueattendant149.bookshelf.domain.use_case.book
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.domain.repository.BookRepository
-import ua.acclorite.book_story.domain.repository.HistoryRepository
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.repository.BookRepository
+import org.dueattendant149.bookshelf.domain.repository.HistoryRepository
 import javax.inject.Inject
 
 private const val TAG = "SearchBooks"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/UpdateBookUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/UpdateBookUseCase.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/book/UpdateBookUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/UpdateBookUseCase.kt
index 6e30e870..9a31c5af 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/UpdateBookUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/UpdateBookUseCase.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.book
+package org.dueattendant149.bookshelf.domain.use_case.book
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.domain.repository.BookRepository
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.repository.BookRepository
 import javax.inject.Inject
 
 private const val TAG = "UpdateBook"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/UpdateCoverImageUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/UpdateCoverImageUseCase.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/book/UpdateCoverImageUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/UpdateCoverImageUseCase.kt
index c6c072f5..30251c49 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/book/UpdateCoverImageUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/book/UpdateCoverImageUseCase.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.book
+package org.dueattendant149.bookshelf.domain.use_case.book
 
 import androidx.core.net.toUri
-import ua.acclorite.book_story.core.CoverImage
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.core.log.logW
-import ua.acclorite.book_story.domain.repository.BookRepository
-import ua.acclorite.book_story.domain.service.CoverImageHandler
+import org.dueattendant149.bookshelf.core.CoverImage
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.core.log.logW
+import org.dueattendant149.bookshelf.domain.repository.BookRepository
+import org.dueattendant149.bookshelf.domain.service.CoverImageHandler
 import javax.inject.Inject
 
 private const val TAG = "UpdateCoverImage"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/AddCategoryUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/category/AddCategoryUseCase.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/category/AddCategoryUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/category/AddCategoryUseCase.kt
index ea9c409c..06a2b278 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/AddCategoryUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/category/AddCategoryUseCase.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.category
+package org.dueattendant149.bookshelf.domain.use_case.category
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.library.Category
-import ua.acclorite.book_story.domain.repository.CategoryRepository
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.domain.repository.CategoryRepository
 import javax.inject.Inject
 
 private const val TAG = "AddCategory"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/DeleteCategoryUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/category/DeleteCategoryUseCase.kt
similarity index 75%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/category/DeleteCategoryUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/category/DeleteCategoryUseCase.kt
index bea859ba..50daedce 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/DeleteCategoryUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/category/DeleteCategoryUseCase.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.category
+package org.dueattendant149.bookshelf.domain.use_case.category
 
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.library.Category
-import ua.acclorite.book_story.domain.repository.CategoryRepository
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.domain.repository.CategoryRepository
 import javax.inject.Inject
 
 private const val TAG = "DeleteCategory"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/GetCategoriesUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/category/GetCategoriesUseCase.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/category/GetCategoriesUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/category/GetCategoriesUseCase.kt
index b5211653..6ece57e1 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/GetCategoriesUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/category/GetCategoriesUseCase.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.category
+package org.dueattendant149.bookshelf.domain.use_case.category
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.library.Category
-import ua.acclorite.book_story.domain.repository.CategoryRepository
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.domain.repository.CategoryRepository
 import javax.inject.Inject
 
 private const val TAG = "GetCategories"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategoriesOrderUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/category/UpdateCategoriesOrderUseCase.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategoriesOrderUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/category/UpdateCategoriesOrderUseCase.kt
index 3707f010..b6cfd61b 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategoriesOrderUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/category/UpdateCategoriesOrderUseCase.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.category
+package org.dueattendant149.bookshelf.domain.use_case.category
 
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.library.Category
-import ua.acclorite.book_story.domain.repository.CategoryRepository
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.domain.repository.CategoryRepository
 import javax.inject.Inject
 
 private const val TAG = "UpdateCategoryOrder"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategoryUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/category/UpdateCategoryUseCase.kt
similarity index 74%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategoryUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/category/UpdateCategoryUseCase.kt
index e6bc1ae2..44821fd1 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/category/UpdateCategoryUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/category/UpdateCategoryUseCase.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.category
+package org.dueattendant149.bookshelf.domain.use_case.category
 
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.library.Category
-import ua.acclorite.book_story.domain.repository.CategoryRepository
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.domain.repository.CategoryRepository
 import javax.inject.Inject
 
 private const val TAG = "UpdateCategory"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/DeleteColorPresetUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/color_preset/DeleteColorPresetUseCase.kt
similarity index 73%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/DeleteColorPresetUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/color_preset/DeleteColorPresetUseCase.kt
index 66fb21bc..d7f81be6 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/DeleteColorPresetUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/color_preset/DeleteColorPresetUseCase.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.color_preset
+package org.dueattendant149.bookshelf.domain.use_case.color_preset
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.reader.ColorPreset
-import ua.acclorite.book_story.domain.repository.ColorPresetRepository
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.reader.ColorPreset
+import org.dueattendant149.bookshelf.domain.repository.ColorPresetRepository
 import javax.inject.Inject
 
 private const val TAG = "DeleteColorPreset"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/GetColorPresetsUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/color_preset/GetColorPresetsUseCase.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/GetColorPresetsUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/color_preset/GetColorPresetsUseCase.kt
index 427ffd1f..1f182fe2 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/GetColorPresetsUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/color_preset/GetColorPresetsUseCase.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.color_preset
+package org.dueattendant149.bookshelf.domain.use_case.color_preset
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.reader.ColorPreset
-import ua.acclorite.book_story.domain.repository.ColorPresetRepository
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.reader.ColorPreset
+import org.dueattendant149.bookshelf.domain.repository.ColorPresetRepository
 import javax.inject.Inject
 
 private const val TAG = "GetColorPresets"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/ReorderColorPresetsUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/color_preset/ReorderColorPresetsUseCase.kt
similarity index 74%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/ReorderColorPresetsUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/color_preset/ReorderColorPresetsUseCase.kt
index 3154ff22..7df2d17e 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/ReorderColorPresetsUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/color_preset/ReorderColorPresetsUseCase.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.color_preset
+package org.dueattendant149.bookshelf.domain.use_case.color_preset
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.reader.ColorPreset
-import ua.acclorite.book_story.domain.repository.ColorPresetRepository
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.reader.ColorPreset
+import org.dueattendant149.bookshelf.domain.repository.ColorPresetRepository
 import javax.inject.Inject
 
 private const val TAG = "ReorderPresets"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/SelectColorPresetUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/color_preset/SelectColorPresetUseCase.kt
similarity index 73%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/SelectColorPresetUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/color_preset/SelectColorPresetUseCase.kt
index a6c92fd5..c4247256 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/SelectColorPresetUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/color_preset/SelectColorPresetUseCase.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.color_preset
+package org.dueattendant149.bookshelf.domain.use_case.color_preset
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.reader.ColorPreset
-import ua.acclorite.book_story.domain.repository.ColorPresetRepository
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.reader.ColorPreset
+import org.dueattendant149.bookshelf.domain.repository.ColorPresetRepository
 import javax.inject.Inject
 
 private const val TAG = "SelectColorPreset"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/UpdateColorPresetUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/color_preset/UpdateColorPresetUseCase.kt
similarity index 73%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/UpdateColorPresetUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/color_preset/UpdateColorPresetUseCase.kt
index c100c46c..168b3972 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/color_preset/UpdateColorPresetUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/color_preset/UpdateColorPresetUseCase.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.color_preset
+package org.dueattendant149.bookshelf.domain.use_case.color_preset
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.reader.ColorPreset
-import ua.acclorite.book_story.domain.repository.ColorPresetRepository
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.reader.ColorPreset
+import org.dueattendant149.bookshelf.domain.repository.ColorPresetRepository
 import javax.inject.Inject
 
 private const val TAG = "UpdateColorPreset"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetBookFromFileUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/file_system/GetBookFromFileUseCase.kt
similarity index 66%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetBookFromFileUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/file_system/GetBookFromFileUseCase.kt
index 5581d03c..3ded80b5 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetBookFromFileUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/file_system/GetBookFromFileUseCase.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.file_system
+package org.dueattendant149.bookshelf.domain.use_case.file_system
 
-import ua.acclorite.book_story.core.CoverImage
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.file.File
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.domain.repository.FileSystemRepository
+import org.dueattendant149.bookshelf.core.CoverImage
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.file.File
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.repository.FileSystemRepository
 import javax.inject.Inject
 
 private const val TAG = "GetBookFromFile"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetFilesUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/file_system/GetFilesUseCase.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetFilesUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/file_system/GetFilesUseCase.kt
index 5eb33be7..342c7f0e 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetFilesUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/file_system/GetFilesUseCase.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.file_system
+package org.dueattendant149.bookshelf.domain.use_case.file_system
 
-import ua.acclorite.book_story.core.helpers.compareByWithOrder
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.data.settings.SettingsManager
-import ua.acclorite.book_story.domain.model.file.File
-import ua.acclorite.book_story.domain.repository.FileSystemRepository
-import ua.acclorite.book_story.presentation.browse.model.BrowseSortOrder
+import org.dueattendant149.bookshelf.core.helpers.compareByWithOrder
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.data.settings.SettingsManager
+import org.dueattendant149.bookshelf.domain.model.file.File
+import org.dueattendant149.bookshelf.domain.repository.FileSystemRepository
+import org.dueattendant149.bookshelf.presentation.browse.model.BrowseSortOrder
 import javax.inject.Inject
 
 private const val TAG = "GetFiles"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/AddHistoryUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/history/AddHistoryUseCase.kt
similarity index 73%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/history/AddHistoryUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/history/AddHistoryUseCase.kt
index 8f95a6db..6392a335 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/AddHistoryUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/history/AddHistoryUseCase.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.history
+package org.dueattendant149.bookshelf.domain.use_case.history
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.history.History
-import ua.acclorite.book_story.domain.repository.HistoryRepository
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.history.History
+import org.dueattendant149.bookshelf.domain.repository.HistoryRepository
 import javax.inject.Inject
 
 private const val TAG = "AddHistory"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/DeleteHistoryUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/history/DeleteHistoryUseCase.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/history/DeleteHistoryUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/history/DeleteHistoryUseCase.kt
index 3ac12703..65af238d 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/DeleteHistoryUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/history/DeleteHistoryUseCase.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.history
+package org.dueattendant149.bookshelf.domain.use_case.history
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.history.History
-import ua.acclorite.book_story.domain.repository.HistoryRepository
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.history.History
+import org.dueattendant149.bookshelf.domain.repository.HistoryRepository
 import javax.inject.Inject
 
 private const val TAG = "DeleteHistory"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/DeleteWholeHistoryUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/history/DeleteWholeHistoryUseCase.kt
similarity index 75%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/history/DeleteWholeHistoryUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/history/DeleteWholeHistoryUseCase.kt
index 6d1afe32..63bc4696 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/DeleteWholeHistoryUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/history/DeleteWholeHistoryUseCase.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.history
+package org.dueattendant149.bookshelf.domain.use_case.history
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.repository.HistoryRepository
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.repository.HistoryRepository
 import javax.inject.Inject
 
 private const val TAG = "DeleteWholeHistory"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/GetHistoryForBookUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/history/GetHistoryForBookUseCase.kt
similarity index 73%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/history/GetHistoryForBookUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/history/GetHistoryForBookUseCase.kt
index 2686119f..c76fdfde 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/GetHistoryForBookUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/history/GetHistoryForBookUseCase.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.history
+package org.dueattendant149.bookshelf.domain.use_case.history
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.history.History
-import ua.acclorite.book_story.domain.repository.HistoryRepository
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.history.History
+import org.dueattendant149.bookshelf.domain.repository.HistoryRepository
 import javax.inject.Inject
 
 private const val TAG = "GetHistoryForBook"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/GetHistoryUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/history/GetHistoryUseCase.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/history/GetHistoryUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/history/GetHistoryUseCase.kt
index e50ba698..7cb9c181 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/history/GetHistoryUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/history/GetHistoryUseCase.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.history
+package org.dueattendant149.bookshelf.domain.use_case.history
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.model.history.History
-import ua.acclorite.book_story.domain.repository.HistoryRepository
-import ua.acclorite.book_story.presentation.history.model.GroupedHistory
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.model.history.History
+import org.dueattendant149.bookshelf.domain.repository.HistoryRepository
+import org.dueattendant149.bookshelf.presentation.history.model.GroupedHistory
 import java.time.Instant
 import java.time.LocalDate
 import java.time.ZoneId
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/permission/GrantPersistableUriPermissionUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/permission/GrantPersistableUriPermissionUseCase.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/permission/GrantPersistableUriPermissionUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/permission/GrantPersistableUriPermissionUseCase.kt
index 120af180..62691dee 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/permission/GrantPersistableUriPermissionUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/permission/GrantPersistableUriPermissionUseCase.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.permission
+package org.dueattendant149.bookshelf.domain.use_case.permission
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.repository.PermissionRepository
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.repository.PermissionRepository
 import javax.inject.Inject
 
 private const val TAG = "GrantUriPermission"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/permission/ReleasePersistableUriPermissionUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/permission/ReleasePersistableUriPermissionUseCase.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/permission/ReleasePersistableUriPermissionUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/permission/ReleasePersistableUriPermissionUseCase.kt
index b2bc8964..eff3b4ba 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/permission/ReleasePersistableUriPermissionUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/permission/ReleasePersistableUriPermissionUseCase.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.permission
+package org.dueattendant149.bookshelf.domain.use_case.permission
 
-import ua.acclorite.book_story.core.log.logE
-import ua.acclorite.book_story.core.log.logI
-import ua.acclorite.book_story.domain.repository.PermissionRepository
+import org.dueattendant149.bookshelf.core.log.logE
+import org.dueattendant149.bookshelf.core.log.logI
+import org.dueattendant149.bookshelf.domain.repository.PermissionRepository
 import javax.inject.Inject
 
 private const val TAG = "ReleaseUriPermission"
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/settings/UpdateLanguageUseCase.kt b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/settings/UpdateLanguageUseCase.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/domain/use_case/settings/UpdateLanguageUseCase.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/settings/UpdateLanguageUseCase.kt
index bfd9b182..f843b974 100644
--- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/settings/UpdateLanguageUseCase.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/domain/use_case/settings/UpdateLanguageUseCase.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.domain.use_case.settings
+package org.dueattendant149.bookshelf.domain.use_case.settings
 
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.os.LocaleListCompat
-import ua.acclorite.book_story.core.language.Language
-import ua.acclorite.book_story.data.settings.SettingsManager
+import org.dueattendant149.bookshelf.core.language.Language
+import org.dueattendant149.bookshelf.data.settings.SettingsManager
 import javax.inject.Inject
 
 class UpdateLanguageUseCase @Inject constructor(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutEffect.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/about/AboutEffect.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/presentation/about/AboutEffect.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/about/AboutEffect.kt
index 805429fb..1581db54 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutEffect.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/about/AboutEffect.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.about
+package org.dueattendant149.bookshelf.presentation.about
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutEvent.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/about/AboutEvent.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/presentation/about/AboutEvent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/about/AboutEvent.kt
index d7ebf775..bf623d78 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutEvent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/about/AboutEvent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.about
+package org.dueattendant149.bookshelf.presentation.about
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutModel.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/about/AboutModel.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/about/AboutModel.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/about/AboutModel.kt
index 83264273..6036465f 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutModel.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/about/AboutModel.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.about
+package org.dueattendant149.bookshelf.presentation.about
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutScreen.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/about/AboutScreen.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/presentation/about/AboutScreen.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/about/AboutScreen.kt
index 1bc5896c..322b1cf0 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/about/AboutScreen.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/about/AboutScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.about
+package org.dueattendant149.bookshelf.presentation.about
 
 import android.os.Parcelable
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -12,10 +12,10 @@ 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.navigator.Screen
-import ua.acclorite.book_story.ui.about.AboutContent
-import ua.acclorite.book_story.ui.about.AboutEffects
-import ua.acclorite.book_story.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import org.dueattendant149.bookshelf.presentation.navigator.Screen
+import org.dueattendant149.bookshelf.ui.about.AboutContent
+import org.dueattendant149.bookshelf.ui.about.AboutEffects
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
 
 @Parcelize
 object AboutScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoEffect.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/book_info/BookInfoEffect.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoEffect.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/book_info/BookInfoEffect.kt
index 83ba33ad..4af3307d 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoEffect.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/book_info/BookInfoEffect.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package org.dueattendant149.bookshelf.presentation.book_info
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoEvent.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/book_info/BookInfoEvent.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoEvent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/book_info/BookInfoEvent.kt
index 4e33cb66..917a51e5 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoEvent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/book_info/BookInfoEvent.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package org.dueattendant149.bookshelf.presentation.book_info
 
 import android.graphics.Bitmap
 import androidx.compose.runtime.Immutable
-import ua.acclorite.book_story.core.ui.UIText
-import ua.acclorite.book_story.domain.model.library.Category
+import org.dueattendant149.bookshelf.core.ui.UIText
+import org.dueattendant149.bookshelf.domain.model.library.Category
 
 @Immutable
 sealed class BookInfoEvent {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoModel.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/book_info/BookInfoModel.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoModel.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/book_info/BookInfoModel.kt
index ab7e3c8f..147172c5 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoModel.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/book_info/BookInfoModel.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package org.dueattendant149.bookshelf.presentation.book_info
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -20,16 +20,16 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import ua.acclorite.book_story.domain.use_case.book.CanResetCoverImageUseCase
-import ua.acclorite.book_story.domain.use_case.book.DeleteBookUseCase
-import ua.acclorite.book_story.domain.use_case.book.GetBookUseCase
-import ua.acclorite.book_story.domain.use_case.book.GetFileFromBookUseCase
-import ua.acclorite.book_story.domain.use_case.book.ResetCoverImageUseCase
-import ua.acclorite.book_story.domain.use_case.book.UpdateBookUseCase
-import ua.acclorite.book_story.domain.use_case.book.UpdateCoverImageUseCase
-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 org.dueattendant149.bookshelf.domain.use_case.book.CanResetCoverImageUseCase
+import org.dueattendant149.bookshelf.domain.use_case.book.DeleteBookUseCase
+import org.dueattendant149.bookshelf.domain.use_case.book.GetBookUseCase
+import org.dueattendant149.bookshelf.domain.use_case.book.GetFileFromBookUseCase
+import org.dueattendant149.bookshelf.domain.use_case.book.ResetCoverImageUseCase
+import org.dueattendant149.bookshelf.domain.use_case.book.UpdateBookUseCase
+import org.dueattendant149.bookshelf.domain.use_case.book.UpdateCoverImageUseCase
+import org.dueattendant149.bookshelf.presentation.browse.BrowseScreen
+import org.dueattendant149.bookshelf.presentation.history.HistoryScreen
+import org.dueattendant149.bookshelf.presentation.library.LibraryScreen
 import javax.inject.Inject
 import kotlin.coroutines.coroutineContext
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoScreen.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/book_info/BookInfoScreen.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoScreen.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/book_info/BookInfoScreen.kt
index 4a07c0f5..d691c4f8 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoScreen.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/book_info/BookInfoScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package org.dueattendant149.bookshelf.presentation.book_info
 
 import android.os.Parcelable
 import androidx.compose.foundation.layout.Box
@@ -20,10 +20,10 @@ 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.navigator.Screen
-import ua.acclorite.book_story.presentation.settings.SettingsModel
-import ua.acclorite.book_story.ui.book_info.BookInfoContent
-import ua.acclorite.book_story.ui.book_info.BookInfoEffects
+import org.dueattendant149.bookshelf.presentation.navigator.Screen
+import org.dueattendant149.bookshelf.presentation.settings.SettingsModel
+import org.dueattendant149.bookshelf.ui.book_info.BookInfoContent
+import org.dueattendant149.bookshelf.ui.book_info.BookInfoEffects
 
 @Parcelize
 data class BookInfoScreen(val bookId: Int) : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoState.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/book_info/BookInfoState.kt
similarity index 61%
rename from app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoState.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/book_info/BookInfoState.kt
index ff8b45fe..9ca90acf 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/book_info/BookInfoState.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/book_info/BookInfoState.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.book_info
+package org.dueattendant149.bookshelf.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.model.file.File
-import ua.acclorite.book_story.domain.model.library.Book
+import org.dueattendant149.bookshelf.core.BottomSheet
+import org.dueattendant149.bookshelf.core.Dialog
+import org.dueattendant149.bookshelf.domain.model.file.File
+import org.dueattendant149.bookshelf.domain.model.library.Book
 
 @Immutable
 data class BookInfoState(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseEffect.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/BrowseEffect.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseEffect.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/BrowseEffect.kt
index 581afaa2..e7121cb9 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseEffect.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/BrowseEffect.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package org.dueattendant149.bookshelf.presentation.browse
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseEvent.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/BrowseEvent.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseEvent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/BrowseEvent.kt
index aab43c80..6cd3e92a 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseEvent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/BrowseEvent.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package org.dueattendant149.bookshelf.presentation.browse
 
 import androidx.compose.runtime.Immutable
-import ua.acclorite.book_story.presentation.browse.model.SelectableFile
-import ua.acclorite.book_story.presentation.browse.model.SelectableNullableBook
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableFile
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableNullableBook
 
 @Immutable
 sealed class BrowseEvent {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseModel.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/BrowseModel.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseModel.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/BrowseModel.kt
index b4ae9f99..6bfaf496 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseModel.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/BrowseModel.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package org.dueattendant149.bookshelf.presentation.browse
 
 import androidx.core.net.toUri
 import androidx.lifecycle.ViewModel
@@ -24,16 +24,16 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.core.ui.UIText
-import ua.acclorite.book_story.domain.model.file.File
-import ua.acclorite.book_story.domain.use_case.book.AddBookUseCase
-import ua.acclorite.book_story.domain.use_case.file_system.GetBookFromFileUseCase
-import ua.acclorite.book_story.domain.use_case.file_system.GetFilesUseCase
-import ua.acclorite.book_story.presentation.browse.model.NullableBook
-import ua.acclorite.book_story.presentation.browse.model.SelectableFile
-import ua.acclorite.book_story.presentation.browse.model.SelectableNullableBook
-import ua.acclorite.book_story.presentation.library.LibraryScreen
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.ui.UIText
+import org.dueattendant149.bookshelf.domain.model.file.File
+import org.dueattendant149.bookshelf.domain.use_case.book.AddBookUseCase
+import org.dueattendant149.bookshelf.domain.use_case.file_system.GetBookFromFileUseCase
+import org.dueattendant149.bookshelf.domain.use_case.file_system.GetFilesUseCase
+import org.dueattendant149.bookshelf.presentation.browse.model.NullableBook
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableFile
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableNullableBook
+import org.dueattendant149.bookshelf.presentation.library.LibraryScreen
 import javax.inject.Inject
 import kotlin.coroutines.coroutineContext
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseScreen.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/BrowseScreen.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseScreen.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/BrowseScreen.kt
index 7dc8b35c..d62c9aca 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseScreen.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/BrowseScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package org.dueattendant149.bookshelf.presentation.browse
 
 import android.os.Parcelable
 import androidx.compose.foundation.lazy.grid.rememberLazyGridState
@@ -23,11 +23,11 @@ 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.model.BrowseLayout
-import ua.acclorite.book_story.presentation.navigator.Screen
-import ua.acclorite.book_story.ui.browse.BrowseContent
-import ua.acclorite.book_story.ui.browse.BrowseEffects
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.presentation.browse.model.BrowseLayout
+import org.dueattendant149.bookshelf.presentation.navigator.Screen
+import org.dueattendant149.bookshelf.ui.browse.BrowseContent
+import org.dueattendant149.bookshelf.ui.browse.BrowseEffects
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Parcelize
 object BrowseScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseState.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/BrowseState.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseState.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/BrowseState.kt
index a3aeee85..8934ac6c 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseState.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/BrowseState.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse
+package org.dueattendant149.bookshelf.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.presentation.browse.model.SelectableFile
-import ua.acclorite.book_story.presentation.browse.model.SelectableNullableBook
+import org.dueattendant149.bookshelf.core.BottomSheet
+import org.dueattendant149.bookshelf.core.Dialog
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableFile
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableNullableBook
 
 @Immutable
 data class BrowseState(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/model/BrowseLayout.kt
similarity index 75%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/model/BrowseLayout.kt
index 3013f60b..c820f6a3 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/model/BrowseLayout.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse.model
+package org.dueattendant149.bookshelf.presentation.browse.model
 
 import androidx.annotation.StringRes
-import ua.acclorite.book_story.R
+import org.dueattendant149.bookshelf.R
 
 
 enum class BrowseLayout(@StringRes val title: Int) {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseSortOrder.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/model/BrowseSortOrder.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseSortOrder.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/model/BrowseSortOrder.kt
index 1ae3533a..856841fb 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseSortOrder.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/model/BrowseSortOrder.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse.model
+package org.dueattendant149.bookshelf.presentation.browse.model
 
 
 enum class BrowseSortOrder {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/GroupedFiles.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/model/GroupedFiles.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/model/GroupedFiles.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/model/GroupedFiles.kt
index 80384c67..91dde5a4 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/GroupedFiles.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/model/GroupedFiles.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse.model
+package org.dueattendant149.bookshelf.presentation.browse.model
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/NullableBook.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/model/NullableBook.kt
similarity index 65%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/model/NullableBook.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/model/NullableBook.kt
index f68b2202..984e87cb 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/NullableBook.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/model/NullableBook.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse.model
+package org.dueattendant149.bookshelf.presentation.browse.model
 
 import androidx.compose.runtime.Immutable
-import ua.acclorite.book_story.core.CoverImage
-import ua.acclorite.book_story.core.ui.UIText
-import ua.acclorite.book_story.domain.model.library.Book
+import org.dueattendant149.bookshelf.core.CoverImage
+import org.dueattendant149.bookshelf.core.ui.UIText
+import org.dueattendant149.bookshelf.domain.model.library.Book
 
 @Immutable
 sealed class NullableBook {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/SelectableFile.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/model/SelectableFile.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/model/SelectableFile.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/model/SelectableFile.kt
index 39b04024..9ef74c43 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/SelectableFile.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/model/SelectableFile.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse.model
+package org.dueattendant149.bookshelf.presentation.browse.model
 
 import android.net.Uri
 import androidx.compose.runtime.Immutable
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/SelectableNullableBook.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/model/SelectableNullableBook.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/presentation/browse/model/SelectableNullableBook.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/model/SelectableNullableBook.kt
index bc08573f..617c6bd4 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/SelectableNullableBook.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/browse/model/SelectableNullableBook.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.browse.model
+package org.dueattendant149.bookshelf.presentation.browse.model
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashActivity.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/crash/CrashActivity.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashActivity.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/crash/CrashActivity.kt
index 6f722b52..4ab357d6 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashActivity.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/crash/CrashActivity.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.crash
+package org.dueattendant149.bookshelf.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.theme.BookStoryTheme
-import ua.acclorite.book_story.ui.theme.model.Theme
-import ua.acclorite.book_story.ui.theme.model.ThemeContrast
+import org.dueattendant149.bookshelf.ui.theme.BookStoryTheme
+import org.dueattendant149.bookshelf.ui.theme.model.Theme
+import org.dueattendant149.bookshelf.ui.theme.model.ThemeContrast
 
 class CrashActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashScreen.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/crash/CrashScreen.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashScreen.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/crash/CrashScreen.kt
index 0f8d5366..d42c4c81 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashScreen.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/crash/CrashScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.crash
+package org.dueattendant149.bookshelf.presentation.crash
 
 import android.content.ClipData
 import android.content.Intent
@@ -18,13 +18,13 @@ import androidx.compose.ui.platform.LocalClipboard
 import kotlinx.coroutines.Dispatchers
 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.navigator.Screen
-import ua.acclorite.book_story.ui.common.helpers.LocalActivity
-import ua.acclorite.book_story.ui.common.helpers.launchActivity
-import ua.acclorite.book_story.ui.common.helpers.showToast
-import ua.acclorite.book_story.ui.crash.CrashContent
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.crash.CrashUtils
+import org.dueattendant149.bookshelf.presentation.navigator.Screen
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalActivity
+import org.dueattendant149.bookshelf.ui.common.helpers.launchActivity
+import org.dueattendant149.bookshelf.ui.common.helpers.showToast
+import org.dueattendant149.bookshelf.ui.crash.CrashContent
 
 @Parcelize
 object CrashScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsScreen.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/credits/CreditsScreen.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsScreen.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/credits/CreditsScreen.kt
index e8973dd8..09e7f728 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/credits/CreditsScreen.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/credits/CreditsScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.credits
+package org.dueattendant149.bookshelf.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.about.AboutModel
-import ua.acclorite.book_story.presentation.navigator.Screen
-import ua.acclorite.book_story.ui.about.AboutEffects
-import ua.acclorite.book_story.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
-import ua.acclorite.book_story.ui.credits.CreditsContent
+import org.dueattendant149.bookshelf.presentation.about.AboutModel
+import org.dueattendant149.bookshelf.presentation.navigator.Screen
+import org.dueattendant149.bookshelf.ui.about.AboutEffects
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import org.dueattendant149.bookshelf.ui.credits.CreditsContent
 
 @Parcelize
 object CreditsScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEffect.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/history/HistoryEffect.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEffect.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/history/HistoryEffect.kt
index 6eb8916c..9444a55a 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEffect.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/history/HistoryEffect.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.history
+package org.dueattendant149.bookshelf.presentation.history
 
 import androidx.compose.runtime.Immutable
-import ua.acclorite.book_story.domain.model.history.History
+import org.dueattendant149.bookshelf.domain.model.history.History
 
 @Immutable
 sealed class HistoryEffect {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEvent.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/history/HistoryEvent.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEvent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/history/HistoryEvent.kt
index 9f7711b3..eb2ae34b 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryEvent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/history/HistoryEvent.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.history
+package org.dueattendant149.bookshelf.presentation.history
 
 import androidx.compose.runtime.Immutable
-import ua.acclorite.book_story.domain.model.history.History
+import org.dueattendant149.bookshelf.domain.model.history.History
 
 @Immutable
 sealed class HistoryEvent {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryModel.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/history/HistoryModel.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryModel.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/history/HistoryModel.kt
index 6aaf36fd..b2b0dea6 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryModel.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/history/HistoryModel.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.history
+package org.dueattendant149.bookshelf.presentation.history
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -23,13 +23,13 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import ua.acclorite.book_story.domain.model.history.History
-import ua.acclorite.book_story.domain.use_case.book.GetBookUseCase
-import ua.acclorite.book_story.domain.use_case.history.AddHistoryUseCase
-import ua.acclorite.book_story.domain.use_case.history.DeleteHistoryUseCase
-import ua.acclorite.book_story.domain.use_case.history.DeleteWholeHistoryUseCase
-import ua.acclorite.book_story.domain.use_case.history.GetHistoryUseCase
-import ua.acclorite.book_story.presentation.library.LibraryScreen
+import org.dueattendant149.bookshelf.domain.model.history.History
+import org.dueattendant149.bookshelf.domain.use_case.book.GetBookUseCase
+import org.dueattendant149.bookshelf.domain.use_case.history.AddHistoryUseCase
+import org.dueattendant149.bookshelf.domain.use_case.history.DeleteHistoryUseCase
+import org.dueattendant149.bookshelf.domain.use_case.history.DeleteWholeHistoryUseCase
+import org.dueattendant149.bookshelf.domain.use_case.history.GetHistoryUseCase
+import org.dueattendant149.bookshelf.presentation.library.LibraryScreen
 import java.util.Date
 import javax.inject.Inject
 import kotlin.coroutines.coroutineContext
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryScreen.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/history/HistoryScreen.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryScreen.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/history/HistoryScreen.kt
index 2f34596f..3748bc67 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryScreen.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/history/HistoryScreen.kt
@@ -6,7 +6,7 @@
 
 @file:OptIn(ExperimentalMaterialApi::class)
 
-package ua.acclorite.book_story.presentation.history
+package org.dueattendant149.bookshelf.presentation.history
 
 import android.os.Parcelable
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -22,9 +22,9 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.coroutines.channels.Channel
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.presentation.navigator.Screen
-import ua.acclorite.book_story.ui.history.HistoryContent
-import ua.acclorite.book_story.ui.history.HistoryEffects
+import org.dueattendant149.bookshelf.presentation.navigator.Screen
+import org.dueattendant149.bookshelf.ui.history.HistoryContent
+import org.dueattendant149.bookshelf.ui.history.HistoryEffects
 
 @Parcelize
 object HistoryScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryState.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/history/HistoryState.kt
similarity index 72%
rename from app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryState.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/history/HistoryState.kt
index bbd8021b..a4992558 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/history/HistoryState.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/history/HistoryState.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.history
+package org.dueattendant149.bookshelf.presentation.history
 
 import androidx.compose.runtime.Immutable
-import ua.acclorite.book_story.core.Dialog
-import ua.acclorite.book_story.presentation.history.model.GroupedHistory
+import org.dueattendant149.bookshelf.core.Dialog
+import org.dueattendant149.bookshelf.presentation.history.model.GroupedHistory
 
 @Immutable
 data class HistoryState(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/history/model/GroupedHistory.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/history/model/GroupedHistory.kt
similarity index 68%
rename from app/src/main/java/ua/acclorite/book_story/presentation/history/model/GroupedHistory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/history/model/GroupedHistory.kt
index 3b3fbbfe..c68f1fe6 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/history/model/GroupedHistory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/history/model/GroupedHistory.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.history.model
+package org.dueattendant149.bookshelf.presentation.history.model
 
 import androidx.compose.runtime.Immutable
-import ua.acclorite.book_story.domain.model.history.History
+import org.dueattendant149.bookshelf.domain.model.history.History
 
 @Immutable
 data class GroupedHistory(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEffect.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/library/LibraryEffect.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEffect.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/library/LibraryEffect.kt
index 556ccfb9..8d7208b2 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEffect.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/library/LibraryEffect.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package org.dueattendant149.bookshelf.presentation.library
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEvent.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/library/LibraryEvent.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEvent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/library/LibraryEvent.kt
index bf6cbd35..eb5d5012 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryEvent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/library/LibraryEvent.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package org.dueattendant149.bookshelf.presentation.library
 
 import androidx.compose.runtime.Immutable
-import ua.acclorite.book_story.domain.model.library.Category
-import ua.acclorite.book_story.presentation.library.model.SelectableBook
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.presentation.library.model.SelectableBook
 
 @Immutable
 sealed class LibraryEvent {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryModel.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/library/LibraryModel.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryModel.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/library/LibraryModel.kt
index 9ebbb2b0..cae944e6 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryModel.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/library/LibraryModel.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package org.dueattendant149.bookshelf.presentation.library
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -23,12 +23,12 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import ua.acclorite.book_story.domain.use_case.book.DeleteBookUseCase
-import ua.acclorite.book_story.domain.use_case.book.SearchBooksUseCase
-import ua.acclorite.book_story.domain.use_case.book.UpdateBookUseCase
-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 org.dueattendant149.bookshelf.domain.use_case.book.DeleteBookUseCase
+import org.dueattendant149.bookshelf.domain.use_case.book.SearchBooksUseCase
+import org.dueattendant149.bookshelf.domain.use_case.book.UpdateBookUseCase
+import org.dueattendant149.bookshelf.presentation.browse.BrowseScreen
+import org.dueattendant149.bookshelf.presentation.history.HistoryScreen
+import org.dueattendant149.bookshelf.presentation.library.model.SelectableBook
 import javax.inject.Inject
 import kotlin.coroutines.coroutineContext
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryScreen.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/library/LibraryScreen.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryScreen.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/library/LibraryScreen.kt
index 7009fe1d..53d52818 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryScreen.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/library/LibraryScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package org.dueattendant149.bookshelf.presentation.library
 
 import android.os.Parcelable
 import androidx.compose.foundation.pager.rememberPagerState
@@ -23,11 +23,11 @@ import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.presentation.navigator.Screen
-import ua.acclorite.book_story.presentation.settings.SettingsModel
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.library.LibraryContent
-import ua.acclorite.book_story.ui.library.LibraryEffects
+import org.dueattendant149.bookshelf.presentation.navigator.Screen
+import org.dueattendant149.bookshelf.presentation.settings.SettingsModel
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.library.LibraryContent
+import org.dueattendant149.bookshelf.ui.library.LibraryEffects
 
 @Parcelize
 object LibraryScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryState.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/library/LibraryState.kt
similarity index 72%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryState.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/library/LibraryState.kt
index d349f7b8..3c2986a7 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/LibraryState.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/library/LibraryState.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library
+package org.dueattendant149.bookshelf.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.presentation.library.model.SelectableBook
+import org.dueattendant149.bookshelf.core.BottomSheet
+import org.dueattendant149.bookshelf.core.Dialog
+import org.dueattendant149.bookshelf.presentation.library.model.SelectableBook
 
 @Immutable
 data class LibraryState(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/library/model/LibraryLayout.kt
similarity index 74%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/library/model/LibraryLayout.kt
index de7bfe9d..199b1841 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/library/model/LibraryLayout.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library.model
+package org.dueattendant149.bookshelf.presentation.library.model
 
 import androidx.annotation.StringRes
-import ua.acclorite.book_story.R
+import org.dueattendant149.bookshelf.R
 
 enum class LibraryLayout(@StringRes val title: Int) {
     GRID(R.string.layout_grid),
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibrarySortOrder.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/library/model/LibrarySortOrder.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibrarySortOrder.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/library/model/LibrarySortOrder.kt
index a12840af..93dcd01e 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibrarySortOrder.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/library/model/LibrarySortOrder.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library.model
+package org.dueattendant149.bookshelf.presentation.library.model
 
 
 enum class LibrarySortOrder {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryTitlePosition.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/library/model/LibraryTitlePosition.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryTitlePosition.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/library/model/LibraryTitlePosition.kt
index b03cf405..a4b16db7 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryTitlePosition.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/library/model/LibraryTitlePosition.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library.model
+package org.dueattendant149.bookshelf.presentation.library.model
 
 import androidx.annotation.StringRes
-import ua.acclorite.book_story.R
+import org.dueattendant149.bookshelf.R
 
 
 enum class LibraryTitlePosition(@StringRes val title: Int) {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/model/SelectableBook.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/library/model/SelectableBook.kt
similarity index 68%
rename from app/src/main/java/ua/acclorite/book_story/presentation/library/model/SelectableBook.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/library/model/SelectableBook.kt
index df588637..2284a297 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/model/SelectableBook.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/library/model/SelectableBook.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.library.model
+package org.dueattendant149.bookshelf.presentation.library.model
 
 import androidx.compose.runtime.Immutable
-import ua.acclorite.book_story.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.model.library.Book
 
 @Immutable
 data class SelectableBook(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoScreen.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/license_info/LicenseInfoScreen.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoScreen.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/license_info/LicenseInfoScreen.kt
index 4a66ca47..c0a72f17 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/license_info/LicenseInfoScreen.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/license_info/LicenseInfoScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.license_info
+package org.dueattendant149.bookshelf.presentation.license_info
 
 import android.os.Parcelable
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -17,12 +17,12 @@ import androidx.hilt.navigation.compose.hiltViewModel
 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.about.AboutModel
-import ua.acclorite.book_story.presentation.navigator.Screen
-import ua.acclorite.book_story.ui.about.AboutEffects
-import ua.acclorite.book_story.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
-import ua.acclorite.book_story.ui.license_info.LicenseInfoContent
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.about.AboutModel
+import org.dueattendant149.bookshelf.presentation.navigator.Screen
+import org.dueattendant149.bookshelf.ui.about.AboutEffects
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import org.dueattendant149.bookshelf.ui.license_info.LicenseInfoContent
 
 @Parcelize
 data class LicenseInfoScreen(val uniqueId: String) : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesScreen.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/licenses/LicensesScreen.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesScreen.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/licenses/LicensesScreen.kt
index d14e9668..2b3a9392 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/licenses/LicensesScreen.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/licenses/LicensesScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.licenses
+package org.dueattendant149.bookshelf.presentation.licenses
 
 import android.os.Parcelable
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -19,12 +19,12 @@ import com.mikepenz.aboutlibraries.Libs
 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.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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.license_info.LicenseInfoScreen
+import org.dueattendant149.bookshelf.presentation.navigator.Screen
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import org.dueattendant149.bookshelf.ui.licenses.LicensesContent
+import org.dueattendant149.bookshelf.ui.navigator.LocalNavigator
 
 @Parcelize
 object LicensesScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/main/MainActivity.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/main/MainActivity.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/presentation/main/MainActivity.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/main/MainActivity.kt
index aed650f6..6e56e2c5 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/main/MainActivity.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/main/MainActivity.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("UnusedVariable", "unused")
 
-package ua.acclorite.book_story.presentation.main
+package org.dueattendant149.bookshelf.presentation.main
 
 import android.annotation.SuppressLint
 import android.database.CursorWindow
@@ -22,27 +22,27 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.collections.immutable.persistentListOf
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.data.settings.SettingsManager
-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.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.ui.common.components.navigation_bar.NavigationBar
-import ua.acclorite.book_story.ui.common.components.navigation_rail.NavigationRail
-import ua.acclorite.book_story.ui.common.helpers.ProvideSettings
-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 ua.acclorite.book_story.ui.settings.SettingsEffects
-import ua.acclorite.book_story.ui.theme.BookStoryTheme
-import ua.acclorite.book_story.ui.theme.Transitions
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.data.settings.SettingsManager
+import org.dueattendant149.bookshelf.presentation.browse.BrowseModel
+import org.dueattendant149.bookshelf.presentation.browse.BrowseScreen
+import org.dueattendant149.bookshelf.presentation.history.HistoryModel
+import org.dueattendant149.bookshelf.presentation.history.HistoryScreen
+import org.dueattendant149.bookshelf.presentation.library.LibraryModel
+import org.dueattendant149.bookshelf.presentation.library.LibraryScreen
+import org.dueattendant149.bookshelf.presentation.navigator.NavigatorItem
+import org.dueattendant149.bookshelf.presentation.navigator.StackEvent
+import org.dueattendant149.bookshelf.presentation.settings.SettingsModel
+import org.dueattendant149.bookshelf.presentation.start.StartScreen
+import org.dueattendant149.bookshelf.ui.common.components.navigation_bar.NavigationBar
+import org.dueattendant149.bookshelf.ui.common.components.navigation_rail.NavigationRail
+import org.dueattendant149.bookshelf.ui.common.helpers.ProvideSettings
+import org.dueattendant149.bookshelf.ui.main.MainActivityKeyboardManager
+import org.dueattendant149.bookshelf.ui.navigator.Navigator
+import org.dueattendant149.bookshelf.ui.navigator.NavigatorTabs
+import org.dueattendant149.bookshelf.ui.settings.SettingsEffects
+import org.dueattendant149.bookshelf.ui.theme.BookStoryTheme
+import org.dueattendant149.bookshelf.ui.theme.Transitions
 import java.lang.reflect.Field
 import javax.inject.Inject
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/Navigator.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/navigator/Navigator.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/presentation/navigator/Navigator.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/navigator/Navigator.kt
index 2e38c325..8ec90827 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/Navigator.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/navigator/Navigator.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.navigator
+package org.dueattendant149.bookshelf.presentation.navigator
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/navigator/NavigatorItem.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/navigator/NavigatorItem.kt
index c9d45153..29574560 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/NavigatorItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/navigator/NavigatorItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.navigator
+package org.dueattendant149.bookshelf.presentation.navigator
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/Screen.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/navigator/Screen.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/presentation/navigator/Screen.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/navigator/Screen.kt
index 99b3ba62..2a29f911 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/Screen.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/navigator/Screen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.navigator
+package org.dueattendant149.bookshelf.presentation.navigator
 
 import androidx.compose.runtime.Composable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/StackEvent.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/navigator/StackEvent.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/presentation/navigator/StackEvent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/navigator/StackEvent.kt
index 842e4ba3..aa707ff0 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/StackEvent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/navigator/StackEvent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.navigator
+package org.dueattendant149.bookshelf.presentation.navigator
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderEffect.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/ReaderEffect.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderEffect.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/ReaderEffect.kt
index 10c3ba72..229d26f9 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderEffect.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/ReaderEffect.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package org.dueattendant149.bookshelf.presentation.reader
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderEvent.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/ReaderEvent.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderEvent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/ReaderEvent.kt
index 95c8f0f2..04e16265 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderEvent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/ReaderEvent.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package org.dueattendant149.bookshelf.presentation.reader
 
 import androidx.compose.runtime.Immutable
-import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter
-import ua.acclorite.book_story.presentation.reader.model.Checkpoint
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText.Chapter
+import org.dueattendant149.bookshelf.presentation.reader.model.Checkpoint
 
 @Immutable
 sealed class ReaderEvent {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderModel.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/ReaderModel.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderModel.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/ReaderModel.kt
index 5e83b954..c045f8bd 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderModel.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/ReaderModel.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package org.dueattendant149.bookshelf.presentation.reader
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.snapshotFlow
@@ -28,18 +28,18 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.core.helpers.coerceAndPreventNaN
-import ua.acclorite.book_story.core.ui.UIText
-import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter
-import ua.acclorite.book_story.domain.use_case.book.GetBookUseCase
-import ua.acclorite.book_story.domain.use_case.book.GetChapterProgressUseCase
-import ua.acclorite.book_story.domain.use_case.book.GetTextUseCase
-import ua.acclorite.book_story.domain.use_case.book.UpdateBookUseCase
-import ua.acclorite.book_story.domain.use_case.history.GetHistoryForBookUseCase
-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 org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.helpers.coerceAndPreventNaN
+import org.dueattendant149.bookshelf.core.ui.UIText
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText.Chapter
+import org.dueattendant149.bookshelf.domain.use_case.book.GetBookUseCase
+import org.dueattendant149.bookshelf.domain.use_case.book.GetChapterProgressUseCase
+import org.dueattendant149.bookshelf.domain.use_case.book.GetTextUseCase
+import org.dueattendant149.bookshelf.domain.use_case.book.UpdateBookUseCase
+import org.dueattendant149.bookshelf.domain.use_case.history.GetHistoryForBookUseCase
+import org.dueattendant149.bookshelf.presentation.history.HistoryScreen
+import org.dueattendant149.bookshelf.presentation.library.LibraryScreen
+import org.dueattendant149.bookshelf.presentation.reader.model.Checkpoint
 import javax.inject.Inject
 import kotlin.coroutines.coroutineContext
 import kotlin.math.roundToInt
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderScreen.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/ReaderScreen.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderScreen.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/ReaderScreen.kt
index b6979fb0..68efbb25 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderScreen.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/ReaderScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package org.dueattendant149.bookshelf.presentation.reader
 
 import android.content.pm.ActivityInfo
 import android.os.Parcelable
@@ -44,17 +44,17 @@ 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.core.helpers.calculateProgress
-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.helpers.LocalActivity
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.helpers.setBrightness
-import ua.acclorite.book_story.ui.reader.ReaderContent
-import ua.acclorite.book_story.ui.reader.ReaderEffects
+import org.dueattendant149.bookshelf.core.helpers.calculateProgress
+import org.dueattendant149.bookshelf.presentation.navigator.Screen
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderColorEffects
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderProgressCount
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderTextAlignment
+import org.dueattendant149.bookshelf.presentation.settings.SettingsModel
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalActivity
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.helpers.setBrightness
+import org.dueattendant149.bookshelf.ui.reader.ReaderContent
+import org.dueattendant149.bookshelf.ui.reader.ReaderEffects
 import kotlin.math.roundToInt
 
 @Parcelize
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderState.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/ReaderState.kt
similarity index 61%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderState.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/ReaderState.kt
index 10f35f24..e46aecd0 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderState.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/ReaderState.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader
+package org.dueattendant149.bookshelf.presentation.reader
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Immutable
-import ua.acclorite.book_story.core.BottomSheet
-import ua.acclorite.book_story.core.Drawer
-import ua.acclorite.book_story.core.ui.UIText
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.domain.model.reader.ReaderText
-import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter
-import ua.acclorite.book_story.presentation.reader.model.Checkpoint
+import org.dueattendant149.bookshelf.core.BottomSheet
+import org.dueattendant149.bookshelf.core.Drawer
+import org.dueattendant149.bookshelf.core.ui.UIText
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText.Chapter
+import org.dueattendant149.bookshelf.presentation.reader.model.Checkpoint
 
 @Immutable
 data class ReaderState(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/Checkpoint.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/Checkpoint.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/model/Checkpoint.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/Checkpoint.kt
index 1907d80b..1c6269a4 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/Checkpoint.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/Checkpoint.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader.model
+package org.dueattendant149.bookshelf.presentation.reader.model
 
 import androidx.compose.runtime.Immutable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderColorEffects.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/ReaderColorEffects.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderColorEffects.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/ReaderColorEffects.kt
index c5ffc5b8..a6704c65 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderColorEffects.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/ReaderColorEffects.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader.model
+package org.dueattendant149.bookshelf.presentation.reader.model
 
 import androidx.annotation.StringRes
-import ua.acclorite.book_story.R
+import org.dueattendant149.bookshelf.R
 
 enum class ReaderColorEffects(@StringRes val title: Int) {
     OFF(R.string.color_effects_off),
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderFontThickness.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/ReaderFontThickness.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderFontThickness.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/ReaderFontThickness.kt
index 247543c0..0439c199 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderFontThickness.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/ReaderFontThickness.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader.model
+package org.dueattendant149.bookshelf.presentation.reader.model
 
 import androidx.annotation.StringRes
 import androidx.compose.ui.text.font.FontWeight
-import ua.acclorite.book_story.R
+import org.dueattendant149.bookshelf.R
 
 enum class ReaderFontThickness(val thickness: FontWeight, @StringRes val title: Int) {
     THIN(FontWeight.Thin, R.string.font_thickness_thin),
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderHorizontalGesture.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/ReaderHorizontalGesture.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderHorizontalGesture.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/ReaderHorizontalGesture.kt
index 21141729..9ac3a9ff 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderHorizontalGesture.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/ReaderHorizontalGesture.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader.model
+package org.dueattendant149.bookshelf.presentation.reader.model
 
 import androidx.annotation.StringRes
-import ua.acclorite.book_story.R
+import org.dueattendant149.bookshelf.R
 
 enum class ReaderHorizontalGesture(@StringRes val title: Int) {
     OFF(R.string.horizontal_gesture_off),
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderProgressCount.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/ReaderProgressCount.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderProgressCount.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/ReaderProgressCount.kt
index f67fc7a4..ac104ab0 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderProgressCount.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/ReaderProgressCount.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader.model
+package org.dueattendant149.bookshelf.presentation.reader.model
 
 import androidx.annotation.StringRes
-import ua.acclorite.book_story.R
+import org.dueattendant149.bookshelf.R
 
 
 enum class ReaderProgressCount(@StringRes val title: Int) {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderScreenOrientation.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/ReaderScreenOrientation.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderScreenOrientation.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/ReaderScreenOrientation.kt
index bf5e8488..c8e27198 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderScreenOrientation.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/ReaderScreenOrientation.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader.model
+package org.dueattendant149.bookshelf.presentation.reader.model
 
 import android.content.pm.ActivityInfo
 import androidx.annotation.StringRes
-import ua.acclorite.book_story.R
+import org.dueattendant149.bookshelf.R
 
 enum class ReaderScreenOrientation(val code: Int, @StringRes val title: Int) {
     DEFAULT(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderTextAlignment.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/ReaderTextAlignment.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderTextAlignment.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/ReaderTextAlignment.kt
index 91f084ae..b57f7d41 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderTextAlignment.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/reader/model/ReaderTextAlignment.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.reader.model
+package org.dueattendant149.bookshelf.presentation.reader.model
 
 import androidx.annotation.StringRes
 import androidx.compose.ui.text.style.TextAlign
-import ua.acclorite.book_story.R
+import org.dueattendant149.bookshelf.R
 
 enum class ReaderTextAlignment(val textAlignment: TextAlign, @StringRes val title: Int) {
     START(TextAlign.Start, R.string.alignment_start),
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/AppearanceSettingsScreen.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/AppearanceSettingsScreen.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/AppearanceSettingsScreen.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/AppearanceSettingsScreen.kt
index 1e289fb5..643a8baf 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/AppearanceSettingsScreen.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/AppearanceSettingsScreen.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings
+package org.dueattendant149.bookshelf.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.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
+import org.dueattendant149.bookshelf.presentation.navigator.Screen
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import org.dueattendant149.bookshelf.ui.navigator.LocalNavigator
+import org.dueattendant149.bookshelf.ui.settings.appearance.AppearanceSettingsContent
 
 @Parcelize
 object AppearanceSettingsScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/BrowseSettingsScreen.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/BrowseSettingsScreen.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/BrowseSettingsScreen.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/BrowseSettingsScreen.kt
index ab9a71b8..1c34c97a 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/BrowseSettingsScreen.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/BrowseSettingsScreen.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings
+package org.dueattendant149.bookshelf.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.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
+import org.dueattendant149.bookshelf.presentation.navigator.Screen
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import org.dueattendant149.bookshelf.ui.navigator.LocalNavigator
+import org.dueattendant149.bookshelf.ui.settings.browse.BrowseSettingsContent
 
 @Parcelize
 object BrowseSettingsScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/GeneralSettingsScreen.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/GeneralSettingsScreen.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/GeneralSettingsScreen.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/GeneralSettingsScreen.kt
index 09e7cd28..f23b6ecc 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/GeneralSettingsScreen.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/GeneralSettingsScreen.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings
+package org.dueattendant149.bookshelf.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.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
+import org.dueattendant149.bookshelf.presentation.navigator.Screen
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import org.dueattendant149.bookshelf.ui.navigator.LocalNavigator
+import org.dueattendant149.bookshelf.ui.settings.general.GeneralSettingsContent
 
 @Parcelize
 object GeneralSettingsScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/LibrarySettingsScreen.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/LibrarySettingsScreen.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/LibrarySettingsScreen.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/LibrarySettingsScreen.kt
index 37ac251e..06109e56 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/LibrarySettingsScreen.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/LibrarySettingsScreen.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings
+package org.dueattendant149.bookshelf.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.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
+import org.dueattendant149.bookshelf.presentation.navigator.Screen
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import org.dueattendant149.bookshelf.ui.navigator.LocalNavigator
+import org.dueattendant149.bookshelf.ui.settings.library.LibrarySettingsContent
 
 @Parcelize
 object LibrarySettingsScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/ReaderSettingsScreen.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/ReaderSettingsScreen.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/ReaderSettingsScreen.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/ReaderSettingsScreen.kt
index 61382403..57d7a4ce 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/ReaderSettingsScreen.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/ReaderSettingsScreen.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings
+package org.dueattendant149.bookshelf.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.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
+import org.dueattendant149.bookshelf.presentation.navigator.Screen
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import org.dueattendant149.bookshelf.ui.navigator.LocalNavigator
+import org.dueattendant149.bookshelf.ui.settings.reader.ReaderSettingsContent
 
 @Parcelize
 object ReaderSettingsScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsEffect.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/SettingsEffect.kt
similarity index 72%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsEffect.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/SettingsEffect.kt
index c7381134..767bf7fd 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsEffect.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/SettingsEffect.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings
+package org.dueattendant149.bookshelf.presentation.settings
 
 import androidx.compose.runtime.Immutable
-import ua.acclorite.book_story.domain.model.reader.ColorPreset
+import org.dueattendant149.bookshelf.domain.model.reader.ColorPreset
 
 @Immutable
 sealed class SettingsEffect {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsEvent.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/SettingsEvent.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsEvent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/SettingsEvent.kt
index 5ee9de12..81526d52 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsEvent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/SettingsEvent.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings
+package org.dueattendant149.bookshelf.presentation.settings
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.Color
-import ua.acclorite.book_story.core.language.Language
-import ua.acclorite.book_story.domain.model.library.Category
+import org.dueattendant149.bookshelf.core.language.Language
+import org.dueattendant149.bookshelf.domain.model.library.Category
 
 @Immutable
 sealed class SettingsEvent {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsModel.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/SettingsModel.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsModel.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/SettingsModel.kt
index aa822781..939aae6b 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsModel.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/SettingsModel.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings
+package org.dueattendant149.bookshelf.presentation.settings
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -20,20 +20,20 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import ua.acclorite.book_story.domain.model.reader.ColorPreset
-import ua.acclorite.book_story.domain.use_case.category.AddCategoryUseCase
-import ua.acclorite.book_story.domain.use_case.category.DeleteCategoryUseCase
-import ua.acclorite.book_story.domain.use_case.category.GetCategoriesUseCase
-import ua.acclorite.book_story.domain.use_case.category.UpdateCategoriesOrderUseCase
-import ua.acclorite.book_story.domain.use_case.category.UpdateCategoryUseCase
-import ua.acclorite.book_story.domain.use_case.color_preset.DeleteColorPresetUseCase
-import ua.acclorite.book_story.domain.use_case.color_preset.GetColorPresetsUseCase
-import ua.acclorite.book_story.domain.use_case.color_preset.ReorderColorPresetsUseCase
-import ua.acclorite.book_story.domain.use_case.color_preset.SelectColorPresetUseCase
-import ua.acclorite.book_story.domain.use_case.color_preset.UpdateColorPresetUseCase
-import ua.acclorite.book_story.domain.use_case.permission.GrantPersistableUriPermissionUseCase
-import ua.acclorite.book_story.domain.use_case.permission.ReleasePersistableUriPermissionUseCase
-import ua.acclorite.book_story.domain.use_case.settings.UpdateLanguageUseCase
+import org.dueattendant149.bookshelf.domain.model.reader.ColorPreset
+import org.dueattendant149.bookshelf.domain.use_case.category.AddCategoryUseCase
+import org.dueattendant149.bookshelf.domain.use_case.category.DeleteCategoryUseCase
+import org.dueattendant149.bookshelf.domain.use_case.category.GetCategoriesUseCase
+import org.dueattendant149.bookshelf.domain.use_case.category.UpdateCategoriesOrderUseCase
+import org.dueattendant149.bookshelf.domain.use_case.category.UpdateCategoryUseCase
+import org.dueattendant149.bookshelf.domain.use_case.color_preset.DeleteColorPresetUseCase
+import org.dueattendant149.bookshelf.domain.use_case.color_preset.GetColorPresetsUseCase
+import org.dueattendant149.bookshelf.domain.use_case.color_preset.ReorderColorPresetsUseCase
+import org.dueattendant149.bookshelf.domain.use_case.color_preset.SelectColorPresetUseCase
+import org.dueattendant149.bookshelf.domain.use_case.color_preset.UpdateColorPresetUseCase
+import org.dueattendant149.bookshelf.domain.use_case.permission.GrantPersistableUriPermissionUseCase
+import org.dueattendant149.bookshelf.domain.use_case.permission.ReleasePersistableUriPermissionUseCase
+import org.dueattendant149.bookshelf.domain.use_case.settings.UpdateLanguageUseCase
 import javax.inject.Inject
 import kotlin.coroutines.coroutineContext
 import kotlin.random.Random
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsScreen.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/SettingsScreen.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsScreen.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/SettingsScreen.kt
index 7750a85f..bcbd249a 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsScreen.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/SettingsScreen.kt
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings
+package org.dueattendant149.bookshelf.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.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.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.navigator.LocalNavigator
-import ua.acclorite.book_story.ui.settings.SettingsContent
+import org.dueattendant149.bookshelf.presentation.navigator.Screen
+import org.dueattendant149.bookshelf.presentation.start.StartScreen
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.collapsibleTopAppBarScrollBehavior
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.navigator.LocalNavigator
+import org.dueattendant149.bookshelf.ui.settings.SettingsContent
 
 @Parcelize
 object SettingsScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsState.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/SettingsState.kt
similarity index 74%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsState.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/SettingsState.kt
index 4f530084..39a4b840 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/SettingsState.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/settings/SettingsState.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.settings
+package org.dueattendant149.bookshelf.presentation.settings
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Immutable
-import ua.acclorite.book_story.domain.model.library.Category
-import ua.acclorite.book_story.domain.model.reader.ColorPreset
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.domain.model.reader.ColorPreset
 
 @Immutable
 data class SettingsState(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartScreen.kt b/app/src/main/java/org/dueattendant149/bookshelf/presentation/start/StartScreen.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/presentation/start/StartScreen.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/presentation/start/StartScreen.kt
index 22effe70..ac71cad1 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartScreen.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/presentation/start/StartScreen.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.presentation.start
+package org.dueattendant149.bookshelf.presentation.start
 
 import android.annotation.SuppressLint
 import android.os.Parcelable
@@ -15,17 +15,17 @@ import androidx.compose.runtime.remember
 import androidx.hilt.navigation.compose.hiltViewModel
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
-import ua.acclorite.book_story.core.data.CoreData
-import ua.acclorite.book_story.presentation.browse.BrowseScreen
-import ua.acclorite.book_story.presentation.navigator.Screen
-import ua.acclorite.book_story.presentation.navigator.StackEvent
-import ua.acclorite.book_story.presentation.settings.SettingsEvent
-import ua.acclorite.book_story.presentation.settings.SettingsModel
-import ua.acclorite.book_story.ui.common.helpers.LocalActivity
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.model.ListItem
-import ua.acclorite.book_story.ui.navigator.LocalNavigator
-import ua.acclorite.book_story.ui.start.StartContent
+import org.dueattendant149.bookshelf.core.data.CoreData
+import org.dueattendant149.bookshelf.presentation.browse.BrowseScreen
+import org.dueattendant149.bookshelf.presentation.navigator.Screen
+import org.dueattendant149.bookshelf.presentation.navigator.StackEvent
+import org.dueattendant149.bookshelf.presentation.settings.SettingsEvent
+import org.dueattendant149.bookshelf.presentation.settings.SettingsModel
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalActivity
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.ui.navigator.LocalNavigator
+import org.dueattendant149.bookshelf.ui.start.StartContent
 
 @Parcelize
 object StartScreen : Screen, Parcelable {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutBadgeItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutBadgeItem.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/ui/about/AboutBadgeItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutBadgeItem.kt
index a69f3bc8..de390e01 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutBadgeItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutBadgeItem.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.about
+package org.dueattendant149.bookshelf.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.ui.about.model.Badge
-import ua.acclorite.book_story.ui.common.components.common.IconButton
+import org.dueattendant149.bookshelf.ui.about.model.Badge
+import org.dueattendant149.bookshelf.ui.common.components.common.IconButton
 
 @Composable
 fun AboutBadgeItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutBadges.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutBadges.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/ui/about/AboutBadges.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutBadges.kt
index b12b03ee..2b425d42 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutBadges.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutBadges.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.about
+package org.dueattendant149.bookshelf.ui.about
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -17,10 +17,10 @@ import androidx.compose.ui.Alignment
 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.about.AboutEvent
-import ua.acclorite.book_story.ui.about.data.AboutData
-import ua.acclorite.book_story.ui.common.helpers.showToast
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.about.AboutEvent
+import org.dueattendant149.bookshelf.ui.about.data.AboutData
+import org.dueattendant149.bookshelf.ui.common.helpers.showToast
 
 @Composable
 fun AboutBadges(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutContent.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutContent.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/ui/about/AboutContent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutContent.kt
index 10a500b4..94def149 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutContent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutContent.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.about
+package org.dueattendant149.bookshelf.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.presentation.about.AboutEvent
+import org.dueattendant149.bookshelf.presentation.about.AboutEvent
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutEffects.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutEffects.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/ui/about/AboutEffects.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutEffects.kt
index 079e1ebc..8eb8979c 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutEffects.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutEffects.kt
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.about
+package org.dueattendant149.bookshelf.ui.about
 
 import android.content.Intent
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.core.net.toUri
 import kotlinx.coroutines.flow.SharedFlow
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.about.AboutEffect
-import ua.acclorite.book_story.presentation.credits.CreditsScreen
-import ua.acclorite.book_story.presentation.licenses.LicensesScreen
-import ua.acclorite.book_story.ui.common.helpers.LocalActivity
-import ua.acclorite.book_story.ui.common.helpers.launchActivity
-import ua.acclorite.book_story.ui.common.helpers.showToast
-import ua.acclorite.book_story.ui.navigator.LocalNavigator
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.about.AboutEffect
+import org.dueattendant149.bookshelf.presentation.credits.CreditsScreen
+import org.dueattendant149.bookshelf.presentation.licenses.LicensesScreen
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalActivity
+import org.dueattendant149.bookshelf.ui.common.helpers.launchActivity
+import org.dueattendant149.bookshelf.ui.common.helpers.showToast
+import org.dueattendant149.bookshelf.ui.navigator.LocalNavigator
 
 @Composable
 fun AboutEffects(effects: SharedFlow<AboutEffect>) {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutItem.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/about/AboutItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutItem.kt
index 246dfced..b0de8c55 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.about
+package org.dueattendant149.bookshelf.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.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun AboutItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutLayout.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/ui/about/AboutLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutLayout.kt
index cc1470af..795d1a2a 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.about
+package org.dueattendant149.bookshelf.ui.about
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
@@ -24,11 +24,11 @@ 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.BuildConfig
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.core.data.LinkData
-import ua.acclorite.book_story.presentation.about.AboutEvent
-import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.BuildConfig
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.data.LinkData
+import org.dueattendant149.bookshelf.presentation.about.AboutEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun AboutLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutScaffold.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutScaffold.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/about/AboutScaffold.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutScaffold.kt
index 55e63cdc..e676904e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutScaffold.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.about
+package org.dueattendant149.bookshelf.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.presentation.about.AboutEvent
+import org.dueattendant149.bookshelf.presentation.about.AboutEvent
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutTopBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutTopBar.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/ui/about/AboutTopBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutTopBar.kt
index d01b4266..f891587d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/about/AboutTopBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/AboutTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.about
+package org.dueattendant149.bookshelf.ui.about
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LargeTopAppBar
@@ -13,10 +13,10 @@ import androidx.compose.material3.TopAppBarDefaults
 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.about.AboutEvent
-import ua.acclorite.book_story.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.about.AboutEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/about/data/AboutData.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/data/AboutData.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/ui/about/data/AboutData.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/about/data/AboutData.kt
index d408e3fd..f3733d1b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/about/data/AboutData.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/data/AboutData.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.about.data
+package org.dueattendant149.bookshelf.ui.about.data
 
 import kotlinx.collections.immutable.persistentListOf
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.about.model.Badge
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.about.model.Badge
 
 object AboutData {
     val badges = persistentListOf(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/about/model/Badge.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/model/Badge.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/ui/about/model/Badge.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/about/model/Badge.kt
index 51696fad..c011546e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/about/model/Badge.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/model/Badge.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.about.model
+package org.dueattendant149.bookshelf.ui.about.model
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/about/model/Credit.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/model/Credit.kt
similarity index 75%
rename from app/src/main/java/ua/acclorite/book_story/ui/about/model/Credit.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/about/model/Credit.kt
index 745f75e6..025d04e3 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/about/model/Credit.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/about/model/Credit.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.about.model
+package org.dueattendant149.bookshelf.ui.about.model
 
 import androidx.compose.runtime.Immutable
-import ua.acclorite.book_story.core.ui.UIText
+import org.dueattendant149.bookshelf.core.ui.UIText
 
 @Immutable
 data class Credit(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoAuthorDialog.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoAuthorDialog.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoAuthorDialog.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoAuthorDialog.kt
index 10825a1f..5e28744c 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoAuthorDialog.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoAuthorDialog.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.core.ui.UIText
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
-import ua.acclorite.book_story.ui.common.components.dialog.DialogWithTextField
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.ui.UIText
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.ui.common.components.dialog.DialogWithTextField
 
 @Composable
 fun BookInfoAuthorDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoBackHandler.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoBackHandler.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoBackHandler.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoBackHandler.kt
index 04bbbb19..f60b2400 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoBackHandler.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoBackHandler.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
 
 @Composable
 fun BookInfoBackHandler(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoBottomSheet.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoBottomSheet.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoBottomSheet.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoBottomSheet.kt
index b9e76d9c..2b47287c 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoBottomSheet.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoBottomSheet.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.core.BottomSheet
-import ua.acclorite.book_story.domain.model.file.File
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
-import ua.acclorite.book_story.presentation.book_info.BookInfoScreen
+import org.dueattendant149.bookshelf.core.BottomSheet
+import org.dueattendant149.bookshelf.domain.model.file.File
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoScreen
 
 @Composable
 fun BookInfoBottomSheet(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoChangeCoverBottomSheet.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoChangeCoverBottomSheet.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoChangeCoverBottomSheet.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoChangeCoverBottomSheet.kt
index 68cdd6ed..0842b83f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoChangeCoverBottomSheet.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoChangeCoverBottomSheet.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import android.graphics.BitmapFactory
 import androidx.activity.compose.rememberLauncherForActivityResult
@@ -24,10 +24,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
-import ua.acclorite.book_story.ui.common.components.modal_bottom_sheet.ModalBottomSheet
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.ui.common.components.modal_bottom_sheet.ModalBottomSheet
 
 @Composable
 fun BookInfoChangeCoverBottomSheet(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoChangeCoverBottomSheetItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoChangeCoverBottomSheetItem.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoChangeCoverBottomSheetItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoChangeCoverBottomSheetItem.kt
index ebe0eba0..28c2cf4d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoChangeCoverBottomSheetItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoChangeCoverBottomSheetItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.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.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun LazyItemScope.BookInfoChangeCoverBottomSheetItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoContent.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoContent.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoContent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoContent.kt
index 17671a40..f3c32c46 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoContent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoContent.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.core.BottomSheet
-import ua.acclorite.book_story.core.Dialog
-import ua.acclorite.book_story.domain.model.file.File
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.domain.model.library.Category
-import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.core.BottomSheet
+import org.dueattendant149.bookshelf.core.Dialog
+import org.dueattendant149.bookshelf.domain.model.file.File
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
 
 @Composable
 fun BookInfoContent(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDeleteDialog.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoDeleteDialog.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDeleteDialog.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoDeleteDialog.kt
index 319b0a69..2d26aef2 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDeleteDialog.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoDeleteDialog.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.DeleteOutline
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
-import ua.acclorite.book_story.ui.common.components.dialog.Dialog
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.ui.common.components.dialog.Dialog
 
 @Composable
 fun BookInfoDeleteDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDescriptionDialog.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoDescriptionDialog.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDescriptionDialog.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoDescriptionDialog.kt
index 344308a5..e55ca814 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDescriptionDialog.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoDescriptionDialog.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
-import ua.acclorite.book_story.ui.common.components.dialog.DialogWithTextField
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.ui.common.components.dialog.DialogWithTextField
 
 @Composable
 fun BookInfoDescriptionDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDetailsBottomSheet.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoDetailsBottomSheet.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDetailsBottomSheet.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoDetailsBottomSheet.kt
index 394969f9..c54a0291 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDetailsBottomSheet.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoDetailsBottomSheet.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
@@ -16,14 +16,14 @@ import androidx.compose.runtime.remember
 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.core.data.ExtensionsData
-import ua.acclorite.book_story.domain.model.file.File
-import ua.acclorite.book_story.domain.model.library.Book
-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.settings.components.SettingsSubcategoryTitle
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.data.ExtensionsData
+import org.dueattendant149.bookshelf.domain.model.file.File
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.components.modal_bottom_sheet.ModalBottomSheet
+import org.dueattendant149.bookshelf.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/ui/book_info/BookInfoDetailsBottomSheetItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoDetailsBottomSheetItem.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDetailsBottomSheetItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoDetailsBottomSheetItem.kt
index 5f972f6d..8e278531 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDetailsBottomSheetItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoDetailsBottomSheetItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.Arrangement
@@ -23,11 +23,11 @@ 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.R
-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.theme.ExpandingTransition
-import ua.acclorite.book_story.ui.theme.FadeTransitionPreservingSpace
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.IconButton
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.ui.theme.FadeTransitionPreservingSpace
 
 @Composable
 fun BookInfoDetailsBottomSheetItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDialog.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoDialog.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDialog.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoDialog.kt
index 40b02838..125aeb01 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoDialog.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoDialog.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.core.Dialog
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.domain.model.library.Category
-import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
-import ua.acclorite.book_story.presentation.book_info.BookInfoScreen
+import org.dueattendant149.bookshelf.core.Dialog
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoScreen
 
 @Composable
 fun BookInfoDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoEffects.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoEffects.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoEffects.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoEffects.kt
index 271ebb9c..65416b7a 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoEffects.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoEffects.kt
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.platform.LocalContext
 import kotlinx.coroutines.flow.SharedFlow
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.presentation.book_info.BookInfoEffect
-import ua.acclorite.book_story.presentation.history.HistoryScreen
-import ua.acclorite.book_story.presentation.reader.ReaderScreen
-import ua.acclorite.book_story.presentation.settings.LibrarySettingsScreen
-import ua.acclorite.book_story.ui.common.helpers.showToast
-import ua.acclorite.book_story.ui.navigator.LocalNavigator
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEffect
+import org.dueattendant149.bookshelf.presentation.history.HistoryScreen
+import org.dueattendant149.bookshelf.presentation.reader.ReaderScreen
+import org.dueattendant149.bookshelf.presentation.settings.LibrarySettingsScreen
+import org.dueattendant149.bookshelf.ui.common.helpers.showToast
+import org.dueattendant149.bookshelf.ui.navigator.LocalNavigator
 
 @Composable
 fun BookInfoEffects(effects: SharedFlow<BookInfoEffect>, book: Book) {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayout.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayout.kt
index 4fdb203b..2ae31235 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -17,10 +17,10 @@ import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.domain.model.library.Book
-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.data.ScrollbarData
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.data.ScrollbarData
 
 @Composable
 fun BookInfoLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutActions.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutActions.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutActions.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutActions.kt
index abe92b9e..3b76aff3 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutActions.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutActions.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
@@ -20,8 +20,8 @@ import androidx.compose.ui.Modifier
 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.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
 
 @Composable
 fun BookInfoLayoutActions(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutActionsItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutActionsItem.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutActionsItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutActionsItem.kt
index 9f51e5bf..e03f0cb1 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutActionsItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutActionsItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.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.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun BookInfoLayoutActionsItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutBackground.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutBackground.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutBackground.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutBackground.kt
index 7ab37599..0d0acd93 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutBackground.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutBackground.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.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.ui.common.components.common.AsyncCoverImage
+import org.dueattendant149.bookshelf.ui.common.components.common.AsyncCoverImage
 
 @Composable
 fun BookInfoLayoutBackground(height: Dp, image: Uri) {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutButton.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutButton.kt
similarity index 75%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutButton.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutButton.kt
index ff1d210e..0054c93d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutButton.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutButton.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -14,11 +14,11 @@ import androidx.compose.runtime.Composable
 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.core.helpers.calculateProgress
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
-import ua.acclorite.book_story.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.helpers.calculateProgress
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun BookInfoLayoutButton(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutDescription.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutDescription.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutDescription.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutDescription.kt
index 906a96d5..17ec8d2e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutDescription.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutDescription.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.animateColorAsState
@@ -38,11 +38,11 @@ import androidx.compose.ui.graphics.Color
 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.domain.model.library.Book
-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.helpers.noRippleClickable
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.helpers.noRippleClickable
 
 @Composable
 fun BookInfoLayoutDescription(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfo.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutInfo.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfo.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutInfo.kt
index 4cb66835..53301c79 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfo.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutInfo.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -15,8 +15,8 @@ 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.domain.model.library.Book
-import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
 
 @Composable
 fun BookInfoLayoutInfo(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoAuthor.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutInfoAuthor.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoAuthor.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutInfoAuthor.kt
index fd7c0a87..d32f00e5 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoAuthor.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutInfoAuthor.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
@@ -19,11 +19,11 @@ import androidx.compose.ui.Alignment
 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.domain.model.library.Book
-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.helpers.noRippleClickable
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.helpers.noRippleClickable
 
 @Composable
 fun BookInfoLayoutInfoAuthor(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoCover.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutInfoCover.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoCover.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutInfoCover.kt
index 7de3dc47..b7b54306 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoCover.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutInfoCover.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -24,11 +24,11 @@ import androidx.compose.ui.Modifier
 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.domain.model.library.Book
-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.helpers.noRippleClickable
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.AsyncCoverImage
+import org.dueattendant149.bookshelf.ui.common.helpers.noRippleClickable
 
 @Composable
 fun BookInfoLayoutInfoCover(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoProgress.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutInfoProgress.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoProgress.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutInfoProgress.kt
index 29811aa1..41426abb 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoProgress.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutInfoProgress.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
@@ -17,9 +17,9 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.core.helpers.calculateProgress
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.core.helpers.calculateProgress
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoTitle.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutInfoTitle.kt
similarity index 73%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoTitle.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutInfoTitle.kt
index 5242fd6e..15600dd2 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoLayoutInfoTitle.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoLayoutInfoTitle.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.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.model.library.Book
-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.helpers.noRippleClickable
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.helpers.noRippleClickable
 
 @Composable
 fun BookInfoLayoutInfoTitle(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoMoveDialog.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoMoveDialog.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoMoveDialog.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoMoveDialog.kt
index 11c5c054..ee809496 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoMoveDialog.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoMoveDialog.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.items
@@ -16,13 +16,13 @@ import androidx.compose.runtime.remember
 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.domain.model.library.Book
-import ua.acclorite.book_story.domain.model.library.Category
-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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.dialog.CheckboxDialogItem
+import org.dueattendant149.bookshelf.ui.common.components.dialog.Dialog
 
 @Composable
 fun BookInfoMoveDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoPathDialog.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoPathDialog.kt
similarity index 75%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoPathDialog.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoPathDialog.kt
index 2ecc958e..4151a1c8 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoPathDialog.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoPathDialog.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
-import ua.acclorite.book_story.ui.common.components.dialog.DialogWithTextField
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.ui.common.components.dialog.DialogWithTextField
 
 @Composable
 fun BookInfoPathDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoScaffold.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoScaffold.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoScaffold.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoScaffold.kt
index 3d132582..6b1b90b4 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoScaffold.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
@@ -16,8 +16,8 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
 
 @Composable
 fun BookInfoScaffold(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTitleDialog.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoTitleDialog.kt
similarity index 75%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTitleDialog.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoTitleDialog.kt
index 9106a67c..cb219e57 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTitleDialog.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoTitleDialog.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
-import ua.acclorite.book_story.ui.common.components.dialog.DialogWithTextField
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.ui.common.components.dialog.DialogWithTextField
 
 @Composable
 fun BookInfoTitleDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTopBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoTopBar.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTopBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoTopBar.kt
index b1213786..0628c629 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTopBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/book_info/BookInfoTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.book_info
+package org.dueattendant149.bookshelf.ui.book_info
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material.icons.Icons
@@ -14,15 +14,15 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.remember
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.presentation.book_info.BookInfoEvent
-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
-import ua.acclorite.book_story.ui.theme.DefaultTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.IconButton
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.TopAppBar
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.TopAppBarData
+import org.dueattendant149.bookshelf.ui.navigator.NavigatorBackIconButton
+import org.dueattendant149.bookshelf.ui.theme.DefaultTransition
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseAddDialog.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseAddDialog.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseAddDialog.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseAddDialog.kt
index 39b7d8c6..4dd796d7 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseAddDialog.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseAddDialog.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.ui.browse
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -19,13 +19,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.browse.BrowseEvent
-import ua.acclorite.book_story.presentation.browse.model.NullableBook
-import ua.acclorite.book_story.presentation.browse.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.helpers.showToast
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.browse.BrowseEvent
+import org.dueattendant149.bookshelf.presentation.browse.model.NullableBook
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableNullableBook
+import org.dueattendant149.bookshelf.ui.common.components.dialog.Dialog
+import org.dueattendant149.bookshelf.ui.common.components.progress_indicator.CircularProgressIndicator
+import org.dueattendant149.bookshelf.ui.common.helpers.showToast
 
 @Composable
 fun BrowseAddDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseAddDialogItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseAddDialogItem.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseAddDialogItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseAddDialogItem.kt
index 29c57019..2570c1cd 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseAddDialogItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseAddDialogItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.ui.browse
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
@@ -23,11 +23,11 @@ import androidx.compose.ui.Alignment
 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.browse.model.NullableBook
-import ua.acclorite.book_story.presentation.browse.model.SelectableNullableBook
-import ua.acclorite.book_story.ui.common.components.common.CircularCheckbox
-import ua.acclorite.book_story.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.browse.model.NullableBook
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableNullableBook
+import org.dueattendant149.bookshelf.ui.common.components.common.CircularCheckbox
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun BrowseAddDialogItem(result: SelectableNullableBook, onClick: () -> Unit) {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseBackHandler.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseBackHandler.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseBackHandler.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseBackHandler.kt
index 323b584b..ef9d8f94 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseBackHandler.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseBackHandler.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.ui.browse
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.presentation.browse.BrowseEvent
+import org.dueattendant149.bookshelf.presentation.browse.BrowseEvent
 
 @Composable
 fun BrowseBackHandler(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseBottomSheet.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseBottomSheet.kt
similarity index 68%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseBottomSheet.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseBottomSheet.kt
index b75cc883..dd4c7316 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseBottomSheet.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseBottomSheet.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.ui.browse
 
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.core.BottomSheet
-import ua.acclorite.book_story.presentation.browse.BrowseEvent
-import ua.acclorite.book_story.presentation.browse.BrowseScreen
+import org.dueattendant149.bookshelf.core.BottomSheet
+import org.dueattendant149.bookshelf.presentation.browse.BrowseEvent
+import org.dueattendant149.bookshelf.presentation.browse.BrowseScreen
 
 @Composable
 fun BrowseBottomSheet(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseContent.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseContent.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseContent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseContent.kt
index ca82cb95..1038fd93 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseContent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.ui.browse
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.grid.LazyGridState
@@ -12,12 +12,12 @@ import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.pullrefresh.PullRefreshState
 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.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.browse.model.SelectableNullableBook
+import org.dueattendant149.bookshelf.core.BottomSheet
+import org.dueattendant149.bookshelf.core.Dialog
+import org.dueattendant149.bookshelf.presentation.browse.BrowseEvent
+import org.dueattendant149.bookshelf.presentation.browse.model.BrowseLayout
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableFile
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableNullableBook
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseDialog.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseDialog.kt
similarity index 74%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseDialog.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseDialog.kt
index 880dedf6..c4260644 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseDialog.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseDialog.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.ui.browse
 
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.core.Dialog
-import ua.acclorite.book_story.presentation.browse.BrowseEvent
-import ua.acclorite.book_story.presentation.browse.BrowseScreen
-import ua.acclorite.book_story.presentation.browse.model.SelectableNullableBook
+import org.dueattendant149.bookshelf.core.Dialog
+import org.dueattendant149.bookshelf.presentation.browse.BrowseEvent
+import org.dueattendant149.bookshelf.presentation.browse.BrowseScreen
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableNullableBook
 
 @Composable
 fun BrowseDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEffects.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseEffects.kt
similarity index 74%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEffects.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseEffects.kt
index 569ad62c..9aa08cfd 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEffects.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseEffects.kt
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.ui.browse
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.platform.LocalContext
 import kotlinx.coroutines.flow.SharedFlow
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.core.helpers.toggle
-import ua.acclorite.book_story.presentation.browse.BrowseEffect
-import ua.acclorite.book_story.presentation.library.LibraryScreen
-import ua.acclorite.book_story.presentation.settings.BrowseSettingsScreen
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.helpers.showToast
-import ua.acclorite.book_story.ui.navigator.LocalNavigator
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.helpers.toggle
+import org.dueattendant149.bookshelf.presentation.browse.BrowseEffect
+import org.dueattendant149.bookshelf.presentation.library.LibraryScreen
+import org.dueattendant149.bookshelf.presentation.settings.BrowseSettingsScreen
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.helpers.showToast
+import org.dueattendant149.bookshelf.ui.navigator.LocalNavigator
 
 @Composable
 fun BrowseEffects(effects: SharedFlow<BrowseEffect>, focusRequester: FocusRequester) {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEmptyPlaceholder.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseEmptyPlaceholder.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEmptyPlaceholder.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseEmptyPlaceholder.kt
index 57c587ba..4c75ac96 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEmptyPlaceholder.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseEmptyPlaceholder.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.ui.browse
 
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.runtime.Composable
@@ -12,11 +12,11 @@ import androidx.compose.ui.Alignment
 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.browse.BrowseEvent
-import ua.acclorite.book_story.ui.common.components.common.AnimatedVisibility
-import ua.acclorite.book_story.ui.common.components.placeholder.EmptyPlaceholder
-import ua.acclorite.book_story.ui.theme.Transitions
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.browse.BrowseEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.AnimatedVisibility
+import org.dueattendant149.bookshelf.ui.common.components.placeholder.EmptyPlaceholder
+import org.dueattendant149.bookshelf.ui.theme.Transitions
 
 @Composable
 fun BoxScope.BrowseEmptyPlaceholder(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseFilterBottomSheet.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseFilterBottomSheet.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseFilterBottomSheet.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseFilterBottomSheet.kt
index 0bea5d24..f0f10af1 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseFilterBottomSheet.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseFilterBottomSheet.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.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.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
+import org.dueattendant149.bookshelf.presentation.browse.BrowseEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.components.modal_bottom_sheet.ModalBottomSheet
+import org.dueattendant149.bookshelf.ui.settings.browse.display.BrowseDisplaySubcategory
+import org.dueattendant149.bookshelf.ui.settings.browse.filter.BrowseFilterSubcategory
+import org.dueattendant149.bookshelf.ui.settings.browse.sort.BrowseSortSubcategory
 
 private var initialPage = 0
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseFilterBottomSheetTabRow.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseFilterBottomSheetTabRow.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseFilterBottomSheetTabRow.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseFilterBottomSheetTabRow.kt
index 679ea759..7ee6827a 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseFilterBottomSheetTabRow.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseFilterBottomSheetTabRow.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.ui.browse
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.modal_bottom_sheet.ModalBottomSheetTabRow
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.modal_bottom_sheet.ModalBottomSheetTabRow
 
 @Composable
 fun BrowseFilterBottomSheetTabRow(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridFileItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseGridFileItem.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridFileItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseGridFileItem.kt
index 514bed24..e811061c 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridFileItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseGridFileItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.ui.browse
 
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Box
@@ -27,11 +27,11 @@ import androidx.compose.ui.res.stringResource
 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.browse.model.SelectableFile
-import ua.acclorite.book_story.ui.common.components.common.CircularCheckbox
-import ua.acclorite.book_story.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.theme.DefaultTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableFile
+import org.dueattendant149.bookshelf.ui.common.components.common.CircularCheckbox
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.theme.DefaultTransition
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseGridItem.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseGridItem.kt
index 77f2175e..1bf59972 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseGridItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.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.presentation.browse.model.SelectableFile
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableFile
 
 @Composable
 fun BrowseGridItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseGridLayout.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseGridLayout.kt
index 44ada86b..b0a063a4 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseGridLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.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.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.data.ScrollbarData
+import org.dueattendant149.bookshelf.presentation.browse.model.GroupedFiles
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableFile
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyVerticalGridWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.components.common.header
+import org.dueattendant149.bookshelf.ui.common.data.ScrollbarData
 
 @Composable
 fun BrowseGridLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseItem.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseItem.kt
index 9ce541aa..79f4db13 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseItem.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.ui.browse
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import ua.acclorite.book_story.presentation.browse.model.BrowseLayout
-import ua.acclorite.book_story.presentation.browse.model.SelectableFile
+import org.dueattendant149.bookshelf.presentation.browse.model.BrowseLayout
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableFile
 
 @Composable
 fun BrowseItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseLayout.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseLayout.kt
index 78d7c2dd..f8d9d846 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseLayout.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.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.presentation.browse.model.BrowseLayout
-import ua.acclorite.book_story.presentation.browse.model.GroupedFiles
-import ua.acclorite.book_story.presentation.browse.model.SelectableFile
+import org.dueattendant149.bookshelf.presentation.browse.model.BrowseLayout
+import org.dueattendant149.bookshelf.presentation.browse.model.GroupedFiles
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableFile
 import java.io.File
 
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseLayoutHeader.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseLayoutHeader.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseLayoutHeader.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseLayoutHeader.kt
index abd21793..79daa3ff 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseLayoutHeader.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseLayoutHeader.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.ui.browse
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -22,9 +22,9 @@ import androidx.compose.ui.Alignment
 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.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.common.helpers.noRippleClickable
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.helpers.noRippleClickable
 
 @Composable
 fun BrowseLayoutHeader(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListFileItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseListFileItem.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListFileItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseListFileItem.kt
index 0dbb0861..a2138f7e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListFileItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseListFileItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.ui.browse
 
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
@@ -30,9 +30,9 @@ import androidx.compose.ui.Modifier
 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.browse.model.SelectableFile
-import ua.acclorite.book_story.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableFile
+import org.dueattendant149.bookshelf.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/ui/browse/BrowseListItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseListItem.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseListItem.kt
index 08753451..a7057861 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseListItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.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.browse.model.SelectableFile
-import ua.acclorite.book_story.ui.common.components.common.CircularCheckbox
-import ua.acclorite.book_story.ui.theme.FadeTransitionPreservingSpace
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableFile
+import org.dueattendant149.bookshelf.ui.common.components.common.CircularCheckbox
+import org.dueattendant149.bookshelf.ui.theme.FadeTransitionPreservingSpace
 
 @Composable
 fun BrowseListItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseListLayout.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseListLayout.kt
index 877b75ee..625d41b6 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseListLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.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.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.data.ScrollbarData
+import org.dueattendant149.bookshelf.presentation.browse.model.GroupedFiles
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableFile
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.data.ScrollbarData
 
 @Composable
 fun BrowseListLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseRefreshIndicator.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseRefreshIndicator.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseRefreshIndicator.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseRefreshIndicator.kt
index e0aaee3e..e4a8cb47 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseRefreshIndicator.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseRefreshIndicator.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.ui.browse
 
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.material.ExperimentalMaterialApi
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScaffold.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseScaffold.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScaffold.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseScaffold.kt
index 9516b2a0..3385b562 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScaffold.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.ui.browse
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
@@ -19,10 +19,10 @@ 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.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.theme.DefaultTransition
+import org.dueattendant149.bookshelf.presentation.browse.BrowseEvent
+import org.dueattendant149.bookshelf.presentation.browse.model.BrowseLayout
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableFile
+import org.dueattendant149.bookshelf.ui.theme.DefaultTransition
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseTopBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseTopBar.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseTopBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseTopBar.kt
index b816f8e1..4ac947fe 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseTopBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/browse/BrowseTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.browse
+package org.dueattendant149.bookshelf.ui.browse
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.material.icons.Icons
@@ -25,16 +25,16 @@ import androidx.compose.ui.focus.FocusRequester
 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.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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.browse.BrowseEvent
+import org.dueattendant149.bookshelf.presentation.browse.model.BrowseLayout
+import org.dueattendant149.bookshelf.presentation.browse.model.SelectableFile
+import org.dueattendant149.bookshelf.ui.common.components.common.IconButton
+import org.dueattendant149.bookshelf.ui.common.components.common.SearchTextField
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.TopAppBar
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.TopAppBarData
+import org.dueattendant149.bookshelf.ui.navigator.NavigatorIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/AnimatedVisibility.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/AnimatedVisibility.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/common/AnimatedVisibility.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/AnimatedVisibility.kt
index 896afcc3..0efed952 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/AnimatedVisibility.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/AnimatedVisibility.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.common
+package org.dueattendant149.bookshelf.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/ui/common/components/common/AsyncCoverImage.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/AsyncCoverImage.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/common/AsyncCoverImage.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/AsyncCoverImage.kt
index f831230f..e4f42bfc 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/AsyncCoverImage.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/AsyncCoverImage.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.common
+package org.dueattendant149.bookshelf.ui.common.components.common
 
 import android.net.Uri
 import androidx.compose.runtime.Composable
@@ -14,7 +14,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
-import ua.acclorite.book_story.R
+import org.dueattendant149.bookshelf.R
 
 /**
  * Custom Cover Image. Has smooth appearing.
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/CircularCheckbox.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/CircularCheckbox.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/common/CircularCheckbox.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/CircularCheckbox.kt
index 61114311..33c14a6b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/CircularCheckbox.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/CircularCheckbox.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.common
+package org.dueattendant149.bookshelf.ui.common.components.common
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -21,7 +21,7 @@ import androidx.compose.ui.graphics.Color
 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 org.dueattendant149.bookshelf.R
 
 /**
  * Checkbox. Has a Circle shape.
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/HighlightedText.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/HighlightedText.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/common/HighlightedText.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/HighlightedText.kt
index 17a72a41..3a9ca387 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/HighlightedText.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/HighlightedText.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.common
+package org.dueattendant149.bookshelf.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/ui/common/components/common/IconButton.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/IconButton.kt
similarity index 98%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/common/IconButton.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/IconButton.kt
index 1fd011e8..9aa1c59f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/IconButton.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/IconButton.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.common
+package org.dueattendant149.bookshelf.ui.common.components.common
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/LazyColumnWithScrollbar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/LazyColumnWithScrollbar.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/common/LazyColumnWithScrollbar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/LazyColumnWithScrollbar.kt
index 2cc6249e..88fec14d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/LazyColumnWithScrollbar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/LazyColumnWithScrollbar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.common
+package org.dueattendant149.bookshelf.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.ui.common.data.ScrollbarData
+import org.dueattendant149.bookshelf.ui.common.data.ScrollbarData
 
 @Composable
 fun LazyColumnWithScrollbar(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/LazyGridHeader.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/LazyGridHeader.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/common/LazyGridHeader.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/LazyGridHeader.kt
index f11a840d..3f80b0cd 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/LazyGridHeader.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/LazyGridHeader.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.common
+package org.dueattendant149.bookshelf.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/ui/common/components/common/LazyVerticalGridWithScrollbar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/LazyVerticalGridWithScrollbar.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/common/LazyVerticalGridWithScrollbar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/LazyVerticalGridWithScrollbar.kt
index 3bc46357..3a7cffb6 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/LazyVerticalGridWithScrollbar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/LazyVerticalGridWithScrollbar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.common
+package org.dueattendant149.bookshelf.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.ui.common.data.ScrollbarData
+import org.dueattendant149.bookshelf.ui.common.data.ScrollbarData
 
 @Composable
 fun LazyVerticalGridWithScrollbar(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/SearchTextField.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/SearchTextField.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/common/SearchTextField.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/SearchTextField.kt
index 1fc6d48a..efd8bacd 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/SearchTextField.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/SearchTextField.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.common
+package org.dueattendant149.bookshelf.ui.common.components.common
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.text.BasicTextField
@@ -27,7 +27,7 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.debounce
-import ua.acclorite.book_story.R
+import org.dueattendant149.bookshelf.R
 
 /**
  * Search Text Field.
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/SelectionContainer.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/SelectionContainer.kt
similarity index 98%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/common/SelectionContainer.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/SelectionContainer.kt
index 5da87154..a1eb2978 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/SelectionContainer.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/SelectionContainer.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("DEPRECATION")
 
-package ua.acclorite.book_story.ui.common.components.common
+package org.dueattendant149.bookshelf.ui.common.components.common
 
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -29,7 +29,7 @@ import androidx.compose.ui.platform.LocalTextToolbar
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.platform.TextToolbar
 import androidx.compose.ui.platform.TextToolbarStatus
-import ua.acclorite.book_story.R
+import org.dueattendant149.bookshelf.R
 
 
 private const val MENU_ITEM_COPY = 0
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/Snackbar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/Snackbar.kt
similarity index 98%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/common/Snackbar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/Snackbar.kt
index c7a744db..c9fd926c 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/Snackbar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/Snackbar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.common
+package org.dueattendant149.bookshelf.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/ui/common/components/common/SpacedItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/SpacedItem.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/common/SpacedItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/SpacedItem.kt
index bc126dd7..432cf7d0 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/SpacedItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/SpacedItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.common
+package org.dueattendant149.bookshelf.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/ui/common/components/common/StyledText.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/StyledText.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/common/StyledText.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/StyledText.kt
index 7f06cc2c..747bdfb0 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/StyledText.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/StyledText.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.common
+package org.dueattendant149.bookshelf.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/ui/common/components/common/Tooltip.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/Tooltip.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/common/Tooltip.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/Tooltip.kt
index 99e798da..03b866b5 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/common/Tooltip.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/common/Tooltip.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.common
+package org.dueattendant149.bookshelf.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/ui/common/components/dialog/CheckboxDialogItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/dialog/CheckboxDialogItem.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/CheckboxDialogItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/dialog/CheckboxDialogItem.kt
index c2f20d16..bdfc7647 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/CheckboxDialogItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/dialog/CheckboxDialogItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.dialog
+package org.dueattendant149.bookshelf.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.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun CheckboxDialogItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/Dialog.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/dialog/Dialog.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/Dialog.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/dialog/Dialog.kt
index 625074da..97a8ea02 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/Dialog.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/dialog/Dialog.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.dialog
+package org.dueattendant149.bookshelf.ui.common.components.dialog
 
 import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.animateDpAsState
@@ -45,9 +45,9 @@ import androidx.compose.ui.text.style.TextAlign
 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.ui.common.components.common.LazyColumnWithScrollbar
-import ua.acclorite.book_story.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 
 @OptIn(ExperimentalMaterial3Api::class)
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/DialogWithTextField.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/dialog/DialogWithTextField.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/DialogWithTextField.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/dialog/DialogWithTextField.kt
index 5dde7df8..74ba2d66 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/DialogWithTextField.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/dialog/DialogWithTextField.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.dialog
+package org.dueattendant149.bookshelf.ui.common.components.dialog
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -24,8 +24,8 @@ import androidx.compose.ui.text.TextRange
 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.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun DialogWithTextField(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/SelectableDialogItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/dialog/SelectableDialogItem.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/SelectableDialogItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/dialog/SelectableDialogItem.kt
index beb10ea9..a638b790 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/dialog/SelectableDialogItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/dialog/SelectableDialogItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.dialog
+package org.dueattendant149.bookshelf.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.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun SelectableDialogItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_bottom_sheet/ModalBottomSheet.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/modal_bottom_sheet/ModalBottomSheet.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_bottom_sheet/ModalBottomSheet.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/modal_bottom_sheet/ModalBottomSheet.kt
index fc4613ef..6293890b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_bottom_sheet/ModalBottomSheet.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/modal_bottom_sheet/ModalBottomSheet.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.modal_bottom_sheet
+package org.dueattendant149.bookshelf.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/ui/common/components/modal_bottom_sheet/ModalBottomSheetTabRow.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/modal_bottom_sheet/ModalBottomSheetTabRow.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_bottom_sheet/ModalBottomSheetTabRow.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/modal_bottom_sheet/ModalBottomSheetTabRow.kt
index 8d28b56b..0df25afa 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_bottom_sheet/ModalBottomSheetTabRow.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/modal_bottom_sheet/ModalBottomSheetTabRow.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.modal_bottom_sheet
+package org.dueattendant149.bookshelf.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.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.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/ui/common/components/modal_drawer/ModalDrawer.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/modal_drawer/ModalDrawer.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_drawer/ModalDrawer.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/modal_drawer/ModalDrawer.kt
index 88f8b2ec..c9c8352d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_drawer/ModalDrawer.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/modal_drawer/ModalDrawer.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.modal_drawer
+package org.dueattendant149.bookshelf.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.ui.common.components.common.AnimatedVisibility
-import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
-import ua.acclorite.book_story.ui.common.data.ScrollbarData
-import ua.acclorite.book_story.ui.common.helpers.noRippleClickable
+import org.dueattendant149.bookshelf.ui.common.components.common.AnimatedVisibility
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.data.ScrollbarData
+import org.dueattendant149.bookshelf.ui.common.helpers.noRippleClickable
 
 /**
  * Modal Drawer.
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_drawer/ModalDrawerSelectableItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/modal_drawer/ModalDrawerSelectableItem.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_drawer/ModalDrawerSelectableItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/modal_drawer/ModalDrawerSelectableItem.kt
index 7b576d7d..1d6852ef 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_drawer/ModalDrawerSelectableItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/modal_drawer/ModalDrawerSelectableItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.modal_drawer
+package org.dueattendant149.bookshelf.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/ui/common/components/modal_drawer/ModalDrawerTitleItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/modal_drawer/ModalDrawerTitleItem.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_drawer/ModalDrawerTitleItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/modal_drawer/ModalDrawerTitleItem.kt
index d2c700cc..e1cfce00 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/modal_drawer/ModalDrawerTitleItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/modal_drawer/ModalDrawerTitleItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.modal_drawer
+package org.dueattendant149.bookshelf.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.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 /**
  * Modal Drawer Title Item.
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_bar/NavigationBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/navigation_bar/NavigationBar.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_bar/NavigationBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/navigation_bar/NavigationBar.kt
index 9e092179..0d773a1b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_bar/NavigationBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/navigation_bar/NavigationBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.navigation_bar
+package org.dueattendant149.bookshelf.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.NavigatorItem
-import ua.acclorite.book_story.ui.navigator.LocalNavigator
+import org.dueattendant149.bookshelf.presentation.navigator.NavigatorItem
+import org.dueattendant149.bookshelf.ui.navigator.LocalNavigator
 
 @Composable
 fun NavigationBar(tabs: List<NavigatorItem>, showLabels: Boolean) {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_bar/NavigationBarItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/navigation_bar/NavigationBarItem.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_bar/NavigationBarItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/navigation_bar/NavigationBarItem.kt
index 2c34c31f..54a88160 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_bar/NavigationBarItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/navigation_bar/NavigationBarItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.navigation_bar
+package org.dueattendant149.bookshelf.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.navigator.NavigatorItem
-import ua.acclorite.book_story.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.common.components.common.Tooltip
+import org.dueattendant149.bookshelf.presentation.navigator.NavigatorItem
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.common.Tooltip
 
 @Composable
 fun RowScope.NavigationBarItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_rail/NavigationRail.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/navigation_rail/NavigationRail.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_rail/NavigationRail.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/navigation_rail/NavigationRail.kt
index 3e41e8c2..b3420a97 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_rail/NavigationRail.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/navigation_rail/NavigationRail.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.navigation_rail
+package org.dueattendant149.bookshelf.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.NavigatorItem
-import ua.acclorite.book_story.ui.navigator.LocalNavigator
+import org.dueattendant149.bookshelf.presentation.navigator.NavigatorItem
+import org.dueattendant149.bookshelf.ui.navigator.LocalNavigator
 
 @Composable
 fun NavigationRail(tabs: List<NavigatorItem>, showLabels: Boolean) {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_rail/NavigationRailItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/navigation_rail/NavigationRailItem.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_rail/NavigationRailItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/navigation_rail/NavigationRailItem.kt
index 434128f2..8a34ac10 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/navigation_rail/NavigationRailItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/navigation_rail/NavigationRailItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.navigation_rail
+package org.dueattendant149.bookshelf.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.navigator.NavigatorItem
-import ua.acclorite.book_story.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.common.components.common.Tooltip
+import org.dueattendant149.bookshelf.presentation.navigator.NavigatorItem
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.common.Tooltip
 
 @Composable
 fun NavigationRailItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/placeholder/EmptyPlaceholder.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/placeholder/EmptyPlaceholder.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/placeholder/EmptyPlaceholder.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/placeholder/EmptyPlaceholder.kt
index 7c9fc49e..c7887e12 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/placeholder/EmptyPlaceholder.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/placeholder/EmptyPlaceholder.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.placeholder
+package org.dueattendant149.bookshelf.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.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 
 /**
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/placeholder/ErrorPlaceholder.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/placeholder/ErrorPlaceholder.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/placeholder/ErrorPlaceholder.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/placeholder/ErrorPlaceholder.kt
index da265c78..22683fcb 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/placeholder/ErrorPlaceholder.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/placeholder/ErrorPlaceholder.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.placeholder
+package org.dueattendant149.bookshelf.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.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 /**
  * Empty placeholder.
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/progress_indicator/CircularProgressIndicator.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/progress_indicator/CircularProgressIndicator.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/progress_indicator/CircularProgressIndicator.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/progress_indicator/CircularProgressIndicator.kt
index 3e7d4745..784a4a7c 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/progress_indicator/CircularProgressIndicator.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/progress_indicator/CircularProgressIndicator.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.progress_indicator
+package org.dueattendant149.bookshelf.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/ui/common/components/settings/ChipsWithTitle.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/settings/ChipsWithTitle.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/ChipsWithTitle.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/settings/ChipsWithTitle.kt
index 3d3e6bd4..c8e8aa0f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/ChipsWithTitle.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/settings/ChipsWithTitle.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.settings
+package org.dueattendant149.bookshelf.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.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.common.model.ListItem
-import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategoryTitle
 
 @Composable
 fun <T> ChipsWithTitle(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/ColorPickerWithTitle.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/settings/ColorPickerWithTitle.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/ColorPickerWithTitle.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/settings/ColorPickerWithTitle.kt
index c081e0e3..f3eb9b85 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/ColorPickerWithTitle.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/settings/ColorPickerWithTitle.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.settings
+package org.dueattendant149.bookshelf.ui.common.components.settings
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -35,9 +35,9 @@ import androidx.compose.ui.unit.dp
 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.ui.common.components.common.IconButton
-import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.IconButton
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategoryTitle
 
 @OptIn(FlowPreview::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/SegmentedButtonWithTitle.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/settings/SegmentedButtonWithTitle.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/SegmentedButtonWithTitle.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/settings/SegmentedButtonWithTitle.kt
index d187c207..ccb00b5c 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/SegmentedButtonWithTitle.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/settings/SegmentedButtonWithTitle.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.settings
+package org.dueattendant149.bookshelf.ui.common.components.settings
 
 import androidx.compose.animation.expandHorizontally
 import androidx.compose.animation.fadeIn
@@ -41,11 +41,11 @@ import androidx.compose.ui.graphics.Color
 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.ui.common.components.common.AnimatedVisibility
-import ua.acclorite.book_story.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.common.model.ListItem
-import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.AnimatedVisibility
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategoryTitle
 
 @Composable
 fun <T> SegmentedButtonWithTitle(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/SliderWithTitle.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/settings/SliderWithTitle.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/SliderWithTitle.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/settings/SliderWithTitle.kt
index 88f2111c..01a0afe7 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/SliderWithTitle.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/settings/SliderWithTitle.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.settings
+package org.dueattendant149.bookshelf.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.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategoryTitle
 import kotlin.math.roundToInt
 
 @OptIn(ExperimentalMaterial3Api::class)
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/SwitchWIthTitle.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/settings/SwitchWIthTitle.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/SwitchWIthTitle.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/settings/SwitchWIthTitle.kt
index 8153a13a..a02682e4 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/settings/SwitchWIthTitle.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/settings/SwitchWIthTitle.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.settings
+package org.dueattendant149.bookshelf.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.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun SwitchWithTitle(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/components/top_bar/CollapsibleTopAppBarScrollBehavior.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/top_bar/CollapsibleTopAppBarScrollBehavior.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/top_bar/CollapsibleTopAppBarScrollBehavior.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/top_bar/CollapsibleTopAppBarScrollBehavior.kt
index 261aa1a2..ce00eea3 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/top_bar/CollapsibleTopAppBarScrollBehavior.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/top_bar/CollapsibleTopAppBarScrollBehavior.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.top_bar
+package org.dueattendant149.bookshelf.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/ui/common/components/top_bar/TopAppBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/top_bar/TopAppBar.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/components/top_bar/TopAppBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/top_bar/TopAppBar.kt
index 66ad9dea..2b20ea3b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/components/top_bar/TopAppBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/components/top_bar/TopAppBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.components.top_bar
+package org.dueattendant149.bookshelf.ui.common.components.top_bar
 
 import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.animateFloatAsState
@@ -28,7 +28,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.lerp
-import ua.acclorite.book_story.ui.common.components.common.AnimatedVisibility
+import org.dueattendant149.bookshelf.ui.common.components.common.AnimatedVisibility
 
 data class TopAppBarData(
     val contentID: Int,
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/data/ScrollbarData.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/data/ScrollbarData.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/data/ScrollbarData.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/data/ScrollbarData.kt
index 991d5f99..b83ba793 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/data/ScrollbarData.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/data/ScrollbarData.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.data
+package org.dueattendant149.bookshelf.ui.common.data
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/helpers/LifecycleHelpers.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/helpers/LifecycleHelpers.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/helpers/LifecycleHelpers.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/helpers/LifecycleHelpers.kt
index 221ff48b..1229e5ef 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/helpers/LifecycleHelpers.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/helpers/LifecycleHelpers.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.helpers
+package org.dueattendant149.bookshelf.ui.common.helpers
 
 import android.annotation.SuppressLint
 import android.content.Intent
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/helpers/ModifierHelpers.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/helpers/ModifierHelpers.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/helpers/ModifierHelpers.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/helpers/ModifierHelpers.kt
index 2e5675db..4030aaf3 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/helpers/ModifierHelpers.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/helpers/ModifierHelpers.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.helpers
+package org.dueattendant149.bookshelf.ui.common.helpers
 
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.ui.Modifier
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/helpers/SettingsHelpers.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/helpers/SettingsHelpers.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/helpers/SettingsHelpers.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/helpers/SettingsHelpers.kt
index 1b289184..7393b5d1 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/helpers/SettingsHelpers.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/helpers/SettingsHelpers.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.helpers
+package org.dueattendant149.bookshelf.ui.common.helpers
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.staticCompositionLocalOf
-import ua.acclorite.book_story.data.settings.SettingsManager
+import org.dueattendant149.bookshelf.data.settings.SettingsManager
 
 val LocalSettings = staticCompositionLocalOf<SettingsManager> {
     error("No settings provided")
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/helpers/ToastHelpers.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/helpers/ToastHelpers.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/helpers/ToastHelpers.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/helpers/ToastHelpers.kt
index c7be1f62..0031a5d0 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/helpers/ToastHelpers.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/helpers/ToastHelpers.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.helpers
+package org.dueattendant149.bookshelf.ui.common.helpers
 
 import android.content.Context
 import android.widget.Toast
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/model/Direction.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/model/Direction.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/model/Direction.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/model/Direction.kt
index f5993654..093f399a 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/model/Direction.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/model/Direction.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.model
+package org.dueattendant149.bookshelf.ui.common.model
 
 
 enum class Direction {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/model/ListItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/model/ListItem.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/model/ListItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/model/ListItem.kt
index 667d33dd..e8a87fcb 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/model/ListItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/model/ListItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.model
+package org.dueattendant149.bookshelf.ui.common.model
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/model/Position.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/model/Position.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/ui/common/model/Position.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/common/model/Position.kt
index 6bfd5fc2..55f792cf 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/model/Position.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/common/model/Position.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.common.model
+package org.dueattendant149.bookshelf.ui.common.model
 
 
 enum class Position {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashBottomBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/crash/CrashBottomBar.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/crash/CrashBottomBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/crash/CrashBottomBar.kt
index 72684f99..564d2e76 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashBottomBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/crash/CrashBottomBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.crash
+package org.dueattendant149.bookshelf.ui.crash
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
@@ -22,8 +22,8 @@ import androidx.compose.ui.platform.LocalDensity
 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.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun CrashBottomBar(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashContent.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/crash/CrashContent.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/ui/crash/CrashContent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/crash/CrashContent.kt
index 2eda1fbd..09c2e33d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashContent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/crash/CrashContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.crash
+package org.dueattendant149.bookshelf.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.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun CrashContent(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/crash/CrashLayout.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/crash/CrashLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/crash/CrashLayout.kt
index c6363a62..e64c9748 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/crash/CrashLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.crash
+package org.dueattendant149.bookshelf.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.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun CrashLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashScaffold.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/crash/CrashScaffold.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/crash/CrashScaffold.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/crash/CrashScaffold.kt
index 4a4ae311..0430c8b9 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/crash/CrashScaffold.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/crash/CrashScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.crash
+package org.dueattendant149.bookshelf.ui.crash
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -24,8 +24,8 @@ import androidx.compose.ui.Modifier
 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.common.components.common.StyledText
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun CrashScaffold(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/credits/CreditItem.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/ui/credits/CreditItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/credits/CreditItem.kt
index 1999f65e..af2f12b4 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/credits/CreditItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.credits
+package org.dueattendant149.bookshelf.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.ui.about.model.Credit
-import ua.acclorite.book_story.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.about.model.Credit
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun CreditItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsContent.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/credits/CreditsContent.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsContent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/credits/CreditsContent.kt
index abc7124e..7ade037e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsContent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/credits/CreditsContent.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.credits
+package org.dueattendant149.bookshelf.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.presentation.about.AboutEvent
+import org.dueattendant149.bookshelf.presentation.about.AboutEvent
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/credits/CreditsLayout.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/credits/CreditsLayout.kt
index f3008844..1d776058 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/credits/CreditsLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.credits
+package org.dueattendant149.bookshelf.ui.credits
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
@@ -13,9 +13,9 @@ import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import ua.acclorite.book_story.presentation.about.AboutEvent
-import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
-import ua.acclorite.book_story.ui.credits.data.CreditData
+import org.dueattendant149.bookshelf.presentation.about.AboutEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.credits.data.CreditData
 
 @Composable
 fun CreditsLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsScaffold.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/credits/CreditsScaffold.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsScaffold.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/credits/CreditsScaffold.kt
index 85fe0520..41ab1e84 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsScaffold.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/credits/CreditsScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.credits
+package org.dueattendant149.bookshelf.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.presentation.about.AboutEvent
+import org.dueattendant149.bookshelf.presentation.about.AboutEvent
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsTopBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/credits/CreditsTopBar.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsTopBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/credits/CreditsTopBar.kt
index 9afe022c..97c3675e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/credits/CreditsTopBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/credits/CreditsTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.credits
+package org.dueattendant149.bookshelf.ui.credits
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LargeTopAppBar
@@ -13,10 +13,10 @@ import androidx.compose.material3.TopAppBarDefaults
 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.about.AboutEvent
-import ua.acclorite.book_story.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.about.AboutEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/credits/data/CreditData.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/credits/data/CreditData.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/ui/credits/data/CreditData.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/credits/data/CreditData.kt
index b4c75776..9a803728 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/credits/data/CreditData.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/credits/data/CreditData.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.credits.data
+package org.dueattendant149.bookshelf.ui.credits.data
 
 import kotlinx.collections.immutable.persistentListOf
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.core.ui.UIText
-import ua.acclorite.book_story.ui.about.model.Credit
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.ui.UIText
+import org.dueattendant149.bookshelf.ui.about.model.Credit
 
 object CreditData {
     val credits = persistentListOf(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryBackHandler.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryBackHandler.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/ui/history/HistoryBackHandler.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryBackHandler.kt
index 63cb0824..03b9d034 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryBackHandler.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryBackHandler.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.history
+package org.dueattendant149.bookshelf.ui.history
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.presentation.history.HistoryEvent
+import org.dueattendant149.bookshelf.presentation.history.HistoryEvent
 
 @Composable
 fun HistoryBackHandler(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryContent.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryContent.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/ui/history/HistoryContent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryContent.kt
index 663c04c2..5e20d5ef 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryContent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.history
+package org.dueattendant149.bookshelf.ui.history
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material.ExperimentalMaterialApi
@@ -12,9 +12,9 @@ import androidx.compose.material.pullrefresh.PullRefreshState
 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.presentation.history.HistoryEvent
-import ua.acclorite.book_story.presentation.history.model.GroupedHistory
+import org.dueattendant149.bookshelf.core.Dialog
+import org.dueattendant149.bookshelf.presentation.history.HistoryEvent
+import org.dueattendant149.bookshelf.presentation.history.model.GroupedHistory
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryDeleteWholeHistoryDialog.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryDeleteWholeHistoryDialog.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/ui/history/HistoryDeleteWholeHistoryDialog.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryDeleteWholeHistoryDialog.kt
index 9ccc8db9..70817a03 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryDeleteWholeHistoryDialog.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryDeleteWholeHistoryDialog.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.history
+package org.dueattendant149.bookshelf.ui.history
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.DeleteOutline
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.history.HistoryEvent
-import ua.acclorite.book_story.ui.common.components.dialog.Dialog
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.history.HistoryEvent
+import org.dueattendant149.bookshelf.ui.common.components.dialog.Dialog
 
 @Composable
 fun HistoryDeleteWholeHistoryDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryDialog.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryDialog.kt
similarity index 73%
rename from app/src/main/java/ua/acclorite/book_story/ui/history/HistoryDialog.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryDialog.kt
index 7b37a863..2f9dd2ac 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryDialog.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryDialog.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.history
+package org.dueattendant149.bookshelf.ui.history
 
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.core.Dialog
-import ua.acclorite.book_story.presentation.history.HistoryEvent
-import ua.acclorite.book_story.presentation.history.HistoryScreen
+import org.dueattendant149.bookshelf.core.Dialog
+import org.dueattendant149.bookshelf.presentation.history.HistoryEvent
+import org.dueattendant149.bookshelf.presentation.history.HistoryScreen
 
 @Composable
 fun HistoryDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryEffects.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryEffects.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/ui/history/HistoryEffects.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryEffects.kt
index 8e4d4c4a..cc2b7911 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryEffects.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryEffects.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.history
+package org.dueattendant149.bookshelf.ui.history
 
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.SnackbarResult
@@ -13,15 +13,15 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.platform.LocalContext
 import kotlinx.coroutines.flow.SharedFlow
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.book_info.BookInfoScreen
-import ua.acclorite.book_story.presentation.history.HistoryEffect
-import ua.acclorite.book_story.presentation.history.HistoryEvent
-import ua.acclorite.book_story.presentation.history.HistoryScreen.insertHistoryChannel
-import ua.acclorite.book_story.presentation.library.LibraryScreen
-import ua.acclorite.book_story.presentation.reader.ReaderScreen
-import ua.acclorite.book_story.ui.common.helpers.showToast
-import ua.acclorite.book_story.ui.navigator.LocalNavigator
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoScreen
+import org.dueattendant149.bookshelf.presentation.history.HistoryEffect
+import org.dueattendant149.bookshelf.presentation.history.HistoryEvent
+import org.dueattendant149.bookshelf.presentation.history.HistoryScreen.insertHistoryChannel
+import org.dueattendant149.bookshelf.presentation.library.LibraryScreen
+import org.dueattendant149.bookshelf.presentation.reader.ReaderScreen
+import org.dueattendant149.bookshelf.ui.common.helpers.showToast
+import org.dueattendant149.bookshelf.ui.navigator.LocalNavigator
 
 @Composable
 fun HistoryEffects(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryEmptyPlaceholder.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryEmptyPlaceholder.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/ui/history/HistoryEmptyPlaceholder.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryEmptyPlaceholder.kt
index 5522dd1d..a0792fe3 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryEmptyPlaceholder.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryEmptyPlaceholder.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.history
+package org.dueattendant149.bookshelf.ui.history
 
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeOut
@@ -14,10 +14,10 @@ import androidx.compose.ui.Alignment
 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.ui.common.components.common.AnimatedVisibility
-import ua.acclorite.book_story.ui.common.components.placeholder.EmptyPlaceholder
-import ua.acclorite.book_story.ui.theme.Transitions
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.AnimatedVisibility
+import org.dueattendant149.bookshelf.ui.common.components.placeholder.EmptyPlaceholder
+import org.dueattendant149.bookshelf.ui.theme.Transitions
 
 @Composable
 fun BoxScope.HistoryEmptyPlaceholder(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryItem.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/ui/history/HistoryItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryItem.kt
index 0a17741d..2a307f9f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.history
+package org.dueattendant149.bookshelf.ui.history
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -35,12 +35,12 @@ import androidx.compose.ui.draw.clip
 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.domain.model.history.History
-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.helpers.noRippleClickable
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.domain.model.history.History
+import org.dueattendant149.bookshelf.ui.common.components.common.AsyncCoverImage
+import org.dueattendant149.bookshelf.ui.common.components.common.IconButton
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.helpers.noRippleClickable
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryLayout.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/ui/history/HistoryLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryLayout.kt
index 3fac7b77..448880ea 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.history
+package org.dueattendant149.bookshelf.ui.history
 
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -15,13 +15,13 @@ import androidx.compose.runtime.Composable
 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.history.HistoryEvent
-import ua.acclorite.book_story.presentation.history.model.GroupedHistory
-import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
-import ua.acclorite.book_story.ui.common.data.ScrollbarData
-import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle
-import ua.acclorite.book_story.ui.theme.DefaultTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.history.HistoryEvent
+import org.dueattendant149.bookshelf.presentation.history.model.GroupedHistory
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.data.ScrollbarData
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategoryTitle
+import org.dueattendant149.bookshelf.ui.theme.DefaultTransition
 
 @Composable
 fun HistoryLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryRefreshIndicator.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryRefreshIndicator.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/ui/history/HistoryRefreshIndicator.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryRefreshIndicator.kt
index aa3723dd..d7362202 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryRefreshIndicator.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryRefreshIndicator.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.history
+package org.dueattendant149.bookshelf.ui.history
 
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.material.ExperimentalMaterialApi
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryScaffold.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryScaffold.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/history/HistoryScaffold.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryScaffold.kt
index dabef981..762f2b1d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryScaffold.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.history
+package org.dueattendant149.bookshelf.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.history.HistoryEvent
-import ua.acclorite.book_story.presentation.history.model.GroupedHistory
-import ua.acclorite.book_story.ui.common.components.common.Snackbar
+import org.dueattendant149.bookshelf.presentation.history.HistoryEvent
+import org.dueattendant149.bookshelf.presentation.history.model.GroupedHistory
+import org.dueattendant149.bookshelf.ui.common.components.common.Snackbar
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryTopBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryTopBar.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/ui/history/HistoryTopBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryTopBar.kt
index afe0d032..ef9c67fb 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryTopBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/history/HistoryTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.history
+package org.dueattendant149.bookshelf.ui.history
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
@@ -17,14 +17,14 @@ import androidx.compose.ui.focus.FocusRequester
 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.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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.history.HistoryEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.IconButton
+import org.dueattendant149.bookshelf.ui.common.components.common.SearchTextField
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.TopAppBar
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.TopAppBarData
+import org.dueattendant149.bookshelf.ui.navigator.NavigatorIconButton
 
 
 @OptIn(ExperimentalMaterial3Api::class)
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryBackHandler.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryBackHandler.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryBackHandler.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryBackHandler.kt
index 8ad3b200..52ffdbd1 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryBackHandler.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryBackHandler.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.ui.library
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.pager.PagerState
@@ -13,10 +13,10 @@ import androidx.compose.runtime.rememberCoroutineScope
 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.library.LibraryEvent
-import ua.acclorite.book_story.ui.common.helpers.LocalActivity
-import ua.acclorite.book_story.ui.common.helpers.showToast
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.library.LibraryEvent
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalActivity
+import org.dueattendant149.bookshelf.ui.common.helpers.showToast
 
 @Composable
 fun LibraryBackHandler(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryBottomSheet.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryBottomSheet.kt
similarity index 75%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryBottomSheet.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryBottomSheet.kt
index 1e020650..27cddeb5 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryBottomSheet.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryBottomSheet.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.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.model.library.Category
-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.settings.SettingsEvent
+import org.dueattendant149.bookshelf.core.BottomSheet
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.presentation.library.LibraryEvent
+import org.dueattendant149.bookshelf.presentation.library.LibraryScreen
+import org.dueattendant149.bookshelf.presentation.library.model.LibrarySortOrder
+import org.dueattendant149.bookshelf.presentation.settings.SettingsEvent
 
 @Composable
 fun LibraryBottomSheet(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryContent.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryContent.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryContent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryContent.kt
index eb3ff20c..b8417e5e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryContent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryContent.kt
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.ui.library
 
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.pullrefresh.PullRefreshState
 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.domain.model.library.Category
-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.settings.SettingsEvent
+import org.dueattendant149.bookshelf.core.BottomSheet
+import org.dueattendant149.bookshelf.core.Dialog
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.presentation.library.LibraryEvent
+import org.dueattendant149.bookshelf.presentation.library.model.LibraryLayout
+import org.dueattendant149.bookshelf.presentation.library.model.LibrarySortOrder
+import org.dueattendant149.bookshelf.presentation.library.model.LibraryTitlePosition
+import org.dueattendant149.bookshelf.presentation.library.model.SelectableBook
+import org.dueattendant149.bookshelf.presentation.settings.SettingsEvent
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryDeleteDialog.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryDeleteDialog.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryDeleteDialog.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryDeleteDialog.kt
index 6772a331..41066dde 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryDeleteDialog.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryDeleteDialog.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.ui.library
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.DeleteOutline
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.library.LibraryEvent
-import ua.acclorite.book_story.ui.common.components.dialog.Dialog
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.library.LibraryEvent
+import org.dueattendant149.bookshelf.ui.common.components.dialog.Dialog
 
 @Composable
 fun LibraryDeleteDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryDialog.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryDialog.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryDialog.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryDialog.kt
index baca3aca..a1bbe01d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryDialog.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryDialog.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.ui.library
 
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.core.Dialog
-import ua.acclorite.book_story.domain.model.library.Category
-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
+import org.dueattendant149.bookshelf.core.Dialog
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.presentation.library.LibraryEvent
+import org.dueattendant149.bookshelf.presentation.library.LibraryScreen
+import org.dueattendant149.bookshelf.presentation.library.model.SelectableBook
 
 @Composable
 fun LibraryDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEffects.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryEffects.kt
similarity index 73%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEffects.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryEffects.kt
index 229b46c8..99be4c31 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEffects.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryEffects.kt
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.ui.library
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.platform.LocalContext
 import kotlinx.coroutines.flow.SharedFlow
-import ua.acclorite.book_story.R
-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.library.LibraryEffect
-import ua.acclorite.book_story.presentation.reader.ReaderScreen
-import ua.acclorite.book_story.presentation.settings.LibrarySettingsScreen
-import ua.acclorite.book_story.ui.common.helpers.showToast
-import ua.acclorite.book_story.ui.navigator.LocalNavigator
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoScreen
+import org.dueattendant149.bookshelf.presentation.browse.BrowseScreen
+import org.dueattendant149.bookshelf.presentation.history.HistoryScreen
+import org.dueattendant149.bookshelf.presentation.library.LibraryEffect
+import org.dueattendant149.bookshelf.presentation.reader.ReaderScreen
+import org.dueattendant149.bookshelf.presentation.settings.LibrarySettingsScreen
+import org.dueattendant149.bookshelf.ui.common.helpers.showToast
+import org.dueattendant149.bookshelf.ui.navigator.LocalNavigator
 
 @Composable
 fun LibraryEffects(effects: SharedFlow<LibraryEffect>, focusRequester: FocusRequester) {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEmptyPlaceholder.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryEmptyPlaceholder.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEmptyPlaceholder.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryEmptyPlaceholder.kt
index 020c2282..c0b4ee1f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEmptyPlaceholder.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryEmptyPlaceholder.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.ui.library
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.tween
@@ -15,10 +15,10 @@ import androidx.compose.ui.Alignment
 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.library.LibraryEvent
-import ua.acclorite.book_story.ui.common.components.placeholder.EmptyPlaceholder
-import ua.acclorite.book_story.ui.theme.Transitions
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.library.LibraryEvent
+import org.dueattendant149.bookshelf.ui.common.components.placeholder.EmptyPlaceholder
+import org.dueattendant149.bookshelf.ui.theme.Transitions
 
 @Composable
 fun BoxScope.LibraryEmptyPlaceholder(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryFilterBottomSheet.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryFilterBottomSheet.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryFilterBottomSheet.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryFilterBottomSheet.kt
index f58aa9c3..b280fd2a 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryFilterBottomSheet.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryFilterBottomSheet.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.ui.library
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxHeight
@@ -22,15 +22,15 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
-import ua.acclorite.book_story.domain.model.library.Category
-import ua.acclorite.book_story.presentation.library.LibraryEvent
-import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder
-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
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.presentation.library.LibraryEvent
+import org.dueattendant149.bookshelf.presentation.library.model.LibrarySortOrder
+import org.dueattendant149.bookshelf.presentation.settings.SettingsEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.components.modal_bottom_sheet.ModalBottomSheet
+import org.dueattendant149.bookshelf.ui.settings.library.display.LibraryDisplaySubcategory
+import org.dueattendant149.bookshelf.ui.settings.library.sort.components.LibrarySortOption
+import org.dueattendant149.bookshelf.ui.settings.library.tabs.LibraryTabsSubcategory
 
 private var initialPage = 0
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryFilterBottomSheetTabRow.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryFilterBottomSheetTabRow.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryFilterBottomSheetTabRow.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryFilterBottomSheetTabRow.kt
index ac31c83e..9df3c09c 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryFilterBottomSheetTabRow.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryFilterBottomSheetTabRow.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.ui.library
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.modal_bottom_sheet.ModalBottomSheetTabRow
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.modal_bottom_sheet.ModalBottomSheetTabRow
 
 @Composable
 fun LibraryFilterBottomSheetTabRow(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryGridItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryGridItem.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryGridItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryGridItem.kt
index f7c8cb12..38c3cf5b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryGridItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryGridItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.ui.library
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
@@ -38,12 +38,12 @@ import androidx.compose.ui.graphics.Color
 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.core.helpers.calculateProgress
-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 org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.helpers.calculateProgress
+import org.dueattendant149.bookshelf.presentation.library.model.LibraryTitlePosition
+import org.dueattendant149.bookshelf.presentation.library.model.SelectableBook
+import org.dueattendant149.bookshelf.ui.common.components.common.AsyncCoverImage
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun LibraryGridItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryGridLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryGridLayout.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryGridLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryGridLayout.kt
index 43b6f083..51d18ae6 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryGridLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryGridLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.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.library.model.SelectableBook
-import ua.acclorite.book_story.ui.common.components.common.LazyVerticalGridWithScrollbar
-import ua.acclorite.book_story.ui.common.data.ScrollbarData
+import org.dueattendant149.bookshelf.presentation.library.model.SelectableBook
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyVerticalGridWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.data.ScrollbarData
 
 @Composable
 fun LibraryGridLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryItem.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryItem.kt
index 407dee1b..8325c53f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryItem.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.ui.library
 
 import androidx.compose.runtime.Composable
-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
+import org.dueattendant149.bookshelf.presentation.library.model.LibraryLayout
+import org.dueattendant149.bookshelf.presentation.library.model.LibraryTitlePosition
+import org.dueattendant149.bookshelf.presentation.library.model.SelectableBook
 
 @Composable
 fun LibraryItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryLayout.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryLayout.kt
index 1dd8ef1c..10d6fbcf 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryLayout.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.ui.library
 
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.presentation.library.model.LibraryLayout
-import ua.acclorite.book_story.presentation.library.model.SelectableBook
+import org.dueattendant149.bookshelf.presentation.library.model.LibraryLayout
+import org.dueattendant149.bookshelf.presentation.library.model.SelectableBook
 
 @Composable
 fun LibraryLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryListItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryListItem.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryListItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryListItem.kt
index 2edd07ae..c6ad3e04 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryListItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryListItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.ui.library
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
@@ -32,11 +32,11 @@ import androidx.compose.ui.draw.clip
 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.core.helpers.calculateProgress
-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 org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.helpers.calculateProgress
+import org.dueattendant149.bookshelf.presentation.library.model.SelectableBook
+import org.dueattendant149.bookshelf.ui.common.components.common.AsyncCoverImage
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun LibraryListItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryListLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryListLayout.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryListLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryListLayout.kt
index 1d8934ef..a954b13f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryListLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryListLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.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.library.model.SelectableBook
-import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
-import ua.acclorite.book_story.ui.common.data.ScrollbarData
+import org.dueattendant149.bookshelf.presentation.library.model.SelectableBook
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.data.ScrollbarData
 
 @Composable
 fun LibraryListLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryMoveDialog.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryMoveDialog.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryMoveDialog.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryMoveDialog.kt
index cd0fb750..630337d9 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryMoveDialog.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryMoveDialog.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.ui.library
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.items
@@ -16,13 +16,13 @@ import androidx.compose.runtime.remember
 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.domain.model.library.Category
-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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.presentation.library.LibraryEvent
+import org.dueattendant149.bookshelf.presentation.library.model.SelectableBook
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.dialog.CheckboxDialogItem
+import org.dueattendant149.bookshelf.ui.common.components.dialog.Dialog
 
 @Composable
 fun LibraryMoveDialog(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryPager.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryPager.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryPager.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryPager.kt
index bacc8f9e..04b6ae88 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryPager.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryPager.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.ui.library
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
@@ -14,14 +14,14 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import ua.acclorite.book_story.core.helpers.compareByWithOrder
-import ua.acclorite.book_story.domain.model.library.Category
-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.ui.theme.DefaultTransition
+import org.dueattendant149.bookshelf.core.helpers.compareByWithOrder
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.presentation.library.LibraryEvent
+import org.dueattendant149.bookshelf.presentation.library.model.LibraryLayout
+import org.dueattendant149.bookshelf.presentation.library.model.LibrarySortOrder
+import org.dueattendant149.bookshelf.presentation.library.model.LibraryTitlePosition
+import org.dueattendant149.bookshelf.presentation.library.model.SelectableBook
+import org.dueattendant149.bookshelf.ui.theme.DefaultTransition
 
 @Composable
 fun LibraryPager(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryRefreshIndicator.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryRefreshIndicator.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryRefreshIndicator.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryRefreshIndicator.kt
index 2621ae32..8d05b5c0 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryRefreshIndicator.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryRefreshIndicator.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.ui.library
 
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.material.ExperimentalMaterialApi
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryScaffold.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryScaffold.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryScaffold.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryScaffold.kt
index 1127567d..ceb487a3 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryScaffold.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.ui.library
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
@@ -18,12 +18,12 @@ 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.domain.model.library.Category
-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 org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.presentation.library.LibraryEvent
+import org.dueattendant149.bookshelf.presentation.library.model.LibraryLayout
+import org.dueattendant149.bookshelf.presentation.library.model.LibrarySortOrder
+import org.dueattendant149.bookshelf.presentation.library.model.LibraryTitlePosition
+import org.dueattendant149.bookshelf.presentation.library.model.SelectableBook
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTabs.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryTabs.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTabs.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryTabs.kt
index 14aabb60..b22f7d3a 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTabs.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryTabs.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.ui.library
 
 import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.foundation.background
@@ -29,9 +29,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
-import ua.acclorite.book_story.domain.model.library.Category
-import ua.acclorite.book_story.presentation.library.model.SelectableBook
-import ua.acclorite.book_story.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.presentation.library.model.SelectableBook
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun LibraryTabs(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTopBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryTopBar.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTopBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryTopBar.kt
index f6fb9705..fe211d5f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryTopBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/library/LibraryTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.library
+package org.dueattendant149.bookshelf.ui.library
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.Spring
@@ -40,17 +40,17 @@ import androidx.compose.ui.layout.onGloballyPositioned
 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.domain.model.library.Category
-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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.presentation.library.LibraryEvent
+import org.dueattendant149.bookshelf.presentation.library.model.SelectableBook
+import org.dueattendant149.bookshelf.ui.common.components.common.AnimatedVisibility
+import org.dueattendant149.bookshelf.ui.common.components.common.IconButton
+import org.dueattendant149.bookshelf.ui.common.components.common.SearchTextField
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.TopAppBar
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.TopAppBarData
+import org.dueattendant149.bookshelf.ui.navigator.NavigatorIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoContent.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/license_info/LicenseInfoContent.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoContent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/license_info/LicenseInfoContent.kt
index 9fdd65ba..fb3ab18a 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoContent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/license_info/LicenseInfoContent.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.license_info
+package org.dueattendant149.bookshelf.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.presentation.about.AboutEvent
+import org.dueattendant149.bookshelf.presentation.about.AboutEvent
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/license_info/LicenseInfoItem.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/license_info/LicenseInfoItem.kt
index a8f6e7bb..10440dde 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/license_info/LicenseInfoItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.license_info
+package org.dueattendant149.bookshelf.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.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.theme.SlidingTransition
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.theme.SlidingTransition
 
 @Composable
 fun LazyItemScope.LicenseInfoItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/license_info/LicenseInfoLayout.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/license_info/LicenseInfoLayout.kt
index ef1fdd02..433d701d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/license_info/LicenseInfoLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.license_info
+package org.dueattendant149.bookshelf.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.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun LicenseInfoLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoScaffold.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/license_info/LicenseInfoScaffold.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoScaffold.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/license_info/LicenseInfoScaffold.kt
index 343317ef..40ec7612 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoScaffold.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/license_info/LicenseInfoScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.license_info
+package org.dueattendant149.bookshelf.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.presentation.about.AboutEvent
-import ua.acclorite.book_story.ui.theme.DefaultTransition
+import org.dueattendant149.bookshelf.presentation.about.AboutEvent
+import org.dueattendant149.bookshelf.ui.theme.DefaultTransition
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoTopBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/license_info/LicenseInfoTopBar.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoTopBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/license_info/LicenseInfoTopBar.kt
index 6dceffab..40908cce 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoTopBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/license_info/LicenseInfoTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.license_info
+package org.dueattendant149.bookshelf.ui.license_info
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Language
@@ -15,11 +15,11 @@ import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import com.mikepenz.aboutlibraries.entity.Library
-import ua.acclorite.book_story.R
-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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.about.AboutEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.IconButton
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesContent.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/licenses/LicensesContent.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesContent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/licenses/LicensesContent.kt
index 9732c55a..20616e64 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesContent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/licenses/LicensesContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.licenses
+package org.dueattendant149.bookshelf.ui.licenses
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/licenses/LicensesItem.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/licenses/LicensesItem.kt
index 0e2210e1..3eb62b63 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/licenses/LicensesItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.licenses
+package org.dueattendant149.bookshelf.ui.licenses
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -28,8 +28,8 @@ import androidx.compose.ui.text.style.TextAlign
 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.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun LicensesItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/licenses/LicensesLayout.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/licenses/LicensesLayout.kt
index dbda9d1d..637b0739 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/licenses/LicensesLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.licenses
+package org.dueattendant149.bookshelf.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.ui.common.components.common.AnimatedVisibility
-import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.components.common.AnimatedVisibility
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun LicensesLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesScaffold.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/licenses/LicensesScaffold.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesScaffold.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/licenses/LicensesScaffold.kt
index ed80ada6..043b9649 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesScaffold.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/licenses/LicensesScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.licenses
+package org.dueattendant149.bookshelf.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/ui/licenses/LicensesTopBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/licenses/LicensesTopBar.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesTopBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/licenses/LicensesTopBar.kt
index edfc705d..d453ee7b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/licenses/LicensesTopBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/licenses/LicensesTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.licenses
+package org.dueattendant149.bookshelf.ui.licenses
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LargeTopAppBar
@@ -13,9 +13,9 @@ import androidx.compose.material3.TopAppBarDefaults
 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.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/main/MainActivityKeyboardManager.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/main/MainActivityKeyboardManager.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/ui/main/MainActivityKeyboardManager.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/main/MainActivityKeyboardManager.kt
index 88d82a14..66fdedf1 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/main/MainActivityKeyboardManager.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/main/MainActivityKeyboardManager.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.main
+package org.dueattendant149.bookshelf.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/org/dueattendant149/bookshelf/ui/navigator/Navigator.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/ui/navigator/Navigator.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/Navigator.kt
index b95988e5..4c4f82bd 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/navigator/Navigator.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/Navigator.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.navigator
+package org.dueattendant149.bookshelf.ui.navigator
 
 import androidx.activity.compose.BackHandler
 import androidx.activity.viewModels
@@ -20,10 +20,10 @@ 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.helpers.LocalActivity
+import org.dueattendant149.bookshelf.presentation.navigator.Navigator
+import org.dueattendant149.bookshelf.presentation.navigator.Screen
+import org.dueattendant149.bookshelf.presentation.navigator.StackEvent
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalActivity
 
 @Composable
 fun rememberNavigator(initialScreen: Screen): Navigator {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorBackIconButton.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/NavigatorBackIconButton.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorBackIconButton.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/NavigatorBackIconButton.kt
index fdc970b0..8aee9491 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorBackIconButton.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/NavigatorBackIconButton.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.navigator
+package org.dueattendant149.bookshelf.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.ui.common.components.common.IconButton
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.IconButton
 
 @Composable
 fun NavigatorBackIconButton(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorBottomSheet.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/NavigatorBottomSheet.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorBottomSheet.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/NavigatorBottomSheet.kt
index 7f7558f6..99097b99 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorBottomSheet.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/NavigatorBottomSheet.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.navigator
+package org.dueattendant149.bookshelf.ui.navigator
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -18,11 +18,11 @@ import androidx.compose.ui.Modifier
 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.about.AboutScreen
-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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.about.AboutScreen
+import org.dueattendant149.bookshelf.presentation.settings.SettingsScreen
+import org.dueattendant149.bookshelf.ui.common.components.modal_bottom_sheet.ModalBottomSheet
+import org.dueattendant149.bookshelf.ui.common.model.Position
 
 val navigatorBottomSheetChannel = Channel<Boolean>(Channel.CONFLATED)
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorBottomSheetItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/NavigatorBottomSheetItem.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorBottomSheetItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/NavigatorBottomSheetItem.kt
index 8d458bf5..f4597062 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorBottomSheetItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/NavigatorBottomSheetItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.navigator
+package org.dueattendant149.bookshelf.ui.navigator
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -25,8 +25,8 @@ 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.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.common.model.Position
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.model.Position
 
 @Composable
 fun NavigatorBottomSheetItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorComposition.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/NavigatorComposition.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorComposition.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/NavigatorComposition.kt
index 34a125b0..3fbbd9f9 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorComposition.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/NavigatorComposition.kt
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.navigator
+package org.dueattendant149.bookshelf.ui.navigator
 
 import androidx.compose.runtime.compositionLocalOf
-import ua.acclorite.book_story.presentation.navigator.Navigator
+import org.dueattendant149.bookshelf.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/ui/navigator/NavigatorIconButton.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/NavigatorIconButton.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorIconButton.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/NavigatorIconButton.kt
index 887444c9..1068f609 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorIconButton.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/NavigatorIconButton.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.navigator
+package org.dueattendant149.bookshelf.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.ui.common.components.common.IconButton
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.IconButton
 
 @Composable
 fun NavigatorIconButton(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorTabs.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/NavigatorTabs.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorTabs.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/NavigatorTabs.kt
index 991aff78..50791230 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/navigator/NavigatorTabs.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/navigator/NavigatorTabs.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.navigator
+package org.dueattendant149.bookshelf.ui.navigator
 
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedContentTransitionScope
@@ -27,8 +27,8 @@ import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.coroutines.flow.receiveAsFlow
-import ua.acclorite.book_story.presentation.navigator.Screen
-import ua.acclorite.book_story.ui.common.helpers.LocalActivity
+import org.dueattendant149.bookshelf.presentation.navigator.Screen
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalActivity
 
 @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBackHandler.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderBackHandler.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBackHandler.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderBackHandler.kt
index 2d13983f..72c3b365 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBackHandler.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderBackHandler.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.ui.reader
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.presentation.reader.ReaderEvent
+import org.dueattendant149.bookshelf.presentation.reader.ReaderEvent
 
 @Composable
 fun ReaderBackHandler(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderBottomBar.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderBottomBar.kt
index b2464315..214f0847 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderBottomBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.ui.reader
 
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
@@ -39,17 +39,17 @@ 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.R
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.domain.model.reader.ReaderText
-import ua.acclorite.book_story.presentation.reader.ReaderEvent
-import ua.acclorite.book_story.presentation.reader.model.Checkpoint
-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.helpers.noRippleClickable
-import ua.acclorite.book_story.ui.common.model.Direction
-import ua.acclorite.book_story.ui.theme.HorizontalExpandingTransition
-import ua.acclorite.book_story.ui.theme.readerBarsColor
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.presentation.reader.ReaderEvent
+import org.dueattendant149.bookshelf.presentation.reader.model.Checkpoint
+import org.dueattendant149.bookshelf.ui.common.components.common.IconButton
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.helpers.noRippleClickable
+import org.dueattendant149.bookshelf.ui.common.model.Direction
+import org.dueattendant149.bookshelf.ui.theme.HorizontalExpandingTransition
+import org.dueattendant149.bookshelf.ui.theme.readerBarsColor
 
 @Composable
 fun ReaderBottomBar(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomSheet.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderBottomSheet.kt
similarity index 72%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomSheet.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderBottomSheet.kt
index 471b5ff8..5667586b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomSheet.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderBottomSheet.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.ui.reader
 
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.core.BottomSheet
-import ua.acclorite.book_story.presentation.reader.ReaderEvent
-import ua.acclorite.book_story.presentation.reader.ReaderScreen
+import org.dueattendant149.bookshelf.core.BottomSheet
+import org.dueattendant149.bookshelf.presentation.reader.ReaderEvent
+import org.dueattendant149.bookshelf.presentation.reader.ReaderScreen
 
 @Composable
 fun ReaderBottomSheet(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderChaptersDrawer.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderChaptersDrawer.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderChaptersDrawer.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderChaptersDrawer.kt
index 10ba6691..41b1e50b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderChaptersDrawer.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderChaptersDrawer.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.ui.reader
 
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.layout.Spacer
@@ -21,17 +21,17 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.core.helpers.calculateProgress
-import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter
-import ua.acclorite.book_story.presentation.reader.ReaderEvent
-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.helpers.noRippleClickable
-import ua.acclorite.book_story.ui.reader.model.ExpandableChapter
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.helpers.calculateProgress
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText.Chapter
+import org.dueattendant149.bookshelf.presentation.reader.ReaderEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.modal_drawer.ModalDrawer
+import org.dueattendant149.bookshelf.ui.common.components.modal_drawer.ModalDrawerSelectableItem
+import org.dueattendant149.bookshelf.ui.common.components.modal_drawer.ModalDrawerTitleItem
+import org.dueattendant149.bookshelf.ui.common.helpers.noRippleClickable
+import org.dueattendant149.bookshelf.ui.reader.model.ExpandableChapter
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun ReaderChaptersDrawer(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderColorPresetChange.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderColorPresetChange.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderColorPresetChange.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderColorPresetChange.kt
index 0905e890..1b664ee6 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderColorPresetChange.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderColorPresetChange.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.ui.reader
 
 import androidx.compose.foundation.gestures.detectHorizontalDragGestures
 import androidx.compose.runtime.Composable
@@ -12,7 +12,7 @@ import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.pointer.pointerInput
-import ua.acclorite.book_story.presentation.settings.SettingsEvent
+import org.dueattendant149.bookshelf.presentation.settings.SettingsEvent
 
 @Composable
 fun Modifier.readerColorPresetChange(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderContent.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderContent.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderContent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderContent.kt
index 47e57424..64a38678 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderContent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.ui.reader
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.lazy.LazyListState
@@ -18,20 +18,20 @@ import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.TextUnit
-import ua.acclorite.book_story.core.BottomSheet
-import ua.acclorite.book_story.core.Drawer
-import ua.acclorite.book_story.core.ui.UIText
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.domain.model.reader.ReaderText
-import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter
-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
-import ua.acclorite.book_story.ui.theme.model.HorizontalAlignment
+import org.dueattendant149.bookshelf.core.BottomSheet
+import org.dueattendant149.bookshelf.core.Drawer
+import org.dueattendant149.bookshelf.core.ui.UIText
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText.Chapter
+import org.dueattendant149.bookshelf.presentation.reader.ReaderEvent
+import org.dueattendant149.bookshelf.presentation.reader.model.Checkpoint
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderFontThickness
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderHorizontalGesture
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderTextAlignment
+import org.dueattendant149.bookshelf.presentation.settings.SettingsEvent
+import org.dueattendant149.bookshelf.ui.reader.model.FontWithName
+import org.dueattendant149.bookshelf.ui.theme.model.HorizontalAlignment
 
 @Composable
 fun ReaderContent(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderDrawer.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderDrawer.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderDrawer.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderDrawer.kt
index f44dea50..15f16a1c 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderDrawer.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderDrawer.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.ui.reader
 
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.core.Drawer
-import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter
-import ua.acclorite.book_story.presentation.reader.ReaderEvent
-import ua.acclorite.book_story.presentation.reader.ReaderScreen
+import org.dueattendant149.bookshelf.core.Drawer
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText.Chapter
+import org.dueattendant149.bookshelf.presentation.reader.ReaderEvent
+import org.dueattendant149.bookshelf.presentation.reader.ReaderScreen
 
 @Composable
 fun ReaderDrawer(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderEffects.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderEffects.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderEffects.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderEffects.kt
index 44453c5e..1527bc94 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderEffects.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderEffects.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.ui.reader
 
 import android.app.SearchManager
 import android.content.Intent
@@ -15,15 +15,15 @@ import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import kotlinx.coroutines.flow.SharedFlow
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.presentation.book_info.BookInfoScreen
-import ua.acclorite.book_story.presentation.reader.ReaderEffect
-import ua.acclorite.book_story.ui.common.helpers.LocalActivity
-import ua.acclorite.book_story.ui.common.helpers.launchActivity
-import ua.acclorite.book_story.ui.common.helpers.setBrightness
-import ua.acclorite.book_story.ui.common.helpers.showToast
-import ua.acclorite.book_story.ui.navigator.LocalNavigator
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.presentation.book_info.BookInfoScreen
+import org.dueattendant149.bookshelf.presentation.reader.ReaderEffect
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalActivity
+import org.dueattendant149.bookshelf.ui.common.helpers.launchActivity
+import org.dueattendant149.bookshelf.ui.common.helpers.setBrightness
+import org.dueattendant149.bookshelf.ui.common.helpers.showToast
+import org.dueattendant149.bookshelf.ui.navigator.LocalNavigator
 
 @Composable
 fun ReaderEffects(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderErrorPlaceholder.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderErrorPlaceholder.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderErrorPlaceholder.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderErrorPlaceholder.kt
index 98196b00..499d0142 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderErrorPlaceholder.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderErrorPlaceholder.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.ui.reader
 
 import android.annotation.SuppressLint
 import androidx.compose.foundation.layout.Box
@@ -18,13 +18,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 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.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.navigator.NavigatorBackIconButton
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.ui.UIText
+import org.dueattendant149.bookshelf.presentation.reader.ReaderEvent
+import org.dueattendant149.bookshelf.ui.common.components.placeholder.ErrorPlaceholder
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.TopAppBar
+import org.dueattendant149.bookshelf.ui.common.components.top_bar.TopAppBarData
+import org.dueattendant149.bookshelf.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderHorizontalGesture.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderHorizontalGesture.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderHorizontalGesture.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderHorizontalGesture.kt
index 295a91fb..4aa2f3cf 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderHorizontalGesture.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderHorizontalGesture.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.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.presentation.reader.model.ReaderHorizontalGesture
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderHorizontalGesture
 import kotlin.math.abs
 import kotlin.math.roundToInt
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderHorizontalLimiter.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderHorizontalLimiter.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderHorizontalLimiter.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderHorizontalLimiter.kt
index e6e65110..52186cbd 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderHorizontalLimiter.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderHorizontalLimiter.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.ui.reader
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -21,7 +21,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalWindowInfo
 import androidx.compose.ui.unit.Dp
-import ua.acclorite.book_story.ui.theme.DefaultTransition
+import org.dueattendant149.bookshelf.ui.theme.DefaultTransition
 
 @Composable
 fun ReaderHorizontalLimiter(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLayout.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLayout.kt
index 693cecbe..fd94325f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.ui.reader
 
 import android.os.Build
 import androidx.compose.animation.expandVertically
@@ -32,21 +32,21 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.coerceAtLeast
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.domain.model.reader.ReaderText
-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.helpers.LocalActivity
-import ua.acclorite.book_story.ui.common.helpers.noRippleClickable
-import ua.acclorite.book_story.ui.common.helpers.showToast
-import ua.acclorite.book_story.ui.reader.model.FontWithName
-import ua.acclorite.book_story.ui.theme.model.HorizontalAlignment
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.presentation.reader.ReaderEvent
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderFontThickness
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderHorizontalGesture
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderTextAlignment
+import org.dueattendant149.bookshelf.ui.common.components.common.AnimatedVisibility
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.components.common.SelectionContainer
+import org.dueattendant149.bookshelf.ui.common.components.common.SpacedItem
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalActivity
+import org.dueattendant149.bookshelf.ui.common.helpers.noRippleClickable
+import org.dueattendant149.bookshelf.ui.common.helpers.showToast
+import org.dueattendant149.bookshelf.ui.reader.model.FontWithName
+import org.dueattendant149.bookshelf.ui.theme.model.HorizontalAlignment
 
 @Composable
 fun ReaderLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutText.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLayoutText.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutText.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLayoutText.kt
index 00a160af..808646bf 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutText.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLayoutText.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.ui.reader
 
 import androidx.compose.foundation.lazy.LazyItemScope
 import androidx.compose.runtime.Composable
@@ -15,12 +15,12 @@ import androidx.compose.ui.text.font.FontStyle
 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.model.reader.ReaderText
-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
-import ua.acclorite.book_story.ui.theme.model.HorizontalAlignment
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.presentation.reader.ReaderEvent
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderFontThickness
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderTextAlignment
+import org.dueattendant149.bookshelf.ui.reader.model.FontWithName
+import org.dueattendant149.bookshelf.ui.theme.model.HorizontalAlignment
 
 @Composable
 fun LazyItemScope.ReaderLayoutText(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextChapter.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLayoutTextChapter.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextChapter.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLayoutTextChapter.kt
index fb9aad16..c34f99ed 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextChapter.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLayoutTextChapter.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.ui.reader
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -21,9 +21,9 @@ import androidx.compose.ui.text.buildAnnotatedString
 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.model.reader.ReaderText.Chapter
-import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment
-import ua.acclorite.book_story.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText.Chapter
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderTextAlignment
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun LazyItemScope.ReaderLayoutTextChapter(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextImage.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLayoutTextImage.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextImage.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLayoutTextImage.kt
index c05d0fe8..f6d5b1e9 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextImage.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLayoutTextImage.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.ui.reader
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
@@ -18,8 +18,8 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.Dp
-import ua.acclorite.book_story.domain.model.reader.ReaderText
-import ua.acclorite.book_story.ui.theme.model.HorizontalAlignment
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.ui.theme.model.HorizontalAlignment
 
 @Composable
 fun LazyItemScope.ReaderLayoutTextImage(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextParagraph.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLayoutTextParagraph.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextParagraph.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLayoutTextParagraph.kt
index 3b76ebd6..1320c793 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextParagraph.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLayoutTextParagraph.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.ui.reader
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -22,13 +22,13 @@ import androidx.compose.ui.text.style.LineBreak
 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.model.reader.ReaderText.Text
-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.helpers.noRippleClickable
-import ua.acclorite.book_story.ui.reader.model.FontWithName
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText.Text
+import org.dueattendant149.bookshelf.presentation.reader.ReaderEvent
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderFontThickness
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderTextAlignment
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.helpers.noRippleClickable
+import org.dueattendant149.bookshelf.ui.reader.model.FontWithName
 
 @Composable
 fun LazyItemScope.ReaderLayoutTextParagraph(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextSeparator.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLayoutTextSeparator.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextSeparator.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLayoutTextSeparator.kt
index d0db1ec5..be3220ee 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLayoutTextSeparator.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLayoutTextSeparator.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.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/ui/reader/ReaderLoadingPlaceholder.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLoadingPlaceholder.kt
similarity index 85%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLoadingPlaceholder.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLoadingPlaceholder.kt
index e7a7db85..98d68c1b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderLoadingPlaceholder.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderLoadingPlaceholder.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.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.ui.common.components.progress_indicator.CircularProgressIndicator
+import org.dueattendant149.bookshelf.ui.common.components.progress_indicator.CircularProgressIndicator
 
 @Composable
 fun ReaderLoadingPlaceholder() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderPerceptionExpander.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderPerceptionExpander.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderPerceptionExpander.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderPerceptionExpander.kt
index a5a54218..517da953 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderPerceptionExpander.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderPerceptionExpander.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.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/ui/reader/ReaderProgressBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderProgressBar.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderProgressBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderProgressBar.kt
index 65380411..689cc02d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderProgressBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderProgressBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.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.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.theme.model.HorizontalAlignment
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.theme.model.HorizontalAlignment
 
 @Composable
 fun ReaderProgressBar(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScaffold.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderScaffold.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScaffold.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderScaffold.kt
index bde07cb0..31bd411e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderScaffold.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.ui.reader
 
 import android.annotation.SuppressLint
 import androidx.compose.animation.slideInVertically
@@ -26,18 +26,18 @@ import androidx.compose.ui.text.font.FontStyle
 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.model.library.Book
-import ua.acclorite.book_story.domain.model.reader.ReaderText
-import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter
-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
-import ua.acclorite.book_story.ui.theme.model.HorizontalAlignment
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText.Chapter
+import org.dueattendant149.bookshelf.presentation.reader.ReaderEvent
+import org.dueattendant149.bookshelf.presentation.reader.model.Checkpoint
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderFontThickness
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderHorizontalGesture
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderTextAlignment
+import org.dueattendant149.bookshelf.presentation.settings.SettingsEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.AnimatedVisibility
+import org.dueattendant149.bookshelf.ui.reader.model.FontWithName
+import org.dueattendant149.bookshelf.ui.theme.model.HorizontalAlignment
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderSettingsBottomSheet.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderSettingsBottomSheet.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderSettingsBottomSheet.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderSettingsBottomSheet.kt
index cd88585d..507a78ae 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderSettingsBottomSheet.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderSettingsBottomSheet.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.ui.reader
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.animateFloatAsState
@@ -25,21 +25,21 @@ 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.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.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
+import org.dueattendant149.bookshelf.presentation.reader.ReaderEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.components.modal_bottom_sheet.ModalBottomSheet
+import org.dueattendant149.bookshelf.ui.settings.appearance.colors.ColorsSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.chapters.ChaptersSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.font.FontSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.images.ImagesSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.misc.MiscSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.padding.PaddingSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.progress.ProgressSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.reading_mode.ReadingModeSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.ReadingSpeedSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.system.SystemSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.text.TextSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.translator.TranslatorSubcategory
 
 private var initialPage = 0
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderSettingsBottomSheetTabRow.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderSettingsBottomSheetTabRow.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderSettingsBottomSheetTabRow.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderSettingsBottomSheetTabRow.kt
index 95efa287..6808f2c8 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderSettingsBottomSheetTabRow.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderSettingsBottomSheetTabRow.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.ui.reader
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.modal_bottom_sheet.ModalBottomSheetTabRow
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.modal_bottom_sheet.ModalBottomSheetTabRow
 
 @Composable
 fun ReaderSettingsBottomSheetTabRow(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderTopBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderTopBar.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderTopBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderTopBar.kt
index 21b8202f..fb6a3d9e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderTopBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/ReaderTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader
+package org.dueattendant149.bookshelf.ui.reader
 
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
@@ -28,16 +28,16 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.domain.model.library.Book
-import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter
-import ua.acclorite.book_story.presentation.reader.ReaderEvent
-import ua.acclorite.book_story.presentation.settings.SettingsEvent
-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.helpers.LocalActivity
-import ua.acclorite.book_story.ui.common.helpers.noRippleClickable
-import ua.acclorite.book_story.ui.theme.readerBarsColor
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.domain.model.library.Book
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText.Chapter
+import org.dueattendant149.bookshelf.presentation.reader.ReaderEvent
+import org.dueattendant149.bookshelf.presentation.settings.SettingsEvent
+import org.dueattendant149.bookshelf.ui.common.components.common.IconButton
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalActivity
+import org.dueattendant149.bookshelf.ui.common.helpers.noRippleClickable
+import org.dueattendant149.bookshelf.ui.theme.readerBarsColor
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/data/ReaderData.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/data/ReaderData.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/data/ReaderData.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/data/ReaderData.kt
index fa492929..cc96466a 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/data/ReaderData.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/data/ReaderData.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader.data
+package org.dueattendant149.bookshelf.ui.reader.data
 
 import androidx.annotation.FontRes
 import androidx.compose.ui.text.ExperimentalTextApi
@@ -14,9 +14,9 @@ import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontVariation
 import androidx.compose.ui.text.font.FontWeight
 import kotlinx.collections.immutable.persistentListOf
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.core.ui.UIText
-import ua.acclorite.book_story.ui.reader.model.FontWithName
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.ui.UIText
+import org.dueattendant149.bookshelf.ui.reader.model.FontWithName
 
 object ReaderData {
     val fonts = persistentListOf(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ExpandableChapter.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/model/ExpandableChapter.kt
similarity index 73%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/model/ExpandableChapter.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/model/ExpandableChapter.kt
index 3bf091cb..562b7084 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/ExpandableChapter.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/model/ExpandableChapter.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader.model
+package org.dueattendant149.bookshelf.ui.reader.model
 
 import androidx.compose.runtime.Immutable
-import ua.acclorite.book_story.domain.model.reader.ReaderText
+import org.dueattendant149.bookshelf.domain.model.reader.ReaderText
 
 @Immutable
 data class ExpandableChapter(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/FontWithName.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/model/FontWithName.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/ui/reader/model/FontWithName.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/reader/model/FontWithName.kt
index 1e7afa60..3ede7d88 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/reader/model/FontWithName.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/reader/model/FontWithName.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.reader.model
+package org.dueattendant149.bookshelf.ui.reader.model
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.text.font.FontFamily
-import ua.acclorite.book_story.core.ui.UIText
+import org.dueattendant149.bookshelf.core.ui.UIText
 
 @Immutable
 data class FontWithName(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsContent.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/SettingsContent.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsContent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/SettingsContent.kt
index 61f0173a..7e36cbb4 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsContent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/SettingsContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings
+package org.dueattendant149.bookshelf.ui.settings
 
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsEffects.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/SettingsEffects.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsEffects.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/SettingsEffects.kt
index 1efb2c32..3bae96a6 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsEffects.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/SettingsEffects.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings
+package org.dueattendant149.bookshelf.ui.settings
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.platform.LocalContext
 import kotlinx.coroutines.flow.SharedFlow
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.settings.SettingsEffect
-import ua.acclorite.book_story.ui.common.helpers.showToast
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.settings.SettingsEffect
+import org.dueattendant149.bookshelf.ui.common.helpers.showToast
 
 @Composable
 fun SettingsEffects(effects: SharedFlow<SettingsEffect>) {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/SettingsLayout.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/SettingsLayout.kt
index 245c96a3..0b1c3142 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/SettingsLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings
+package org.dueattendant149.bookshelf.ui.settings
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
@@ -20,8 +20,8 @@ import androidx.compose.runtime.Composable
 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.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun SettingsLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsLayoutItem.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/SettingsLayoutItem.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsLayoutItem.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/SettingsLayoutItem.kt
index b35b4af0..70215294 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsLayoutItem.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/SettingsLayoutItem.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings
+package org.dueattendant149.bookshelf.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.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.theme.dynamicListItemColor
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.theme.dynamicListItemColor
 
 @Composable
 fun SettingsLayoutItem(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsScaffold.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/SettingsScaffold.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsScaffold.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/SettingsScaffold.kt
index 2ba3e333..7b44d958 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsScaffold.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/SettingsScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings
+package org.dueattendant149.bookshelf.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/ui/settings/SettingsTopBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/SettingsTopBar.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsTopBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/SettingsTopBar.kt
index 35ecd6d5..517833be 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsTopBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/SettingsTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings
+package org.dueattendant149.bookshelf.ui.settings
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.RestartAlt
@@ -15,10 +15,10 @@ import androidx.compose.material3.TopAppBarDefaults
 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.ui.common.components.common.IconButton
-import ua.acclorite.book_story.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.IconButton
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsCategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/AppearanceSettingsCategory.kt
similarity index 72%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsCategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/AppearanceSettingsCategory.kt
index 9f5d65bc..f84df0a8 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsCategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/AppearanceSettingsCategory.kt
@@ -6,14 +6,14 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.appearance
+package org.dueattendant149.bookshelf.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.ui.settings.appearance.colors.ColorsSubcategory
-import ua.acclorite.book_story.ui.settings.appearance.theme_preferences.ThemePreferencesSubcategory
+import org.dueattendant149.bookshelf.ui.settings.appearance.colors.ColorsSubcategory
+import org.dueattendant149.bookshelf.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/ui/settings/appearance/AppearanceSettingsContent.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/AppearanceSettingsContent.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsContent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/AppearanceSettingsContent.kt
index 3ab24321..46d8d6e7 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsContent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/AppearanceSettingsContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.appearance
+package org.dueattendant149.bookshelf.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/ui/settings/appearance/AppearanceSettingsLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/AppearanceSettingsLayout.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/AppearanceSettingsLayout.kt
index 47b85988..b47219d5 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/AppearanceSettingsLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.appearance
+package org.dueattendant149.bookshelf.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.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun AppearanceSettingsLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsScaffold.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/AppearanceSettingsScaffold.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsScaffold.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/AppearanceSettingsScaffold.kt
index 25185baa..b188e062 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsScaffold.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/AppearanceSettingsScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.appearance
+package org.dueattendant149.bookshelf.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/ui/settings/appearance/AppearanceSettingsTopBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/AppearanceSettingsTopBar.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsTopBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/AppearanceSettingsTopBar.kt
index 5bbf4cfd..8443a66c 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/AppearanceSettingsTopBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/AppearanceSettingsTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.appearance
+package org.dueattendant149.bookshelf.ui.settings.appearance
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LargeTopAppBar
@@ -13,9 +13,9 @@ import androidx.compose.material3.TopAppBarDefaults
 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.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/ColorsSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/colors/ColorsSubcategory.kt
similarity index 74%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/ColorsSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/colors/ColorsSubcategory.kt
index a01f4ca9..e9ffa482 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/ColorsSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/colors/ColorsSubcategory.kt
@@ -6,17 +6,17 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.appearance.colors
+package org.dueattendant149.bookshelf.ui.settings.appearance.colors
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.appearance.colors.components.ColorPresetOption
+import org.dueattendant149.bookshelf.ui.settings.appearance.colors.components.FastColorPresetChangeOption
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
 
 fun LazyListScope.ColorsSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/ColorPresetOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/colors/components/ColorPresetOption.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/ColorPresetOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/colors/components/ColorPresetOption.kt
index 7cf83ab1..bad5d875 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/ColorPresetOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/colors/components/ColorPresetOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.appearance.colors.components
+package org.dueattendant149.bookshelf.ui.settings.appearance.colors.components
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.expandHorizontally
@@ -62,17 +62,17 @@ import kotlinx.coroutines.flow.debounce
 import sh.calvin.reorderable.ReorderableCollectionItemScope
 import sh.calvin.reorderable.ReorderableItem
 import sh.calvin.reorderable.rememberReorderableLazyListState
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.domain.model.reader.ColorPreset
-import ua.acclorite.book_story.presentation.settings.SettingsEvent
-import ua.acclorite.book_story.presentation.settings.SettingsModel
-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
-import ua.acclorite.book_story.ui.theme.FadeTransitionPreservingSpace
-import ua.acclorite.book_story.ui.theme.Transitions
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.domain.model.reader.ColorPreset
+import org.dueattendant149.bookshelf.presentation.settings.SettingsEvent
+import org.dueattendant149.bookshelf.presentation.settings.SettingsModel
+import org.dueattendant149.bookshelf.ui.common.components.common.AnimatedVisibility
+import org.dueattendant149.bookshelf.ui.common.components.common.IconButton
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.settings.ColorPickerWithTitle
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategoryTitle
+import org.dueattendant149.bookshelf.ui.theme.FadeTransitionPreservingSpace
+import org.dueattendant149.bookshelf.ui.theme.Transitions
 
 @Composable
 fun ColorPresetOption(backgroundColor: Color) {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/FastColorPresetChangeOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/colors/components/FastColorPresetChangeOption.kt
similarity index 72%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/FastColorPresetChangeOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/colors/components/FastColorPresetChangeOption.kt
index c566f837..0b06386b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/FastColorPresetChangeOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/colors/components/FastColorPresetChangeOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.appearance.colors.components
+package org.dueattendant149.bookshelf.ui.settings.appearance.colors.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun FastColorPresetChangeOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/ThemePreferencesSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/ThemePreferencesSubcategory.kt
similarity index 59%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/ThemePreferencesSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/ThemePreferencesSubcategory.kt
index 691873d0..653d6939 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/ThemePreferencesSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/ThemePreferencesSubcategory.kt
@@ -6,21 +6,21 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.appearance.theme_preferences
+package org.dueattendant149.bookshelf.ui.settings.appearance.theme_preferences
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.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.ShowNavigationLabelsOption
-import ua.acclorite.book_story.ui.settings.appearance.theme_preferences.components.ThemeContrastOption
-import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.appearance.theme_preferences.components.AbsoluteDarkOption
+import org.dueattendant149.bookshelf.ui.settings.appearance.theme_preferences.components.AppThemeOption
+import org.dueattendant149.bookshelf.ui.settings.appearance.theme_preferences.components.DarkThemeOption
+import org.dueattendant149.bookshelf.ui.settings.appearance.theme_preferences.components.PureDarkOption
+import org.dueattendant149.bookshelf.ui.settings.appearance.theme_preferences.components.ShowNavigationLabelsOption
+import org.dueattendant149.bookshelf.ui.settings.appearance.theme_preferences.components.ThemeContrastOption
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
 
 fun LazyListScope.ThemePreferencesSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt
similarity index 72%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt
index e8af87ee..38bd6488 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.appearance.theme_preferences.components
+package org.dueattendant149.bookshelf.ui.settings.appearance.theme_preferences.components
 
 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.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun AbsoluteDarkOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AppThemeOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/components/AppThemeOption.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AppThemeOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/components/AppThemeOption.kt
index f62f41a4..109a38b3 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AppThemeOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/components/AppThemeOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.appearance.theme_preferences.components
+package org.dueattendant149.bookshelf.ui.settings.appearance.theme_preferences.components
 
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
@@ -39,14 +39,14 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import ua.acclorite.book_story.R
-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.helpers.LocalSettings
-import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle
-import ua.acclorite.book_story.ui.theme.animatedColorScheme
-import ua.acclorite.book_story.ui.theme.model.Theme
-import ua.acclorite.book_story.ui.theme.model.ThemeContrast
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.AnimatedVisibility
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategoryTitle
+import org.dueattendant149.bookshelf.ui.theme.animatedColorScheme
+import org.dueattendant149.bookshelf.ui.theme.model.Theme
+import org.dueattendant149.bookshelf.ui.theme.model.ThemeContrast
 
 @Composable
 fun AppThemeOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/DarkThemeOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/components/DarkThemeOption.kt
similarity index 64%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/DarkThemeOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/components/DarkThemeOption.kt
index 462fe506..0d35c6b5 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/DarkThemeOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/components/DarkThemeOption.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.appearance.theme_preferences.components
+package org.dueattendant149.bookshelf.ui.settings.appearance.theme_preferences.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.model.ListItem
-import ua.acclorite.book_story.ui.theme.model.DarkTheme
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SegmentedButtonWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.ui.theme.model.DarkTheme
 
 @Composable
 fun DarkThemeOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/PureDarkOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/components/PureDarkOption.kt
similarity index 64%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/PureDarkOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/components/PureDarkOption.kt
index 2d12d43c..a05ea422 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/PureDarkOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/components/PureDarkOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.appearance.theme_preferences.components
+package org.dueattendant149.bookshelf.ui.settings.appearance.theme_preferences.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.model.ListItem
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
-import ua.acclorite.book_story.ui.theme.model.PureDark
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SegmentedButtonWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.ui.theme.model.PureDark
 
 @Composable
 fun PureDarkOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/ShowNavigationLabelsOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/components/ShowNavigationLabelsOption.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/ShowNavigationLabelsOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/components/ShowNavigationLabelsOption.kt
index 3260e9c2..2f6398ce 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/ShowNavigationLabelsOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/components/ShowNavigationLabelsOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.appearance.theme_preferences.components
+package org.dueattendant149.bookshelf.ui.settings.appearance.theme_preferences.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun ShowNavigationLabelsOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/ThemeContrastOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/components/ThemeContrastOption.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/ThemeContrastOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/components/ThemeContrastOption.kt
index 41b4beea..90c59d5e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/ThemeContrastOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/appearance/theme_preferences/components/ThemeContrastOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.appearance.theme_preferences.components
+package org.dueattendant149.bookshelf.ui.settings.appearance.theme_preferences.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -12,13 +12,13 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.model.ListItem
-import ua.acclorite.book_story.ui.theme.BookStoryTheme
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
-import ua.acclorite.book_story.ui.theme.model.ThemeContrast
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SegmentedButtonWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.ui.theme.BookStoryTheme
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.ui.theme.model.ThemeContrast
 
 @Composable
 fun ThemeContrastOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsCategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/BrowseSettingsCategory.kt
similarity index 62%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsCategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/BrowseSettingsCategory.kt
index 139e73e5..70a91a5b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsCategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/BrowseSettingsCategory.kt
@@ -6,11 +6,11 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.browse
+package org.dueattendant149.bookshelf.ui.settings.browse
 
 import androidx.compose.foundation.lazy.LazyListScope
-import ua.acclorite.book_story.ui.settings.browse.display.BrowseDisplaySubcategory
-import ua.acclorite.book_story.ui.settings.browse.scan.BrowseScanSubcategory
+import org.dueattendant149.bookshelf.ui.settings.browse.display.BrowseDisplaySubcategory
+import org.dueattendant149.bookshelf.ui.settings.browse.scan.BrowseScanSubcategory
 
 fun LazyListScope.BrowseSettingsCategory() {
     BrowseScanSubcategory()
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsContent.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/BrowseSettingsContent.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsContent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/BrowseSettingsContent.kt
index 88050a06..72d09e41 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsContent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/BrowseSettingsContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.browse
+package org.dueattendant149.bookshelf.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/ui/settings/browse/BrowseSettingsLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/BrowseSettingsLayout.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/BrowseSettingsLayout.kt
index 1f6afbef..7f393ccc 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/BrowseSettingsLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.browse
+package org.dueattendant149.bookshelf.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.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun BrowseSettingsLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsScaffold.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/BrowseSettingsScaffold.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsScaffold.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/BrowseSettingsScaffold.kt
index d1c5d6cc..6eaede64 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsScaffold.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/BrowseSettingsScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.browse
+package org.dueattendant149.bookshelf.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/ui/settings/browse/BrowseSettingsTopBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/BrowseSettingsTopBar.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsTopBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/BrowseSettingsTopBar.kt
index 09749e13..65f80bd2 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/BrowseSettingsTopBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/BrowseSettingsTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.browse
+package org.dueattendant149.bookshelf.ui.settings.browse
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LargeTopAppBar
@@ -13,9 +13,9 @@ import androidx.compose.material3.TopAppBarDefaults
 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.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/BrowseDisplaySubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/display/BrowseDisplaySubcategory.kt
similarity index 72%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/BrowseDisplaySubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/display/BrowseDisplaySubcategory.kt
index af1fdd8a..f722336b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/BrowseDisplaySubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/display/BrowseDisplaySubcategory.kt
@@ -6,17 +6,17 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.browse.display
+package org.dueattendant149.bookshelf.ui.settings.browse.display
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.browse.display.components.BrowseGridSizeOption
+import org.dueattendant149.bookshelf.ui.settings.browse.display.components.BrowseLayoutOption
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
 
 fun LazyListScope.BrowseDisplaySubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/components/BrowseGridSizeOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/display/components/BrowseGridSizeOption.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/components/BrowseGridSizeOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/display/components/BrowseGridSizeOption.kt
index 621005bd..9779b904 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/components/BrowseGridSizeOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/display/components/BrowseGridSizeOption.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.browse.display.components
+package org.dueattendant149.bookshelf.ui.settings.browse.display.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.browse.model.BrowseLayout
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.browse.model.BrowseLayout
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun BrowseGridSizeOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/components/BrowseLayoutOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/display/components/BrowseLayoutOption.kt
similarity index 64%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/components/BrowseLayoutOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/display/components/BrowseLayoutOption.kt
index 30a78c10..783a9c98 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/components/BrowseLayoutOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/display/components/BrowseLayoutOption.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.browse.display.components
+package org.dueattendant149.bookshelf.ui.settings.browse.display.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.browse.model.BrowseLayout
-import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.browse.model.BrowseLayout
+import org.dueattendant149.bookshelf.ui.common.components.settings.SegmentedButtonWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
 
 @Composable
 fun BrowseLayoutOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/filter/BrowseFilterSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/filter/BrowseFilterSubcategory.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/browse/filter/BrowseFilterSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/filter/BrowseFilterSubcategory.kt
index 26b2b393..57cecc65 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/filter/BrowseFilterSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/filter/BrowseFilterSubcategory.kt
@@ -6,16 +6,16 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.browse.filter
+package org.dueattendant149.bookshelf.ui.settings.browse.filter
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.ui.settings.browse.filter.components.BrowseFilterOption
-import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.browse.filter.components.BrowseFilterOption
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
 
 fun LazyListScope.BrowseFilterSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/filter/components/BrowseFilterOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/filter/components/BrowseFilterOption.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/browse/filter/components/BrowseFilterOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/filter/components/BrowseFilterOption.kt
index dbb9d54e..a0f14b72 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/filter/components/BrowseFilterOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/filter/components/BrowseFilterOption.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.browse.filter.components
+package org.dueattendant149.bookshelf.ui.settings.browse.filter.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
@@ -23,10 +23,10 @@ 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.core.data.ExtensionsData
-import ua.acclorite.book_story.core.helpers.toggle
-import ua.acclorite.book_story.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.core.data.ExtensionsData
+import org.dueattendant149.bookshelf.core.helpers.toggle
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 fun LazyListScope.BrowseFilterOption() {
     items(ExtensionsData.fileExtensions, key = { it }) {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/BrowseScanSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/scan/BrowseScanSubcategory.kt
similarity index 73%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/BrowseScanSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/scan/BrowseScanSubcategory.kt
index 09d9957d..8d889fb0 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/BrowseScanSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/scan/BrowseScanSubcategory.kt
@@ -6,17 +6,17 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.browse.scan
+package org.dueattendant149.bookshelf.ui.settings.browse.scan
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.browse.scan.components.BrowseScanOption
+import org.dueattendant149.bookshelf.ui.settings.browse.scan.components.BrowseScanOptionNote
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
 
 fun LazyListScope.BrowseScanSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/components/BrowseScanOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/scan/components/BrowseScanOption.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/components/BrowseScanOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/scan/components/BrowseScanOption.kt
index 940b5136..08f3a30a 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/components/BrowseScanOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/scan/components/BrowseScanOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.browse.scan.components
+package org.dueattendant149.bookshelf.ui.settings.browse.scan.components
 
 import android.content.Context
 import android.content.UriPermission
@@ -38,15 +38,15 @@ import androidx.hilt.navigation.compose.hiltViewModel
 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.browse.BrowseScreen
-import ua.acclorite.book_story.presentation.settings.SettingsEvent
-import ua.acclorite.book_story.presentation.settings.SettingsModel
-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.helpers.noRippleClickable
-import ua.acclorite.book_story.ui.common.helpers.showToast
-import ua.acclorite.book_story.ui.theme.dynamicListItemColor
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.browse.BrowseScreen
+import org.dueattendant149.bookshelf.presentation.settings.SettingsEvent
+import org.dueattendant149.bookshelf.presentation.settings.SettingsModel
+import org.dueattendant149.bookshelf.ui.common.components.common.IconButton
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.helpers.noRippleClickable
+import org.dueattendant149.bookshelf.ui.common.helpers.showToast
+import org.dueattendant149.bookshelf.ui.theme.dynamicListItemColor
 
 @Composable
 fun BrowseScanOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/components/BrowseScanOptionNote.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/scan/components/BrowseScanOptionNote.kt
similarity index 67%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/components/BrowseScanOptionNote.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/scan/components/BrowseScanOptionNote.kt
index c0987c9f..0918c2c2 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/components/BrowseScanOptionNote.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/scan/components/BrowseScanOptionNote.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.browse.scan.components
+package org.dueattendant149.bookshelf.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.ui.settings.components.SettingsSubcategoryNote
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategoryNote
 
 @Composable
 fun BrowseScanOptionNote() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/sort/BrowseSortSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/sort/BrowseSortSubcategory.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/browse/sort/BrowseSortSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/sort/BrowseSortSubcategory.kt
index 50cede5a..4433d677 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/sort/BrowseSortSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/sort/BrowseSortSubcategory.kt
@@ -6,16 +6,16 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.browse.sort
+package org.dueattendant149.bookshelf.ui.settings.browse.sort
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.ui.settings.browse.sort.components.BrowseSortOption
-import ua.acclorite.book_story.ui.settings.components.SettingsSubcategory
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.browse.sort.components.BrowseSortOption
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
 
 fun LazyListScope.BrowseSortSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/sort/components/BrowseSortOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/sort/components/BrowseSortOption.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/browse/sort/components/BrowseSortOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/sort/components/BrowseSortOption.kt
index fee3bdf4..c454a20a 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/sort/components/BrowseSortOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/browse/sort/components/BrowseSortOption.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.browse.sort.components
+package org.dueattendant149.bookshelf.ui.settings.browse.sort.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
@@ -28,10 +28,10 @@ import androidx.compose.ui.Modifier
 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.browse.model.BrowseSortOrder
-import ua.acclorite.book_story.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.browse.model.BrowseSortOrder
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 fun LazyListScope.BrowseSortOption() {
     items(BrowseSortOrder.entries, key = { it.name }) {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/components/SettingsSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/components/SettingsSubcategory.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/components/SettingsSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/components/SettingsSubcategory.kt
index ea44b075..2148c281 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/components/SettingsSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/components/SettingsSubcategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.components
+package org.dueattendant149.bookshelf.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/ui/settings/components/SettingsSubcategoryNote.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/components/SettingsSubcategoryNote.kt
similarity index 90%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/components/SettingsSubcategoryNote.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/components/SettingsSubcategoryNote.kt
index 0d366eb3..73a0b1fc 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/components/SettingsSubcategoryNote.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/components/SettingsSubcategoryNote.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.components
+package org.dueattendant149.bookshelf.ui.settings.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -20,8 +20,8 @@ import androidx.compose.ui.Modifier
 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.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun SettingsSubcategoryNote(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/components/SettingsSubcategoryTitle.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/components/SettingsSubcategoryTitle.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/components/SettingsSubcategoryTitle.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/components/SettingsSubcategoryTitle.kt
index 92ca4074..1f1217dc 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/components/SettingsSubcategoryTitle.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/components/SettingsSubcategoryTitle.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.components
+package org.dueattendant149.bookshelf.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.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun SettingsSubcategoryTitle(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsCategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/GeneralSettingsCategory.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsCategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/GeneralSettingsCategory.kt
index bd9cda8e..d824eb4b 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsCategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/GeneralSettingsCategory.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.general
+package org.dueattendant149.bookshelf.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.ui.settings.general.components.AppLanguageOption
-import ua.acclorite.book_story.ui.settings.general.components.DoublePressExitOption
+import org.dueattendant149.bookshelf.ui.settings.general.components.AppLanguageOption
+import org.dueattendant149.bookshelf.ui.settings.general.components.DoublePressExitOption
 
 fun LazyListScope.GeneralSettingsCategory(
     topPadding: Dp = 16.dp,
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsContent.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/GeneralSettingsContent.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsContent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/GeneralSettingsContent.kt
index 5998e423..63cc7734 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsContent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/GeneralSettingsContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.general
+package org.dueattendant149.bookshelf.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/ui/settings/general/GeneralSettingsLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/GeneralSettingsLayout.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/GeneralSettingsLayout.kt
index db15fdba..640806bc 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/GeneralSettingsLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.general
+package org.dueattendant149.bookshelf.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.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun GeneralSettingsLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsScaffold.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/GeneralSettingsScaffold.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsScaffold.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/GeneralSettingsScaffold.kt
index 931653ae..34acb586 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsScaffold.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/GeneralSettingsScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.general
+package org.dueattendant149.bookshelf.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/ui/settings/general/GeneralSettingsTopBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/GeneralSettingsTopBar.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsTopBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/GeneralSettingsTopBar.kt
index eda1e401..582e4509 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/general/GeneralSettingsTopBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/GeneralSettingsTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.general
+package org.dueattendant149.bookshelf.ui.settings.general
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LargeTopAppBar
@@ -13,9 +13,9 @@ import androidx.compose.material3.TopAppBarDefaults
 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.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/general/components/AppLanguageOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/components/AppLanguageOption.kt
similarity index 62%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/general/components/AppLanguageOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/components/AppLanguageOption.kt
index 44f1aca8..70d4c87a 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/general/components/AppLanguageOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/components/AppLanguageOption.kt
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.general.components
+package org.dueattendant149.bookshelf.ui.settings.general.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.core.data.CoreData
-import ua.acclorite.book_story.presentation.settings.SettingsEvent
-import ua.acclorite.book_story.presentation.settings.SettingsModel
-import ua.acclorite.book_story.ui.common.components.settings.ChipsWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.data.CoreData
+import org.dueattendant149.bookshelf.presentation.settings.SettingsEvent
+import org.dueattendant149.bookshelf.presentation.settings.SettingsModel
+import org.dueattendant149.bookshelf.ui.common.components.settings.ChipsWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
 
 @Composable
 fun AppLanguageOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/general/components/DoublePressExitOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/components/DoublePressExitOption.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/general/components/DoublePressExitOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/components/DoublePressExitOption.kt
index b87b5647..ca34dff1 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/general/components/DoublePressExitOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/general/components/DoublePressExitOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.general.components
+package org.dueattendant149.bookshelf.ui.settings.general.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun DoublePressExitOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsCategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/LibrarySettingsCategory.kt
similarity index 51%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsCategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/LibrarySettingsCategory.kt
index 18f0e8ce..b839b37c 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsCategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/LibrarySettingsCategory.kt
@@ -6,13 +6,13 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.library
+package org.dueattendant149.bookshelf.ui.settings.library
 
 import androidx.compose.foundation.lazy.LazyListScope
-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
+import org.dueattendant149.bookshelf.ui.settings.library.categories.LibraryCategoriesSubcategory
+import org.dueattendant149.bookshelf.ui.settings.library.display.LibraryDisplaySubcategory
+import org.dueattendant149.bookshelf.ui.settings.library.sort.LibrarySortSubcategory
+import org.dueattendant149.bookshelf.ui.settings.library.tabs.LibraryTabsSubcategory
 
 fun LazyListScope.LibrarySettingsCategory() {
     LibraryCategoriesSubcategory()
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsContent.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/LibrarySettingsContent.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsContent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/LibrarySettingsContent.kt
index 7e78e750..15f21c37 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsContent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/LibrarySettingsContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.library
+package org.dueattendant149.bookshelf.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/ui/settings/library/LibrarySettingsLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/LibrarySettingsLayout.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/LibrarySettingsLayout.kt
index f2e8dff1..186123b5 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/LibrarySettingsLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.library
+package org.dueattendant149.bookshelf.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.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun LibrarySettingsLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsScaffold.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/LibrarySettingsScaffold.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsScaffold.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/LibrarySettingsScaffold.kt
index 58d2c255..72af3b7d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsScaffold.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/LibrarySettingsScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.library
+package org.dueattendant149.bookshelf.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/ui/settings/library/LibrarySettingsTopBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/LibrarySettingsTopBar.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsTopBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/LibrarySettingsTopBar.kt
index 9ca788fe..d3520e85 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/LibrarySettingsTopBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/LibrarySettingsTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.library
+package org.dueattendant149.bookshelf.ui.settings.library
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LargeTopAppBar
@@ -13,9 +13,9 @@ import androidx.compose.material3.TopAppBarDefaults
 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.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/LibraryCategoriesSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/categories/LibraryCategoriesSubcategory.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/LibraryCategoriesSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/categories/LibraryCategoriesSubcategory.kt
index ced62e7a..ec0565f6 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/LibraryCategoriesSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/categories/LibraryCategoriesSubcategory.kt
@@ -6,17 +6,17 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.library.categories
+package org.dueattendant149.bookshelf.ui.settings.library.categories
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
+import org.dueattendant149.bookshelf.ui.settings.library.categories.components.LibraryCategoriesOption
+import org.dueattendant149.bookshelf.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/ui/settings/library/categories/components/LibraryCategoriesOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/categories/components/LibraryCategoriesOption.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/components/LibraryCategoriesOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/categories/components/LibraryCategoriesOption.kt
index b4b57038..279e16ae 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/components/LibraryCategoriesOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/categories/components/LibraryCategoriesOption.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.library.categories.components
+package org.dueattendant149.bookshelf.ui.settings.library.categories.components
 
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.background
@@ -46,18 +46,18 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import sh.calvin.reorderable.ReorderableColumn
 import sh.calvin.reorderable.ReorderableScope
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.domain.model.library.Category
-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.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.helpers.noRippleClickable
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
-import ua.acclorite.book_story.ui.theme.dynamicListItemColor
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.domain.model.library.Category
+import org.dueattendant149.bookshelf.presentation.library.LibraryScreen
+import org.dueattendant149.bookshelf.presentation.settings.SettingsEvent
+import org.dueattendant149.bookshelf.presentation.settings.SettingsModel
+import org.dueattendant149.bookshelf.ui.common.components.common.IconButton
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.common.components.dialog.Dialog
+import org.dueattendant149.bookshelf.ui.common.components.dialog.DialogWithTextField
+import org.dueattendant149.bookshelf.ui.common.helpers.noRippleClickable
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.ui.theme.dynamicListItemColor
 
 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/ui/settings/library/categories/components/LibraryCategoriesOptionNote.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/categories/components/LibraryCategoriesOptionNote.kt
similarity index 66%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/components/LibraryCategoriesOptionNote.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/categories/components/LibraryCategoriesOptionNote.kt
index 1d60e3be..892c54a6 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/components/LibraryCategoriesOptionNote.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/categories/components/LibraryCategoriesOptionNote.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.library.categories.components
+package org.dueattendant149.bookshelf.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.ui.settings.components.SettingsSubcategoryNote
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategoryNote
 
 @Composable
 fun LibraryCategoriesOptionNote() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/LibraryDisplaySubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/display/LibraryDisplaySubcategory.kt
similarity index 63%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/LibraryDisplaySubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/display/LibraryDisplaySubcategory.kt
index dfc1b4b0..01448bc0 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/LibraryDisplaySubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/display/LibraryDisplaySubcategory.kt
@@ -6,20 +6,20 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.library.display
+package org.dueattendant149.bookshelf.ui.settings.library.display
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
+import org.dueattendant149.bookshelf.ui.settings.library.display.components.LibraryGridSizeOption
+import org.dueattendant149.bookshelf.ui.settings.library.display.components.LibraryLayoutOption
+import org.dueattendant149.bookshelf.ui.settings.library.display.components.LibraryReadButtonOption
+import org.dueattendant149.bookshelf.ui.settings.library.display.components.LibraryShowProgressOption
+import org.dueattendant149.bookshelf.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/ui/settings/library/display/components/LibraryGridSizeOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/display/components/LibraryGridSizeOption.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryGridSizeOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/display/components/LibraryGridSizeOption.kt
index 47e6f7c5..78038055 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryGridSizeOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/display/components/LibraryGridSizeOption.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.library.display.components
+package org.dueattendant149.bookshelf.ui.settings.library.display.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.library.model.LibraryLayout
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.library.model.LibraryLayout
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun LibraryGridSizeOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryLayoutOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/display/components/LibraryLayoutOption.kt
similarity index 64%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryLayoutOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/display/components/LibraryLayoutOption.kt
index 43998685..d169fdea 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryLayoutOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/display/components/LibraryLayoutOption.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.library.display.components
+package org.dueattendant149.bookshelf.ui.settings.library.display.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.library.model.LibraryLayout
-import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.library.model.LibraryLayout
+import org.dueattendant149.bookshelf.ui.common.components.settings.SegmentedButtonWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
 
 @Composable
 fun LibraryLayoutOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryReadButtonOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/display/components/LibraryReadButtonOption.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryReadButtonOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/display/components/LibraryReadButtonOption.kt
index ea4a0fbd..e2017e7d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryReadButtonOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/display/components/LibraryReadButtonOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.library.display.components
+package org.dueattendant149.bookshelf.ui.settings.library.display.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun LibraryReadButtonOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryShowProgressOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/display/components/LibraryShowProgressOption.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryShowProgressOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/display/components/LibraryShowProgressOption.kt
index 6332c26f..72f8d490 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryShowProgressOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/display/components/LibraryShowProgressOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.library.display.components
+package org.dueattendant149.bookshelf.ui.settings.library.display.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun LibraryShowProgressOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryTitlePositionOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/display/components/LibraryTitlePositionOption.kt
similarity index 62%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryTitlePositionOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/display/components/LibraryTitlePositionOption.kt
index 1413265a..e3480903 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryTitlePositionOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/display/components/LibraryTitlePositionOption.kt
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.library.display.components
+package org.dueattendant149.bookshelf.ui.settings.library.display.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.library.model.LibraryLayout
-import ua.acclorite.book_story.presentation.library.model.LibraryTitlePosition
-import ua.acclorite.book_story.ui.common.components.settings.ChipsWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.model.ListItem
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.library.model.LibraryLayout
+import org.dueattendant149.bookshelf.presentation.library.model.LibraryTitlePosition
+import org.dueattendant149.bookshelf.ui.common.components.settings.ChipsWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun LibraryTitlePositionOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/LibrarySortSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/sort/LibrarySortSubcategory.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/LibrarySortSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/sort/LibrarySortSubcategory.kt
index 764548a8..597aaff4 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/LibrarySortSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/sort/LibrarySortSubcategory.kt
@@ -6,17 +6,17 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.library.sort
+package org.dueattendant149.bookshelf.ui.settings.library.sort
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.ui.settings.components.SettingsSubcategory
-import ua.acclorite.book_story.ui.settings.library.sort.components.LibraryPerCategorySortOption
-import ua.acclorite.book_story.ui.settings.library.sort.components.LibraryPerCategorySortOptionNote
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
+import org.dueattendant149.bookshelf.ui.settings.library.sort.components.LibraryPerCategorySortOption
+import org.dueattendant149.bookshelf.ui.settings.library.sort.components.LibraryPerCategorySortOptionNote
 
 fun LazyListScope.LibrarySortSubcategory(
     titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/components/LibraryPerCategorySortOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/sort/components/LibraryPerCategorySortOption.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/components/LibraryPerCategorySortOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/sort/components/LibraryPerCategorySortOption.kt
index ba2753f5..7f0bd1da 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/components/LibraryPerCategorySortOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/sort/components/LibraryPerCategorySortOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.library.sort.components
+package org.dueattendant149.bookshelf.ui.settings.library.sort.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun LibraryPerCategorySortOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/components/LibraryPerCategorySortOptionNote.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/sort/components/LibraryPerCategorySortOptionNote.kt
similarity index 67%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/components/LibraryPerCategorySortOptionNote.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/sort/components/LibraryPerCategorySortOptionNote.kt
index f228c405..12b5b93d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/components/LibraryPerCategorySortOptionNote.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/sort/components/LibraryPerCategorySortOptionNote.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.library.sort.components
+package org.dueattendant149.bookshelf.ui.settings.library.sort.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryNote
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategoryNote
 
 @Composable
 fun LibraryPerCategorySortOptionNote() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/components/LibrarySortOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/sort/components/LibrarySortOption.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/components/LibrarySortOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/sort/components/LibrarySortOption.kt
index 81592eb8..cfac8bb8 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/sort/components/LibrarySortOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/sort/components/LibrarySortOption.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.library.sort.components
+package org.dueattendant149.bookshelf.ui.settings.library.sort.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
@@ -28,9 +28,9 @@ import androidx.compose.ui.Modifier
 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.library.model.LibrarySortOrder
-import ua.acclorite.book_story.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.library.model.LibrarySortOrder
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 fun LazyListScope.LibrarySortOption(
     sortOrder: LibrarySortOrder,
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/LibraryTabsSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/tabs/LibraryTabsSubcategory.kt
similarity index 68%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/LibraryTabsSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/tabs/LibraryTabsSubcategory.kt
index 32fe8806..c777c8ac 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/LibraryTabsSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/tabs/LibraryTabsSubcategory.kt
@@ -6,18 +6,18 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.library.tabs
+package org.dueattendant149.bookshelf.ui.settings.library.tabs
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
+import org.dueattendant149.bookshelf.ui.settings.library.tabs.components.LibraryAlwaysShowDefaultTabOption
+import org.dueattendant149.bookshelf.ui.settings.library.tabs.components.LibraryShowBookCountOption
+import org.dueattendant149.bookshelf.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/ui/settings/library/tabs/components/LibraryAlwaysShowDefaultTabOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/tabs/components/LibraryAlwaysShowDefaultTabOption.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/components/LibraryAlwaysShowDefaultTabOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/tabs/components/LibraryAlwaysShowDefaultTabOption.kt
index 8b87120a..db816ff5 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/components/LibraryAlwaysShowDefaultTabOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/tabs/components/LibraryAlwaysShowDefaultTabOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.library.tabs.components
+package org.dueattendant149.bookshelf.ui.settings.library.tabs.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun LibraryAlwaysShowDefaultTabOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/components/LibraryShowBookCountOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/tabs/components/LibraryShowBookCountOption.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/components/LibraryShowBookCountOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/tabs/components/LibraryShowBookCountOption.kt
index 4806149d..6482dc99 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/components/LibraryShowBookCountOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/tabs/components/LibraryShowBookCountOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.library.tabs.components
+package org.dueattendant149.bookshelf.ui.settings.library.tabs.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun LibraryShowBookCountOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/components/LibraryShowCategoryTabsOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/tabs/components/LibraryShowCategoryTabsOption.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/components/LibraryShowCategoryTabsOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/tabs/components/LibraryShowCategoryTabsOption.kt
index da619824..f58dc3ec 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/tabs/components/LibraryShowCategoryTabsOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/library/tabs/components/LibraryShowCategoryTabsOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.library.tabs.components
+package org.dueattendant149.bookshelf.ui.settings.library.tabs.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun LibraryShowCategoryTabsOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsCategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/ReaderSettingsCategory.kt
similarity index 55%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsCategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/ReaderSettingsCategory.kt
index 0e25c1d6..dfb3086f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsCategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/ReaderSettingsCategory.kt
@@ -6,23 +6,23 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.reader
+package org.dueattendant149.bookshelf.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.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
+import org.dueattendant149.bookshelf.ui.settings.reader.chapters.ChaptersSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.font.FontSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.images.ImagesSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.misc.MiscSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.padding.PaddingSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.progress.ProgressSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.reading_mode.ReadingModeSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.ReadingSpeedSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.system.SystemSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.text.TextSubcategory
+import org.dueattendant149.bookshelf.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/ui/settings/reader/ReaderSettingsContent.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/ReaderSettingsContent.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsContent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/ReaderSettingsContent.kt
index 59de0329..809247be 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsContent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/ReaderSettingsContent.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader
+package org.dueattendant149.bookshelf.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/ui/settings/reader/ReaderSettingsLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/ReaderSettingsLayout.kt
similarity index 83%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/ReaderSettingsLayout.kt
index 07e4f3e5..8354c402 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/ReaderSettingsLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader
+package org.dueattendant149.bookshelf.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.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun ReaderSettingsLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsScaffold.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/ReaderSettingsScaffold.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsScaffold.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/ReaderSettingsScaffold.kt
index 07b8ed93..15603b1d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsScaffold.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/ReaderSettingsScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader
+package org.dueattendant149.bookshelf.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/ui/settings/reader/ReaderSettingsTopBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/ReaderSettingsTopBar.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsTopBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/ReaderSettingsTopBar.kt
index 5ec683f9..c1019bac 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/ReaderSettingsTopBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/ReaderSettingsTopBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader
+package org.dueattendant149.bookshelf.ui.settings.reader
 
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LargeTopAppBar
@@ -13,9 +13,9 @@ import androidx.compose.material3.TopAppBarDefaults
 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.ui.common.components.common.StyledText
-import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.ui.navigator.NavigatorBackIconButton
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/chapters/ChaptersSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/chapters/ChaptersSubcategory.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/chapters/ChaptersSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/chapters/ChaptersSubcategory.kt
index 90cf4d22..e69a2cad 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/chapters/ChaptersSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/chapters/ChaptersSubcategory.kt
@@ -6,16 +6,16 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.reader.chapters
+package org.dueattendant149.bookshelf.ui.settings.reader.chapters
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.ui.settings.components.SettingsSubcategory
-import ua.acclorite.book_story.ui.settings.reader.chapters.components.ChapterTitleAlignmentOption
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
+import org.dueattendant149.bookshelf.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/ui/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt
similarity index 65%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt
index 1a9181b3..b86be71e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.chapters.components
+package org.dueattendant149.bookshelf.ui.settings.reader.chapters.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-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.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderTextAlignment
+import org.dueattendant149.bookshelf.ui.common.components.settings.SegmentedButtonWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
 
 @Composable
 fun ChapterTitleAlignmentOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/FontSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/font/FontSubcategory.kt
similarity index 64%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/FontSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/font/FontSubcategory.kt
index f3d66f7f..5bb80548 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/FontSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/font/FontSubcategory.kt
@@ -6,20 +6,20 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.reader.font
+package org.dueattendant149.bookshelf.ui.settings.reader.font
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.font.components.FontFamilyOption
+import org.dueattendant149.bookshelf.ui.settings.reader.font.components.FontSizeOption
+import org.dueattendant149.bookshelf.ui.settings.reader.font.components.FontStyleOption
+import org.dueattendant149.bookshelf.ui.settings.reader.font.components.FontThicknessOption
+import org.dueattendant149.bookshelf.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/ui/settings/reader/font/components/FontFamilyOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/font/components/FontFamilyOption.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontFamilyOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/font/components/FontFamilyOption.kt
index 1ae1e971..0b69654f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontFamilyOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/font/components/FontFamilyOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.font.components
+package org.dueattendant149.bookshelf.ui.settings.reader.font.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.ChipsWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.model.ListItem
-import ua.acclorite.book_story.ui.reader.data.ReaderData
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.ChipsWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.ui.reader.data.ReaderData
 
 @Composable
 fun FontFamilyOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontSizeOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/font/components/FontSizeOption.kt
similarity index 68%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontSizeOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/font/components/FontSizeOption.kt
index 5f0fca0e..e8776cee 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontSizeOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/font/components/FontSizeOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.font.components
+package org.dueattendant149.bookshelf.ui.settings.reader.font.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun FontSizeOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontStyleOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/font/components/FontStyleOption.kt
similarity index 81%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontStyleOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/font/components/FontStyleOption.kt
index 68f0e4a4..be39ab44 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontStyleOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/font/components/FontStyleOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.font.components
+package org.dueattendant149.bookshelf.ui.settings.reader.font.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontStyle
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SegmentedButtonWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
 
 @Composable
 fun FontStyleOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontThicknessOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/font/components/FontThicknessOption.kt
similarity index 72%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontThicknessOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/font/components/FontThicknessOption.kt
index 59adb770..2becc6fd 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/FontThicknessOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/font/components/FontThicknessOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.font.components
+package org.dueattendant149.bookshelf.ui.settings.reader.font.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-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.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderFontThickness
+import org.dueattendant149.bookshelf.ui.common.components.settings.ChipsWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
 
 @Composable
 fun FontThicknessOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/LetterSpacingOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/font/components/LetterSpacingOption.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/LetterSpacingOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/font/components/LetterSpacingOption.kt
index 0324c461..ac194967 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/font/components/LetterSpacingOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/font/components/LetterSpacingOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.font.components
+package org.dueattendant149.bookshelf.ui.settings.reader.font.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun LetterSpacingOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/ImagesSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/ImagesSubcategory.kt
similarity index 61%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/ImagesSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/ImagesSubcategory.kt
index 4da29173..937734e6 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/ImagesSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/ImagesSubcategory.kt
@@ -6,21 +6,21 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.reader.images
+package org.dueattendant149.bookshelf.ui.settings.reader.images
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.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.ImagesCaptionsOption
-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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.images.components.ImagesAlignmentOption
+import org.dueattendant149.bookshelf.ui.settings.reader.images.components.ImagesCaptionsOption
+import org.dueattendant149.bookshelf.ui.settings.reader.images.components.ImagesColorEffectsOption
+import org.dueattendant149.bookshelf.ui.settings.reader.images.components.ImagesCornersRoundnessOption
+import org.dueattendant149.bookshelf.ui.settings.reader.images.components.ImagesOption
+import org.dueattendant149.bookshelf.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/ui/settings/reader/images/components/ImagesAlignmentOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/components/ImagesAlignmentOption.kt
similarity index 65%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesAlignmentOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/components/ImagesAlignmentOption.kt
index 73357ada..37d5f4d9 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesAlignmentOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/components/ImagesAlignmentOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.images.components
+package org.dueattendant149.bookshelf.ui.settings.reader.images.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.model.ListItem
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
-import ua.acclorite.book_story.ui.theme.model.HorizontalAlignment
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SegmentedButtonWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.ui.theme.model.HorizontalAlignment
 
 @Composable
 fun ImagesAlignmentOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesCaptionsOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/components/ImagesCaptionsOption.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesCaptionsOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/components/ImagesCaptionsOption.kt
index f90e1a19..0eab435e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesCaptionsOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/components/ImagesCaptionsOption.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.images.components
+package org.dueattendant149.bookshelf.ui.settings.reader.images.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun ImagesCaptionsOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesColorEffectsOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/components/ImagesColorEffectsOption.kt
similarity index 65%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesColorEffectsOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/components/ImagesColorEffectsOption.kt
index ffdbde49..4b23c845 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesColorEffectsOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/components/ImagesColorEffectsOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.images.components
+package org.dueattendant149.bookshelf.ui.settings.reader.images.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.reader.model.ReaderColorEffects
-import ua.acclorite.book_story.ui.common.components.settings.ChipsWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.model.ListItem
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderColorEffects
+import org.dueattendant149.bookshelf.ui.common.components.settings.ChipsWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun ImagesColorEffectsOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesCornersRoundnessOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/components/ImagesCornersRoundnessOption.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesCornersRoundnessOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/components/ImagesCornersRoundnessOption.kt
index e0ea0d60..e6a941dc 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesCornersRoundnessOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/components/ImagesCornersRoundnessOption.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.images.components
+package org.dueattendant149.bookshelf.ui.settings.reader.images.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun ImagesCornersRoundnessOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/components/ImagesOption.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/components/ImagesOption.kt
index 753788cc..4f0e0277 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/components/ImagesOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.images.components
+package org.dueattendant149.bookshelf.ui.settings.reader.images.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun ImagesOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesWidthOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/components/ImagesWidthOption.kt
similarity index 66%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesWidthOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/components/ImagesWidthOption.kt
index da7b702a..dbac8d82 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesWidthOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/images/components/ImagesWidthOption.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.images.components
+package org.dueattendant149.bookshelf.ui.settings.reader.images.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun ImagesWidthOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/MiscSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/misc/MiscSubcategory.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/MiscSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/misc/MiscSubcategory.kt
index c5869f2b..91e8213f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/MiscSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/misc/MiscSubcategory.kt
@@ -6,18 +6,18 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.reader.misc
+package org.dueattendant149.bookshelf.ui.settings.reader.misc
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.misc.components.FullscreenOption
+import org.dueattendant149.bookshelf.ui.settings.reader.misc.components.HideBarsOnFastScrollOption
+import org.dueattendant149.bookshelf.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/ui/settings/reader/misc/components/FullscreenOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/misc/components/FullscreenOption.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/components/FullscreenOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/misc/components/FullscreenOption.kt
index eb8ad6fd..550f4cb4 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/components/FullscreenOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/misc/components/FullscreenOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.misc.components
+package org.dueattendant149.bookshelf.ui.settings.reader.misc.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun FullscreenOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/components/HideBarsOnFastScrollOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/misc/components/HideBarsOnFastScrollOption.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/components/HideBarsOnFastScrollOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/misc/components/HideBarsOnFastScrollOption.kt
index ef0530d5..1a8e744a 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/components/HideBarsOnFastScrollOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/misc/components/HideBarsOnFastScrollOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.misc.components
+package org.dueattendant149.bookshelf.ui.settings.reader.misc.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun HideBarsOnFastScrollOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/components/KeepScreenOnOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/misc/components/KeepScreenOnOption.kt
similarity index 68%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/components/KeepScreenOnOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/misc/components/KeepScreenOnOption.kt
index e9e9eac1..7a534f10 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/misc/components/KeepScreenOnOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/misc/components/KeepScreenOnOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.misc.components
+package org.dueattendant149.bookshelf.ui.settings.reader.misc.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun KeepScreenOnOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/PaddingSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/padding/PaddingSubcategory.kt
similarity index 66%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/PaddingSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/padding/PaddingSubcategory.kt
index 4f7e1c44..cfc374ad 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/PaddingSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/padding/PaddingSubcategory.kt
@@ -6,19 +6,19 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.reader.padding
+package org.dueattendant149.bookshelf.ui.settings.reader.padding
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.padding.components.BottomBarPaddingOption
+import org.dueattendant149.bookshelf.ui.settings.reader.padding.components.CutoutPaddingOption
+import org.dueattendant149.bookshelf.ui.settings.reader.padding.components.SidePaddingOption
+import org.dueattendant149.bookshelf.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/ui/settings/reader/padding/components/BottomBarPaddingOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/padding/components/BottomBarPaddingOption.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/BottomBarPaddingOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/padding/components/BottomBarPaddingOption.kt
index 81721fbc..8970668f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/BottomBarPaddingOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/padding/components/BottomBarPaddingOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.padding.components
+package org.dueattendant149.bookshelf.ui.settings.reader.padding.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun BottomBarPaddingOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/CutoutPaddingOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/padding/components/CutoutPaddingOption.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/CutoutPaddingOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/padding/components/CutoutPaddingOption.kt
index 4986c068..21bb20bc 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/CutoutPaddingOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/padding/components/CutoutPaddingOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.padding.components
+package org.dueattendant149.bookshelf.ui.settings.reader.padding.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun CutoutPaddingOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/SidePaddingOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/padding/components/SidePaddingOption.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/SidePaddingOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/padding/components/SidePaddingOption.kt
index cc670d08..01209a57 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/SidePaddingOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/padding/components/SidePaddingOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.padding.components
+package org.dueattendant149.bookshelf.ui.settings.reader.padding.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun SidePaddingOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/VerticalPaddingOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/padding/components/VerticalPaddingOption.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/VerticalPaddingOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/padding/components/VerticalPaddingOption.kt
index e9fdee70..bb39d3cf 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/padding/components/VerticalPaddingOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/padding/components/VerticalPaddingOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.padding.components
+package org.dueattendant149.bookshelf.ui.settings.reader.padding.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun VerticalPaddingOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/ProgressSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/progress/ProgressSubcategory.kt
similarity index 63%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/ProgressSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/progress/ProgressSubcategory.kt
index e392c381..ac679ef1 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/ProgressSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/progress/ProgressSubcategory.kt
@@ -6,20 +6,20 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.reader.progress
+package org.dueattendant149.bookshelf.ui.settings.reader.progress
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.progress.components.ProgressBarAlignmentOption
+import org.dueattendant149.bookshelf.ui.settings.reader.progress.components.ProgressBarFontSizeOption
+import org.dueattendant149.bookshelf.ui.settings.reader.progress.components.ProgressBarOption
+import org.dueattendant149.bookshelf.ui.settings.reader.progress.components.ProgressBarPaddingOption
+import org.dueattendant149.bookshelf.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/ui/settings/reader/progress/components/ProgressBarAlignmentOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/progress/components/ProgressBarAlignmentOption.kt
similarity index 66%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarAlignmentOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/progress/components/ProgressBarAlignmentOption.kt
index 54314114..11abfade 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarAlignmentOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/progress/components/ProgressBarAlignmentOption.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.progress.components
+package org.dueattendant149.bookshelf.ui.settings.reader.progress.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.model.ListItem
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
-import ua.acclorite.book_story.ui.theme.model.HorizontalAlignment
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SegmentedButtonWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.ui.theme.model.HorizontalAlignment
 
 @Composable
 fun ProgressBarAlignmentOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarFontSizeOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/progress/components/ProgressBarFontSizeOption.kt
similarity index 68%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarFontSizeOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/progress/components/ProgressBarFontSizeOption.kt
index 86289554..7ca4c453 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarFontSizeOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/progress/components/ProgressBarFontSizeOption.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.progress.components
+package org.dueattendant149.bookshelf.ui.settings.reader.progress.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun ProgressBarFontSizeOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/progress/components/ProgressBarOption.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/progress/components/ProgressBarOption.kt
index 702d3dd5..944c60b3 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/progress/components/ProgressBarOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.progress.components
+package org.dueattendant149.bookshelf.ui.settings.reader.progress.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun ProgressBarOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarPaddingOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/progress/components/ProgressBarPaddingOption.kt
similarity index 68%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarPaddingOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/progress/components/ProgressBarPaddingOption.kt
index 37e3c6fa..df336866 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarPaddingOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/progress/components/ProgressBarPaddingOption.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.progress.components
+package org.dueattendant149.bookshelf.ui.settings.reader.progress.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun ProgressBarPaddingOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressCountOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/progress/components/ProgressCountOption.kt
similarity index 64%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressCountOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/progress/components/ProgressCountOption.kt
index ec330a39..bc5f2190 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressCountOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/progress/components/ProgressCountOption.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.progress.components
+package org.dueattendant149.bookshelf.ui.settings.reader.progress.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-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.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderProgressCount
+import org.dueattendant149.bookshelf.ui.common.components.settings.SegmentedButtonWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
 
 @Composable
 fun ProgressCountOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/ReadingModeSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/ReadingModeSubcategory.kt
similarity index 60%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/ReadingModeSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/ReadingModeSubcategory.kt
index db1062e9..706f3f16 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/ReadingModeSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/ReadingModeSubcategory.kt
@@ -6,21 +6,21 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.reader.reading_mode
+package org.dueattendant149.bookshelf.ui.settings.reader.reading_mode
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.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.HorizontalGestureDisableScrollingOption
-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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.reading_mode.components.HorizontalGestureAlphaAnimOption
+import org.dueattendant149.bookshelf.ui.settings.reader.reading_mode.components.HorizontalGestureDisableScrollingOption
+import org.dueattendant149.bookshelf.ui.settings.reader.reading_mode.components.HorizontalGestureOption
+import org.dueattendant149.bookshelf.ui.settings.reader.reading_mode.components.HorizontalGesturePullAnimOption
+import org.dueattendant149.bookshelf.ui.settings.reader.reading_mode.components.HorizontalGestureScrollOption
+import org.dueattendant149.bookshelf.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/ui/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt
index d7572199..6fda91b0 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.reading_mode.components
+package org.dueattendant149.bookshelf.ui.settings.reader.reading_mode.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderHorizontalGesture
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun HorizontalGestureAlphaAnimOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureDisableScrollingOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/components/HorizontalGestureDisableScrollingOption.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureDisableScrollingOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/components/HorizontalGestureDisableScrollingOption.kt
index 19b963ec..675d36d6 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureDisableScrollingOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/components/HorizontalGestureDisableScrollingOption.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.reading_mode.components
+package org.dueattendant149.bookshelf.ui.settings.reader.reading_mode.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderHorizontalGesture
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun HorizontalGestureDisableScrollingOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/components/HorizontalGestureOption.kt
similarity index 65%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/components/HorizontalGestureOption.kt
index d234559a..77509219 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/components/HorizontalGestureOption.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.reading_mode.components
+package org.dueattendant149.bookshelf.ui.settings.reader.reading_mode.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-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.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderHorizontalGesture
+import org.dueattendant149.bookshelf.ui.common.components.settings.ChipsWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
 
 @Composable
 fun HorizontalGestureOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt
index f5270773..3ae1be76 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.reading_mode.components
+package org.dueattendant149.bookshelf.ui.settings.reader.reading_mode.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderHorizontalGesture
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun HorizontalGesturePullAnimOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt
similarity index 66%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt
index 7b28d69d..155f213d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.reading_mode.components
+package org.dueattendant149.bookshelf.ui.settings.reader.reading_mode.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderHorizontalGesture
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun HorizontalGestureScrollOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt
similarity index 66%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt
index 642dbd2c..3d606685 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.reading_mode.components
+package org.dueattendant149.bookshelf.ui.settings.reader.reading_mode.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderHorizontalGesture
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun HorizontalGestureSensitivityOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/ReadingSpeedSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/ReadingSpeedSubcategory.kt
similarity index 53%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/ReadingSpeedSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/ReadingSpeedSubcategory.kt
index 291ac213..17e5ad84 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/ReadingSpeedSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/ReadingSpeedSubcategory.kt
@@ -6,26 +6,26 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.reader.reading_speed
+package org.dueattendant149.bookshelf.ui.settings.reader.reading_speed
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.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.HorizontalLimiterDimmingOption
-import ua.acclorite.book_story.ui.settings.reader.reading_speed.components.HorizontalLimiterHeightOption
-import ua.acclorite.book_story.ui.settings.reader.reading_speed.components.HorizontalLimiterOption
-import ua.acclorite.book_story.ui.settings.reader.reading_speed.components.HorizontalLimiterRulerOption
-import ua.acclorite.book_story.ui.settings.reader.reading_speed.components.HorizontalLimiterRulerThicknessOption
-import ua.acclorite.book_story.ui.settings.reader.reading_speed.components.HorizontalLimiterVerticalOffsetOption
-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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components.HighlightedReadingOption
+import org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components.HighlightedReadingThicknessOption
+import org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components.HorizontalLimiterDimmingOption
+import org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components.HorizontalLimiterHeightOption
+import org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components.HorizontalLimiterOption
+import org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components.HorizontalLimiterRulerOption
+import org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components.HorizontalLimiterRulerThicknessOption
+import org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components.HorizontalLimiterVerticalOffsetOption
+import org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components.PerceptionExpanderOption
+import org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components.PerceptionExpanderPaddingOption
+import org.dueattendant149.bookshelf.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/ui/settings/reader/reading_speed/components/HighlightedReadingOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HighlightedReadingOption.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HighlightedReadingOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HighlightedReadingOption.kt
index bd19edc5..1bd11074 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HighlightedReadingOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HighlightedReadingOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.reading_speed.components
+package org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun HighlightedReadingOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt
index 643473e9..38796ae1 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.reading_speed.components
+package org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun HighlightedReadingThicknessOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HorizontalLimiterDimmingOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HorizontalLimiterDimmingOption.kt
similarity index 68%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HorizontalLimiterDimmingOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HorizontalLimiterDimmingOption.kt
index ccd3d38e..20a52b36 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HorizontalLimiterDimmingOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HorizontalLimiterDimmingOption.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.reading_speed.components
+package org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun HorizontalLimiterDimmingOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HorizontalLimiterHeightOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HorizontalLimiterHeightOption.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HorizontalLimiterHeightOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HorizontalLimiterHeightOption.kt
index dbeebc4b..a1a04f08 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HorizontalLimiterHeightOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HorizontalLimiterHeightOption.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.reading_speed.components
+package org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun HorizontalLimiterHeightOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HorizontalLimiterOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HorizontalLimiterOption.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HorizontalLimiterOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HorizontalLimiterOption.kt
index f73197db..e5415142 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HorizontalLimiterOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HorizontalLimiterOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.reading_speed.components
+package org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun HorizontalLimiterOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HorizontalLimiterRulerOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HorizontalLimiterRulerOption.kt
similarity index 68%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HorizontalLimiterRulerOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HorizontalLimiterRulerOption.kt
index 36db8f19..84f958e1 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HorizontalLimiterRulerOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HorizontalLimiterRulerOption.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.reading_speed.components
+package org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun HorizontalLimiterRulerOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HorizontalLimiterRulerThicknessOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HorizontalLimiterRulerThicknessOption.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HorizontalLimiterRulerThicknessOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HorizontalLimiterRulerThicknessOption.kt
index 0596ecef..977f437f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HorizontalLimiterRulerThicknessOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HorizontalLimiterRulerThicknessOption.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.reading_speed.components
+package org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun HorizontalLimiterRulerThicknessOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HorizontalLimiterVerticalOffsetOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HorizontalLimiterVerticalOffsetOption.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HorizontalLimiterVerticalOffsetOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HorizontalLimiterVerticalOffsetOption.kt
index 53990143..3aae9cf5 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HorizontalLimiterVerticalOffsetOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/HorizontalLimiterVerticalOffsetOption.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.reading_speed.components
+package org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun HorizontalLimiterVerticalOffsetOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/PerceptionExpanderOption.kt
similarity index 71%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/PerceptionExpanderOption.kt
index 76724ec6..29a4fadd 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/PerceptionExpanderOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.reading_speed.components
+package org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun PerceptionExpanderOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt
index c5fb0ace..dc32bdc4 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.reading_speed.components
+package org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun PerceptionExpanderPaddingOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt
index 0c867b57..85ddbb71 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.reading_speed.components
+package org.dueattendant149.bookshelf.ui.settings.reader.reading_speed.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun PerceptionExpanderThicknessOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/SystemSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/system/SystemSubcategory.kt
similarity index 68%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/SystemSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/system/SystemSubcategory.kt
index 799ec423..c4d7bcc9 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/SystemSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/system/SystemSubcategory.kt
@@ -6,18 +6,18 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.reader.system
+package org.dueattendant149.bookshelf.ui.settings.reader.system
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.system.components.CustomScreenBrightnessOption
+import org.dueattendant149.bookshelf.ui.settings.reader.system.components.ScreenBrightnessOption
+import org.dueattendant149.bookshelf.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/ui/settings/reader/system/components/CustomScreenBrightnessOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/system/components/CustomScreenBrightnessOption.kt
similarity index 70%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/CustomScreenBrightnessOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/system/components/CustomScreenBrightnessOption.kt
index 24e6a6f7..f64488d1 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/CustomScreenBrightnessOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/system/components/CustomScreenBrightnessOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.system.components
+package org.dueattendant149.bookshelf.ui.settings.reader.system.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun CustomScreenBrightnessOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/ScreenBrightnessOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/system/components/ScreenBrightnessOption.kt
similarity index 68%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/ScreenBrightnessOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/system/components/ScreenBrightnessOption.kt
index 3edc200d..0f9df9fb 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/ScreenBrightnessOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/system/components/ScreenBrightnessOption.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.system.components
+package org.dueattendant149.bookshelf.ui.settings.reader.system.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun ScreenBrightnessOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/ScreenOrientationOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/system/components/ScreenOrientationOption.kt
similarity index 65%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/ScreenOrientationOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/system/components/ScreenOrientationOption.kt
index abcf41bc..3a532963 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/ScreenOrientationOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/system/components/ScreenOrientationOption.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.system.components
+package org.dueattendant149.bookshelf.ui.settings.reader.system.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-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.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderScreenOrientation
+import org.dueattendant149.bookshelf.ui.common.components.settings.ChipsWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
 
 @Composable
 fun ScreenOrientationOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/TextSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/text/TextSubcategory.kt
similarity index 66%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/TextSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/text/TextSubcategory.kt
index c7c2140f..057f61e0 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/TextSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/text/TextSubcategory.kt
@@ -6,19 +6,19 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.reader.text
+package org.dueattendant149.bookshelf.ui.settings.reader.text
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.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
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
+import org.dueattendant149.bookshelf.ui.settings.reader.text.components.LineHeightOption
+import org.dueattendant149.bookshelf.ui.settings.reader.text.components.ParagraphHeightOption
+import org.dueattendant149.bookshelf.ui.settings.reader.text.components.ParagraphIndentationOption
+import org.dueattendant149.bookshelf.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/ui/settings/reader/text/components/LineHeightOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/text/components/LineHeightOption.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/LineHeightOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/text/components/LineHeightOption.kt
index 6291a8bc..4abc0534 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/LineHeightOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/text/components/LineHeightOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.text.components
+package org.dueattendant149.bookshelf.ui.settings.reader.text.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun LineHeightOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/ParagraphHeightOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/text/components/ParagraphHeightOption.kt
similarity index 69%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/ParagraphHeightOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/text/components/ParagraphHeightOption.kt
index 8f9bae86..ee9d889d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/ParagraphHeightOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/text/components/ParagraphHeightOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.text.components
+package org.dueattendant149.bookshelf.ui.settings.reader.text.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun ParagraphHeightOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/ParagraphIndentationOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/text/components/ParagraphIndentationOption.kt
similarity index 67%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/ParagraphIndentationOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/text/components/ParagraphIndentationOption.kt
index 6edaba04..be4894eb 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/ParagraphIndentationOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/text/components/ParagraphIndentationOption.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.text.components
+package org.dueattendant149.bookshelf.ui.settings.reader.text.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment
-import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
-import ua.acclorite.book_story.ui.theme.ExpandingTransition
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderTextAlignment
+import org.dueattendant149.bookshelf.ui.common.components.settings.SliderWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.theme.ExpandingTransition
 
 @Composable
 fun ParagraphIndentationOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/TextAlignmentOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/text/components/TextAlignmentOption.kt
similarity index 64%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/TextAlignmentOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/text/components/TextAlignmentOption.kt
index 4e6fca67..59c0564d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/TextAlignmentOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/text/components/TextAlignmentOption.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.text.components
+package org.dueattendant149.bookshelf.ui.settings.reader.text.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-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.helpers.LocalSettings
-import ua.acclorite.book_story.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.presentation.reader.model.ReaderTextAlignment
+import org.dueattendant149.bookshelf.ui.common.components.settings.SegmentedButtonWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
 
 @Composable
 fun TextAlignmentOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/translator/TranslatorSubcategory.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/translator/TranslatorSubcategory.kt
similarity index 76%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/translator/TranslatorSubcategory.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/translator/TranslatorSubcategory.kt
index 5bbf9444..ca99239e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/translator/TranslatorSubcategory.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/translator/TranslatorSubcategory.kt
@@ -6,16 +6,16 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.settings.reader.translator
+package org.dueattendant149.bookshelf.ui.settings.reader.translator
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 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.ui.settings.components.SettingsSubcategory
-import ua.acclorite.book_story.ui.settings.reader.translator.components.DoubleClickTranslationOption
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategory
+import org.dueattendant149.bookshelf.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/ui/settings/reader/translator/components/DoubleClickTranslationOption.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/translator/components/DoubleClickTranslationOption.kt
similarity index 72%
rename from app/src/main/java/ua/acclorite/book_story/ui/settings/reader/translator/components/DoubleClickTranslationOption.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/translator/components/DoubleClickTranslationOption.kt
index 6c54a151..f8aff8b7 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/translator/components/DoubleClickTranslationOption.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/settings/reader/translator/components/DoubleClickTranslationOption.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.settings.reader.translator.components
+package org.dueattendant149.bookshelf.ui.settings.reader.translator.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import ua.acclorite.book_story.R
-import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.settings.SwitchWithTitle
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @Composable
 fun DoubleClickTranslationOption() {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/start/StartBackHandler.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartBackHandler.kt
similarity index 88%
rename from app/src/main/java/ua/acclorite/book_story/ui/start/StartBackHandler.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartBackHandler.kt
index 21052f3c..92c38604 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/start/StartBackHandler.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartBackHandler.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.start
+package org.dueattendant149.bookshelf.ui.start
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/start/StartContent.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartContent.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/start/StartContent.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartContent.kt
index 035ede4f..3f614c88 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/start/StartContent.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartContent.kt
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.start
+package org.dueattendant149.bookshelf.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.core.language.Language
-import ua.acclorite.book_story.presentation.navigator.StackEvent
-import ua.acclorite.book_story.presentation.start.StartScreen
-import ua.acclorite.book_story.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.core.language.Language
+import org.dueattendant149.bookshelf.presentation.navigator.StackEvent
+import org.dueattendant149.bookshelf.presentation.start.StartScreen
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
 
 @Composable
 fun StartContent(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/start/StartContentTransition.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartContentTransition.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/ui/start/StartContentTransition.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartContentTransition.kt
index 2ee129a9..c8166eb3 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/start/StartContentTransition.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartContentTransition.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.start
+package org.dueattendant149.bookshelf.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.presentation.navigator.StackEvent
-import ua.acclorite.book_story.ui.theme.Transitions
+import org.dueattendant149.bookshelf.presentation.navigator.StackEvent
+import org.dueattendant149.bookshelf.ui.theme.Transitions
 
 @Composable
 fun StartContentTransition(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/start/StartDone.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartDone.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/ui/start/StartDone.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartDone.kt
index 3749482e..77126e69 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/start/StartDone.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartDone.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.start
+package org.dueattendant149.bookshelf.ui.start
 
 import androidx.compose.runtime.Composable
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/start/StartDoneBottomBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartDoneBottomBar.kt
similarity index 86%
rename from app/src/main/java/ua/acclorite/book_story/ui/start/StartDoneBottomBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartDoneBottomBar.kt
index 5f8ed886..eaf58f62 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/start/StartDoneBottomBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartDoneBottomBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.start
+package org.dueattendant149.bookshelf.ui.start
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.navigationBarsPadding
@@ -15,8 +15,8 @@ import androidx.compose.runtime.Composable
 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.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun StartDoneBottomBar(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/start/StartDoneLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartDoneLayout.kt
similarity index 93%
rename from app/src/main/java/ua/acclorite/book_story/ui/start/StartDoneLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartDoneLayout.kt
index 1769d0a6..093425d0 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/start/StartDoneLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartDoneLayout.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.start
+package org.dueattendant149.bookshelf.ui.start
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -25,8 +25,8 @@ import androidx.compose.ui.res.painterResource
 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.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun StartDoneLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/start/StartDoneScaffold.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartDoneScaffold.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/start/StartDoneScaffold.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartDoneScaffold.kt
index 771ac8ea..1ad6606c 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/start/StartDoneScaffold.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartDoneScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.start
+package org.dueattendant149.bookshelf.ui.start
 
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettings.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettings.kt
similarity index 82%
rename from app/src/main/java/ua/acclorite/book_story/ui/start/StartSettings.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettings.kt
index c2f46920..2d17ce29 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettings.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettings.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.start
+package org.dueattendant149.bookshelf.ui.start
 
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.core.language.Language
-import ua.acclorite.book_story.presentation.navigator.StackEvent
-import ua.acclorite.book_story.presentation.start.StartScreen
-import ua.acclorite.book_story.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.core.language.Language
+import org.dueattendant149.bookshelf.presentation.navigator.StackEvent
+import org.dueattendant149.bookshelf.presentation.start.StartScreen
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
 
 @Composable
 fun StartSettings(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsBottomBar.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettingsBottomBar.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsBottomBar.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettingsBottomBar.kt
index 5c015a65..202aa313 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsBottomBar.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettingsBottomBar.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.start
+package org.dueattendant149.bookshelf.ui.start
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -17,8 +17,8 @@ import androidx.compose.runtime.Composable
 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.ui.common.components.common.StyledText
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun StartSettingsBottomBar(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayout.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettingsLayout.kt
similarity index 78%
rename from app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayout.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettingsLayout.kt
index d3c789f5..6a2dc245 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayout.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettingsLayout.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.start
+package org.dueattendant149.bookshelf.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.ui.common.components.common.LazyColumnWithScrollbar
+import org.dueattendant149.bookshelf.ui.common.components.common.LazyColumnWithScrollbar
 
 @Composable
 fun StartSettingsLayout(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayoutAppearance.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettingsLayoutAppearance.kt
similarity index 75%
rename from app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayoutAppearance.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettingsLayoutAppearance.kt
index 01b187e2..ee0a8e1e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayoutAppearance.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettingsLayoutAppearance.kt
@@ -6,13 +6,13 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.start
+package org.dueattendant149.bookshelf.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.ui.settings.appearance.theme_preferences.ThemePreferencesSubcategory
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.appearance.theme_preferences.ThemePreferencesSubcategory
 
 fun LazyListScope.StartSettingsLayoutAppearance() {
     ThemePreferencesSubcategory(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayoutGeneral.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettingsLayoutGeneral.kt
similarity index 77%
rename from app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayoutGeneral.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettingsLayoutGeneral.kt
index 75728640..fb27795e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayoutGeneral.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettingsLayoutGeneral.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.start
+package org.dueattendant149.bookshelf.ui.start
 
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
@@ -16,11 +16,11 @@ import androidx.compose.material3.MaterialTheme
 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.core.language.Language
-import ua.acclorite.book_story.ui.common.components.dialog.SelectableDialogItem
-import ua.acclorite.book_story.ui.common.model.ListItem
-import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.core.language.Language
+import org.dueattendant149.bookshelf.ui.common.components.dialog.SelectableDialogItem
+import org.dueattendant149.bookshelf.ui.common.model.ListItem
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategoryTitle
 
 fun LazyListScope.StartSettingsLayoutGeneral(
     languages: List<ListItem<Language>>,
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayoutScan.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettingsLayoutScan.kt
similarity index 79%
rename from app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayoutScan.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettingsLayoutScan.kt
index 71a33817..72fe4786 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsLayoutScan.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettingsLayoutScan.kt
@@ -6,7 +6,7 @@
 
 @file:Suppress("FunctionName")
 
-package ua.acclorite.book_story.ui.start
+package org.dueattendant149.bookshelf.ui.start
 
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
@@ -15,9 +15,9 @@ import androidx.compose.material3.MaterialTheme
 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.ui.settings.browse.scan.components.BrowseScanOption
-import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.settings.browse.scan.components.BrowseScanOption
+import org.dueattendant149.bookshelf.ui.settings.components.SettingsSubcategoryTitle
 
 fun LazyListScope.StartSettingsLayoutScan() {
     item {
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsScaffold.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettingsScaffold.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsScaffold.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettingsScaffold.kt
index 04f96ffe..e1668e86 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/start/StartSettingsScaffold.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/start/StartSettingsScaffold.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.start
+package org.dueattendant149.bookshelf.ui.start
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -24,8 +24,8 @@ import androidx.compose.ui.Modifier
 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.common.components.common.StyledText
+import org.dueattendant149.bookshelf.R
+import org.dueattendant149.bookshelf.ui.common.components.common.StyledText
 
 @Composable
 fun StartSettingsScaffold(
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/Animations.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/Animations.kt
similarity index 96%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/Animations.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/theme/Animations.kt
index 006629af..52b38a1e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/Animations.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/Animations.kt
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme
+package org.dueattendant149.bookshelf.ui.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.theme.model.Theme
-import ua.acclorite.book_story.ui.theme.model.ThemeContrast
+import org.dueattendant149.bookshelf.ui.theme.model.Theme
+import org.dueattendant149.bookshelf.ui.theme.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/org/dueattendant149/bookshelf/ui/theme/Color.kt
similarity index 67%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/Color.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/theme/Color.kt
index 5486fe94..3a82a692 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/Color.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/Color.kt
@@ -4,30 +4,30 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme
+package org.dueattendant149.bookshelf.ui.theme
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.runtime.Composable
-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.grayTheme
-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.ui.theme.model.Theme
-import ua.acclorite.book_story.ui.theme.model.ThemeContrast
+import org.dueattendant149.bookshelf.ui.theme.color.aquaTheme
+import org.dueattendant149.bookshelf.ui.theme.color.blackTheme
+import org.dueattendant149.bookshelf.ui.theme.color.blueTheme
+import org.dueattendant149.bookshelf.ui.theme.color.dynamicTheme
+import org.dueattendant149.bookshelf.ui.theme.color.grayTheme
+import org.dueattendant149.bookshelf.ui.theme.color.green2Theme
+import org.dueattendant149.bookshelf.ui.theme.color.greenGrayTheme
+import org.dueattendant149.bookshelf.ui.theme.color.greenTheme
+import org.dueattendant149.bookshelf.ui.theme.color.lavenderTheme
+import org.dueattendant149.bookshelf.ui.theme.color.marshTheme
+import org.dueattendant149.bookshelf.ui.theme.color.pink2Theme
+import org.dueattendant149.bookshelf.ui.theme.color.pinkTheme
+import org.dueattendant149.bookshelf.ui.theme.color.purpleGrayTheme
+import org.dueattendant149.bookshelf.ui.theme.color.purpleTheme
+import org.dueattendant149.bookshelf.ui.theme.color.redGrayTheme
+import org.dueattendant149.bookshelf.ui.theme.color.redTheme
+import org.dueattendant149.bookshelf.ui.theme.color.yellow2Theme
+import org.dueattendant149.bookshelf.ui.theme.color.yellowTheme
+import org.dueattendant149.bookshelf.ui.theme.model.Theme
+import org.dueattendant149.bookshelf.ui.theme.model.ThemeContrast
 
 
 @Composable
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/Theme.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/Theme.kt
similarity index 91%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/Theme.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/theme/Theme.kt
index 7d800ae6..184ff67a 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/Theme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/Theme.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme
+package org.dueattendant149.bookshelf.ui.theme
 
 import android.app.Activity
 import android.os.Build
@@ -16,8 +16,8 @@ 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.theme.model.Theme
-import ua.acclorite.book_story.ui.theme.model.ThemeContrast
+import org.dueattendant149.bookshelf.ui.theme.model.Theme
+import org.dueattendant149.bookshelf.ui.theme.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/org/dueattendant149/bookshelf/ui/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/org/dueattendant149/bookshelf/ui/theme/ThemeExtensions.kt
index c44919d3..de035d6a 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/ThemeExtensions.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/ThemeExtensions.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme
+package org.dueattendant149.bookshelf.ui.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/org/dueattendant149/bookshelf/ui/theme/ThemeLogger.kt
similarity index 97%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/ThemeLogger.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/theme/ThemeLogger.kt
index 1f244788..02ab69ba 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/ThemeLogger.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/ThemeLogger.kt
@@ -6,12 +6,12 @@
 
 @file:Suppress("unused")
 
-package ua.acclorite.book_story.ui.theme
+package org.dueattendant149.bookshelf.ui.theme
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
-import ua.acclorite.book_story.core.log.logD
+import org.dueattendant149.bookshelf.core.log.logD
 
 private const val TAG = "ThemeLogger"
 
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/Transitions.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/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/org/dueattendant149/bookshelf/ui/theme/Transitions.kt
index 00969503..3d524ea4 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/Transitions.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/Transitions.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme
+package org.dueattendant149.bookshelf.ui.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.ui.common.components.common.AnimatedVisibility
+import org.dueattendant149.bookshelf.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/org/dueattendant149/bookshelf/ui/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/org/dueattendant149/bookshelf/ui/theme/color/AquaTheme.kt
index 757a6814..b2e8eebe 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/AquaTheme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/AquaTheme.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package org.dueattendant149.bookshelf.ui.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.theme.model.ThemeContrast
+import org.dueattendant149.bookshelf.ui.theme.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/org/dueattendant149/bookshelf/ui/theme/color/BlackTheme.kt
similarity index 92%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlackTheme.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/BlackTheme.kt
index 8ef28eaa..cd44f2a5 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlackTheme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/BlackTheme.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package org.dueattendant149.bookshelf.ui.theme.color
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.Color
-import ua.acclorite.book_story.ui.common.helpers.LocalSettings
+import org.dueattendant149.bookshelf.ui.common.helpers.LocalSettings
 
 @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/org/dueattendant149/bookshelf/ui/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/org/dueattendant149/bookshelf/ui/theme/color/BlueTheme.kt
index 042160b3..3108cc3f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlueTheme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/BlueTheme.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package org.dueattendant149.bookshelf.ui.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.theme.model.ThemeContrast
+import org.dueattendant149.bookshelf.ui.theme.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/org/dueattendant149/bookshelf/ui/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/org/dueattendant149/bookshelf/ui/theme/color/DynamicTheme.kt
index eb17aaf0..3c811b0a 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/DynamicTheme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/DynamicTheme.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package org.dueattendant149.bookshelf.ui.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/GrayTheme.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/GrayTheme.kt
similarity index 99%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/color/GrayTheme.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/GrayTheme.kt
index 1f5b7d21..745f2285 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/GrayTheme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/GrayTheme.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package org.dueattendant149.bookshelf.ui.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/Green2Theme.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/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/org/dueattendant149/bookshelf/ui/theme/color/Green2Theme.kt
index 2bdc4408..a99863ca 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/Green2Theme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/Green2Theme.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package org.dueattendant149.bookshelf.ui.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/org/dueattendant149/bookshelf/ui/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/org/dueattendant149/bookshelf/ui/theme/color/GreenGrayTheme.kt
index ddbd5e02..857b41ba 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenGrayTheme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/GreenGrayTheme.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package org.dueattendant149.bookshelf.ui.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/org/dueattendant149/bookshelf/ui/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/org/dueattendant149/bookshelf/ui/theme/color/GreenTheme.kt
index eb8a88ea..e65f2a2e 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenTheme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/GreenTheme.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package org.dueattendant149.bookshelf.ui.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.theme.model.ThemeContrast
+import org.dueattendant149.bookshelf.ui.theme.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/org/dueattendant149/bookshelf/ui/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/org/dueattendant149/bookshelf/ui/theme/color/LavenderTheme.kt
index ef6a518e..faca2bd4 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/LavenderTheme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/LavenderTheme.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package org.dueattendant149.bookshelf.ui.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.theme.model.ThemeContrast
+import org.dueattendant149.bookshelf.ui.theme.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/org/dueattendant149/bookshelf/ui/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/org/dueattendant149/bookshelf/ui/theme/color/MarshTheme.kt
index 99817cfe..9457026c 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/MarshTheme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/MarshTheme.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package org.dueattendant149.bookshelf.ui.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.theme.model.ThemeContrast
+import org.dueattendant149.bookshelf.ui.theme.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/org/dueattendant149/bookshelf/ui/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/org/dueattendant149/bookshelf/ui/theme/color/Pink2Theme.kt
index 45009fdb..3b389357 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/Pink2Theme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/Pink2Theme.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package org.dueattendant149.bookshelf.ui.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/org/dueattendant149/bookshelf/ui/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/org/dueattendant149/bookshelf/ui/theme/color/PinkTheme.kt
index 8de30b79..c2102d30 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PinkTheme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/PinkTheme.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package org.dueattendant149.bookshelf.ui.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.theme.model.ThemeContrast
+import org.dueattendant149.bookshelf.ui.theme.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/org/dueattendant149/bookshelf/ui/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/org/dueattendant149/bookshelf/ui/theme/color/PurpleGrayTheme.kt
index 143f0d0e..215c7445 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleGrayTheme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/PurpleGrayTheme.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package org.dueattendant149.bookshelf.ui.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/org/dueattendant149/bookshelf/ui/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/org/dueattendant149/bookshelf/ui/theme/color/PurpleTheme.kt
index 834c189a..baddb143 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleTheme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/PurpleTheme.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package org.dueattendant149.bookshelf.ui.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.theme.model.ThemeContrast
+import org.dueattendant149.bookshelf.ui.theme.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/org/dueattendant149/bookshelf/ui/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/org/dueattendant149/bookshelf/ui/theme/color/RedGrayTheme.kt
index 3ccf2d8b..1a6a4725 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedGrayTheme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/RedGrayTheme.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package org.dueattendant149.bookshelf.ui.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/org/dueattendant149/bookshelf/ui/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/org/dueattendant149/bookshelf/ui/theme/color/RedTheme.kt
index 949fbac4..6fab21b1 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedTheme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/RedTheme.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package org.dueattendant149.bookshelf.ui.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.theme.model.ThemeContrast
+import org.dueattendant149.bookshelf.ui.theme.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/org/dueattendant149/bookshelf/ui/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/org/dueattendant149/bookshelf/ui/theme/color/Yellow2Theme.kt
index 15444d3c..6bf969fb 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/Yellow2Theme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/Yellow2Theme.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package org.dueattendant149.bookshelf.ui.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/org/dueattendant149/bookshelf/ui/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/org/dueattendant149/bookshelf/ui/theme/color/YellowTheme.kt
index 1664c2cb..0a994130 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/color/YellowTheme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/color/YellowTheme.kt
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.color
+package org.dueattendant149.bookshelf.ui.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.theme.model.ThemeContrast
+import org.dueattendant149.bookshelf.ui.theme.model.ThemeContrast
 
 private val primaryLight = Color(0xFF845415)
 private val onPrimaryLight = Color(0xFFFFFFFF)
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/model/DarkTheme.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/model/DarkTheme.kt
similarity index 87%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/model/DarkTheme.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/theme/model/DarkTheme.kt
index 4650d4ce..a63f2290 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/model/DarkTheme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/model/DarkTheme.kt
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.model
+package org.dueattendant149.bookshelf.ui.theme.model
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.R
+import org.dueattendant149.bookshelf.R
 
 enum class DarkTheme(@StringRes val title: Int) {
     FOLLOW_SYSTEM(R.string.dark_theme_follow_system),
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/model/HorizontalAlignment.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/model/HorizontalAlignment.kt
similarity index 84%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/model/HorizontalAlignment.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/theme/model/HorizontalAlignment.kt
index baf6d658..b360f121 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/model/HorizontalAlignment.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/model/HorizontalAlignment.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.model
+package org.dueattendant149.bookshelf.ui.theme.model
 
 import androidx.annotation.StringRes
 import androidx.compose.ui.Alignment
-import ua.acclorite.book_story.R
+import org.dueattendant149.bookshelf.R
 
 enum class HorizontalAlignment(val alignment: Alignment, @StringRes val title: Int) {
     START(Alignment.Companion.CenterStart, R.string.alignment_start),
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/model/PureDark.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/model/PureDark.kt
similarity index 89%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/model/PureDark.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/theme/model/PureDark.kt
index 6520d2c3..d71d1c16 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/model/PureDark.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/model/PureDark.kt
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.model
+package org.dueattendant149.bookshelf.ui.theme.model
 
 import android.content.Context
 import android.os.PowerManager
 import androidx.annotation.StringRes
 import androidx.compose.runtime.Composable
-import ua.acclorite.book_story.R
+import org.dueattendant149.bookshelf.R
 
 enum class PureDark(@StringRes val title: Int) {
     OFF(R.string.pure_dark_off),
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/model/Theme.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/model/Theme.kt
similarity index 94%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/model/Theme.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/theme/model/Theme.kt
index 7d1e88a9..4f5a43e7 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/model/Theme.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/model/Theme.kt
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.model
+package org.dueattendant149.bookshelf.ui.theme.model
 
 import android.os.Build
 import androidx.annotation.StringRes
-import ua.acclorite.book_story.R
+import org.dueattendant149.bookshelf.R
 
 enum class Theme(
     val hasThemeContrast: Boolean,
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/model/ThemeContrast.kt b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/model/ThemeContrast.kt
similarity index 80%
rename from app/src/main/java/ua/acclorite/book_story/ui/theme/model/ThemeContrast.kt
rename to app/src/main/java/org/dueattendant149/bookshelf/ui/theme/model/ThemeContrast.kt
index 4acc702a..01d5623f 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/theme/model/ThemeContrast.kt
+++ b/app/src/main/java/org/dueattendant149/bookshelf/ui/theme/model/ThemeContrast.kt
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-package ua.acclorite.book_story.ui.theme.model
+package org.dueattendant149.bookshelf.ui.theme.model
 
 import androidx.annotation.StringRes
-import ua.acclorite.book_story.R
+import org.dueattendant149.bookshelf.R
 
 
 enum class ThemeContrast(@StringRes val title: Int) {