refactor: update package structure to use core namespace

2026-07-24 03:36:51 +00:00 · 2026-05-06 17:24:04 +02:00
parent 41f7129b08
commit 322eb69ab5
194 changed files with 465 additions and 457 deletions
--- 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/core/src/main/java/hu/bbara/purefin/core/download/DownloadState.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/download/DownloadState.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.download
+package hu.bbara.purefin.core.download

 sealed class DownloadState {
    data object NotDownloaded : DownloadState()
--- a/core/src/main/java/hu/bbara/purefin/core/download/MediaDownloadController.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/download/MediaDownloadController.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.download
+package hu.bbara.purefin.core.download

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

 import android.content.Context
 import android.util.Log
@@ -9,9 +9,9 @@ import androidx.media3.exoplayer.offline.Download
 import androidx.media3.exoplayer.offline.DownloadManager
 import androidx.media3.exoplayer.offline.DownloadRequest
 import dagger.hilt.android.qualifiers.ApplicationContext
-import hu.bbara.purefin.data.DownloadMediaSourceResolver
-import hu.bbara.purefin.data.OfflineCatalogStore
-import hu.bbara.purefin.data.SmartDownloadStore
+import hu.bbara.purefin.core.data.DownloadMediaSourceResolver
+import hu.bbara.purefin.core.data.OfflineCatalogStore
+import hu.bbara.purefin.core.data.SmartDownloadStore
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
--- a/core/src/main/java/hu/bbara/purefin/core/download/PurefinDownloadService.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/download/PurefinDownloadService.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.download
+package hu.bbara.purefin.core.download

 import android.app.Notification
 import android.content.Context
--- a/core/src/main/java/hu/bbara/purefin/core/feature/browse/home/AppViewModel.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/feature/browse/home/AppViewModel.kt
@@ -1,26 +1,26 @@
-package hu.bbara.purefin.feature.browse.home
+package hu.bbara.purefin.core.feature.browse.home

 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import hu.bbara.purefin.data.HomeRepository
-import hu.bbara.purefin.data.LocalMediaRepository
-import hu.bbara.purefin.data.UserSessionRepository
-import hu.bbara.purefin.download.MediaDownloadController
-import hu.bbara.purefin.jellyfin.JellyfinMediaMetadataUpdater
+import hu.bbara.purefin.core.data.HomeRepository
+import hu.bbara.purefin.core.data.LocalMediaRepository
+import hu.bbara.purefin.core.data.UserSessionRepository
+import hu.bbara.purefin.core.download.MediaDownloadController
+import hu.bbara.purefin.core.jellyfin.JellyfinMediaMetadataUpdater
+import hu.bbara.purefin.core.model.EpisodeUiModel
+import hu.bbara.purefin.core.model.LibraryUiModel
+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.core.navigation.EpisodeDto
+import hu.bbara.purefin.core.navigation.LibraryDto
+import hu.bbara.purefin.core.navigation.MovieDto
+import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.core.navigation.Route
+import hu.bbara.purefin.core.navigation.SeriesDto
 import hu.bbara.purefin.model.LibraryKind
 import hu.bbara.purefin.model.Media
-import hu.bbara.purefin.navigation.EpisodeDto
-import hu.bbara.purefin.navigation.LibraryDto
-import hu.bbara.purefin.navigation.MovieDto
-import hu.bbara.purefin.navigation.NavigationManager
-import hu.bbara.purefin.navigation.Route
-import hu.bbara.purefin.navigation.SeriesDto
-import hu.bbara.purefin.ui.model.EpisodeUiModel
-import hu.bbara.purefin.ui.model.LibraryUiModel
-import hu.bbara.purefin.ui.model.MediaUiModel
-import hu.bbara.purefin.ui.model.MovieUiModel
-import hu.bbara.purefin.ui.model.SeriesUiModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -172,7 +172,12 @@ class AppViewModel @Inject constructor(

    fun onLibrarySelected(id: UUID, name: String) {
        viewModelScope.launch {
-            navigationManager.navigate(Route.LibraryRoute(library = LibraryDto(id = id, name = name)))
+            navigationManager.navigate(
+                Route.LibraryRoute(library = LibraryDto(
+                    id = id,
+                    name = name
+                )
+                ))
        }
    }

@@ -189,31 +194,34 @@ class AppViewModel @Inject constructor(
    }

    private fun onMovieSelected(movieId: UUID) {
-        navigationManager.navigate(Route.MovieRoute(
-            MovieDto(
-                id = movieId,
-            )
+        navigationManager.navigate(
+            Route.MovieRoute(
+                MovieDto(
+                    id = movieId,
+                )
        ))
    }

    private fun onSeriesSelected(seriesId: UUID) {
        viewModelScope.launch {
-            navigationManager.navigate(Route.SeriesRoute(
-                SeriesDto(
-                    id = seriesId,
-                )
+            navigationManager.navigate(
+                Route.SeriesRoute(
+                    SeriesDto(
+                        id = seriesId,
+                    )
            ))
        }
    }

    private fun onEpisodeSelected(seriesId: UUID, seasonId: UUID, episodeId: UUID) {
        viewModelScope.launch {
-            navigationManager.navigate(Route.EpisodeRoute(
-                EpisodeDto(
-                    id = episodeId,
-                    seasonId = seasonId,
-                    seriesId = seriesId
-                )
+            navigationManager.navigate(
+                Route.EpisodeRoute(
+                    EpisodeDto(
+                        id = episodeId,
+                        seasonId = seasonId,
+                        seriesId = seriesId
+                    )
            ))
        }
    }
--- a/core/src/main/java/hu/bbara/purefin/core/feature/browse/library/LibraryViewModel.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/feature/browse/library/LibraryViewModel.kt
@@ -1,17 +1,17 @@
-package hu.bbara.purefin.feature.browse.library
+package hu.bbara.purefin.core.feature.browse.library

 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import hu.bbara.purefin.data.HomeRepository
+import hu.bbara.purefin.core.data.HomeRepository
+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.core.navigation.MovieDto
+import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.core.navigation.Route
+import hu.bbara.purefin.core.navigation.SeriesDto
 import hu.bbara.purefin.model.LibraryKind
-import hu.bbara.purefin.navigation.MovieDto
-import hu.bbara.purefin.navigation.NavigationManager
-import hu.bbara.purefin.navigation.Route
-import hu.bbara.purefin.navigation.SeriesDto
-import hu.bbara.purefin.ui.model.MediaUiModel
-import hu.bbara.purefin.ui.model.MovieUiModel
-import hu.bbara.purefin.ui.model.SeriesUiModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -50,19 +50,21 @@ class LibraryViewModel @Inject constructor(
    }

    fun onMovieSelected(movieId: UUID) {
-        navigationManager.navigate(Route.MovieRoute(
-            MovieDto(
-                id = movieId,
-            )
+        navigationManager.navigate(
+            Route.MovieRoute(
+                MovieDto(
+                    id = movieId,
+                )
        ))
    }

    fun onSeriesSelected(seriesId: UUID) {
        viewModelScope.launch {
-            navigationManager.navigate(Route.SeriesRoute(
-                SeriesDto(
-                    id = seriesId,
-                )
+            navigationManager.navigate(
+                Route.SeriesRoute(
+                    SeriesDto(
+                        id = seriesId,
+                    )
            ))
        }
    }
--- a/core/src/main/java/hu/bbara/purefin/core/feature/content/episode/EpisodeScreenViewModel.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/feature/content/episode/EpisodeScreenViewModel.kt
@@ -1,15 +1,15 @@
-package hu.bbara.purefin.feature.content.episode
+package hu.bbara.purefin.core.feature.content.episode

 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import hu.bbara.purefin.data.LocalMediaRepository
-import hu.bbara.purefin.download.DownloadState
-import hu.bbara.purefin.download.MediaDownloadController
+import hu.bbara.purefin.core.data.LocalMediaRepository
+import hu.bbara.purefin.core.download.DownloadState
+import hu.bbara.purefin.core.download.MediaDownloadController
+import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.core.navigation.Route
+import hu.bbara.purefin.core.navigation.SeriesDto
 import hu.bbara.purefin.model.Episode
-import hu.bbara.purefin.navigation.NavigationManager
-import hu.bbara.purefin.navigation.Route
-import hu.bbara.purefin.navigation.SeriesDto
 import java.util.UUID
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
--- a/core/src/main/java/hu/bbara/purefin/core/feature/content/movie/MovieScreenViewModel.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/feature/content/movie/MovieScreenViewModel.kt
@@ -1,14 +1,14 @@
-package hu.bbara.purefin.feature.content.movie
+package hu.bbara.purefin.core.feature.content.movie

 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import hu.bbara.purefin.data.LocalMediaRepository
-import hu.bbara.purefin.download.DownloadState
-import hu.bbara.purefin.download.MediaDownloadController
+import hu.bbara.purefin.core.data.LocalMediaRepository
+import hu.bbara.purefin.core.download.DownloadState
+import hu.bbara.purefin.core.download.MediaDownloadController
+import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.model.Movie
-import hu.bbara.purefin.navigation.NavigationManager
-import hu.bbara.purefin.navigation.Route
 import java.util.UUID
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
--- a/core/src/main/java/hu/bbara/purefin/core/feature/content/series/SeriesViewModel.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/feature/content/series/SeriesViewModel.kt
@@ -1,16 +1,16 @@
-package hu.bbara.purefin.feature.content.series
+package hu.bbara.purefin.core.feature.content.series

 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import hu.bbara.purefin.data.LocalMediaRepository
-import hu.bbara.purefin.download.DownloadState
-import hu.bbara.purefin.download.MediaDownloadController
+import hu.bbara.purefin.core.data.LocalMediaRepository
+import hu.bbara.purefin.core.download.DownloadState
+import hu.bbara.purefin.core.download.MediaDownloadController
+import hu.bbara.purefin.core.navigation.EpisodeDto
+import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.core.navigation.Route
 import hu.bbara.purefin.model.Episode
 import hu.bbara.purefin.model.Series
-import hu.bbara.purefin.navigation.EpisodeDto
-import hu.bbara.purefin.navigation.NavigationManager
-import hu.bbara.purefin.navigation.Route
 import java.util.UUID
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -105,12 +105,13 @@ class SeriesViewModel @Inject constructor(
    }

    fun onSelectEpisode(seriesId: UUID, seasonId: UUID, episodeId: UUID) {
-        navigationManager.navigate(Route.EpisodeRoute(
-            EpisodeDto(
-                id = episodeId,
-                seasonId = seasonId,
-                seriesId = seriesId
-            )
+        navigationManager.navigate(
+            Route.EpisodeRoute(
+                EpisodeDto(
+                    id = episodeId,
+                    seasonId = seasonId,
+                    seriesId = seriesId
+                )
        ))
    }

--- a/core/src/main/java/hu/bbara/purefin/core/feature/downloads/ActiveDownloadItem.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/feature/downloads/ActiveDownloadItem.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.feature.downloads
+package hu.bbara.purefin.core.feature.downloads

 data class ActiveDownloadItem(
    val contentId: String,
--- a/core/src/main/java/hu/bbara/purefin/core/feature/downloads/DownloadsViewModel.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/feature/downloads/DownloadsViewModel.kt
@@ -1,19 +1,19 @@
-package hu.bbara.purefin.feature.downloads
+package hu.bbara.purefin.core.feature.downloads

 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import hu.bbara.purefin.Offline
-import hu.bbara.purefin.data.LocalMediaRepository
-import hu.bbara.purefin.download.MediaDownloadController
-import hu.bbara.purefin.image.ArtworkKind
-import hu.bbara.purefin.image.ImageUrlBuilder
-import hu.bbara.purefin.navigation.MovieDto
-import hu.bbara.purefin.navigation.NavigationManager
-import hu.bbara.purefin.navigation.Route
-import hu.bbara.purefin.navigation.SeriesDto
-import hu.bbara.purefin.ui.model.MovieUiModel
-import hu.bbara.purefin.ui.model.SeriesUiModel
+import hu.bbara.purefin.core.Offline
+import hu.bbara.purefin.core.data.LocalMediaRepository
+import hu.bbara.purefin.core.download.MediaDownloadController
+import hu.bbara.purefin.core.image.ArtworkKind
+import hu.bbara.purefin.core.image.ImageUrlBuilder
+import hu.bbara.purefin.core.model.MovieUiModel
+import hu.bbara.purefin.core.model.SeriesUiModel
+import hu.bbara.purefin.core.navigation.MovieDto
+import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.core.navigation.Route
+import hu.bbara.purefin.core.navigation.SeriesDto
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
@@ -29,15 +29,17 @@ class DownloadsViewModel @Inject constructor(
 ) : ViewModel() {

    fun onMovieSelected(movieId: UUID) {
-        navigationManager.navigate(Route.MovieRoute(
-            MovieDto(id = movieId)
+        navigationManager.navigate(
+            Route.MovieRoute(
+                MovieDto(id = movieId)
        ))
    }

    fun onSeriesSelected(seriesId: UUID) {
        viewModelScope.launch {
-            navigationManager.navigate(Route.SeriesRoute(
-                SeriesDto(id = seriesId)
+            navigationManager.navigate(
+                Route.SeriesRoute(
+                    SeriesDto(id = seriesId)
            ))
        }
    }
--- a/core/src/main/java/hu/bbara/purefin/core/feature/login/LoginViewModel.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/feature/login/LoginViewModel.kt
@@ -1,10 +1,10 @@
-package hu.bbara.purefin.feature.login
+package hu.bbara.purefin.core.feature.login

 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import hu.bbara.purefin.data.AuthenticationRepository
-import hu.bbara.purefin.data.UserSessionRepository
+import hu.bbara.purefin.core.data.AuthenticationRepository
+import hu.bbara.purefin.core.data.UserSessionRepository
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
--- a/core/src/main/java/hu/bbara/purefin/core/feature/search/SearchResult.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/feature/search/SearchResult.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.feature.search
+package hu.bbara.purefin.core.feature.search

 import hu.bbara.purefin.model.MediaKind
 import hu.bbara.purefin.model.Movie
--- a/core/src/main/java/hu/bbara/purefin/core/feature/search/SearchViewModel.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/feature/search/SearchViewModel.kt
@@ -1,13 +1,13 @@
-package hu.bbara.purefin.feature.search
+package hu.bbara.purefin.core.feature.search

 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import hu.bbara.purefin.data.SearchManager
+import hu.bbara.purefin.core.data.SearchManager
+import hu.bbara.purefin.core.navigation.MovieDto
+import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.core.navigation.Route
+import hu.bbara.purefin.core.navigation.SeriesDto
 import hu.bbara.purefin.model.MediaKind
-import hu.bbara.purefin.navigation.MovieDto
-import hu.bbara.purefin.navigation.NavigationManager
-import hu.bbara.purefin.navigation.Route
-import hu.bbara.purefin.navigation.SeriesDto
 import java.util.UUID
 import javax.inject.Inject

--- a/core/src/main/java/hu/bbara/purefin/core/feature/settings/SettingsViewModel.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/feature/settings/SettingsViewModel.kt
@@ -1,13 +1,13 @@
-package hu.bbara.purefin.feature.settings
+package hu.bbara.purefin.core.feature.settings

 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import hu.bbara.purefin.navigation.NavigationManager
-import hu.bbara.purefin.settings.BooleanSetting
-import hu.bbara.purefin.settings.NumberSetting
-import hu.bbara.purefin.settings.SettingsRepository
-import hu.bbara.purefin.settings.StringSetting
+import hu.bbara.purefin.core.navigation.NavigationManager
+import hu.bbara.purefin.core.settings.BooleanSetting
+import hu.bbara.purefin.core.settings.NumberSetting
+import hu.bbara.purefin.core.settings.SettingsRepository
+import hu.bbara.purefin.core.settings.StringSetting
 import kotlinx.coroutines.launch
 import javax.inject.Inject

--- a/core/src/main/java/hu/bbara/purefin/core/feature/update/AppUpdateInfo.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/feature/update/AppUpdateInfo.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.feature.update
+package hu.bbara.purefin.core.feature.update

 data class AppUpdateInfo(
    val versionCode: Long,
--- a/core/src/main/java/hu/bbara/purefin/core/feature/update/AppUpdateInstaller.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/feature/update/AppUpdateInstaller.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.feature.update
+package hu.bbara.purefin.core.feature.update

 interface AppUpdateInstaller {
    suspend fun installUpdate(update: AppUpdateInfo): String
--- a/core/src/main/java/hu/bbara/purefin/core/feature/update/AppUpdateRepository.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/feature/update/AppUpdateRepository.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.feature.update
+package hu.bbara.purefin.core.feature.update

 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
--- a/core/src/main/java/hu/bbara/purefin/core/feature/update/AppUpdateViewModel.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/feature/update/AppUpdateViewModel.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.feature.update
+package hu.bbara.purefin.core.feature.update

 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
--- a/core/src/main/java/hu/bbara/purefin/core/feature/update/AppVersionProvider.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/feature/update/AppVersionProvider.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.feature.update
+package hu.bbara.purefin.core.feature.update

 interface AppVersionProvider {
    val versionCode: Long
--- a/core/src/main/java/hu/bbara/purefin/core/image/ArtworkKind.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/image/ArtworkKind.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.image
+package hu.bbara.purefin.core.image

 enum class ArtworkKind(
    internal val pathSegment: String,
--- a/core/src/main/java/hu/bbara/purefin/core/image/ImageUrlBuilder.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/image/ImageUrlBuilder.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.image
+package hu.bbara.purefin.core.image

 import java.util.UUID

--- a/core/src/main/java/hu/bbara/purefin/core/jellyfin/JellyfinAuthInterceptor.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/jellyfin/JellyfinAuthInterceptor.kt
@@ -1,6 +1,6 @@
-package hu.bbara.purefin.jellyfin
+package hu.bbara.purefin.core.jellyfin

-import hu.bbara.purefin.data.UserSessionRepository
+import hu.bbara.purefin.core.data.UserSessionRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
--- a/core/src/main/java/hu/bbara/purefin/core/jellyfin/JellyfinMediaMetadataUpdater.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/jellyfin/JellyfinMediaMetadataUpdater.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.jellyfin
+package hu.bbara.purefin.core.jellyfin

 import java.util.UUID

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

 import dagger.Module
 import dagger.Provides
--- a/core/src/main/java/hu/bbara/purefin/core/model/LibraryUiModel.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/model/LibraryUiModel.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.ui.model
+package hu.bbara.purefin.core.model

 import hu.bbara.purefin.model.LibraryKind
 import java.util.UUID
--- a/core/src/main/java/hu/bbara/purefin/core/model/MediaUiModel.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/model/MediaUiModel.kt
@@ -1,7 +1,7 @@
-package hu.bbara.purefin.ui.model
+package hu.bbara.purefin.core.model

-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.Episode
 import hu.bbara.purefin.model.Movie
 import hu.bbara.purefin.model.Series
--- a/core/src/main/java/hu/bbara/purefin/core/module/RepositoryModule.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/module/RepositoryModule.kt
@@ -1,12 +1,12 @@
-package hu.bbara.purefin.module
+package hu.bbara.purefin.core.module

 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import hu.bbara.purefin.data.CompositeLocalMediaRepository
-import hu.bbara.purefin.data.LocalMediaUpdater
-import hu.bbara.purefin.data.LocalMediaRepository
+import hu.bbara.purefin.core.data.CompositeLocalMediaRepository
+import hu.bbara.purefin.core.data.LocalMediaRepository
+import hu.bbara.purefin.core.data.LocalMediaUpdater


@Module
--- a/core/src/main/java/hu/bbara/purefin/core/navigation/EpisodeDto.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/navigation/EpisodeDto.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.navigation
+package hu.bbara.purefin.core.navigation

 import kotlinx.serialization.Serializable
 import java.util.UUID
--- a/core/src/main/java/hu/bbara/purefin/core/navigation/LibraryDto.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/navigation/LibraryDto.kt
@@ -1,8 +1,7 @@
-package hu.bbara.purefin.navigation
+package hu.bbara.purefin.core.navigation

 import java.util.UUID
 import kotlinx.serialization.Serializable
-import hu.bbara.purefin.navigation.UuidSerializer

@Serializable
 data class LibraryDto(
--- a/core/src/main/java/hu/bbara/purefin/core/navigation/MovieDto.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/navigation/MovieDto.kt
@@ -1,8 +1,7 @@
-package hu.bbara.purefin.navigation
+package hu.bbara.purefin.core.navigation

 import java.util.UUID
 import kotlinx.serialization.Serializable
-import hu.bbara.purefin.navigation.UuidSerializer

@Serializable
 data class MovieDto(
--- a/core/src/main/java/hu/bbara/purefin/core/navigation/NavigationManager.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/navigation/NavigationManager.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.navigation
+package hu.bbara.purefin.core.navigation

 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
--- a/core/src/main/java/hu/bbara/purefin/core/navigation/NavigationManagerModule.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/navigation/NavigationManagerModule.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.navigation
+package hu.bbara.purefin.core.navigation

 import dagger.Module
 import dagger.Provides
--- a/core/src/main/java/hu/bbara/purefin/core/navigation/Route.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/navigation/Route.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.navigation
+package hu.bbara.purefin.core.navigation

 import androidx.navigation3.runtime.NavKey
 import kotlinx.serialization.Serializable
--- a/core/src/main/java/hu/bbara/purefin/core/navigation/SeriesDto.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/navigation/SeriesDto.kt
@@ -1,8 +1,7 @@
-package hu.bbara.purefin.navigation
+package hu.bbara.purefin.core.navigation

 import java.util.UUID
 import kotlinx.serialization.Serializable
-import hu.bbara.purefin.navigation.UuidSerializer

@Serializable
 data class SeriesDto(
--- a/core/src/main/java/hu/bbara/purefin/core/navigation/UuidSerializer.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/navigation/UuidSerializer.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.navigation
+package hu.bbara.purefin.core.navigation

 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.PrimitiveKind
--- a/core/src/main/java/hu/bbara/purefin/core/player/manager/MediaSegmentManager.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/player/manager/MediaSegmentManager.kt
@@ -1,9 +1,9 @@
-package hu.bbara.purefin.player.manager
+package hu.bbara.purefin.core.player.manager

 import android.util.Log
 import androidx.media3.exoplayer.ExoPlayer
+import hu.bbara.purefin.core.player.model.SegmentStatus
 import hu.bbara.purefin.model.MediaSegment
-import hu.bbara.purefin.player.model.SegmentStatus
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
--- a/core/src/main/java/hu/bbara/purefin/core/player/manager/PlayerManager.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/player/manager/PlayerManager.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.manager
+package hu.bbara.purefin.core.player.manager

 import androidx.annotation.OptIn
 import androidx.media3.common.C
@@ -9,21 +9,21 @@ import androidx.media3.common.TrackSelectionOverride
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.ExoPlayer
 import dagger.hilt.android.scopes.ViewModelScoped
-import hu.bbara.purefin.data.PlayableMediaRepository
-import hu.bbara.purefin.data.PlaybackReportContext
+import hu.bbara.purefin.core.data.PlayableMediaRepository
+import hu.bbara.purefin.core.data.PlaybackReportContext
+import hu.bbara.purefin.core.player.model.MetadataState
+import hu.bbara.purefin.core.player.model.PlaybackProgressSnapshot
+import hu.bbara.purefin.core.player.model.PlaybackStateSnapshot
+import hu.bbara.purefin.core.player.model.SegmentStatus
+import hu.bbara.purefin.core.player.model.TrackOption
+import hu.bbara.purefin.core.player.model.TrackType
 import hu.bbara.purefin.model.AudioTrackProperties
 import hu.bbara.purefin.model.MediaSegment
 import hu.bbara.purefin.model.PlayableMedia
 import hu.bbara.purefin.model.SegmentType
 import hu.bbara.purefin.model.SubtitleTrackProperties
-import hu.bbara.purefin.player.model.MetadataState
-import hu.bbara.purefin.player.model.PlaybackProgressSnapshot
-import hu.bbara.purefin.player.model.PlaybackStateSnapshot
-import hu.bbara.purefin.player.model.SegmentStatus
-import hu.bbara.purefin.player.model.TrackOption
-import hu.bbara.purefin.player.model.TrackType
-import hu.bbara.purefin.player.preference.TrackMatcher
-import hu.bbara.purefin.player.preference.TrackPreferencesRepository
+import hu.bbara.purefin.core.player.preference.TrackMatcher
+import hu.bbara.purefin.core.player.preference.TrackPreferencesRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
--- a/core/src/main/java/hu/bbara/purefin/core/player/manager/ProgressManager.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/player/manager/ProgressManager.kt
@@ -1,13 +1,13 @@
-package hu.bbara.purefin.player.manager
+package hu.bbara.purefin.core.player.manager

 import android.util.Log
 import dagger.hilt.android.scopes.ViewModelScoped
-import hu.bbara.purefin.data.LocalMediaUpdater
-import hu.bbara.purefin.data.PlaybackProgressReporter
-import hu.bbara.purefin.data.PlaybackReportContext
-import hu.bbara.purefin.player.model.MetadataState
-import hu.bbara.purefin.player.model.PlaybackProgressSnapshot
-import hu.bbara.purefin.player.model.PlaybackStateSnapshot
+import hu.bbara.purefin.core.data.LocalMediaUpdater
+import hu.bbara.purefin.core.data.PlaybackProgressReporter
+import hu.bbara.purefin.core.data.PlaybackReportContext
+import hu.bbara.purefin.core.player.model.MetadataState
+import hu.bbara.purefin.core.player.model.PlaybackProgressSnapshot
+import hu.bbara.purefin.core.player.model.PlaybackStateSnapshot
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
--- a/core/src/main/java/hu/bbara/purefin/core/player/manager/TrackMapper.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/player/manager/TrackMapper.kt
@@ -1,12 +1,12 @@
-package hu.bbara.purefin.player.manager
+package hu.bbara.purefin.core.player.manager

 import androidx.annotation.OptIn
 import androidx.media3.common.C
 import androidx.media3.common.Format
 import androidx.media3.common.Tracks
 import androidx.media3.common.util.UnstableApi
-import hu.bbara.purefin.player.model.TrackOption
-import hu.bbara.purefin.player.model.TrackType
+import hu.bbara.purefin.core.player.model.TrackOption
+import hu.bbara.purefin.core.player.model.TrackType
 import java.util.Locale
 import javax.inject.Inject

--- a/core/src/main/java/hu/bbara/purefin/core/player/model/MediaContext.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/player/model/MediaContext.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.model
+package hu.bbara.purefin.core.player.model

 import hu.bbara.purefin.model.MediaSegment
 import hu.bbara.purefin.model.MediaTrackPreferences
--- a/core/src/main/java/hu/bbara/purefin/core/player/model/MetadataState.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/player/model/MetadataState.kt
@@ -1,6 +1,6 @@
-package hu.bbara.purefin.player.model
+package hu.bbara.purefin.core.player.model

-import hu.bbara.purefin.data.PlaybackReportContext
+import hu.bbara.purefin.core.data.PlaybackReportContext

 data class MetadataState(
    val mediaId: String? = null,
--- a/core/src/main/java/hu/bbara/purefin/core/player/model/PlaybackProgressSnapshot.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/player/model/PlaybackProgressSnapshot.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.model
+package hu.bbara.purefin.core.player.model

 data class PlaybackProgressSnapshot(
    val durationMs: Long = 0L,
--- a/core/src/main/java/hu/bbara/purefin/core/player/model/PlaybackStateSnapshot.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/player/model/PlaybackStateSnapshot.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.model
+package hu.bbara.purefin.core.player.model

 data class PlaybackStateSnapshot(
    val isPlaying: Boolean = false,
--- a/core/src/main/java/hu/bbara/purefin/core/player/model/PlayerUiModels.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/player/model/PlayerUiModels.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.model
+package hu.bbara.purefin.core.player.model

 data class PlayerUiState(
    val isPlaying: Boolean = false,
--- a/core/src/main/java/hu/bbara/purefin/core/player/model/SegmentStatus.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/player/model/SegmentStatus.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.model
+package hu.bbara.purefin.core.player.model

 enum class SegmentStatus {
    START,
--- a/core/src/main/java/hu/bbara/purefin/core/player/module/PlaybackNetworkModule.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/player/module/PlaybackNetworkModule.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.module
+package hu.bbara.purefin.core.player.module

 import androidx.annotation.OptIn
 import androidx.media3.common.util.UnstableApi
--- a/core/src/main/java/hu/bbara/purefin/core/player/module/VideoPlayerModule.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/player/module/VideoPlayerModule.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.module
+package hu.bbara.purefin.core.player.module

 import android.app.Application
 import androidx.annotation.OptIn
--- a/core/src/main/java/hu/bbara/purefin/core/player/preference/TrackMatcher.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/player/preference/TrackMatcher.kt
@@ -1,9 +1,9 @@
-package hu.bbara.purefin.player.preference
+package hu.bbara.purefin.core.player.preference

+import hu.bbara.purefin.core.player.model.TrackOption
+import hu.bbara.purefin.core.player.model.TrackType
 import hu.bbara.purefin.model.AudioTrackProperties
 import hu.bbara.purefin.model.SubtitleTrackProperties
-import hu.bbara.purefin.player.model.TrackOption
-import hu.bbara.purefin.player.model.TrackType
 import javax.inject.Inject

 class TrackMatcher @Inject constructor() {
--- a/core/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreferencesModule.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreferencesModule.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.preference
+package hu.bbara.purefin.core.player.preference

 import android.content.Context
 import androidx.datastore.core.DataStore
--- a/core/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreferencesRepository.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreferencesRepository.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.preference
+package hu.bbara.purefin.core.player.preference

 import androidx.datastore.core.DataStore
 import hu.bbara.purefin.model.AudioTrackProperties
--- a/core/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreferencesSerializer.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreferencesSerializer.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.preference
+package hu.bbara.purefin.core.player.preference

 import androidx.datastore.core.CorruptionException
 import androidx.datastore.core.Serializer
--- a/core/src/main/java/hu/bbara/purefin/core/player/viewmodel/ControlsAutoHidePolicy.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/player/viewmodel/ControlsAutoHidePolicy.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.viewmodel
+package hu.bbara.purefin.core.player.viewmodel

 enum class ControlsAutoHideBlocker {
    PLAYLIST,
--- a/core/src/main/java/hu/bbara/purefin/core/player/viewmodel/PlayerViewModel.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/player/viewmodel/PlayerViewModel.kt
@@ -1,19 +1,19 @@
-package hu.bbara.purefin.player.viewmodel
+package hu.bbara.purefin.core.player.viewmodel

 import android.util.Log
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import hu.bbara.purefin.data.LocalMediaRepository
-import hu.bbara.purefin.image.ArtworkKind
-import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.core.data.LocalMediaRepository
+import hu.bbara.purefin.core.image.ArtworkKind
+import hu.bbara.purefin.core.image.ImageUrlBuilder
+import hu.bbara.purefin.core.player.manager.PlayerManager
+import hu.bbara.purefin.core.player.manager.ProgressManager
+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.model.PlayableMedia
-import hu.bbara.purefin.player.manager.PlayerManager
-import hu.bbara.purefin.player.manager.ProgressManager
-import hu.bbara.purefin.player.model.PlayerUiState
-import hu.bbara.purefin.player.model.PlaylistElementUiModel
-import hu.bbara.purefin.player.model.TrackOption
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
--- a/core/src/main/java/hu/bbara/purefin/core/player/viewmodel/SeekByCollector.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/player/viewmodel/SeekByCollector.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.viewmodel
+package hu.bbara.purefin.core.player.viewmodel

 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
--- a/core/src/main/java/hu/bbara/purefin/core/settings/SettingOption.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/settings/SettingOption.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.settings
+package hu.bbara.purefin.core.settings

 sealed interface SettingOption<T> {
    val key: String
--- a/core/src/main/java/hu/bbara/purefin/core/settings/SettingsModule.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/settings/SettingsModule.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.settings
+package hu.bbara.purefin.core.settings

 import android.content.Context
 import androidx.datastore.core.DataStore
--- a/core/src/main/java/hu/bbara/purefin/core/settings/SettingsRepository.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/settings/SettingsRepository.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.settings
+package hu.bbara.purefin.core.settings

 import androidx.datastore.core.DataStore
 import hu.bbara.purefin.model.Settings
--- a/core/src/main/java/hu/bbara/purefin/core/settings/SettingsSerializer.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/settings/SettingsSerializer.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.settings
+package hu.bbara.purefin.core.settings

 import androidx.datastore.core.CorruptionException
 import androidx.datastore.core.Serializer
--- a/core/src/main/java/hu/bbara/purefin/core/update/AndroidAppVersionProvider.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/update/AndroidAppVersionProvider.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.update
+package hu.bbara.purefin.core.update

 import android.content.Context
 import android.content.pm.ApplicationInfo
@@ -6,7 +6,7 @@ import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.os.Build
 import dagger.hilt.android.qualifiers.ApplicationContext
-import hu.bbara.purefin.feature.update.AppVersionProvider
+import hu.bbara.purefin.core.feature.update.AppVersionProvider
 import javax.inject.Inject

 class AndroidAppVersionProvider @Inject constructor(
--- a/core/src/main/java/hu/bbara/purefin/core/update/AppUpdateInstallReceiver.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/update/AppUpdateInstallReceiver.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.update
+package hu.bbara.purefin.core.update

 import android.content.ActivityNotFoundException
 import android.content.BroadcastReceiver
--- a/core/src/main/java/hu/bbara/purefin/core/update/AppUpdateInstaller.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/update/AppUpdateInstaller.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.update
+package hu.bbara.purefin.core.update

 import android.app.PendingIntent
 import android.content.ActivityNotFoundException
@@ -11,8 +11,8 @@ import android.net.Uri
 import android.os.Build
 import android.provider.Settings
 import dagger.hilt.android.qualifiers.ApplicationContext
-import hu.bbara.purefin.feature.update.AppUpdateInfo
-import hu.bbara.purefin.feature.update.AppUpdateInstaller
+import hu.bbara.purefin.core.feature.update.AppUpdateInfo
+import hu.bbara.purefin.core.feature.update.AppUpdateInstaller
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.HttpUrl.Companion.toHttpUrl
--- a/core/src/main/java/hu/bbara/purefin/core/update/AppUpdateModule.kt
+++ b/core/src/main/java/hu/bbara/purefin/core/update/AppUpdateModule.kt
@@ -1,11 +1,11 @@
-package hu.bbara.purefin.update
+package hu.bbara.purefin.core.update

 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import hu.bbara.purefin.feature.update.AppUpdateInstaller
-import hu.bbara.purefin.feature.update.AppVersionProvider
+import hu.bbara.purefin.core.feature.update.AppUpdateInstaller
+import hu.bbara.purefin.core.feature.update.AppVersionProvider

@Module
@InstallIn(SingletonComponent::class)
--- a/core/src/test/java/hu/bbara/purefin/core/download/DownloadModuleTest.kt
+++ b/core/src/test/java/hu/bbara/purefin/core/download/DownloadModuleTest.kt
@@ -3,7 +3,6 @@ package hu.bbara.purefin.core.download
 import androidx.media3.datasource.DataSource
 import androidx.media3.datasource.cache.CacheDataSource
 import androidx.media3.datasource.cache.NoOpCacheEvictor
-import hu.bbara.purefin.download.DownloadModuleFactories
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertSame
 import org.junit.Assert.assertTrue
--- a/core/src/test/java/hu/bbara/purefin/core/navigation/RouteSerializationTest.kt
+++ b/core/src/test/java/hu/bbara/purefin/core/navigation/RouteSerializationTest.kt
@@ -1,10 +1,5 @@
 package hu.bbara.purefin.core.navigation

-import hu.bbara.purefin.navigation.EpisodeDto
-import hu.bbara.purefin.navigation.LibraryDto
-import hu.bbara.purefin.navigation.MovieDto
-import hu.bbara.purefin.navigation.Route
-import hu.bbara.purefin.navigation.SeriesDto
 import java.util.UUID
 import kotlinx.serialization.json.Json
 import org.junit.Assert.assertEquals
--- a/core/src/test/java/hu/bbara/purefin/core/player/viewmodel/ControlsAutoHidePolicyTest.kt
+++ b/core/src/test/java/hu/bbara/purefin/core/player/viewmodel/ControlsAutoHidePolicyTest.kt
@@ -1,8 +1,5 @@
 package hu.bbara.purefin.core.player.viewmodel

-import hu.bbara.purefin.player.viewmodel.ControlsAutoHideBlocker
-import hu.bbara.purefin.player.viewmodel.ControlsAutoHideCommand
-import hu.bbara.purefin.player.viewmodel.ControlsAutoHidePolicy
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test