diff --git a/app/src/main/java/hu/bbara/purefin/navigation/RouteEntryBuilder.kt b/app/src/main/java/hu/bbara/purefin/navigation/RouteEntryBuilder.kt
index 6458c54c..943c52ad 100644
--- a/app/src/main/java/hu/bbara/purefin/navigation/RouteEntryBuilder.kt
+++ b/app/src/main/java/hu/bbara/purefin/navigation/RouteEntryBuilder.kt
@@ -1,9 +1,9 @@
 package hu.bbara.purefin.navigation
 
 import androidx.navigation3.runtime.EntryProviderScope
-import hu.bbara.purefin.app.content.episode.EpisodeScreen
-import hu.bbara.purefin.app.content.movie.MovieScreen
-import hu.bbara.purefin.app.content.series.SeriesScreen
+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
diff --git a/app/src/main/java/hu/bbara/purefin/app/content/episode/EpisodeScreen.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/episode/EpisodeScreen.kt
similarity index 97%
rename from app/src/main/java/hu/bbara/purefin/app/content/episode/EpisodeScreen.kt
rename to app/src/main/java/hu/bbara/purefin/ui/screen/episode/EpisodeScreen.kt
index 1741a076..c6f5cc56 100644
--- a/app/src/main/java/hu/bbara/purefin/app/content/episode/EpisodeScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/episode/EpisodeScreen.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.content.episode
+package hu.bbara.purefin.ui.screen.episode
 
 import android.Manifest
 import android.os.Build
@@ -45,6 +45,9 @@ import hu.bbara.purefin.core.data.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
+import hu.bbara.purefin.ui.screen.episode.components.EpisodeDetails
+import hu.bbara.purefin.ui.screen.episode.components.EpisodeTopBar
+import hu.bbara.purefin.ui.screen.episode.components.EpisodeTopBarShortcut
 import hu.bbara.purefin.ui.theme.AppTheme
 import org.jellyfin.sdk.model.api.ImageType
 import java.util.UUID
diff --git a/app/src/main/java/hu/bbara/purefin/app/content/episode/EpisodeComponents.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/episode/components/EpisodeComponents.kt
similarity index 97%
rename from app/src/main/java/hu/bbara/purefin/app/content/episode/EpisodeComponents.kt
rename to app/src/main/java/hu/bbara/purefin/ui/screen/episode/components/EpisodeComponents.kt
index acae6f3a..eefae6d5 100644
--- a/app/src/main/java/hu/bbara/purefin/app/content/episode/EpisodeComponents.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/episode/components/EpisodeComponents.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.content.episode
+package hu.bbara.purefin.ui.screen.episode.components
 
 import android.content.Intent
 import androidx.compose.foundation.background
@@ -13,11 +13,8 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.sizeIn
 import androidx.compose.foundation.layout.statusBarsPadding
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Add
 import androidx.compose.material.icons.outlined.ArrowBack
 import androidx.compose.material.icons.outlined.Cast
 import androidx.compose.material.icons.outlined.Close
diff --git a/app/src/main/java/hu/bbara/purefin/app/content/movie/MovieScreen.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/movie/MovieScreen.kt
similarity index 97%
rename from app/src/main/java/hu/bbara/purefin/app/content/movie/MovieScreen.kt
rename to app/src/main/java/hu/bbara/purefin/ui/screen/movie/MovieScreen.kt
index 330101d6..d42fcca5 100644
--- a/app/src/main/java/hu/bbara/purefin/app/content/movie/MovieScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/movie/MovieScreen.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.content.movie
+package hu.bbara.purefin.ui.screen.movie
 
 import android.Manifest
 import android.os.Build
@@ -41,6 +41,8 @@ import hu.bbara.purefin.core.data.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
+import hu.bbara.purefin.ui.screen.movie.components.MovieDetails
+import hu.bbara.purefin.ui.screen.movie.components.MovieTopBar
 import hu.bbara.purefin.ui.theme.AppTheme
 import org.jellyfin.sdk.model.api.ImageType
 import java.util.UUID
diff --git a/app/src/main/java/hu/bbara/purefin/app/content/movie/MovieComponents.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/movie/components/MovieComponents.kt
similarity index 99%
rename from app/src/main/java/hu/bbara/purefin/app/content/movie/MovieComponents.kt
rename to app/src/main/java/hu/bbara/purefin/ui/screen/movie/components/MovieComponents.kt
index 75c69ad2..a73dbdb9 100644
--- a/app/src/main/java/hu/bbara/purefin/app/content/movie/MovieComponents.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/movie/components/MovieComponents.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.content.movie
+package hu.bbara.purefin.ui.screen.movie.components
 
 import android.content.Intent
 import androidx.compose.foundation.layout.Arrangement
diff --git a/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesScreen.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/series/SeriesScreen.kt
similarity index 96%
rename from app/src/main/java/hu/bbara/purefin/app/content/series/SeriesScreen.kt
rename to app/src/main/java/hu/bbara/purefin/ui/screen/series/SeriesScreen.kt
index 97d2c4c3..dae35004 100644
--- a/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/series/SeriesScreen.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.content.series
+package hu.bbara.purefin.ui.screen.series
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -41,6 +41,13 @@ import hu.bbara.purefin.core.model.Episode
 import hu.bbara.purefin.core.model.Season
 import hu.bbara.purefin.core.model.Series
 import hu.bbara.purefin.feature.shared.content.series.SeriesViewModel
+import hu.bbara.purefin.ui.screen.series.components.CastRow
+import hu.bbara.purefin.ui.screen.series.components.EpisodeCarousel
+import hu.bbara.purefin.ui.screen.series.components.SeasonTabs
+import hu.bbara.purefin.ui.screen.series.components.SeriesActionButtons
+import hu.bbara.purefin.ui.screen.series.components.SeriesDownloadOption
+import hu.bbara.purefin.ui.screen.series.components.SeriesMetaChips
+import hu.bbara.purefin.ui.screen.series.components.SeriesTopBar
 import hu.bbara.purefin.ui.theme.AppTheme
 import org.jellyfin.sdk.model.api.ImageType
 import java.util.UUID
diff --git a/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesComponents.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/series/components/SeriesComponents.kt
similarity index 99%
rename from app/src/main/java/hu/bbara/purefin/app/content/series/SeriesComponents.kt
rename to app/src/main/java/hu/bbara/purefin/ui/screen/series/components/SeriesComponents.kt
index 739a500c..a25c3e5f 100644
--- a/app/src/main/java/hu/bbara/purefin/app/content/series/SeriesComponents.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/series/components/SeriesComponents.kt
@@ -1,4 +1,4 @@
-package hu.bbara.purefin.app.content.series
+package hu.bbara.purefin.ui.screen.series.components
 
 import android.content.Intent
 import androidx.compose.foundation.background
@@ -47,11 +47,11 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp