refactor: update package structure to use core namespace

2026-07-22 17:41:39 +00:00 · 2026-05-06 17:24:04 +02:00
parent 41f7129b08
commit 322eb69ab5
194 changed files with 465 additions and 457 deletions
--- a/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/home/components/TvHomeContentTest.kt
+++ b/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/home/components/TvHomeContentTest.kt
@@ -19,10 +19,10 @@ import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.LibraryKind
 import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.ui.model.EpisodeUiModel
-import hu.bbara.purefin.ui.model.MediaUiModel
-import hu.bbara.purefin.ui.model.MovieUiModel
-import hu.bbara.purefin.ui.model.LibraryUiModel
+import hu.bbara.purefin.core.model.EpisodeUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
+import hu.bbara.purefin.core.model.MovieUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
 import hu.bbara.purefin.ui.screen.home.TvHomeScreen
 import hu.bbara.purefin.ui.theme.AppTheme
 import org.junit.Assert.assertEquals
--- a/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/home/components/TvNavigationDrawerTest.kt
+++ b/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/home/components/TvNavigationDrawerTest.kt
@@ -24,8 +24,8 @@ import androidx.compose.ui.test.performKeyInput
 import androidx.compose.ui.test.performSemanticsAction
 import androidx.compose.ui.test.pressKey
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.navigation.LibraryDto
-import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.core.navigation.LibraryDto
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.ui.theme.AppTheme
 import org.junit.Rule
 import org.junit.Test
--- a/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/libraries/TvLibrariesOverviewScreenTest.kt
+++ b/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/libraries/TvLibrariesOverviewScreenTest.kt
@@ -5,7 +5,7 @@ import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
 import hu.bbara.purefin.model.LibraryKind
-import hu.bbara.purefin.ui.model.LibraryUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
 import hu.bbara.purefin.ui.theme.AppTheme
 import org.junit.Assert.assertEquals
 import org.junit.Rule
--- a/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlayTest.kt
+++ b/app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlayTest.kt
@@ -39,10 +39,10 @@ import androidx.compose.ui.test.performKeyInput
 import androidx.compose.ui.test.performSemanticsAction
 import androidx.compose.ui.test.pressKey
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.player.model.PlayerUiState
-import hu.bbara.purefin.player.model.PlaylistElementUiModel
-import hu.bbara.purefin.player.model.TrackOption
-import hu.bbara.purefin.player.model.TrackType
+import hu.bbara.purefin.core.player.model.PlayerUiState
+import hu.bbara.purefin.core.player.model.PlaylistElementUiModel
+import hu.bbara.purefin.core.player.model.TrackOption
+import hu.bbara.purefin.core.player.model.TrackType
 import hu.bbara.purefin.ui.screen.player.TV_HIDDEN_STOP_FEEDBACK_MS
 import hu.bbara.purefin.ui.screen.player.TvPlayerHiddenStopFeedback
 import hu.bbara.purefin.ui.screen.player.TvPlayerHiddenStopFeedbackTag
--- a/app-tv/src/main/AndroidManifest.xml
+++ b/app-tv/src/main/AndroidManifest.xml
@@ -41,7 +41,7 @@
            </intent-filter>
        </activity>
        <receiver
-            android:name="hu.bbara.purefin.update.AppUpdateInstallReceiver"
+            android:name="hu.bbara.purefin.core.update.AppUpdateInstallReceiver"
            android:exported="false" />
    </application>

--- a/app-tv/src/main/java/hu/bbara/purefin/modules/TvNavigationModule.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/modules/TvNavigationModule.kt
@@ -6,7 +6,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityRetainedComponent
 import dagger.multibindings.IntoSet
-import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.navigation.tvEpisodeSection
 import hu.bbara.purefin.navigation.tvHomeSection
 import hu.bbara.purefin.navigation.tvLibrarySection
--- a/app-tv/src/main/java/hu/bbara/purefin/modules/TvPlaybackProfileFamilyModule.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/modules/TvPlaybackProfileFamilyModule.kt
@@ -4,7 +4,7 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import hu.bbara.purefin.data.PlaybackProfileFamily
+import hu.bbara.purefin.core.data.PlaybackProfileFamily

@Module
@InstallIn(SingletonComponent::class)
--- a/app-tv/src/main/java/hu/bbara/purefin/navigation/NavigationLocals.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/navigation/NavigationLocals.kt
@@ -3,6 +3,8 @@ package hu.bbara.purefin.navigation
 import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.staticCompositionLocalOf
+import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.core.navigation.Route

 val LocalNavigationManager: ProvidableCompositionLocal<NavigationManager> =
    staticCompositionLocalOf { error("NavigationManager not provided") }
--- a/app-tv/src/main/java/hu/bbara/purefin/navigation/TvRouteEntryBuilder.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/navigation/TvRouteEntryBuilder.kt
@@ -2,7 +2,9 @@ package hu.bbara.purefin.navigation

 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation3.runtime.EntryProviderScope
-import hu.bbara.purefin.feature.browse.home.AppViewModel
+import hu.bbara.purefin.core.navigation.Route
+import hu.bbara.purefin.core.navigation.SeriesDto
+import hu.bbara.purefin.core.feature.browse.home.AppViewModel
 import hu.bbara.purefin.ui.screen.movie.TvMovieScreen
 import hu.bbara.purefin.ui.screen.series.TvSeriesScreen
 import hu.bbara.purefin.ui.screen.login.LoginScreen
--- a/app-tv/src/main/java/hu/bbara/purefin/tv/TvActivity.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/tv/TvActivity.kt
@@ -42,14 +42,14 @@ import coil3.network.okhttp.OkHttpNetworkFetcherFactory
 import coil3.request.crossfade
 import coil3.util.DebugLogger
 import dagger.hilt.android.AndroidEntryPoint
