Put everything under a jui subpackage

android/src/main/kotlin/ca/gosyer/jui/android/App.kt

@@ -12,11 +12,11 @@ import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.lifecycleScope
-import ca.gosyer.core.logging.CKLogger
-import ca.gosyer.core.prefs.Preference
-import ca.gosyer.core.prefs.getAsFlow
-import ca.gosyer.data.ui.model.ThemeMode
 import ca.gosyer.jui.android.data.notification.Notifications
+import ca.gosyer.jui.core.logging.CKLogger
+import ca.gosyer.jui.core.prefs.Preference
+import ca.gosyer.jui.core.prefs.getAsFlow
+import ca.gosyer.jui.data.ui.model.ThemeMode
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import java.util.Locale

android/src/main/kotlin/ca/gosyer/jui/android/AppComponent.kt

@@ -8,11 +8,11 @@ package ca.gosyer.jui.android
 
 import android.annotation.SuppressLint
 import android.content.Context
-import ca.gosyer.core.di.AppScope
-import ca.gosyer.data.DataComponent
-import ca.gosyer.data.create
-import ca.gosyer.ui.base.UiComponent
-import ca.gosyer.ui.base.create
+import ca.gosyer.jui.core.di.AppScope
+import ca.gosyer.jui.data.DataComponent
+import ca.gosyer.jui.data.create
+import ca.gosyer.jui.ui.base.UiComponent
+import ca.gosyer.jui.ui.base.create
 import me.tatarka.inject.annotations.Component
 import me.tatarka.inject.annotations.Provides
 

android/src/main/kotlin/ca/gosyer/jui/android/AppMigrations.kt

@@ -6,9 +6,9 @@
 
 package ca.gosyer.jui.android
 
-import ca.gosyer.data.migration.MigrationPreferences
 import ca.gosyer.jui.android.data.update.UpdateCheckWorker
