refactor: update package structure and imports for consistency across UI components

2026-07-24 03:36:51 +00:00 · 2026-04-14 22:03:36 +02:00
parent 1e6c0e838e
commit b67c8076f1
146 changed files with 1239 additions and 1267 deletions
--- a/app/src/main/java/hu/bbara/purefin/PurefinActivity.kt
+++ b/app/src/main/java/hu/bbara/purefin/PurefinActivity.kt
@@ -36,16 +36,16 @@ import coil3.network.okhttp.OkHttpNetworkFetcherFactory
 import coil3.request.crossfade
 import coil3.util.DebugLogger
 import dagger.hilt.android.AndroidEntryPoint
-import hu.bbara.purefin.common.ui.PurefinWaitingScreen
+import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
 import hu.bbara.purefin.core.data.client.JellyfinApiClient
 import hu.bbara.purefin.core.data.client.JellyfinAuthInterceptor
-import hu.bbara.purefin.core.data.navigation.LocalNavigationBackStack
-import hu.bbara.purefin.core.data.navigation.LocalNavigationManager
-import hu.bbara.purefin.core.data.navigation.NavigationCommand
-import hu.bbara.purefin.core.data.navigation.NavigationManager
-import hu.bbara.purefin.core.data.navigation.Route
 import hu.bbara.purefin.core.data.session.UserSessionRepository
-import hu.bbara.purefin.login.ui.LoginScreen
+import hu.bbara.purefin.feature.shared.navigation.NavigationCommand
+import hu.bbara.purefin.feature.shared.navigation.NavigationManager
+import hu.bbara.purefin.feature.shared.navigation.Route
+import hu.bbara.purefin.navigation.LocalNavigationBackStack
+import hu.bbara.purefin.navigation.LocalNavigationManager
+import hu.bbara.purefin.ui.screen.login.LoginScreen
 import hu.bbara.purefin.ui.theme.AppTheme
 import hu.bbara.purefin.ui.theme.backgroundDark
 import kotlinx.coroutines.launch