-import hu.bbara.purefin.data.SessionBootstrapper
-import hu.bbara.purefin.data.UserSessionRepository
-import hu.bbara.purefin.feature.update.AppUpdateInfo
-import hu.bbara.purefin.feature.update.AppUpdateViewModel
-import hu.bbara.purefin.jellyfin.JellyfinAuthInterceptor
-import hu.bbara.purefin.navigation.NavigationCommand
-import hu.bbara.purefin.navigation.NavigationManager
-import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.core.data.SessionBootstrapper
+import hu.bbara.purefin.core.data.UserSessionRepository
+import hu.bbara.purefin.core.feature.update.AppUpdateInfo
+import hu.bbara.purefin.core.feature.update.AppUpdateViewModel
+import hu.bbara.purefin.core.jellyfin.JellyfinAuthInterceptor
+import hu.bbara.purefin.core.navigation.NavigationCommand
+import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.navigation.LocalNavigationBackStack
 import hu.bbara.purefin.navigation.LocalNavigationManager
 import hu.bbara.purefin.ui.screen.login.LoginScreen
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt
@@ -31,10 +31,10 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import hu.bbara.purefin.ui.common.badge.WatchStateBadge
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
-import hu.bbara.purefin.ui.model.EpisodeUiModel
-import hu.bbara.purefin.ui.model.MediaUiModel
-import hu.bbara.purefin.ui.model.MovieUiModel
-import hu.bbara.purefin.ui.model.SeriesUiModel
+import hu.bbara.purefin.core.model.EpisodeUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
+import hu.bbara.purefin.core.model.MovieUiModel
+import hu.bbara.purefin.core.model.SeriesUiModel
 import java.util.UUID

@Composable
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailShell.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailShell.kt
@@ -27,8 +27,8 @@ import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import hu.bbara.purefin.image.ArtworkKind
-import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.core.image.ArtworkKind
+import hu.bbara.purefin.core.image.ImageUrlBuilder
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage

 internal val MediaDetailHorizontalPadding = 48.dp
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/TvAppScreen.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/TvAppScreen.kt
@@ -19,11 +19,11 @@ import androidx.navigation3.runtime.entryProvider
 import androidx.navigation3.runtime.rememberNavBackStack
 import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
-import hu.bbara.purefin.feature.browse.home.AppViewModel
+import hu.bbara.purefin.core.feature.browse.home.AppViewModel
 import hu.bbara.purefin.model.LibraryKind
-import hu.bbara.purefin.navigation.LibraryDto
+import hu.bbara.purefin.core.navigation.LibraryDto
 import hu.bbara.purefin.navigation.LocalNavigationManager
-import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.ui.screen.home.TvHomeScreen
 import hu.bbara.purefin.ui.screen.home.components.TvDrawerDestinationItem
 import hu.bbara.purefin.ui.screen.home.components.TvNavigationDrawer
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/episode/TvEpisodeScreen.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/episode/TvEpisodeScreen.kt
@@ -13,13 +13,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.feature.content.episode.EpisodeScreenViewModel
-import hu.bbara.purefin.image.ArtworkKind
-import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.core.feature.content.episode.EpisodeScreenViewModel
+import hu.bbara.purefin.core.image.ArtworkKind
+import hu.bbara.purefin.core.image.ImageUrlBuilder
 import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.navigation.EpisodeDto
+import hu.bbara.purefin.core.navigation.EpisodeDto
 import hu.bbara.purefin.navigation.LocalNavigationManager
-import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.ui.common.media.MediaDetailOverviewSection
 import hu.bbara.purefin.ui.common.media.MediaDetailPlaybackSection
 import hu.bbara.purefin.ui.common.media.MediaDetailSectionTitle
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/TvHomeScreen.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/TvHomeScreen.kt
@@ -11,9 +11,9 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.ui.model.MediaUiModel
-import hu.bbara.purefin.ui.model.MovieUiModel
-import hu.bbara.purefin.ui.model.LibraryUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
+import hu.bbara.purefin.core.model.MovieUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
 import hu.bbara.purefin.ui.screen.home.components.TvFocusedItemHero
 import hu.bbara.purefin.ui.screen.home.components.TvHomeContent
 import java.util.UUID
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHero.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHero.kt
@@ -23,7 +23,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage

 internal const val TvHomeHeroTitleTag = "tv-home-hero-title"
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeContent.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeContent.kt
@@ -24,8 +24,8 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.ui.model.LibraryUiModel
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
 import java.util.UUID

 internal const val TvHomeInitialFocusTag = "tv-home-initial-focus-item"
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeModels.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeModels.kt
@@ -1,7 +1,7 @@
 package hu.bbara.purefin.ui.screen.home.components

 import androidx.compose.ui.graphics.vector.ImageVector