-import ca.gosyer.uicore.vm.ContextWrapper
+import ca.gosyer.jui.data.migration.MigrationPreferences
+import ca.gosyer.jui.uicore.vm.ContextWrapper
 import me.tatarka.inject.annotations.Inject
 
 class AppMigrations @Inject constructor(

android/src/main/kotlin/ca/gosyer/jui/android/MainActivity.kt

@@ -4,10 +4,10 @@ import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.CompositionLocalProvider
-import ca.gosyer.data.base.WebsocketService.Actions
 import ca.gosyer.jui.android.data.download.AndroidDownloadService
-import ca.gosyer.ui.base.theme.AppTheme
-import ca.gosyer.ui.main.MainMenu
+import ca.gosyer.jui.data.base.WebsocketService.Actions
+import ca.gosyer.jui.ui.base.theme.AppTheme
+import ca.gosyer.jui.ui.main.MainMenu
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

android/src/main/kotlin/ca/gosyer/jui/android/ReaderActivity.kt

@@ -16,9 +16,9 @@ import androidx.compose.ui.input.key.KeyEvent
 import androidx.compose.ui.input.key.NativeKeyEvent
 import androidx.compose.ui.input.key.key
 import androidx.lifecycle.lifecycleScope
-import ca.gosyer.ui.base.theme.AppTheme
-import ca.gosyer.ui.reader.ReaderMenu
-import ca.gosyer.ui.reader.supportedKeyList
+import ca.gosyer.jui.ui.base.theme.AppTheme
+import ca.gosyer.jui.ui.reader.ReaderMenu
+import ca.gosyer.jui.ui.reader.supportedKeyList
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
 

android/src/main/kotlin/ca/gosyer/jui/android/data/download/AndroidDownloadService.kt

@@ -11,24 +11,24 @@ import android.content.Context
 import android.content.Intent
 import android.os.IBinder
 import androidx.core.content.ContextCompat
-import ca.gosyer.core.lang.chop
-import ca.gosyer.core.lang.throwIfCancellation
-import ca.gosyer.core.logging.CKLogger
-import ca.gosyer.core.prefs.getAsFlow
-import ca.gosyer.data.base.WebsocketService.Actions
-import ca.gosyer.data.base.WebsocketService.Status
-import ca.gosyer.data.download.DownloadService
-import ca.gosyer.data.download.DownloadService.Companion.status
-import ca.gosyer.data.download.model.DownloadState
-import ca.gosyer.data.download.model.DownloadStatus
-import ca.gosyer.data.server.requests.downloadsQuery
-import ca.gosyer.i18n.MR
 import ca.gosyer.jui.android.AppComponent
 import ca.gosyer.jui.android.R
 import ca.gosyer.jui.android.data.notification.Notifications
 import ca.gosyer.jui.android.util.notification
 import ca.gosyer.jui.android.util.notificationBuilder
 import ca.gosyer.jui.android.util.notificationManager
+import ca.gosyer.jui.core.lang.chop
+import ca.gosyer.jui.core.lang.throwIfCancellation
+import ca.gosyer.jui.core.logging.CKLogger
+import ca.gosyer.jui.core.prefs.getAsFlow
+import ca.gosyer.jui.data.base.WebsocketService.Actions
+import ca.gosyer.jui.data.base.WebsocketService.Status
+import ca.gosyer.jui.data.download.DownloadService
+import ca.gosyer.jui.data.download.DownloadService.Companion.status
+import ca.gosyer.jui.data.download.model.DownloadState
+import ca.gosyer.jui.data.download.model.DownloadStatus
+import ca.gosyer.jui.data.server.requests.downloadsQuery
+import ca.gosyer.jui.i18n.MR
 import dev.icerock.moko.resources.desc.desc
 import dev.icerock.moko.resources.format
 import io.ktor.client.features.websocket.ws

android/src/main/kotlin/ca/gosyer/jui/android/data/notification/Notifications.kt

@@ -8,9 +8,9 @@ package ca.gosyer.jui.android.data.notification
 
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
-import ca.gosyer.i18n.MR
 import ca.gosyer.jui.android.util.buildNotificationChannel
 import ca.gosyer.jui.android.util.buildNotificationChannelGroup
+import ca.gosyer.jui.i18n.MR
 import dev.icerock.moko.resources.desc.desc
 
 object Notifications {

android/src/main/kotlin/ca/gosyer/jui/android/data/update/UpdateCheckWorker.kt

@@ -14,12 +14,12 @@ import androidx.work.NetworkType
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
-import ca.gosyer.data.update.UpdateChecker.Update
-import ca.gosyer.i18n.MR
 import ca.gosyer.jui.android.AppComponent
 import ca.gosyer.jui.android.data.notification.Notifications
 import ca.gosyer.jui.android.util.notificationBuilder
 import ca.gosyer.jui.android.util.notificationManager
+import ca.gosyer.jui.data.update.UpdateChecker.Update
+import ca.gosyer.jui.i18n.MR
 import dev.icerock.moko.resources.desc.desc
 import kotlinx.coroutines.flow.singleOrNull
 import java.util.concurrent.TimeUnit

core/build.gradle.kts

@@ -83,5 +83,5 @@ dependencies {
 }
 
 buildkonfig {
-    packageName = "ca.gosyer.core.build"
+    packageName = "ca.gosyer.jui.core.build"
 }

core/src/androidMain/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="ca.gosyer.core"/>
+<manifest package="ca.gosyer.jui.core"/>

core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/AndroidPreference.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.prefs
+package ca.gosyer.jui.core.prefs
 
 import com.russhwolf.settings.ObservableSettings
 import kotlinx.coroutines.CoroutineScope

core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/AndroidPreferenceAdapters.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.prefs
+package ca.gosyer.jui.core.prefs
 
 import com.russhwolf.settings.ObservableSettings
 import com.russhwolf.settings.serialization.decodeValue

core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/AndroidPreferenceStore.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.prefs
+package ca.gosyer.jui.core.prefs
 
 import com.russhwolf.settings.ObservableSettings
 import kotlinx.serialization.KSerializer

core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStoreFactory.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.prefs
+package ca.gosyer.jui.core.prefs
 
 import android.content.Context
 import com.russhwolf.settings.AndroidSettings

core/src/commonMain/kotlin/ca/gosyer/jui/core/di/AppScope.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.di
+package ca.gosyer.jui.core.di
 
 import me.tatarka.inject.annotations.Scope
 

core/src/commonMain/kotlin/ca/gosyer/jui/core/io/FileSystems.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.io
+package ca.gosyer.jui.core.io
 
 import okio.FileSystem
 

core/src/commonMain/kotlin/ca/gosyer/jui/core/io/OkioExtensions.kt

@@ -4,9 +4,9 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.io
+package ca.gosyer.jui.core.io
 
-import ca.gosyer.core.lang.withIOContext
+import ca.gosyer.jui.core.lang.withIOContext
 import okio.BufferedSink
 import okio.FileSystem
 import okio.Path

core/src/commonMain/kotlin/ca/gosyer/jui/core/lang/CoroutineExtensions.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.lang
+package ca.gosyer.jui.core.lang
 
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope

core/src/commonMain/kotlin/ca/gosyer/jui/core/lang/Dispatchers.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.lang
+package ca.gosyer.jui.core.lang
 
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers

core/src/commonMain/kotlin/ca/gosyer/jui/core/lang/Locale.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.lang
+package ca.gosyer.jui.core.lang
 
 import io.fluidsonic.locale.Locale
 
@@ -14,4 +14,4 @@ expect fun Locale.getDisplayLanguage(displayLocale: Locale): String
 
 expect fun Locale.getDisplayName(displayLocale: Locale): String
 
-expect val Locale.displayName: String
+expect val Locale.displayName: String

core/src/commonMain/kotlin/ca/gosyer/jui/core/lang/String.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.lang
+package ca.gosyer.jui.core.lang
 
 import io.fluidsonic.locale.Locale
 
@@ -24,4 +24,4 @@ expect fun String.uppercase(locale: Locale): String
 
 expect fun String.lowercase(locale: Locale): String
 
-expect fun Char.titlecase(locale: Locale): String
+expect fun Char.titlecase(locale: Locale): String

core/src/commonMain/kotlin/ca/gosyer/jui/core/logging/Logging.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.logging
+package ca.gosyer.jui.core.logging
 
 import mu.KLogger
 import mu.KotlinLogging

core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/LazyPreferenceStore.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.prefs
+package ca.gosyer.jui.core.prefs
 
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.modules.SerializersModule

core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/Preference.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.prefs
+package ca.gosyer.jui.core.prefs
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow

core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStore.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.prefs
+package ca.gosyer.jui.core.prefs
 
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.modules.EmptySerializersModule

core/src/commonMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStoreFactory.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.prefs
+package ca.gosyer.jui.core.prefs
 
 expect class PreferenceStoreFactory {
     fun create(vararg names: String): PreferenceStore

core/src/commonMain/kotlin/ca/gosyer/jui/core/util/CollectionExtensions.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.util
+package ca.gosyer.jui.core.util
 
 /**
  * Returns a new list that replaces the item at the given [position] with [newItem].

core/src/commonMain/kotlin/ca/gosyer/jui/core/util/ImageUtil.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.util
+package ca.gosyer.jui.core.util
 
 import io.ktor.utils.io.core.toByteArray
 

core/src/desktopMain/kotlin/ca/gosyer/jui/core/io/AppDirs.kt

@@ -4,9 +4,9 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.io
+package ca.gosyer.jui.core.io
 
-import ca.gosyer.core.build.BuildKonfig
+import ca.gosyer.jui.core.build.BuildKonfig
 import mu.KotlinLogging
 import net.harawata.appdirs.AppDirsFactory
 import okio.FileSystem

core/src/desktopMain/kotlin/ca/gosyer/jui/core/prefs/JvmPreference.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.prefs
+package ca.gosyer.jui.core.prefs
 
 import com.russhwolf.settings.ObservableSettings
 import kotlinx.coroutines.CoroutineScope

core/src/desktopMain/kotlin/ca/gosyer/jui/core/prefs/JvmPreferenceAdapters.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.prefs
+package ca.gosyer.jui.core.prefs
 
 import com.russhwolf.settings.ObservableSettings
 import com.russhwolf.settings.serialization.decodeValue

core/src/desktopMain/kotlin/ca/gosyer/jui/core/prefs/JvmPreferenceStore.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.prefs
+package ca.gosyer.jui.core.prefs
 
 import com.russhwolf.settings.ObservableSettings
 import kotlinx.serialization.KSerializer

core/src/desktopMain/kotlin/ca/gosyer/jui/core/prefs/PreferenceStoreFactory.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.prefs
+package ca.gosyer.jui.core.prefs
 
 import com.russhwolf.settings.JvmPreferencesSettings
 import me.tatarka.inject.annotations.Inject

core/src/jvmMain/kotlin/ca/gosyer/jui/core/io/JvmFileSystems.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.io
+package ca.gosyer.jui.core.io
 
 import okio.FileSystem
 

core/src/jvmMain/kotlin/ca/gosyer/jui/core/lang/JvmDispatchers.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.lang
+package ca.gosyer.jui.core.lang
 
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers

core/src/jvmMain/kotlin/ca/gosyer/jui/core/lang/JvmLocale.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.core.lang
+package ca.gosyer.jui.core.lang
 
 import io.fluidsonic.locale.Locale
 import io.fluidsonic.locale.toCommon
@@ -19,4 +19,4 @@ actual fun Locale.getDisplayLanguage(displayLocale: Locale): String = toPlatform
 actual fun Locale.getDisplayName(displayLocale: Locale): String = toPlatform()
     .getDisplayName(displayLocale.toPlatform())
 
-actual val Locale.displayName get() = toPlatform().displayName
+actual val Locale.displayName get() = toPlatform().displayName

core/src/jvmMain/kotlin/ca/gosyer/jui/core/lang/JvmString.kt

@@ -5,7 +5,7 @@
  */
 @file:JvmName("JvmStringsKt")
 
-package ca.gosyer.core.lang
+package ca.gosyer.jui.core.lang
 
 import io.fluidsonic.locale.Locale
 import io.fluidsonic.locale.toPlatform
@@ -13,9 +13,8 @@ import io.fluidsonic.locale.toPlatform
 fun String.capitalize(locale: Locale = Locale.getDefault()) =
     replaceFirstChar { if (it.isLowerCase()) it.titlecase(locale) else it.toString() }
 
-
 actual fun String.uppercase(locale: Locale): String = uppercase(locale.toPlatform())
 
 actual fun String.lowercase(locale: Locale): String = lowercase(locale.toPlatform())
 
-actual fun Char.titlecase(locale: Locale): String = titlecase(locale.toPlatform())
+actual fun Char.titlecase(locale: Locale): String = titlecase(locale.toPlatform())

data/build.gradle.kts

@@ -80,5 +80,5 @@ dependencies {
 }
 
 buildkonfig {
-    packageName = "ca.gosyer.data.build"
+    packageName = "ca.gosyer.jui.data.build"
 }

data/src/androidMain/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="ca.gosyer.data"/>
+<manifest package="ca.gosyer.jui.data"/>

data/src/androidMain/kotlin/ca/gosyer/jui/data/DataComponent.kt

@@ -4,25 +4,25 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data
+package ca.gosyer.jui.data
 
 import android.content.Context
-import ca.gosyer.core.di.AppScope
-import ca.gosyer.core.prefs.PreferenceStoreFactory
-import ca.gosyer.data.catalog.CatalogPreferences
-import ca.gosyer.data.download.DownloadService
-import ca.gosyer.data.extension.ExtensionPreferences
-import ca.gosyer.data.library.LibraryPreferences
-import ca.gosyer.data.library.LibraryUpdateService
-import ca.gosyer.data.migration.MigrationPreferences
-import ca.gosyer.data.migration.Migrations
-import ca.gosyer.data.reader.ReaderPreferences
-import ca.gosyer.data.server.Http
-import ca.gosyer.data.server.HttpProvider
-import ca.gosyer.data.server.ServerPreferences
-import ca.gosyer.data.ui.UiPreferences
-import ca.gosyer.data.update.UpdateChecker
-import ca.gosyer.data.update.UpdatePreferences
+import ca.gosyer.jui.core.di.AppScope
+import ca.gosyer.jui.core.prefs.PreferenceStoreFactory
+import ca.gosyer.jui.data.catalog.CatalogPreferences
+import ca.gosyer.jui.data.download.DownloadService
+import ca.gosyer.jui.data.extension.ExtensionPreferences
+import ca.gosyer.jui.data.library.LibraryPreferences
+import ca.gosyer.jui.data.library.LibraryUpdateService
+import ca.gosyer.jui.data.migration.MigrationPreferences
+import ca.gosyer.jui.data.migration.Migrations
+import ca.gosyer.jui.data.reader.ReaderPreferences
+import ca.gosyer.jui.data.server.Http
+import ca.gosyer.jui.data.server.HttpProvider
+import ca.gosyer.jui.data.server.ServerPreferences
+import ca.gosyer.jui.data.ui.UiPreferences
+import ca.gosyer.jui.data.update.UpdateChecker
+import ca.gosyer.jui.data.update.UpdatePreferences
 import me.tatarka.inject.annotations.Component
 import me.tatarka.inject.annotations.Provides
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/DataComponent.kt

@@ -4,6 +4,6 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data
+package ca.gosyer.jui.data
 
 expect abstract class DataComponent

data/src/commonMain/kotlin/ca/gosyer/jui/data/base/WebsocketService.kt

@@ -4,13 +4,13 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.base
+package ca.gosyer.jui.data.base
 
-import ca.gosyer.core.lang.throwIfCancellation
-import ca.gosyer.core.logging.CKLogger
-import ca.gosyer.data.build.BuildKonfig
-import ca.gosyer.data.server.Http
-import ca.gosyer.data.server.ServerPreferences
+import ca.gosyer.jui.core.lang.throwIfCancellation
+import ca.gosyer.jui.core.logging.CKLogger
+import ca.gosyer.jui.data.build.BuildKonfig
+import ca.gosyer.jui.data.server.Http
+import ca.gosyer.jui.data.server.ServerPreferences
 import io.ktor.client.features.websocket.ws
 import io.ktor.http.cio.websocket.Frame
 import kotlinx.coroutines.CancellationException

data/src/commonMain/kotlin/ca/gosyer/jui/data/catalog/CatalogPreferences.kt

@@ -4,12 +4,12 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.catalog
+package ca.gosyer.jui.data.catalog
 
-import ca.gosyer.core.lang.getDefault
-import ca.gosyer.core.prefs.Preference
-import ca.gosyer.core.prefs.PreferenceStore
-import ca.gosyer.data.library.model.DisplayMode
+import ca.gosyer.jui.core.lang.getDefault
+import ca.gosyer.jui.core.prefs.Preference
+import ca.gosyer.jui.core.prefs.PreferenceStore
+import ca.gosyer.jui.data.library.model.DisplayMode
 import io.fluidsonic.locale.Locale
 
 class CatalogPreferences(private val preferenceStore: PreferenceStore) {

data/src/commonMain/kotlin/ca/gosyer/jui/data/download/DownloadService.kt

@@ -4,16 +4,16 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.download
+package ca.gosyer.jui.data.download
 
-import ca.gosyer.core.logging.CKLogger
-import ca.gosyer.data.base.WebsocketService
-import ca.gosyer.data.download.model.DownloadChapter
-import ca.gosyer.data.download.model.DownloadStatus
-import ca.gosyer.data.download.model.DownloaderStatus
-import ca.gosyer.data.server.Http
-import ca.gosyer.data.server.ServerPreferences
-import ca.gosyer.data.server.requests.downloadsQuery
+import ca.gosyer.jui.core.logging.CKLogger
+import ca.gosyer.jui.data.base.WebsocketService
+import ca.gosyer.jui.data.download.model.DownloadChapter
+import ca.gosyer.jui.data.download.model.DownloadStatus
+import ca.gosyer.jui.data.download.model.DownloaderStatus
+import ca.gosyer.jui.data.server.Http
+import ca.gosyer.jui.data.server.ServerPreferences
+import ca.gosyer.jui.data.server.requests.downloadsQuery
 import io.ktor.http.cio.websocket.Frame
 import io.ktor.http.cio.websocket.readText
 import kotlinx.coroutines.DelicateCoroutinesApi

data/src/commonMain/kotlin/ca/gosyer/jui/data/download/model/DownloadChapter.kt

@@ -4,10 +4,10 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.download.model
+package ca.gosyer.jui.data.download.model
 
-import ca.gosyer.data.models.Chapter
-import ca.gosyer.data.models.Manga
+import ca.gosyer.jui.data.models.Chapter
+import ca.gosyer.jui.data.models.Manga
 import kotlinx.serialization.Serializable
 
 @Serializable

data/src/commonMain/kotlin/ca/gosyer/jui/data/download/model/DownloadState.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.download.model
+package ca.gosyer.jui.data.download.model
 
 import kotlinx.serialization.Serializable
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/download/model/DownloadStatus.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.download.model
+package ca.gosyer.jui.data.download.model
 
 import kotlinx.serialization.Serializable
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/download/model/DownloaderStatus.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.download.model
+package ca.gosyer.jui.data.download.model
 
 import kotlinx.serialization.Serializable
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/extension/ExtensionPreferences.kt

@@ -4,11 +4,11 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.extension
+package ca.gosyer.jui.data.extension
 
-import ca.gosyer.core.lang.getDefault
-import ca.gosyer.core.prefs.Preference
-import ca.gosyer.core.prefs.PreferenceStore
+import ca.gosyer.jui.core.lang.getDefault
+import ca.gosyer.jui.core.prefs.Preference
+import ca.gosyer.jui.core.prefs.PreferenceStore
 import io.fluidsonic.locale.Locale
 
 class ExtensionPreferences(private val preferenceStore: PreferenceStore) {

data/src/commonMain/kotlin/ca/gosyer/jui/data/library/LibraryPreferences.kt

@@ -4,12 +4,12 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.library
+package ca.gosyer.jui.data.library
 
-import ca.gosyer.core.prefs.Preference
-import ca.gosyer.core.prefs.PreferenceStore
-import ca.gosyer.data.library.model.DisplayMode
-import ca.gosyer.data.library.model.Sort
+import ca.gosyer.jui.core.prefs.Preference
+import ca.gosyer.jui.core.prefs.PreferenceStore
+import ca.gosyer.jui.data.library.model.DisplayMode
+import ca.gosyer.jui.data.library.model.Sort
 
 class LibraryPreferences(private val preferenceStore: PreferenceStore) {
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/library/LibraryUpdateService.kt

@@ -4,14 +4,14 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.library
+package ca.gosyer.jui.data.library
 
-import ca.gosyer.core.logging.CKLogger
-import ca.gosyer.data.base.WebsocketService
-import ca.gosyer.data.library.model.UpdateStatus
-import ca.gosyer.data.server.Http
-import ca.gosyer.data.server.ServerPreferences
-import ca.gosyer.data.server.requests.updatesQuery
+import ca.gosyer.jui.core.logging.CKLogger
+import ca.gosyer.jui.data.base.WebsocketService
+import ca.gosyer.jui.data.library.model.UpdateStatus
+import ca.gosyer.jui.data.server.Http
+import ca.gosyer.jui.data.server.ServerPreferences
+import ca.gosyer.jui.data.server.requests.updatesQuery
 import io.ktor.http.cio.websocket.Frame
 import io.ktor.http.cio.websocket.readText
 import kotlinx.coroutines.DelicateCoroutinesApi

data/src/commonMain/kotlin/ca/gosyer/jui/data/library/model/DisplayMode.kt

@@ -4,9 +4,9 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.library.model
+package ca.gosyer.jui.data.library.model
 
-import ca.gosyer.i18n.MR
+import ca.gosyer.jui.i18n.MR
 import dev.icerock.moko.resources.StringResource
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient

data/src/commonMain/kotlin/ca/gosyer/jui/data/library/model/JobStatus.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.library.model
+package ca.gosyer.jui.data.library.model
 
 import kotlinx.serialization.Serializable
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/library/model/Sort.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.library.model
+package ca.gosyer.jui.data.library.model
 
 import kotlinx.serialization.Serializable
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/library/model/UpdateStatus.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.library.model
+package ca.gosyer.jui.data.library.model
 
 import kotlinx.serialization.Serializable
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/migration/MigrationPreferences.kt

@@ -4,10 +4,10 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.migration
+package ca.gosyer.jui.data.migration
 
-import ca.gosyer.core.prefs.Preference
-import ca.gosyer.core.prefs.PreferenceStore
+import ca.gosyer.jui.core.prefs.Preference
+import ca.gosyer.jui.core.prefs.PreferenceStore
 
 class MigrationPreferences(private val preferenceStore: PreferenceStore) {
     fun version(): Preference<Int> {

data/src/commonMain/kotlin/ca/gosyer/jui/data/migration/Migrations.kt

@@ -4,10 +4,10 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.migration
+package ca.gosyer.jui.data.migration
 
-import ca.gosyer.data.build.BuildKonfig
-import ca.gosyer.data.reader.ReaderPreferences
+import ca.gosyer.jui.data.build.BuildKonfig
+import ca.gosyer.jui.data.reader.ReaderPreferences
 import me.tatarka.inject.annotations.Inject
 
 class Migrations @Inject constructor(

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/About.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models
+package ca.gosyer.jui.data.models
 
 import kotlinx.serialization.Serializable
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/BackupValidationResult.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models
+package ca.gosyer.jui.data.models
 
 import kotlinx.serialization.Serializable
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Category.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models
+package ca.gosyer.jui.data.models
 
 import kotlinx.serialization.Serializable
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Chapter.kt

@@ -4,9 +4,9 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models
+package ca.gosyer.jui.data.models
 
-import ca.gosyer.data.server.interactions.ChapterInteractionHandler
+import ca.gosyer.jui.data.server.interactions.ChapterInteractionHandler
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.flow
 import kotlinx.serialization.Serializable

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Extension.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models
+package ca.gosyer.jui.data.models
 
 import kotlinx.serialization.Serializable
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Manga.kt

@@ -4,10 +4,10 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models
+package ca.gosyer.jui.data.models
 
-import ca.gosyer.data.server.interactions.MangaInteractionHandler
-import ca.gosyer.i18n.MR
+import ca.gosyer.jui.data.server.interactions.MangaInteractionHandler
+import ca.gosyer.jui.i18n.MR
 import dev.icerock.moko.resources.StringResource
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.flow

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/MangaAndChapter.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models
+package ca.gosyer.jui.data.models
 
 import kotlinx.serialization.Serializable
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/MangaPage.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models
+package ca.gosyer.jui.data.models
 
 import kotlinx.serialization.Serializable
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Page.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models
+package ca.gosyer.jui.data.models
 
 import kotlinx.serialization.Serializable
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Source.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models
+package ca.gosyer.jui.data.models
 
 import kotlinx.serialization.Serializable
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/Updates.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models
+package ca.gosyer.jui.data.models
 
 import kotlinx.serialization.Serializable
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/CheckBoxFilter.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models.sourcefilters
+package ca.gosyer.jui.data.models.sourcefilters
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/GroupFilter.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models.sourcefilters
+package ca.gosyer.jui.data.models.sourcefilters
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/HeaderFilter.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models.sourcefilters
+package ca.gosyer.jui.data.models.sourcefilters
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SelectFilter.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models.sourcefilters
+package ca.gosyer.jui.data.models.sourcefilters
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SeparatorFilter.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models.sourcefilters
+package ca.gosyer.jui.data.models.sourcefilters
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SortFilter.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models.sourcefilters
+package ca.gosyer.jui.data.models.sourcefilters
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SourceFilter.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models.sourcefilters
+package ca.gosyer.jui.data.models.sourcefilters
 
 import kotlinx.serialization.Serializable
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/SourceFilterChange.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models.sourcefilters
+package ca.gosyer.jui.data.models.sourcefilters
 
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/TextFilter.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models.sourcefilters
+package ca.gosyer.jui.data.models.sourcefilters
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcefilters/TriStateFilter.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models.sourcefilters
+package ca.gosyer.jui.data.models.sourcefilters
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/CheckBoxPreference.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models.sourcepreference
+package ca.gosyer.jui.data.models.sourcepreference
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/EditTextPreference.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models.sourcepreference
+package ca.gosyer.jui.data.models.sourcepreference
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/ListPreference.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models.sourcepreference
+package ca.gosyer.jui.data.models.sourcepreference
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/MultiSelectListPreference.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models.sourcepreference
+package ca.gosyer.jui.data.models.sourcepreference
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/SourcePreference.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models.sourcepreference
+package ca.gosyer.jui.data.models.sourcepreference
 
 import kotlinx.serialization.Serializable
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/SourcePreferenceChange.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models.sourcepreference
+package ca.gosyer.jui.data.models.sourcepreference
 
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/SwitchPreference.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models.sourcepreference
+package ca.gosyer.jui.data.models.sourcepreference
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

data/src/commonMain/kotlin/ca/gosyer/jui/data/models/sourcepreference/TwoStateProps.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.models.sourcepreference
+package ca.gosyer.jui.data.models.sourcepreference
 
 import kotlinx.serialization.Serializable
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/ReaderModePreferences.kt

@@ -4,14 +4,14 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.reader
+package ca.gosyer.jui.data.reader
 
-import ca.gosyer.core.prefs.Preference
-import ca.gosyer.core.prefs.PreferenceStore
-import ca.gosyer.data.reader.model.DefaultReaderMode
-import ca.gosyer.data.reader.model.Direction
-import ca.gosyer.data.reader.model.ImageScale
-import ca.gosyer.data.reader.model.NavigationMode
+import ca.gosyer.jui.core.prefs.Preference
+import ca.gosyer.jui.core.prefs.PreferenceStore
+import ca.gosyer.jui.data.reader.model.DefaultReaderMode
+import ca.gosyer.jui.data.reader.model.Direction
+import ca.gosyer.jui.data.reader.model.ImageScale
+import ca.gosyer.jui.data.reader.model.NavigationMode
 
 class ReaderModePreferences(private val mode: String, private val preferenceStore: PreferenceStore) {
     constructor(mode: String, factory: (String) -> PreferenceStore) :

data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/ReaderModeWatch.kt

@@ -4,9 +4,9 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.reader
+package ca.gosyer.jui.data.reader
 
-import ca.gosyer.core.prefs.getAsFlow
+import ca.gosyer.jui.core.prefs.getAsFlow
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow

data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/ReaderPreferences.kt

@@ -4,11 +4,11 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.reader
+package ca.gosyer.jui.data.reader
 
-import ca.gosyer.core.prefs.Preference
-import ca.gosyer.core.prefs.PreferenceStore
-import ca.gosyer.data.reader.model.DefaultReaderMode
+import ca.gosyer.jui.core.prefs.Preference
+import ca.gosyer.jui.core.prefs.PreferenceStore
+import ca.gosyer.jui.data.reader.model.DefaultReaderMode
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.builtins.serializer
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/DefaultReaderMode.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.reader.model
+package ca.gosyer.jui.data.reader.model
 
 enum class DefaultReaderMode(
     val res: String,

data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/Direction.kt

@@ -4,9 +4,9 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.reader.model
+package ca.gosyer.jui.data.reader.model
 
-import ca.gosyer.i18n.MR
+import ca.gosyer.jui.i18n.MR
 import dev.icerock.moko.resources.StringResource
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient

data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/ImageScale.kt

@@ -4,9 +4,9 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.reader.model
+package ca.gosyer.jui.data.reader.model
 
-import ca.gosyer.i18n.MR
+import ca.gosyer.jui.i18n.MR
 import dev.icerock.moko.resources.StringResource
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient

data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/NavigationMode.kt

@@ -4,9 +4,9 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.reader.model
+package ca.gosyer.jui.data.reader.model
 
-import ca.gosyer.i18n.MR
+import ca.gosyer.jui.i18n.MR
 import dev.icerock.moko.resources.StringResource
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient

data/src/commonMain/kotlin/ca/gosyer/jui/data/reader/model/TappingInvertMode.kt

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.reader.model
+package ca.gosyer.jui.data.reader.model
 
 import kotlinx.serialization.Serializable
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/server/HttpClient.kt

@@ -4,11 +4,11 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.server
+package ca.gosyer.jui.data.server
 
-import ca.gosyer.data.build.BuildKonfig
-import ca.gosyer.data.server.model.Auth
-import ca.gosyer.data.server.model.Proxy
+import ca.gosyer.jui.data.build.BuildKonfig
+import ca.gosyer.jui.data.server.model.Auth
+import ca.gosyer.jui.data.server.model.Proxy
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.ProxyBuilder
 import io.ktor.client.features.auth.providers.BasicAuthCredentials

data/src/commonMain/kotlin/ca/gosyer/jui/data/server/ServerPreferences.kt

@@ -4,12 +4,12 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.server
+package ca.gosyer.jui.data.server
 
-import ca.gosyer.core.prefs.Preference
-import ca.gosyer.core.prefs.PreferenceStore
-import ca.gosyer.data.server.model.Auth
-import ca.gosyer.data.server.model.Proxy
+import ca.gosyer.jui.core.prefs.Preference
+import ca.gosyer.jui.core.prefs.PreferenceStore
+import ca.gosyer.jui.data.server.model.Auth
+import ca.gosyer.jui.data.server.model.Proxy
 import io.ktor.http.Url
 
 class ServerPreferences(private val preferenceStore: PreferenceStore) {

data/src/commonMain/kotlin/ca/gosyer/jui/data/server/ServerUrlPreference.kt

@@ -4,10 +4,10 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.server
+package ca.gosyer.jui.data.server
 
-import ca.gosyer.core.prefs.Preference
-import ca.gosyer.core.prefs.getAsFlow
+import ca.gosyer.jui.core.prefs.Preference
+import ca.gosyer.jui.core.prefs.getAsFlow
 import io.ktor.http.URLBuilder
 import io.ktor.http.Url
 import kotlinx.coroutines.CoroutineScope

data/src/commonMain/kotlin/ca/gosyer/jui/data/server/interactions/BackupInteractionHandler.kt

@@ -4,16 +4,16 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package ca.gosyer.data.server.interactions
+package ca.gosyer.jui.data.server.interactions
 
-import ca.gosyer.core.io.SYSTEM
-import ca.gosyer.core.lang.IO
-import ca.gosyer.data.models.BackupValidationResult
-import ca.gosyer.data.server.Http
-import ca.gosyer.data.server.ServerPreferences
-import ca.gosyer.data.server.requests.backupFileExportRequest
-import ca.gosyer.data.server.requests.backupFileImportRequest
-import ca.gosyer.data.server.requests.validateBackupFileRequest
+import ca.gosyer.jui.core.io.SYSTEM
+import ca.gosyer.jui.core.lang.IO
+import ca.gosyer.jui.data.models.BackupValidationResult
+import ca.gosyer.jui.data.server.Http
+import ca.gosyer.jui.data.server.ServerPreferences
+import ca.gosyer.jui.data.server.requests.backupFileExportRequest
+import ca.gosyer.jui.data.server.requests.backupFileImportRequest
+import ca.gosyer.jui.data.server.requests.validateBackupFileRequest
 import io.ktor.client.request.HttpRequestBuilder
 import io.ktor.client.request.forms.formData
 import io.ktor.client.request.forms.submitFormWithBinaryData