--- a/app/src/main/java/hu/bbara/purefin/app/home/HomeNavigation.kt
+++ b/app/src/main/java/hu/bbara/purefin/app/home/HomeNavigation.kt
@@ -1,13 +0,0 @@
-package hu.bbara.purefin.app.home
-
-import androidx.navigation3.runtime.EntryProviderScope
-import hu.bbara.purefin.core.data.navigation.Route
-
-/**
- * Navigation 3 entry definition for the Home section.
- */
-fun EntryProviderScope<Route>.homeSection() {
-    entry<Route.Home> {
-        AppScreen()
-    }
-}
--- a/app/src/main/java/hu/bbara/purefin/common/ui/components/PurefinSeachBar.kt
+++ b/app/src/main/java/hu/bbara/purefin/common/ui/components/PurefinSeachBar.kt
@@ -1,111 +0,0 @@
-package hu.bbara.purefin.common.ui.components
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.grid.GridCells
-import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.foundation.lazy.grid.items
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.SearchBar
-import androidx.compose.material3.SearchBarDefaults
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.semantics.isTraversalGroup
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.semantics.traversalIndex
-import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.core.model.SearchResult
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun PurefinSearchBar(
-    onQueryChange: (String) -> Unit,
-    onSearch: (String) -> Unit,
-    searchResults: List<SearchResult>,
-    onExpandedChange: (Boolean) -> Unit = {},
-    modifier: Modifier = Modifier
-) {
-    var query by remember { mutableStateOf("") }
-    var expanded by rememberSaveable { mutableStateOf(false) }
-    val setExpanded: (Boolean) -> Unit = {
-        expanded = it
-        onExpandedChange(it)
-    }
-
-    Box(
-        modifier
-            .fillMaxWidth()
-            .semantics { isTraversalGroup = true }
-    ) {
-        SearchBar(
-            modifier = Modifier
-                .align(Alignment.TopCenter)
-                .fillMaxWidth()
-                .semantics { traversalIndex = 0f },
-            inputField = {
-                SearchBarDefaults.InputField(
-                    query = query,
-                    onQueryChange = {
-                        query = it
-                        onQueryChange(it)
-                    },
-                    onSearch = {
-                        onSearch(query)
-                        setExpanded(false)
-                    },
-                    expanded = expanded,
-                    onExpandedChange = setExpanded,
-                    placeholder = { Text("Search") }
-                )
-            },
-            expanded = expanded,
-            onExpandedChange = setExpanded,
-        ) {
-            LazyVerticalGrid(
-                columns = GridCells.Adaptive(minSize = 120.dp),
-                contentPadding = PaddingValues(16.dp),
-                horizontalArrangement = Arrangement.spacedBy(16.dp),
-                verticalArrangement = Arrangement.spacedBy(16.dp),
-                modifier = Modifier.background(MaterialTheme.colorScheme.background)
-            ) {
-                items(searchResults) { item ->
-                    SearchResultCard(item)
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun SearchResultCard(
-    item: SearchResult,
-    modifier: Modifier = Modifier
-) {
-    Column(modifier = modifier) {
-        PurefinAsyncImage(
-            model = item.posterUrl,
-            contentDescription = item.title,
-            modifier = Modifier.height(150.dp),
-            contentScale = ContentScale.Fit
-        )
-        Text(
-            text = item.title,
-            modifier = Modifier.padding(horizontal = 8.dp)
-        )
-    }
-}
--- a/app/src/main/java/hu/bbara/purefin/common/ui/components/SearchField.kt
+++ b/app/src/main/java/hu/bbara/purefin/common/ui/components/SearchField.kt
@@ -1,56 +0,0 @@
-package hu.bbara.purefin.common.ui.components
-
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Search
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextField
-import androidx.compose.material3.TextFieldDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun SearchField(
-    value: String,
-    onValueChange: (String) -> Unit,
-    placeholder: String,
-    backgroundColor: Color = Color.Unspecified,
-    textColor: Color = Color.Unspecified,
-    cursorColor: Color = Color.Unspecified,
-    modifier: Modifier = Modifier,
-) {
-    val scheme = MaterialTheme.colorScheme
-    val resolvedBackgroundColor =
-        if (backgroundColor == Color.Unspecified) scheme.surfaceVariant else backgroundColor
-    val resolvedTextColor = if (textColor == Color.Unspecified) scheme.onSurface else textColor
-    val resolvedCursorColor = if (cursorColor == Color.Unspecified) scheme.primary else cursorColor
-
-    TextField(
-        value = value,
-        onValueChange = onValueChange,
-        modifier = modifier
-            .fillMaxWidth()
-            .clip(RoundedCornerShape(12.dp)),
-        singleLine = true,
-        placeholder = { Text(placeholder) },
-        leadingIcon = { Icon(imageVector = Icons.Outlined.Search, contentDescription = null) },
-        colors = TextFieldDefaults.colors(
-            focusedContainerColor = resolvedBackgroundColor,
-            unfocusedContainerColor = resolvedBackgroundColor,
-            focusedIndicatorColor = Color.Transparent,
-            unfocusedIndicatorColor = Color.Transparent,
-            cursorColor = resolvedCursorColor,
-            focusedTextColor = resolvedTextColor,
-            unfocusedTextColor = resolvedTextColor,
-            focusedLeadingIconColor = scheme.onSurfaceVariant,
-            unfocusedLeadingIconColor = scheme.onSurfaceVariant,
-            focusedPlaceholderColor = scheme.onSurfaceVariant,
-            unfocusedPlaceholderColor = scheme.onSurfaceVariant,
-        ))
-}
--- a/app/src/main/java/hu/bbara/purefin/navigation/NavigationModule.kt
+++ b/app/src/main/java/hu/bbara/purefin/navigation/NavigationModule.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.navigation
+package hu.bbara.purefin.modules

 import androidx.navigation3.runtime.EntryProviderScope
 import dagger.Module
@@ -6,7 +6,8 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityRetainedComponent
 import dagger.multibindings.IntoSet
-import hu.bbara.purefin.core.data.navigation.Route
+import hu.bbara.purefin.feature.shared.navigation.Route
+import hu.bbara.purefin.navigation.appRouteEntryBuilder

@Module
@InstallIn(ActivityRetainedComponent::class)
--- a/app/src/main/java/hu/bbara/purefin/modules/PlaybackProfileFamilyModule.kt
+++ b/app/src/main/java/hu/bbara/purefin/modules/PlaybackProfileFamilyModule.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.di
+package hu.bbara.purefin.modules

 import dagger.Module
 import dagger.Provides
@@ -12,4 +12,4 @@ object PlaybackProfileFamilyModule {

    @Provides
    fun providePlaybackProfileFamily(): PlaybackProfileFamily = PlaybackProfileFamily.MOBILE
-}
+}
--- a/app/src/main/java/hu/bbara/purefin/navigation/NavigationLocals.kt
+++ b/app/src/main/java/hu/bbara/purefin/navigation/NavigationLocals.kt
@@ -0,0 +1,12 @@
+package hu.bbara.purefin.navigation
+
+import androidx.compose.runtime.ProvidableCompositionLocal
+import androidx.compose.runtime.compositionLocalOf
+import androidx.compose.runtime.staticCompositionLocalOf
+import hu.bbara.purefin.feature.shared.navigation.NavigationManager
+import hu.bbara.purefin.feature.shared.navigation.Route
+
+val LocalNavigationManager: ProvidableCompositionLocal<NavigationManager> =
+    staticCompositionLocalOf { error("NavigationManager not provided") }
+
+val LocalNavigationBackStack = compositionLocalOf<List<Route>> { emptyList() }
--- a/app/src/main/java/hu/bbara/purefin/navigation/RouteEntryBuilder.kt
+++ b/app/src/main/java/hu/bbara/purefin/navigation/RouteEntryBuilder.kt
@@ -1,13 +1,13 @@
 package hu.bbara.purefin.navigation

 import androidx.navigation3.runtime.EntryProviderScope
+import hu.bbara.purefin.feature.shared.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
 import hu.bbara.purefin.ui.screen.episode.EpisodeScreen
 import hu.bbara.purefin.ui.screen.movie.MovieScreen
 import hu.bbara.purefin.ui.screen.series.SeriesScreen
-import hu.bbara.purefin.app.home.AppScreen
-import hu.bbara.purefin.app.library.ui.LibraryScreen
-import hu.bbara.purefin.core.data.navigation.Route
-import hu.bbara.purefin.login.ui.LoginScreen

 fun EntryProviderScope<Route>.appRouteEntryBuilder() {
    entry<Route.Home> {
--- a/app/src/main/java/hu/bbara/purefin/player/PlayerActivity.kt
+++ b/app/src/main/java/hu/bbara/purefin/player/PlayerActivity.kt
@@ -12,7 +12,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import dagger.hilt.android.AndroidEntryPoint
 import hu.bbara.purefin.core.player.viewmodel.PlayerViewModel
-import hu.bbara.purefin.player.ui.PlayerScreen
+import hu.bbara.purefin.ui.screen.player.PlayerScreen
 import hu.bbara.purefin.ui.theme.AppTheme

@AndroidEntryPoint
--- a/app/src/main/java/hu/bbara/purefin/app/home/ui/DefaultTopBar.kt
+++ b/app/src/main/java/hu/bbara/purefin/app/home/ui/DefaultTopBar.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui
+package hu.bbara.purefin.ui.common

 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -27,7 +27,6 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.common.ui.components.PurefinSearchBar
 import hu.bbara.purefin.feature.shared.search.SearchViewModel

@Composable
@@ -56,24 +55,6 @@ fun DefaultTopBar(
                .fillMaxWidth(),
            contentAlignment = Alignment.CenterEnd
        ) {
-            PurefinSearchBar(
-                onQueryChange = {
-                    searchViewModel.search(it)
-                },
-                onSearch = {
-                    searchViewModel.search(it)
-                },
-                onExpandedChange = { expanded ->
-                    isSearchExpanded = expanded
-                    if (expanded) {
-                        isProfileMenuExpanded = false
-                    }
-                },
-                searchResults = searchResult.value,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(end = if (isSearchExpanded) 0.dp else 72.dp),
-            )
            if (!isSearchExpanded) {
                Box {
                    IconButton(
--- a/app/src/main/java/hu/bbara/purefin/app/home/ui/shared/ContentBadge.kt
+++ b/app/src/main/java/hu/bbara/purefin/app/home/ui/shared/ContentBadge.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui.shared
+package hu.bbara.purefin.ui.common.badge

 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.CircleShape
--- a/app/src/main/java/hu/bbara/purefin/common/ui/components/UnwatchedEpisodeIndicator.kt
+++ b/app/src/main/java/hu/bbara/purefin/common/ui/components/UnwatchedEpisodeIndicator.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.common.ui.components
+package hu.bbara.purefin.ui.common.badge

 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
--- a/app/src/main/java/hu/bbara/purefin/common/ui/components/WatchStateIndicator.kt
+++ b/app/src/main/java/hu/bbara/purefin/common/ui/components/WatchStateIndicator.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.common.ui.components
+package hu.bbara.purefin.ui.common.badge

 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
--- a/app/src/main/java/hu/bbara/purefin/common/ui/components/MediaProgressBar.kt
+++ b/app/src/main/java/hu/bbara/purefin/common/ui/components/MediaProgressBar.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.common.ui.components
+package hu.bbara.purefin.ui.common.bar

 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
--- a/app/src/main/java/hu/bbara/purefin/common/ui/components/GhostIconButton.kt
+++ b/app/src/main/java/hu/bbara/purefin/common/ui/components/GhostIconButton.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.common.ui.components
+package hu.bbara.purefin.ui.common.button

 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
--- a/app/src/main/java/hu/bbara/purefin/common/ui/components/MediaActionButton.kt
+++ b/app/src/main/java/hu/bbara/purefin/common/ui/components/MediaActionButton.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.common.ui.components
+package hu.bbara.purefin.ui.common.button

 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
--- a/app/src/main/java/hu/bbara/purefin/common/ui/components/MediaResumeButton.kt
+++ b/app/src/main/java/hu/bbara/purefin/common/ui/components/MediaResumeButton.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.common.ui.components
+package hu.bbara.purefin.ui.common.button

 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -77,7 +77,7 @@ fun MediaResumeButton(
 }

@Composable
-private fun ButtonContent(text: String, color: androidx.compose.ui.graphics.Color) {
+private fun ButtonContent(text: String, color: Color) {
    Row(
        verticalAlignment = Alignment.CenterVertically,
        horizontalArrangement = Arrangement.Center
--- a/app/src/main/java/hu/bbara/purefin/common/ui/components/PurefinIconButton.kt
+++ b/app/src/main/java/hu/bbara/purefin/common/ui/components/PurefinIconButton.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.common.ui.components
+package hu.bbara.purefin.ui.common.button

 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
--- a/app/src/main/java/hu/bbara/purefin/ui/common/button/PurefinTextButton.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/common/button/PurefinTextButton.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.common.ui
+package hu.bbara.purefin.ui.common.button

 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.material3.Button
--- 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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.common.ui
+package hu.bbara.purefin.ui.common.card

 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -23,12 +23,12 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import coil3.request.ImageRequest
-import hu.bbara.purefin.common.ui.components.PurefinAsyncImage
-import hu.bbara.purefin.common.ui.components.UnwatchedEpisodeIndicator
-import hu.bbara.purefin.common.ui.components.WatchStateIndicator
 import hu.bbara.purefin.feature.shared.home.PosterItem
-import org.jellyfin.sdk.model.UUID
-import org.jellyfin.sdk.model.api.BaseItemKind
+import hu.bbara.purefin.ui.common.badge.UnwatchedEpisodeIndicator
+import hu.bbara.purefin.ui.common.badge.WatchStateIndicator
+import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
+import java.util.UUID
+import hu.bbara.purefin.core.model.MediaKind

@Composable
 fun PosterCard(
@@ -47,9 +47,9 @@ fun PosterCard(

    fun openItem(posterItem: PosterItem) {
        when (posterItem.type) {
-            BaseItemKind.MOVIE -> onMovieSelected(posterItem.id)
-            BaseItemKind.SERIES -> onSeriesSelected(posterItem.id)
-            BaseItemKind.EPISODE -> {
+            MediaKind.MOVIE -> onMovieSelected(posterItem.id)
+            MediaKind.SERIES -> onSeriesSelected(posterItem.id)
+            MediaKind.EPISODE -> {
                val ep = posterItem.episode!!
                onEpisodeSelected(ep.seriesId, ep.seasonId, ep.id)
            }
@@ -78,7 +78,7 @@ fun PosterCard(
                contentScale = ContentScale.Crop
            )
            when (item.type) {
-                BaseItemKind.MOVIE -> {
+                MediaKind.MOVIE -> {
                    val m = item.movie!!
                    WatchStateIndicator(
                        size = 28,
@@ -88,7 +88,7 @@ fun PosterCard(
                        started = (m.progress ?: 0.0) > 0
                    )
                }
-                BaseItemKind.EPISODE -> {
+                MediaKind.EPISODE -> {
                    val ep = item.episode!!
                    WatchStateIndicator(
                        size = 28,
@@ -98,7 +98,7 @@ fun PosterCard(
                        started = (ep.progress ?: 0.0) > 0
                    )
                }
-                BaseItemKind.SERIES -> UnwatchedEpisodeIndicator(
+                MediaKind.SERIES -> UnwatchedEpisodeIndicator(
                    size = 28,
                    modifier = Modifier.align(Alignment.TopEnd)
                        .padding(8.dp),
--- a/app/src/main/java/hu/bbara/purefin/app/home/ui/shared/SectionHeader.kt
+++ b/app/src/main/java/hu/bbara/purefin/app/home/ui/shared/SectionHeader.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui.shared
+package hu.bbara.purefin.ui.common.header

 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
--- a/app/src/main/java/hu/bbara/purefin/common/ui/components/PurefinAsyncImage.kt
+++ b/app/src/main/java/hu/bbara/purefin/common/ui/components/PurefinAsyncImage.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.common.ui.components
+package hu.bbara.purefin.ui.common.image

 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
--- a/app/src/main/java/hu/bbara/purefin/common/ui/components/PurefinLogo.kt
+++ b/app/src/main/java/hu/bbara/purefin/common/ui/components/PurefinLogo.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.common.ui.components
+package hu.bbara.purefin.ui.common.image

 import android.graphics.BitmapFactory
 import androidx.compose.foundation.Image
--- a/app/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailComponents.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailComponents.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.common.ui
+package hu.bbara.purefin.ui.common.media

 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -33,8 +33,8 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import hu.bbara.purefin.common.ui.components.PurefinAsyncImage
 import hu.bbara.purefin.core.model.CastMember
+import hu.bbara.purefin.ui.common.image.PurefinAsyncImage

@Composable
 fun MediaMetaChip(
--- a/app/src/main/java/hu/bbara/purefin/common/ui/components/MediaHero.kt
+++ b/app/src/main/java/hu/bbara/purefin/common/ui/components/MediaHero.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.common.ui.components
+package hu.bbara.purefin.ui.common.media

 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -11,6 +11,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.unit.dp
+import hu.bbara.purefin.ui.common.image.PurefinAsyncImage

@Composable
 fun MediaHero(
--- a/app/src/main/java/hu/bbara/purefin/common/ui/components/MediaPlaybackSettings.kt
+++ b/app/src/main/java/hu/bbara/purefin/common/ui/components/MediaPlaybackSettings.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.common.ui.components
+package hu.bbara.purefin.ui.common.media

 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
--- a/app/src/main/java/hu/bbara/purefin/ui/common/media/MediaSynopsis.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/common/media/MediaSynopsis.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.common.ui
+package hu.bbara.purefin.ui.common.media

 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
--- a/app/src/main/java/hu/bbara/purefin/ui/common/textfield/PurefinComplexTextField.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/common/textfield/PurefinComplexTextField.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.common.ui
+package hu.bbara.purefin.ui.common.textfield

 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
--- a/app/src/main/java/hu/bbara/purefin/ui/common/textfield/PurefinPasswordField.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/common/textfield/PurefinPasswordField.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.common.ui
+package hu.bbara.purefin.ui.common.textfield

 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
--- a/app/src/main/java/hu/bbara/purefin/common/ui/components/TimedVisibility.kt
+++ b/app/src/main/java/hu/bbara/purefin/common/ui/components/TimedVisibility.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.common.ui.components
+package hu.bbara.purefin.ui.common.visual

 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.EnterTransition
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/AppBottomBar.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/AppBottomBar.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home
+package hu.bbara.purefin.ui.screen

 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Collections
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/AppScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/AppScreen.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home
+package hu.bbara.purefin.ui.screen

 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
@@ -10,8 +10,11 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.LifecycleResumeEffect
-import hu.bbara.purefin.app.home.ui.HomeNavItem
 import hu.bbara.purefin.feature.shared.home.AppViewModel
+import hu.bbara.purefin.ui.screen.download.DownloadsScreen
+import hu.bbara.purefin.ui.screen.home.HomeScreen
+import hu.bbara.purefin.ui.screen.home.components.HomeNavItem
+import hu.bbara.purefin.ui.screen.libraries.LibrariesScreen

@Composable
 fun AppScreen(
@@ -52,7 +55,12 @@ fun AppScreen(
            onMovieSelected = viewModel::onMovieSelected,
            onSeriesSelected = viewModel::onSeriesSelected,
            onEpisodeSelected = viewModel::onEpisodeSelected,
-            onLibrarySelected = { library -> viewModel.onLibrarySelected(library.id, library.name) },
+            onLibrarySelected = { library ->
+                viewModel.onLibrarySelected(
+                    library.id,
+                    library.name
+                )
+            },
            onProfileClick = {},
            onSettingsClick = {},
            onLogoutClick = viewModel::logout,
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/download/DownloadsScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/download/DownloadsScreen.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home
+package hu.bbara.purefin.ui.screen.download

 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -6,7 +6,8 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import hu.bbara.purefin.app.home.ui.downloads.DownloadsContent
+import hu.bbara.purefin.ui.screen.download.components.DownloadsContent
+import hu.bbara.purefin.ui.screen.AppBottomBar

@Composable
 fun DownloadsScreen(
--- 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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui.downloads
+package hu.bbara.purefin.ui.screen.download.components

 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -26,7 +26,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.common.ui.components.PurefinAsyncImage
+import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 import hu.bbara.purefin.feature.shared.download.ActiveDownloadItem

@Composable
--- 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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui.downloads
+package hu.bbara.purefin.ui.screen.download.components

 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -23,7 +23,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.common.ui.PosterCard
+import hu.bbara.purefin.ui.common.card.PosterCard
 import hu.bbara.purefin.feature.shared.download.DownloadsViewModel

@Composable
--- 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
@@ -34,14 +34,14 @@ 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.common.ui.MediaMetaChip
-import hu.bbara.purefin.common.ui.PurefinWaitingScreen
-import hu.bbara.purefin.common.ui.components.MediaHero
+import hu.bbara.purefin.ui.common.media.MediaMetaChip
+import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
+import hu.bbara.purefin.ui.common.media.MediaHero
 import hu.bbara.purefin.core.data.download.DownloadState
 import hu.bbara.purefin.core.data.image.JellyfinImageHelper
-import hu.bbara.purefin.core.data.navigation.EpisodeDto
-import hu.bbara.purefin.core.data.navigation.LocalNavigationBackStack
-import hu.bbara.purefin.core.data.navigation.Route
+import hu.bbara.purefin.feature.shared.navigation.EpisodeDto
+import hu.bbara.purefin.navigation.LocalNavigationBackStack
+import hu.bbara.purefin.feature.shared.navigation.Route
 import hu.bbara.purefin.core.model.CastMember
 import hu.bbara.purefin.core.model.Episode
 import hu.bbara.purefin.feature.shared.content.episode.EpisodeScreenViewModel
--- 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,12 +34,12 @@ 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.common.ui.MediaCastRow
-import hu.bbara.purefin.common.ui.MediaSynopsis
-import hu.bbara.purefin.common.ui.components.GhostIconButton
-import hu.bbara.purefin.common.ui.components.MediaActionButton
-import hu.bbara.purefin.common.ui.components.MediaPlaybackSettings
-import hu.bbara.purefin.common.ui.components.MediaResumeButton
+import hu.bbara.purefin.ui.common.media.MediaCastRow
+import hu.bbara.purefin.ui.common.media.MediaSynopsis
+import hu.bbara.purefin.ui.common.button.GhostIconButton
+import hu.bbara.purefin.ui.common.button.MediaActionButton
+import hu.bbara.purefin.ui.common.media.MediaPlaybackSettings
+import hu.bbara.purefin.ui.common.button.MediaResumeButton
 import hu.bbara.purefin.core.data.download.DownloadState
 import hu.bbara.purefin.core.model.Episode
 import hu.bbara.purefin.player.PlayerActivity
--- 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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home
+package hu.bbara.purefin.ui.screen.home

 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
@@ -13,15 +13,16 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import hu.bbara.purefin.app.home.ui.HomeContent
-import hu.bbara.purefin.app.home.ui.HomeTopBar
-import hu.bbara.purefin.app.home.ui.search.HomeSearchOverlay
+import hu.bbara.purefin.ui.screen.home.components.HomeContent
+import hu.bbara.purefin.ui.screen.home.components.HomeTopBar
+import hu.bbara.purefin.ui.screen.home.components.search.HomeSearchOverlay
 import hu.bbara.purefin.feature.shared.home.ContinueWatchingItem
 import hu.bbara.purefin.feature.shared.home.LibraryItem
 import hu.bbara.purefin.feature.shared.home.NextUpItem
 import hu.bbara.purefin.feature.shared.home.PosterItem
 import hu.bbara.purefin.feature.shared.home.SuggestedItem
-import org.jellyfin.sdk.model.UUID
+import hu.bbara.purefin.ui.screen.AppBottomBar
+import java.util.UUID

@OptIn(ExperimentalMaterial3Api::class)
@Composable
--- 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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui
+package hu.bbara.purefin.ui.screen.home.components

 import android.util.Log
 import androidx.compose.foundation.background
@@ -22,18 +22,17 @@ 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.app.home.ui.continuewatching.ContinueWatchingSection
-import hu.bbara.purefin.app.home.ui.featured.SuggestionsSection
-import hu.bbara.purefin.app.home.ui.library.LibraryPosterSection
-import hu.bbara.purefin.app.home.ui.nextup.NextUpSection
-import hu.bbara.purefin.app.home.ui.shared.HomeEmptyState
 import hu.bbara.purefin.feature.shared.home.ContinueWatchingItem
 import hu.bbara.purefin.feature.shared.home.LibraryItem
 import hu.bbara.purefin.feature.shared.home.NextUpItem
 import hu.bbara.purefin.feature.shared.home.PosterItem
 import hu.bbara.purefin.feature.shared.home.SuggestedItem
-import org.jellyfin.sdk.model.UUID
-import org.jellyfin.sdk.model.api.BaseItemKind
+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
+import hu.bbara.purefin.ui.screen.home.components.nextup.NextUpSection
+import java.util.UUID
+import hu.bbara.purefin.core.model.MediaKind

@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -106,9 +105,9 @@ fun HomeContent(
                            items = suggestions,
                            onItemOpen = { item ->
                                when (item.type) {
-                                    BaseItemKind.MOVIE -> onMovieSelected(item.id)
-                                    BaseItemKind.SERIES -> onSeriesSelected(item.id)
-                                    BaseItemKind.EPISODE -> onEpisodeSelected(item.id, item.id, item.id)
+                                    MediaKind.MOVIE -> onMovieSelected(item.id)
+                                    MediaKind.SERIES -> onSeriesSelected(item.id)
+                                    MediaKind.EPISODE -> onEpisodeSelected(item.id, item.id, item.id)
                                    else -> {
                                        Log.e("HomeContent", "Unsupported item type: ${item.type}")
                                    }
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/HomeEmptyState.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/HomeEmptyState.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui.shared
+package hu.bbara.purefin.ui.screen.home.components

 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -21,6 +21,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import hu.bbara.purefin.ui.common.badge.ContentBadge

@Composable
 fun HomeEmptyState(
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/HomeModels.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/HomeModels.kt
@@ -1,6 +1,6 @@
-package hu.bbara.purefin.app.home.ui
+package hu.bbara.purefin.ui.screen.home.components

-import org.jellyfin.sdk.model.UUID
+import java.util.UUID

 data class HomeNavItem(
    val id: UUID,
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/HomeTopBar.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/HomeTopBar.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui
+package hu.bbara.purefin.ui.screen.home.components

 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
@@ -31,7 +31,7 @@ import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import hu.bbara.purefin.common.ui.components.PurefinLogo
+import hu.bbara.purefin.ui.common.image.PurefinLogo

@OptIn(ExperimentalMaterial3Api::class)
@Composable
--- 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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui.continuewatching
+package hu.bbara.purefin.ui.screen.home.components.continuewatching

 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -23,12 +23,12 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.common.ui.components.MediaProgressBar
-import hu.bbara.purefin.common.ui.components.PurefinAsyncImage
+import hu.bbara.purefin.ui.common.bar.MediaProgressBar
+import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 import hu.bbara.purefin.core.data.image.JellyfinImageHelper
 import hu.bbara.purefin.feature.shared.home.ContinueWatchingItem
-import org.jellyfin.sdk.model.UUID
-import org.jellyfin.sdk.model.api.BaseItemKind
+import java.util.UUID
+import hu.bbara.purefin.core.model.MediaKind
 import org.jellyfin.sdk.model.api.ImageType

@Composable
@@ -40,12 +40,12 @@ internal fun ContinueWatchingCard(
 ) {
    val scheme = MaterialTheme.colorScheme
    val supportingText = when (item.type) {
-        BaseItemKind.MOVIE -> listOf(
+        MediaKind.MOVIE -> listOf(
            item.movie?.year,
            item.movie?.runtime
        ).filterNotNull().filter { it.isNotBlank() }.joinToString(" • ")

-        BaseItemKind.EPISODE -> listOf(
+        MediaKind.EPISODE -> listOf(
            "Episode ${item.episode?.index}",
            item.episode?.runtime
        ).filterNotNull().filter { it.isNotBlank() }.joinToString(" • ")
@@ -53,11 +53,11 @@ internal fun ContinueWatchingCard(
        else -> ""
    }
    val imageUrl = when (item.type) {
-        BaseItemKind.MOVIE -> JellyfinImageHelper.finishImageUrl(
+        MediaKind.MOVIE -> JellyfinImageHelper.finishImageUrl(
            prefixImageUrl = item.movie?.imageUrlPrefix,
            imageType = ImageType.PRIMARY
        )
-        BaseItemKind.EPISODE -> JellyfinImageHelper.finishImageUrl(
+        MediaKind.EPISODE -> JellyfinImageHelper.finishImageUrl(
            prefixImageUrl = item.episode?.imageUrlPrefix,
            imageType = ImageType.PRIMARY
        )
@@ -74,8 +74,8 @@ internal fun ContinueWatchingCard(
                .fillMaxWidth()
                .clickable {
                    when (item.type) {
-                        BaseItemKind.MOVIE -> onMovieSelected(item.movie!!.id)
-                        BaseItemKind.EPISODE -> {
+                        MediaKind.MOVIE -> onMovieSelected(item.movie!!.id)
+                        MediaKind.EPISODE -> {
                            val episode = item.episode!!
                            onEpisodeSelected(episode.seriesId, episode.seasonId, episode.id)
                        }
--- 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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui.continuewatching
+package hu.bbara.purefin.ui.screen.home.components.continuewatching

 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -9,9 +9,9 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.app.home.ui.shared.SectionHeader
+import hu.bbara.purefin.ui.common.header.SectionHeader
 import hu.bbara.purefin.feature.shared.home.ContinueWatchingItem
-import org.jellyfin.sdk.model.UUID
+import java.util.UUID

@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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui.featured
+package hu.bbara.purefin.ui.screen.home.components.featured

 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -24,8 +24,8 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.common.ui.components.MediaProgressBar
-import hu.bbara.purefin.common.ui.components.PurefinAsyncImage
+import hu.bbara.purefin.ui.common.bar.MediaProgressBar
+import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 import hu.bbara.purefin.feature.shared.home.SuggestedItem

@Composable
--- 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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui.featured
+package hu.bbara.purefin.ui.screen.home.components.featured

 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.animateDpAsState
--- 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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui.library
+package hu.bbara.purefin.ui.screen.home.components.library

 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -23,12 +23,12 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.common.ui.components.PurefinAsyncImage
-import hu.bbara.purefin.common.ui.components.UnwatchedEpisodeIndicator
-import hu.bbara.purefin.common.ui.components.WatchStateIndicator
+import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
+import hu.bbara.purefin.ui.common.badge.UnwatchedEpisodeIndicator
+import hu.bbara.purefin.ui.common.badge.WatchStateIndicator
 import hu.bbara.purefin.feature.shared.home.PosterItem
-import org.jellyfin.sdk.model.UUID
-import org.jellyfin.sdk.model.api.BaseItemKind
+import java.util.UUID
+import hu.bbara.purefin.core.model.MediaKind

@Composable
 internal fun HomeBrowseCard(
@@ -40,16 +40,16 @@ internal fun HomeBrowseCard(
 ) {
    val scheme = MaterialTheme.colorScheme
    val supportingText = when (item.type) {
-        BaseItemKind.MOVIE -> listOf(
+        MediaKind.MOVIE -> listOf(
            item.movie?.year,
            item.movie?.runtime
        ).filterNotNull().filter { it.isNotBlank() }.joinToString(" • ")

-        BaseItemKind.SERIES -> item.series!!.let { series ->
+        MediaKind.SERIES -> item.series!!.let { series ->
            if (series.seasonCount == 1) "1 season" else "${series.seasonCount} seasons"
        }

-        BaseItemKind.EPISODE -> listOf(
+        MediaKind.EPISODE -> listOf(
            "Episode ${item.episode?.index}",
            item.episode?.runtime
        ).filterNotNull().filter { it.isNotBlank() }.joinToString(" • ")
@@ -67,9 +67,9 @@ internal fun HomeBrowseCard(
                .fillMaxWidth()
                .clickable {
                    when (item.type) {
-                        BaseItemKind.MOVIE -> onMovieSelected(item.id)
-                        BaseItemKind.SERIES -> onSeriesSelected(item.id)
-                        BaseItemKind.EPISODE -> {
+                        MediaKind.MOVIE -> onMovieSelected(item.id)
+                        MediaKind.SERIES -> onSeriesSelected(item.id)
+                        MediaKind.EPISODE -> {
                            val episode = item.episode!!
                            onEpisodeSelected(episode.seriesId, episode.seasonId, episode.id)
                        }
@@ -92,7 +92,7 @@ internal fun HomeBrowseCard(
                    contentScale = ContentScale.Crop
                )
                when (item.type) {
-                    BaseItemKind.MOVIE -> {
+                    MediaKind.MOVIE -> {
                        val movie = item.movie!!
                        WatchStateIndicator(
                            size = 28,
@@ -104,7 +104,7 @@ internal fun HomeBrowseCard(
                        )
                    }

-                    BaseItemKind.EPISODE -> {
+                    MediaKind.EPISODE -> {
                        val episode = item.episode!!
                        WatchStateIndicator(
                            size = 28,
@@ -116,7 +116,7 @@ internal fun HomeBrowseCard(
                        )
                    }

-                    BaseItemKind.SERIES -> {
+                    MediaKind.SERIES -> {
                        UnwatchedEpisodeIndicator(
                            size = 28,
                            modifier = Modifier
--- 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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui.library
+package hu.bbara.purefin.ui.screen.home.components.library

 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -9,10 +9,10 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.app.home.ui.shared.SectionHeader
 import hu.bbara.purefin.feature.shared.home.LibraryItem
 import hu.bbara.purefin.feature.shared.home.PosterItem
-import org.jellyfin.sdk.model.UUID
+import hu.bbara.purefin.ui.common.header.SectionHeader
+import java.util.UUID

@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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui.nextup
+package hu.bbara.purefin.ui.screen.home.components.nextup

 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -22,10 +22,10 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.common.ui.components.PurefinAsyncImage
+import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 import hu.bbara.purefin.core.data.image.JellyfinImageHelper
 import hu.bbara.purefin.feature.shared.home.NextUpItem
-import org.jellyfin.sdk.model.UUID
+import java.util.UUID
 import org.jellyfin.sdk.model.api.ImageType

@Composable
--- 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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui.nextup
+package hu.bbara.purefin.ui.screen.home.components.nextup

 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -9,9 +9,9 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.app.home.ui.shared.SectionHeader
+import hu.bbara.purefin.ui.common.header.SectionHeader
 import hu.bbara.purefin.feature.shared.home.NextUpItem
-import org.jellyfin.sdk.model.UUID
+import java.util.UUID

@Composable
 fun NextUpSection(
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/HomeSearchOverlay.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/HomeSearchOverlay.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui.search
+package hu.bbara.purefin.ui.screen.home.components.search

 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.background
@@ -36,8 +36,8 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import hu.bbara.purefin.feature.shared.search.SearchViewModel
-import org.jellyfin.sdk.model.UUID
-import org.jellyfin.sdk.model.api.BaseItemKind
+import java.util.UUID
+import hu.bbara.purefin.core.model.MediaKind

@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -142,8 +142,8 @@ fun HomeSearchOverlay(
                                item = item,
                                onClick = {
                                    when (item.type) {
-                                        BaseItemKind.MOVIE -> onMovieSelected(item.id)
-                                        BaseItemKind.SERIES -> onSeriesSelected(item.id)
+                                        MediaKind.MOVIE -> onMovieSelected(item.id)
+                                        MediaKind.SERIES -> onSeriesSelected(item.id)
                                        else -> Unit
                                    }
                                }
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/HomeSearchResultCard.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/HomeSearchResultCard.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui.search
+package hu.bbara.purefin.ui.screen.home.components.search

 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -17,9 +17,9 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.common.ui.components.PurefinAsyncImage
-import hu.bbara.purefin.core.model.SearchResult
-import org.jellyfin.sdk.model.api.BaseItemKind
+import hu.bbara.purefin.core.model.MediaKind
+import hu.bbara.purefin.feature.shared.search.SearchResult
+import hu.bbara.purefin.ui.common.image.PurefinAsyncImage

@Composable
 internal fun HomeSearchResultCard(
@@ -59,8 +59,8 @@ internal fun HomeSearchResultCard(
            )
            Text(
                text = when (item.type) {
-                    BaseItemKind.MOVIE -> "Movie"
-                    BaseItemKind.SERIES -> "Series"
+                    MediaKind.MOVIE -> "Movie"
+                    MediaKind.SERIES -> "Series"
                    else -> "Title"
                },
                style = MaterialTheme.typography.labelMedium,
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/SearchMessage.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/SearchMessage.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui.search
+package hu.bbara.purefin.ui.screen.home.components.search

 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
--- 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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home
+package hu.bbara.purefin.ui.screen.libraries

 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -6,9 +6,10 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import hu.bbara.purefin.app.home.ui.DefaultTopBar
-import hu.bbara.purefin.app.home.ui.HomeNavItem
-import hu.bbara.purefin.app.home.ui.libraries.LibrariesContent
+import hu.bbara.purefin.ui.common.DefaultTopBar
+import hu.bbara.purefin.ui.screen.home.components.HomeNavItem
+import hu.bbara.purefin.ui.screen.AppBottomBar
+import hu.bbara.purefin.ui.screen.libraries.components.LibrariesContent

@Composable
 fun LibrariesScreen(
--- 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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui.libraries
+package hu.bbara.purefin.ui.screen.libraries.components

 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -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.app.home.ui.HomeNavItem
+import hu.bbara.purefin.ui.screen.home.components.HomeNavItem

@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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.home.ui.libraries
+package hu.bbara.purefin.ui.screen.libraries.components

 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -11,8 +11,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
-import hu.bbara.purefin.app.home.ui.HomeNavItem
-import hu.bbara.purefin.common.ui.components.PurefinAsyncImage
+import hu.bbara.purefin.ui.screen.home.components.HomeNavItem
+import hu.bbara.purefin.ui.common.image.PurefinAsyncImage

@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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.library.ui
+package hu.bbara.purefin.ui.screen.library

 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -21,9 +21,9 @@ 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.common.ui.PosterCard
-import hu.bbara.purefin.common.ui.components.PurefinIconButton
-import hu.bbara.purefin.core.data.navigation.LibraryDto
+import hu.bbara.purefin.ui.common.card.PosterCard
+import hu.bbara.purefin.ui.common.button.PurefinIconButton
+import hu.bbara.purefin.feature.shared.navigation.LibraryDto
 import hu.bbara.purefin.feature.shared.home.PosterItem
 import hu.bbara.purefin.feature.shared.library.LibraryViewModel

--- 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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.login.ui
+package hu.bbara.purefin.ui.screen.login

 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -37,10 +37,10 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.common.ui.PurefinComplexTextField
-import hu.bbara.purefin.common.ui.PurefinPasswordField
-import hu.bbara.purefin.common.ui.PurefinTextButton
-import hu.bbara.purefin.common.ui.PurefinWaitingScreen
+import hu.bbara.purefin.ui.common.textfield.PurefinComplexTextField
+import hu.bbara.purefin.ui.common.textfield.PurefinPasswordField
+import hu.bbara.purefin.ui.common.button.PurefinTextButton
+import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
 import hu.bbara.purefin.feature.shared.login.LoginViewModel
 import kotlinx.coroutines.launch

--- 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
@@ -32,12 +32,12 @@ 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.common.ui.MediaMetaChip
-import hu.bbara.purefin.common.ui.PurefinWaitingScreen
-import hu.bbara.purefin.common.ui.components.MediaHero
+import hu.bbara.purefin.ui.common.media.MediaMetaChip
+import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
+import hu.bbara.purefin.ui.common.media.MediaHero
 import hu.bbara.purefin.core.data.download.DownloadState
 import hu.bbara.purefin.core.data.image.JellyfinImageHelper
-import hu.bbara.purefin.core.data.navigation.MovieDto
+import hu.bbara.purefin.feature.shared.navigation.MovieDto
 import hu.bbara.purefin.core.model.CastMember
 import hu.bbara.purefin.core.model.Movie
 import hu.bbara.purefin.feature.shared.content.movie.MovieScreenViewModel
--- 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,12 +29,12 @@ 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.common.ui.MediaCastRow
-import hu.bbara.purefin.common.ui.MediaSynopsis
-import hu.bbara.purefin.common.ui.components.GhostIconButton
-import hu.bbara.purefin.common.ui.components.MediaActionButton
-import hu.bbara.purefin.common.ui.components.MediaPlaybackSettings
-import hu.bbara.purefin.common.ui.components.MediaResumeButton
+import hu.bbara.purefin.ui.common.media.MediaCastRow
+import hu.bbara.purefin.ui.common.media.MediaSynopsis
+import hu.bbara.purefin.ui.common.button.GhostIconButton
+import hu.bbara.purefin.ui.common.button.MediaActionButton
+import hu.bbara.purefin.ui.common.media.MediaPlaybackSettings
+import hu.bbara.purefin.ui.common.button.MediaResumeButton
 import hu.bbara.purefin.core.data.download.DownloadState
 import hu.bbara.purefin.core.model.Movie
 import hu.bbara.purefin.player.PlayerActivity
--- 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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.ui
+package hu.bbara.purefin.ui.screen.player

 import android.app.Activity
 import android.content.Context
@@ -37,16 +37,16 @@ import androidx.compose.ui.viewinterop.AndroidView
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.ui.AspectRatioFrameLayout
 import androidx.media3.ui.PlayerView
-import hu.bbara.purefin.common.ui.components.EmptyValueTimedVisibility
-import hu.bbara.purefin.common.ui.components.ValueChangeTimedVisibility
 import hu.bbara.purefin.core.player.viewmodel.PlayerViewModel
-import hu.bbara.purefin.player.ui.components.PersistentOverlayContainer
-import hu.bbara.purefin.player.ui.components.PlayerAdjustmentIndicator
-import hu.bbara.purefin.player.ui.components.PlayerControlsOverlay
-import hu.bbara.purefin.player.ui.components.PlayerGesturesLayer
-import hu.bbara.purefin.player.ui.components.PlayerLoadingErrorEndCard
-import hu.bbara.purefin.player.ui.components.PlayerQueuePanel
-import hu.bbara.purefin.player.ui.components.rememberPersistentOverlayController
+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
+import hu.bbara.purefin.ui.screen.player.components.PlayerAdjustmentIndicator
+import hu.bbara.purefin.ui.screen.player.components.PlayerControlsOverlay
+import hu.bbara.purefin.ui.screen.player.components.PlayerGesturesLayer
+import hu.bbara.purefin.ui.screen.player.components.PlayerLoadingErrorEndCard
+import hu.bbara.purefin.ui.screen.player.components.PlayerQueuePanel
+import hu.bbara.purefin.ui.screen.player.components.rememberPersistentOverlayController
 import kotlin.math.abs
 import kotlin.math.roundToInt

@@ -101,7 +101,7 @@ fun PlayerScreen(
            onTap = { viewModel.toggleControlsVisibility() },
            onDoubleTapRight = { viewModel.seekBy(30_000) },
            onDoubleTapLeft = { viewModel.seekBy(-10_000) },
-            onDoubleTapCenter = {viewModel.togglePlayPause()},
+            onDoubleTapCenter = { viewModel.togglePlayPause() },
            onVerticalDragLeft = { delta ->
                val diff = (-delta / 800f)
                brightness = (brightness + diff).coerceIn(0f, 1f)
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PersistentOverlayContainer.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PersistentOverlayContainer.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.ui.components
+package hu.bbara.purefin.ui.screen.player.components

 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerAdjustmentIndicator.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerAdjustmentIndicator.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.ui.components
+package hu.bbara.purefin.ui.screen.player.components

 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
--- 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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.ui.components
+package hu.bbara.purefin.ui.screen.player.components

 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -35,8 +35,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.common.ui.components.GhostIconButton
-import hu.bbara.purefin.common.ui.components.PurefinIconButton
+import hu.bbara.purefin.ui.common.button.GhostIconButton
+import hu.bbara.purefin.ui.common.button.PurefinIconButton
 import hu.bbara.purefin.core.player.model.PlayerUiState
 import hu.bbara.purefin.core.player.model.TrackOption

--- a/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerGesturesLayer.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerGesturesLayer.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.ui.components
+package hu.bbara.purefin.ui.screen.player.components

 import androidx.compose.foundation.gestures.awaitEachGesture
 import androidx.compose.foundation.gestures.awaitFirstDown
--- 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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.ui.components
+package hu.bbara.purefin.ui.screen.player.components

 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.background
--- 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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.ui.components
+package hu.bbara.purefin.ui.screen.player.components

 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
@@ -30,7 +30,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.common.ui.components.PurefinAsyncImage
+import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 import hu.bbara.purefin.core.player.model.PlayerUiState

@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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.ui.components
+package hu.bbara.purefin.ui.screen.player.components

 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.layout.Box
--- 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
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.player.ui.components
+package hu.bbara.purefin.ui.screen.player.components

 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -35,7 +35,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.common.ui.components.PurefinIconButton
+import hu.bbara.purefin.ui.common.button.PurefinIconButton
 import hu.bbara.purefin.core.player.model.TrackOption

@Composable
--- 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,12 +30,12 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
-import hu.bbara.purefin.common.ui.MediaSynopsis
-import hu.bbara.purefin.common.ui.PurefinWaitingScreen
-import hu.bbara.purefin.common.ui.components.MediaHero
+import hu.bbara.purefin.ui.common.media.MediaSynopsis
+import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
+import hu.bbara.purefin.ui.common.media.MediaHero
 import hu.bbara.purefin.core.data.download.DownloadState
 import hu.bbara.purefin.core.data.image.JellyfinImageHelper
-import hu.bbara.purefin.core.data.navigation.SeriesDto
+import hu.bbara.purefin.feature.shared.navigation.SeriesDto
 import hu.bbara.purefin.core.model.CastMember
 import hu.bbara.purefin.core.model.Episode
 import hu.bbara.purefin.core.model.Season
--- 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
@@ -57,19 +57,19 @@ 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.common.ui.MediaCastRow
-import hu.bbara.purefin.common.ui.MediaMetaChip
-import hu.bbara.purefin.common.ui.components.GhostIconButton
-import hu.bbara.purefin.common.ui.components.MediaActionButton
-import hu.bbara.purefin.common.ui.components.MediaProgressBar
-import hu.bbara.purefin.common.ui.components.MediaResumeButton
-import hu.bbara.purefin.common.ui.components.PurefinAsyncImage
-import hu.bbara.purefin.common.ui.components.WatchStateIndicator
+import hu.bbara.purefin.ui.common.media.MediaCastRow
+import hu.bbara.purefin.ui.common.media.MediaMetaChip
+import hu.bbara.purefin.ui.common.button.GhostIconButton
+import hu.bbara.purefin.ui.common.button.MediaActionButton
+import hu.bbara.purefin.ui.common.bar.MediaProgressBar
+import hu.bbara.purefin.ui.common.button.MediaResumeButton
+import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
+import hu.bbara.purefin.ui.common.badge.WatchStateIndicator
 import hu.bbara.purefin.core.data.download.DownloadState
 import hu.bbara.purefin.core.data.image.JellyfinImageHelper
-import hu.bbara.purefin.core.data.navigation.EpisodeDto
-import hu.bbara.purefin.core.data.navigation.LocalNavigationManager
-import hu.bbara.purefin.core.data.navigation.Route
+import hu.bbara.purefin.feature.shared.navigation.EpisodeDto
+import hu.bbara.purefin.navigation.LocalNavigationManager
+import hu.bbara.purefin.feature.shared.navigation.Route
 import hu.bbara.purefin.core.model.CastMember
 import hu.bbara.purefin.core.model.Episode
 import hu.bbara.purefin.core.model.Season
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/waiting/WaitingScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/waiting/WaitingScreen.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.common.ui
+package hu.bbara.purefin.ui.screen.waiting

 import androidx.compose.animation.core.FastOutSlowInEasing
 import androidx.compose.animation.core.RepeatMode