-import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.core.navigation.Route

 data class TvDrawerDestinationItem(
    val destination: Route,
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeSections.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvHomeSections.kt
@@ -51,7 +51,7 @@ import androidx.compose.ui.unit.sp
 import hu.bbara.purefin.ui.common.bar.MediaProgressBar
 import hu.bbara.purefin.ui.common.card.PosterCardContent
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
 import java.util.UUID
 import kotlin.math.roundToInt

--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvNavigationDrawer.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/home/components/TvNavigationDrawer.kt
@@ -28,7 +28,7 @@ import androidx.tv.material3.NavigationDrawer
 import androidx.tv.material3.NavigationDrawerItem
 import androidx.tv.material3.Text
 import androidx.tv.material3.darkColorScheme
-import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.tv.R
 import androidx.tv.material3.MaterialTheme as TvMaterialTheme

--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/libraries/TvLibrariesOverviewScreen.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/libraries/TvLibrariesOverviewScreen.kt
@@ -43,7 +43,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
-import hu.bbara.purefin.ui.model.LibraryUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
 import hu.bbara.purefin.model.LibraryKind

 internal const val TvLibrariesOverviewItemTagPrefix = "tv-libraries-overview-item-"
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/library/TvLibraryScreen.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/library/TvLibraryScreen.kt
@@ -19,10 +19,10 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.feature.browse.library.LibraryViewModel
-import hu.bbara.purefin.navigation.LibraryDto
+import hu.bbara.purefin.core.feature.browse.library.LibraryViewModel
+import hu.bbara.purefin.core.navigation.LibraryDto
 import hu.bbara.purefin.ui.common.card.PosterCard
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel

@Composable
 fun TvLibraryScreen(
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/login/LoginScreen.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/login/LoginScreen.kt
@@ -9,7 +9,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.feature.login.LoginViewModel
+import hu.bbara.purefin.core.feature.login.LoginViewModel
 import kotlinx.coroutines.launch

@Composable
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/movie/TvMovieScreen.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/movie/TvMovieScreen.kt
@@ -12,9 +12,9 @@ import androidx.compose.runtime.withFrameNanos
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.feature.content.movie.MovieScreenViewModel
+import hu.bbara.purefin.core.feature.content.movie.MovieScreenViewModel
 import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.navigation.MovieDto
+import hu.bbara.purefin.core.navigation.MovieDto
 import hu.bbara.purefin.ui.common.media.MediaDetailHorizontalPadding
 import hu.bbara.purefin.ui.common.media.TvMediaDetailBodyBox
 import hu.bbara.purefin.ui.common.media.TvMediaDetailScaffold
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/TvPlayerScreen.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/TvPlayerScreen.kt
@@ -51,8 +51,8 @@ import androidx.media3.common.util.UnstableApi
 import androidx.media3.ui.AspectRatioFrameLayout
 import androidx.media3.ui.PlayerView
 import androidx.media3.ui.SubtitleView
-import hu.bbara.purefin.player.viewmodel.ControlsAutoHideBlocker
-import hu.bbara.purefin.player.viewmodel.PlayerViewModel
+import hu.bbara.purefin.core.player.viewmodel.ControlsAutoHideBlocker
+import hu.bbara.purefin.core.player.viewmodel.PlayerViewModel
 import hu.bbara.purefin.ui.screen.player.components.TvIconButton
 import hu.bbara.purefin.ui.screen.player.components.TvPlayerControlsOverlay
 import hu.bbara.purefin.ui.screen.player.components.TvPlayerLoadingErrorEndCard
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlay.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerControlsOverlay.kt
@@ -46,7 +46,7 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.stateDescription
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.player.model.PlayerUiState
+import hu.bbara.purefin.core.player.model.PlayerUiState

 internal const val TvPlayerPlaylistStateTag = "tv_player_playlist_state"
 internal const val TvPlayerPlayPauseButtonTag = "tv_player_play_pause_button"
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerLoadingErrorEndCard.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerLoadingErrorEndCard.kt
@@ -4,7 +4,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.player.model.PlayerUiState
+import hu.bbara.purefin.core.player.model.PlayerUiState

@Composable
 internal fun TvPlayerLoadingErrorEndCard(
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerQueuePanel.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerQueuePanel.kt
@@ -42,8 +42,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import hu.bbara.purefin.player.model.PlayerUiState
-import hu.bbara.purefin.player.model.PlaylistElementUiModel
+import hu.bbara.purefin.core.player.model.PlayerUiState
+import hu.bbara.purefin.core.player.model.PlaylistElementUiModel

 internal const val TvPlayerPlaylistRowTag = "tv_player_playlist_row"
 internal const val TvPlayerPlaylistCurrentItemTag = "tv_player_playlist_current_item"
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerSeekBar.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvPlayerSeekBar.kt
@@ -22,7 +22,7 @@ import androidx.compose.ui.input.key.key
 import androidx.compose.ui.input.key.onPreviewKeyEvent
 import androidx.compose.ui.input.key.type
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.player.model.TimedMarker
+import hu.bbara.purefin.core.player.model.TimedMarker

@Composable
 internal fun TvPlayerSeekBar(
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvTrackSelectionButtons.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/player/components/TvTrackSelectionButtons.kt
@@ -44,8 +44,8 @@ import androidx.compose.ui.input.key.type
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.player.model.PlayerUiState
-import hu.bbara.purefin.player.model.TrackOption
+import hu.bbara.purefin.core.player.model.PlayerUiState
+import hu.bbara.purefin.core.player.model.TrackOption

 internal const val TvPlayerQualityButtonTag = "tv_player_quality_button"
 internal const val TvPlayerAudioButtonTag = "tv_player_audio_button"
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/TvSeriesScreen.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/TvSeriesScreen.kt
@@ -18,11 +18,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.feature.content.series.SeriesViewModel
+import hu.bbara.purefin.core.feature.content.series.SeriesViewModel
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.Season
 import hu.bbara.purefin.model.Series
-import hu.bbara.purefin.navigation.SeriesDto
+import hu.bbara.purefin.core.navigation.SeriesDto
 import hu.bbara.purefin.ui.common.media.MediaDetailHorizontalPadding
 import hu.bbara.purefin.ui.common.media.TvMediaDetailBodyBox
 import hu.bbara.purefin.ui.common.media.TvMediaDetailScaffold
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/components/TvSeriesComponents.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/components/TvSeriesComponents.kt
@@ -52,8 +52,8 @@ import androidx.compose.ui.unit.sp
 import androidx.tv.material3.Tab
 import androidx.tv.material3.TabDefaults
 import androidx.tv.material3.TabRow
-import hu.bbara.purefin.image.ArtworkKind
-import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.core.image.ArtworkKind
+import hu.bbara.purefin.core.image.ImageUrlBuilder
 import hu.bbara.purefin.model.CastMember
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.Season
--- a/app-tv/src/main/java/hu/bbara/purefin/ui/screen/settings/TvSettingsScreen.kt
+++ b/app-tv/src/main/java/hu/bbara/purefin/ui/screen/settings/TvSettingsScreen.kt
@@ -31,8 +31,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.feature.settings.SettingsViewModel
-import hu.bbara.purefin.settings.SettingsOptions
+import hu.bbara.purefin.core.feature.settings.SettingsViewModel
+import hu.bbara.purefin.core.settings.SettingsOptions
 import java.util.Locale

@Composable
--- a/app-tv/src/test/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHeroTest.kt
+++ b/app-tv/src/test/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHeroTest.kt
@@ -1,6 +1,6 @@
 package hu.bbara.purefin.ui.screen.home.components

-import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.core.image.ImageUrlBuilder
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.MediaKind
 import hu.bbara.purefin.model.Movie
@@ -8,7 +8,7 @@ import hu.bbara.purefin.model.Series
 import hu.bbara.purefin.feature.browse.home.ContinueWatchingItem
 import hu.bbara.purefin.feature.browse.home.NextUpItem
 import hu.bbara.purefin.feature.browse.home.PosterItem
-import hu.bbara.purefin.image.ArtworkKind
+import hu.bbara.purefin.core.image.ArtworkKind
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import java.util.UUID
--- a/app-tv/src/test/java/hu/bbara/purefin/ui/screen/home/components/TvHomeHeroStateTest.kt
+++ b/app-tv/src/test/java/hu/bbara/purefin/ui/screen/home/components/TvHomeHeroStateTest.kt
@@ -5,7 +5,7 @@ import hu.bbara.purefin.model.LibraryKind
 import hu.bbara.purefin.model.MediaKind
 import hu.bbara.purefin.model.Movie
 import hu.bbara.purefin.feature.browse.home.ContinueWatchingItem
-import hu.bbara.purefin.ui.model.LibraryUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
 import hu.bbara.purefin.feature.browse.home.NextUpItem
 import hu.bbara.purefin.feature.browse.home.PosterItem
 import org.junit.Assert.assertEquals
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -39,11 +39,11 @@
            android:exported="false"
            android:theme="@style/Theme.Purefin" />
        <service
-            android:name="hu.bbara.purefin.download.PurefinDownloadService"
+            android:name="hu.bbara.purefin.core.download.PurefinDownloadService"
            android:exported="false"
            android:foregroundServiceType="dataSync" />
        <receiver
-            android:name="hu.bbara.purefin.update.AppUpdateInstallReceiver"
+            android:name="hu.bbara.purefin.core.update.AppUpdateInstallReceiver"
            android:exported="false" />
    </application>

--- a/app/src/main/java/hu/bbara/purefin/PurefinActivity.kt
+++ b/app/src/main/java/hu/bbara/purefin/PurefinActivity.kt
@@ -38,17 +38,17 @@ import coil3.network.okhttp.OkHttpNetworkFetcherFactory
 import coil3.request.crossfade
 import coil3.util.DebugLogger
 import dagger.hilt.android.AndroidEntryPoint
-import hu.bbara.purefin.data.SessionBootstrapper
-import hu.bbara.purefin.jellyfin.JellyfinAuthInterceptor
-import hu.bbara.purefin.data.UserSessionRepository
+import hu.bbara.purefin.core.data.SessionBootstrapper
+import hu.bbara.purefin.core.jellyfin.JellyfinAuthInterceptor
+import hu.bbara.purefin.core.data.UserSessionRepository
 import hu.bbara.purefin.navigation.LocalHomeMediaSharedBoundsKey
 import hu.bbara.purefin.navigation.LocalNavigationBackStack
 import hu.bbara.purefin.navigation.LocalNavigationManager
 import hu.bbara.purefin.navigation.LocalSetHomeMediaSharedBoundsKey
 import hu.bbara.purefin.navigation.LocalSharedTransitionScope
-import hu.bbara.purefin.navigation.NavigationCommand
-import hu.bbara.purefin.navigation.NavigationManager
-import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.core.navigation.NavigationCommand
+import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
 import hu.bbara.purefin.ui.screen.login.LoginScreen
 import hu.bbara.purefin.ui.theme.AppTheme
--- a/app/src/main/java/hu/bbara/purefin/modules/NavigationModule.kt
+++ b/app/src/main/java/hu/bbara/purefin/modules/NavigationModule.kt
@@ -6,7 +6,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityRetainedComponent
 import dagger.multibindings.IntoSet
-import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.navigation.appRouteEntryBuilder

@Module
--- a/app/src/main/java/hu/bbara/purefin/modules/PlaybackProfileFamilyModule.kt
+++ b/app/src/main/java/hu/bbara/purefin/modules/PlaybackProfileFamilyModule.kt
@@ -4,7 +4,7 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import hu.bbara.purefin.data.PlaybackProfileFamily
+import hu.bbara.purefin.core.data.PlaybackProfileFamily

@Module
@InstallIn(SingletonComponent::class)
--- a/app/src/main/java/hu/bbara/purefin/navigation/NavigationLocals.kt
+++ b/app/src/main/java/hu/bbara/purefin/navigation/NavigationLocals.kt
@@ -6,6 +6,8 @@ import androidx.compose.animation.SharedTransitionScope
 import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.staticCompositionLocalOf
+import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.core.navigation.Route

 val LocalNavigationManager: ProvidableCompositionLocal<NavigationManager> =
    staticCompositionLocalOf { error("NavigationManager not provided") }
--- a/app/src/main/java/hu/bbara/purefin/navigation/RouteEntryBuilder.kt
+++ b/app/src/main/java/hu/bbara/purefin/navigation/RouteEntryBuilder.kt
@@ -3,6 +3,7 @@ package hu.bbara.purefin.navigation
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.navigation3.runtime.EntryProviderScope
 import androidx.navigation3.ui.LocalNavAnimatedContentScope
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.ui.screen.library.LibraryScreen
 import hu.bbara.purefin.ui.screen.login.LoginScreen
 import hu.bbara.purefin.ui.screen.AppScreen
--- a/app/src/main/java/hu/bbara/purefin/player/PlayerActivity.kt
+++ b/app/src/main/java/hu/bbara/purefin/player/PlayerActivity.kt
@@ -11,7 +11,7 @@ import androidx.core.view.WindowInsetsControllerCompat
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import dagger.hilt.android.AndroidEntryPoint
-import hu.bbara.purefin.player.viewmodel.PlayerViewModel
+import hu.bbara.purefin.core.player.viewmodel.PlayerViewModel
 import hu.bbara.purefin.ui.screen.player.PlayerScreen
 import hu.bbara.purefin.ui.theme.AppTheme

--- a/app/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/common/card/PosterCard.kt
@@ -29,10 +29,10 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import hu.bbara.purefin.ui.model.EpisodeUiModel
-import hu.bbara.purefin.ui.model.MediaUiModel
-import hu.bbara.purefin.ui.model.MovieUiModel
-import hu.bbara.purefin.ui.model.SeriesUiModel
+import hu.bbara.purefin.core.model.EpisodeUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
+import hu.bbara.purefin.core.model.MovieUiModel
+import hu.bbara.purefin.core.model.SeriesUiModel
 import hu.bbara.purefin.ui.common.badge.WatchStateBadge
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 import java.util.UUID
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/AppScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/AppScreen.kt
@@ -23,9 +23,9 @@ import androidx.navigation3.runtime.entryProvider
 import androidx.navigation3.runtime.rememberNavBackStack
 import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
-import hu.bbara.purefin.feature.browse.home.AppViewModel
-import hu.bbara.purefin.feature.update.AppUpdateInfo
-import hu.bbara.purefin.feature.update.AppUpdateViewModel
+import hu.bbara.purefin.core.feature.browse.home.AppViewModel
+import hu.bbara.purefin.core.feature.update.AppUpdateInfo
+import hu.bbara.purefin.core.feature.update.AppUpdateViewModel
 import hu.bbara.purefin.navigation.LocalNavigationManager
 import hu.bbara.purefin.ui.screen.download.DownloadsScreen
 import hu.bbara.purefin.ui.screen.home.HomeScreen
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/download/components/DownloadingItemRow.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/download/components/DownloadingItemRow.kt
@@ -27,7 +27,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
-import hu.bbara.purefin.feature.downloads.ActiveDownloadItem
+import hu.bbara.purefin.core.feature.downloads.ActiveDownloadItem

@Composable
 internal fun DownloadingItemRow(
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/download/components/DownloadsContent.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/download/components/DownloadsContent.kt
@@ -24,7 +24,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import hu.bbara.purefin.ui.common.card.PosterCard
-import hu.bbara.purefin.feature.downloads.DownloadsViewModel
+import hu.bbara.purefin.core.feature.downloads.DownloadsViewModel

@Composable
 fun DownloadsContent(
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/episode/EpisodeScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/episode/EpisodeScreen.kt
@@ -36,19 +36,19 @@ import hu.bbara.purefin.ui.common.media.MediaHero
 import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsDestination
 import hu.bbara.purefin.ui.common.media.isHomeMediaSharedBoundsTransitionActive
-import hu.bbara.purefin.download.DownloadState
-import hu.bbara.purefin.image.ImageUrlBuilder
-import hu.bbara.purefin.navigation.EpisodeDto
+import hu.bbara.purefin.core.download.DownloadState
+import hu.bbara.purefin.core.image.ImageUrlBuilder
+import hu.bbara.purefin.core.navigation.EpisodeDto
 import hu.bbara.purefin.navigation.LocalNavigationBackStack
-import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.model.CastMember
 import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.feature.content.episode.EpisodeScreenViewModel
+import hu.bbara.purefin.core.feature.content.episode.EpisodeScreenViewModel
 import hu.bbara.purefin.ui.screen.episode.components.EpisodeDetails
 import hu.bbara.purefin.ui.screen.episode.components.EpisodeTopBar
 import hu.bbara.purefin.ui.screen.episode.components.EpisodeTopBarShortcut
 import hu.bbara.purefin.ui.theme.AppTheme
-import hu.bbara.purefin.image.ArtworkKind
+import hu.bbara.purefin.core.image.ArtworkKind
 import java.util.UUID

@Composable
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/episode/components/EpisodeComponents.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/episode/components/EpisodeComponents.kt
@@ -34,7 +34,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import hu.bbara.purefin.download.DownloadState
+import hu.bbara.purefin.core.download.DownloadState
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.player.PlayerActivity
 import hu.bbara.purefin.ui.common.button.GhostIconButton
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/HomeScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/HomeScreen.kt
@@ -8,8 +8,8 @@ import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import hu.bbara.purefin.ui.model.LibraryUiModel
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
 import hu.bbara.purefin.ui.screen.AppBottomBar
 import hu.bbara.purefin.ui.screen.home.components.HomeContent
 import hu.bbara.purefin.ui.screen.home.components.HomeTopBar
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/HomeContent.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/HomeContent.kt
@@ -21,8 +21,8 @@ import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.ui.model.LibraryUiModel
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
 import hu.bbara.purefin.ui.screen.home.components.continuewatching.ContinueWatchingSection
 import hu.bbara.purefin.ui.screen.home.components.featured.SuggestionsSection
 import hu.bbara.purefin.ui.screen.home.components.library.LibraryPosterSection
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingCard.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingCard.kt
@@ -16,7 +16,7 @@ import hu.bbara.purefin.ui.common.card.MediaImageCard
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsSource
 import hu.bbara.purefin.ui.common.media.rememberHomeMediaSharedBoundsClick
 import hu.bbara.purefin.ui.model.MediaAction
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel

@Composable
 internal fun ContinueWatchingCard(
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingSection.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/continuewatching/ContinueWatchingSection.kt
@@ -15,7 +15,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.ui.common.header.SectionHeader
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsKey
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel

@Composable
 fun ContinueWatchingSection(
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/featured/SuggestionCard.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/featured/SuggestionCard.kt
@@ -27,7 +27,7 @@ import hu.bbara.purefin.ui.common.bar.MediaProgressBar
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsSource
 import hu.bbara.purefin.ui.common.media.rememberHomeMediaSharedBoundsClick
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel

@Composable
 internal fun SuggestionCard(
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/featured/SuggestionsSection.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/featured/SuggestionsSection.kt
@@ -23,7 +23,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsKey
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel

@Composable
 fun SuggestionsSection(
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/HomeBrowseCard.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/HomeBrowseCard.kt
@@ -10,9 +10,9 @@ import hu.bbara.purefin.ui.common.badge.WatchStateBadge
 import hu.bbara.purefin.ui.common.card.MediaImageCard
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsSource
 import hu.bbara.purefin.ui.common.media.rememberHomeMediaSharedBoundsClick
-import hu.bbara.purefin.ui.model.EpisodeUiModel
-import hu.bbara.purefin.ui.model.MediaUiModel
-import hu.bbara.purefin.ui.model.MovieUiModel
+import hu.bbara.purefin.core.model.EpisodeUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
+import hu.bbara.purefin.core.model.MovieUiModel

@Composable
 internal fun HomeBrowseCard(
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/LibraryPosterSection.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/library/LibraryPosterSection.kt
@@ -15,8 +15,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.ui.common.header.SectionHeader
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsKey
-import hu.bbara.purefin.ui.model.LibraryUiModel
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
+import hu.bbara.purefin.core.model.MediaUiModel

@Composable
 fun LibraryPosterSection(
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpCard.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpCard.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.ui.common.card.MediaImageCard
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsSource
 import hu.bbara.purefin.ui.common.media.rememberHomeMediaSharedBoundsClick
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel

@Composable
 internal fun NextUpCard(
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpSection.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/nextup/NextUpSection.kt
@@ -15,7 +15,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.ui.common.header.SectionHeader
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsKey
-import hu.bbara.purefin.ui.model.MediaUiModel
+import hu.bbara.purefin.core.model.MediaUiModel

@Composable
 fun NextUpSection(
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/SearchOverlay.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/SearchOverlay.kt
@@ -35,7 +35,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.feature.search.SearchViewModel
+import hu.bbara.purefin.core.feature.search.SearchViewModel
 import java.util.UUID
 import hu.bbara.purefin.model.MediaKind

--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/SearchResultCard.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/SearchResultCard.kt
@@ -2,7 +2,7 @@ package hu.bbara.purefin.ui.screen.home.components.search

 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import hu.bbara.purefin.feature.search.SearchResult
+import hu.bbara.purefin.core.feature.search.SearchResult
 import hu.bbara.purefin.model.MediaKind
 import hu.bbara.purefin.ui.common.card.MediaImageCard

--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/SearchScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/SearchScreen.kt
@@ -54,8 +54,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import hu.bbara.purefin.feature.search.SearchResult
-import hu.bbara.purefin.feature.search.SearchViewModel
+import hu.bbara.purefin.core.feature.search.SearchResult
+import hu.bbara.purefin.core.feature.search.SearchViewModel
 import hu.bbara.purefin.model.Genre
 import hu.bbara.purefin.model.MediaKind
 import hu.bbara.purefin.navigation.HOME_SEARCH_SHARED_BOUNDS_KEY
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/libraries/LibrariesScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/libraries/LibrariesScreen.kt
@@ -6,7 +6,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import hu.bbara.purefin.ui.model.LibraryUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
 import hu.bbara.purefin.ui.screen.AppBottomBar
 import hu.bbara.purefin.ui.screen.libraries.components.LibrariesContent
 import hu.bbara.purefin.ui.screen.libraries.components.LibrariesTopBar
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/libraries/components/LibrariesContent.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/libraries/components/LibrariesContent.kt
@@ -9,7 +9,7 @@ import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.ui.model.LibraryUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel

@Composable
 fun LibrariesContent(
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/libraries/components/LibraryListItem.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/libraries/components/LibraryListItem.kt
@@ -4,7 +4,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import hu.bbara.purefin.model.LibraryKind
 import hu.bbara.purefin.ui.common.card.MediaImageCard
-import hu.bbara.purefin.ui.model.LibraryUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel

@Composable
 fun LibraryListItem(
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/library/LibraryScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/library/LibraryScreen.kt
@@ -19,14 +19,14 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.feature.browse.library.LibraryViewModel
-import hu.bbara.purefin.navigation.LibraryDto
+import hu.bbara.purefin.core.feature.browse.library.LibraryViewModel
+import hu.bbara.purefin.core.navigation.LibraryDto
 import hu.bbara.purefin.ui.common.badge.WatchStateBadge
 import hu.bbara.purefin.ui.common.card.MediaImageCard
-import hu.bbara.purefin.ui.model.EpisodeUiModel
-import hu.bbara.purefin.ui.model.MediaUiModel
-import hu.bbara.purefin.ui.model.MovieUiModel
-import hu.bbara.purefin.ui.model.SeriesUiModel
+import hu.bbara.purefin.core.model.EpisodeUiModel
+import hu.bbara.purefin.core.model.MediaUiModel
+import hu.bbara.purefin.core.model.MovieUiModel
+import hu.bbara.purefin.core.model.SeriesUiModel
 import hu.bbara.purefin.ui.screen.library.components.LibraryTopBar

@Composable
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/login/LoginScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/login/LoginScreen.kt
@@ -9,7 +9,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.feature.login.LoginViewModel
+import hu.bbara.purefin.core.feature.login.LoginViewModel
 import kotlinx.coroutines.launch

@Composable
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/movie/MovieScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/movie/MovieScreen.kt
@@ -30,13 +30,13 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.download.DownloadState
-import hu.bbara.purefin.feature.content.movie.MovieScreenViewModel
-import hu.bbara.purefin.image.ArtworkKind
-import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.core.download.DownloadState
+import hu.bbara.purefin.core.feature.content.movie.MovieScreenViewModel
+import hu.bbara.purefin.core.image.ArtworkKind
+import hu.bbara.purefin.core.image.ImageUrlBuilder
 import hu.bbara.purefin.model.CastMember
 import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.navigation.MovieDto
+import hu.bbara.purefin.core.navigation.MovieDto
 import hu.bbara.purefin.ui.common.media.MediaHero
 import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsDestination
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/movie/components/MovieComponents.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/movie/components/MovieComponents.kt
@@ -29,7 +29,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import hu.bbara.purefin.download.DownloadState
+import hu.bbara.purefin.core.download.DownloadState
 import hu.bbara.purefin.model.Movie
 import hu.bbara.purefin.player.PlayerActivity
 import hu.bbara.purefin.ui.common.button.GhostIconButton
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/player/PlayerScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/player/PlayerScreen.kt
@@ -38,7 +38,7 @@ import androidx.media3.common.util.UnstableApi
 import androidx.media3.ui.AspectRatioFrameLayout
 import androidx.media3.ui.PlayerView
 import androidx.media3.ui.SubtitleView
-import hu.bbara.purefin.player.viewmodel.PlayerViewModel
+import hu.bbara.purefin.core.player.viewmodel.PlayerViewModel
 import hu.bbara.purefin.ui.common.visual.EmptyValueTimedVisibility
 import hu.bbara.purefin.ui.common.visual.ValueChangeTimedVisibility
 import hu.bbara.purefin.ui.screen.player.components.PersistentOverlayContainer
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerControlsOverlay.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerControlsOverlay.kt
@@ -42,8 +42,8 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.player.model.PlayerUiState
-import hu.bbara.purefin.player.model.TrackOption
+import hu.bbara.purefin.core.player.model.PlayerUiState
+import hu.bbara.purefin.core.player.model.TrackOption
 import hu.bbara.purefin.ui.common.button.GhostIconButton
 import hu.bbara.purefin.ui.common.button.PurefinIconButton

--- a/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerLoadingErrorEndCard.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerLoadingErrorEndCard.kt
@@ -3,7 +3,7 @@ package hu.bbara.purefin.ui.screen.player.components
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import hu.bbara.purefin.player.model.PlayerUiState
+import hu.bbara.purefin.core.player.model.PlayerUiState

@Composable
 fun PlayerLoadingErrorEndCard(
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerQueuePanel.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerQueuePanel.kt
@@ -29,7 +29,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.player.model.PlayerUiState
+import hu.bbara.purefin.core.player.model.PlayerUiState
 import hu.bbara.purefin.ui.common.image.PurefinAsyncImage

@Composable
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerSeekBar.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerSeekBar.kt
@@ -17,7 +17,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.player.model.TimedMarker
+import hu.bbara.purefin.core.player.model.TimedMarker

@Composable
 fun PlayerSeekBar(
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/TrackSelectionButtons.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/TrackSelectionButtons.kt
@@ -36,7 +36,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import hu.bbara.purefin.ui.common.button.PurefinIconButton
-import hu.bbara.purefin.player.model.TrackOption
+import hu.bbara.purefin.core.player.model.TrackOption

@Composable
 fun QualitySelectionButton(
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/series/SeriesScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/series/SeriesScreen.kt
@@ -30,15 +30,15 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.download.DownloadState
-import hu.bbara.purefin.feature.content.series.SeriesViewModel
-import hu.bbara.purefin.image.ArtworkKind
-import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.core.download.DownloadState
+import hu.bbara.purefin.core.feature.content.series.SeriesViewModel
+import hu.bbara.purefin.core.image.ArtworkKind
+import hu.bbara.purefin.core.image.ImageUrlBuilder
 import hu.bbara.purefin.model.CastMember
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.Season
 import hu.bbara.purefin.model.Series
-import hu.bbara.purefin.navigation.SeriesDto
+import hu.bbara.purefin.core.navigation.SeriesDto
 import hu.bbara.purefin.ui.common.media.MediaHero
 import hu.bbara.purefin.ui.common.media.MediaSynopsis
 import hu.bbara.purefin.ui.common.media.homeMediaSharedBoundsDestination
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/series/components/SeriesComponents.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/series/components/SeriesComponents.kt
@@ -55,17 +55,17 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.download.DownloadState
-import hu.bbara.purefin.feature.content.series.SeriesViewModel
-import hu.bbara.purefin.image.ArtworkKind
-import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.core.download.DownloadState
+import hu.bbara.purefin.core.feature.content.series.SeriesViewModel
+import hu.bbara.purefin.core.image.ArtworkKind
+import hu.bbara.purefin.core.image.ImageUrlBuilder
 import hu.bbara.purefin.model.CastMember
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.Season
 import hu.bbara.purefin.model.Series
-import hu.bbara.purefin.navigation.EpisodeDto
+import hu.bbara.purefin.core.navigation.EpisodeDto
 import hu.bbara.purefin.navigation.LocalNavigationManager
-import hu.bbara.purefin.navigation.Route
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.player.PlayerActivity
 import hu.bbara.purefin.ui.common.badge.WatchStateBadge
 import hu.bbara.purefin.ui.common.bar.MediaProgressBar
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/settings/SettingsScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/settings/SettingsScreen.kt
@@ -16,8 +16,8 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.feature.settings.SettingsViewModel
-import hu.bbara.purefin.settings.SettingsOptions
+import hu.bbara.purefin.core.feature.settings.SettingsViewModel
+import hu.bbara.purefin.core.settings.SettingsOptions
 import hu.bbara.purefin.ui.screen.home.components.DefaultTopBar
 import hu.bbara.purefin.ui.screen.home.components.DefaultTopBarIconButton
 import hu.bbara.purefin.ui.screen.settings.components.BooleanSettingItem
--- a/core-ui/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerLoadingErrorEndCardContent.kt
+++ b/core-ui/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerLoadingErrorEndCardContent.kt
@@ -21,7 +21,7 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.player.model.PlayerUiState
+import hu.bbara.purefin.core.player.model.PlayerUiState

@Composable
 fun PlayerLoadingErrorEndCardContent(
--- a/core-ui/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerSeekBarTrack.kt
+++ b/core-ui/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerSeekBarTrack.kt
@@ -10,8 +10,8 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.player.model.MarkerType
-import hu.bbara.purefin.player.model.TimedMarker
+import hu.bbara.purefin.core.player.model.MarkerType
+import hu.bbara.purefin.core.player.model.TimedMarker

@Composable
 fun PlayerSeekBarTrack(
--- a/core/src/main/java/hu/bbara/purefin/core/Qualifiers.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/Qualifiers.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin
+package hu.bbara.purefin.core

 import javax.inject.Qualifier

--- a/core/src/main/java/hu/bbara/purefin/core/data/AuthenticationRepository.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/data/AuthenticationRepository.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.data
+package hu.bbara.purefin.core.data

 interface AuthenticationRepository {
    suspend fun login(url: String, username: String, password: String): Boolean
--- a/core/src/main/java/hu/bbara/purefin/core/data/CompositeLocalMediaRepository.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/data/CompositeLocalMediaRepository.kt
@@ -1,7 +1,7 @@
-package hu.bbara.purefin.data
+package hu.bbara.purefin.core.data

-import hu.bbara.purefin.Offline
-import hu.bbara.purefin.Online
+import hu.bbara.purefin.core.Offline
+import hu.bbara.purefin.core.Online
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.Movie
 import hu.bbara.purefin.model.Series
--- a/core/src/main/java/hu/bbara/purefin/core/data/DownloadMediaSourceResolver.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/data/DownloadMediaSourceResolver.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.data
+package hu.bbara.purefin.core.data

 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.Movie
--- a/core/src/main/java/hu/bbara/purefin/core/data/HomeRepository.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/data/HomeRepository.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.data
+package hu.bbara.purefin.core.data

 import hu.bbara.purefin.model.Library
 import hu.bbara.purefin.model.Media
--- a/core/src/main/java/hu/bbara/purefin/core/data/LocalMediaRepository.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/data/LocalMediaRepository.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.data
+package hu.bbara.purefin.core.data

 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.Movie
--- a/core/src/main/java/hu/bbara/purefin/core/data/LocalMediaUpdater.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/data/LocalMediaUpdater.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.data
+package hu.bbara.purefin.core.data

 import java.util.UUID

--- a/core/src/main/java/hu/bbara/purefin/core/data/NetworkMonitor.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/data/NetworkMonitor.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.data
+package hu.bbara.purefin.core.data

 import kotlinx.coroutines.flow.Flow

--- a/core/src/main/java/hu/bbara/purefin/core/data/OfflineCatalogReader.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/data/OfflineCatalogReader.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.data
+package hu.bbara.purefin.core.data

 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.Movie
--- a/core/src/main/java/hu/bbara/purefin/core/data/OfflineCatalogStore.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/data/OfflineCatalogStore.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.data
+package hu.bbara.purefin.core.data

 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.Movie
--- a/core/src/main/java/hu/bbara/purefin/core/data/PlayableMediaRepository.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/data/PlayableMediaRepository.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.data
+package hu.bbara.purefin.core.data

 import hu.bbara.purefin.model.PlayableMedia
 import java.util.UUID
--- a/core/src/main/java/hu/bbara/purefin/core/data/PlaybackMethod.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/data/PlaybackMethod.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.data
+package hu.bbara.purefin.core.data

 enum class PlaybackMethod {
    DIRECT_PLAY,
--- a/core/src/main/java/hu/bbara/purefin/core/data/PlaybackProfileFamily.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/data/PlaybackProfileFamily.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.data
+package hu.bbara.purefin.core.data

 enum class PlaybackProfileFamily {
    MOBILE,
--- a/core/src/main/java/hu/bbara/purefin/core/data/PlaybackProgressReporter.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/data/PlaybackProgressReporter.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.data
+package hu.bbara.purefin.core.data

 import java.util.UUID

--- a/core/src/main/java/hu/bbara/purefin/core/data/PlaybackReportContext.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/data/PlaybackReportContext.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.data
+package hu.bbara.purefin.core.data

 data class PlaybackReportContext(
    val playMethod: PlaybackMethod,
--- a/core/src/main/java/hu/bbara/purefin/core/data/SearchManager.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/data/SearchManager.kt
@@ -1,6 +1,6 @@
-package hu.bbara.purefin.data
+package hu.bbara.purefin.core.data

-import hu.bbara.purefin.feature.search.SearchResult
+import hu.bbara.purefin.core.feature.search.SearchResult
 import hu.bbara.purefin.model.Genre
 import kotlinx.coroutines.flow.StateFlow

--- a/core/src/main/java/hu/bbara/purefin/core/data/SessionBootstrapper.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/data/SessionBootstrapper.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.data
+package hu.bbara.purefin.core.data

 interface SessionBootstrapper {
    suspend fun initialize()
--- a/core/src/main/java/hu/bbara/purefin/core/data/SmartDownloadStore.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/data/SmartDownloadStore.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.data
+package hu.bbara.purefin.core.data

 import kotlinx.coroutines.flow.Flow
 import java.util.UUID
--- a/core/src/main/java/hu/bbara/purefin/core/data/UserSessionRepository.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/data/UserSessionRepository.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.data
+package hu.bbara.purefin.core.data

 import kotlinx.coroutines.flow.Flow
 import java.util.UUID
--- a/core/src/main/java/hu/bbara/purefin/core/download/DownloadControllerModule.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/download/DownloadControllerModule.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.download
+package hu.bbara.purefin.core.download

 import dagger.Binds
 import dagger.Module
--- a/core/src/main/java/hu/bbara/purefin/core/download/DownloadModule.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/download/DownloadModule.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.download
+package hu.bbara.purefin.core.download

 import android.content.Context
 import androidx.annotation.OptIn
--- a/Show More
+++ b/Show More