diff --git a/new-player/src/main/java/net/newpipe/newplayer/ui/NewPlayerUI.kt b/new-player/src/main/java/net/newpipe/newplayer/ui/NewPlayerUI.kt
index c2f6eb3..94057ab 100644
--- a/new-player/src/main/java/net/newpipe/newplayer/ui/NewPlayerUI.kt
+++ b/new-player/src/main/java/net/newpipe/newplayer/ui/NewPlayerUI.kt
@@ -59,6 +59,7 @@ import androidx.media3.common.util.UnstableApi
 import net.newpipe.newplayer.model.UIModeState
 import net.newpipe.newplayer.model.NewPlayerViewModel
 import net.newpipe.newplayer.model.NewPlayerViewModelDummy
+import net.newpipe.newplayer.ui.streamselect.StreamSelectUI
 import net.newpipe.newplayer.ui.theme.VideoPlayerTheme
 import net.newpipe.newplayer.ui.videoplayer.VideoPlayerControllerUI
 import net.newpipe.newplayer.utils.LockScreenOrientation
diff --git a/new-player/src/main/java/net/newpipe/newplayer/ui/streamselect/ChapterItem.kt b/new-player/src/main/java/net/newpipe/newplayer/ui/streamselect/ChapterItem.kt
index 3d2f970..fe4473c 100644
--- a/new-player/src/main/java/net/newpipe/newplayer/ui/streamselect/ChapterItem.kt
+++ b/new-player/src/main/java/net/newpipe/newplayer/ui/streamselect/ChapterItem.kt
@@ -51,7 +51,6 @@ import net.newpipe.newplayer.Chapter
 import net.newpipe.newplayer.NewPlayerException
 import net.newpipe.newplayer.R
 import net.newpipe.newplayer.ui.theme.VideoPlayerTheme
-import net.newpipe.newplayer.ui.ITEM_CORNER_SHAPE
 import net.newpipe.newplayer.utils.Thumbnail
 import net.newpipe.newplayer.utils.getLocale
 import net.newpipe.newplayer.utils.getTimeStringFromMs
diff --git a/new-player/src/main/java/net/newpipe/newplayer/ui/streamselect/StreamItem.kt b/new-player/src/main/java/net/newpipe/newplayer/ui/streamselect/StreamItem.kt
index 3a51d27..8862941 100644
--- a/new-player/src/main/java/net/newpipe/newplayer/ui/streamselect/StreamItem.kt
+++ b/new-player/src/main/java/net/newpipe/newplayer/ui/streamselect/StreamItem.kt
@@ -65,7 +65,6 @@ import net.newpipe.newplayer.R
 import net.newpipe.newplayer.model.NewPlayerUIState
 import net.newpipe.newplayer.ui.videoplayer.CONTROLLER_UI_BACKGROUND_COLOR
 import net.newpipe.newplayer.ui.theme.VideoPlayerTheme
-import net.newpipe.newplayer.ui.ITEM_CORNER_SHAPE
 import net.newpipe.newplayer.utils.ReorderHapticFeedback
 import net.newpipe.newplayer.utils.ReorderHapticFeedbackType
 import net.newpipe.newplayer.utils.Thumbnail
diff --git a/new-player/src/main/java/net/newpipe/newplayer/ui/StreamSelectUI.kt b/new-player/src/main/java/net/newpipe/newplayer/ui/streamselect/StreamSelectUI.kt
similarity index 95%
rename from new-player/src/main/java/net/newpipe/newplayer/ui/StreamSelectUI.kt
rename to new-player/src/main/java/net/newpipe/newplayer/ui/streamselect/StreamSelectUI.kt
index c67ae5a..8af57cb 100644
--- a/new-player/src/main/java/net/newpipe/newplayer/ui/StreamSelectUI.kt
+++ b/new-player/src/main/java/net/newpipe/newplayer/ui/streamselect/StreamSelectUI.kt
@@ -18,7 +18,7 @@
  * along with NewPlayer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.newpipe.newplayer.ui
+package net.newpipe.newplayer.ui.streamselect
 
 import androidx.annotation.OptIn
 import androidx.compose.foundation.layout.Arrangement
@@ -43,11 +43,6 @@ import net.newpipe.newplayer.model.NewPlayerUIState
 import net.newpipe.newplayer.model.NewPlayerViewModel
 import net.newpipe.newplayer.model.NewPlayerViewModelDummy
 import net.newpipe.newplayer.ui.theme.VideoPlayerTheme
-import net.newpipe.newplayer.ui.streamselect.ChapterItem
-import net.newpipe.newplayer.ui.streamselect.ChapterSelectTopBar
-import net.newpipe.newplayer.ui.streamselect.StreamItem
-import net.newpipe.newplayer.ui.streamselect.StreamSelectTopBar
-import net.newpipe.newplayer.ui.streamselect.isActiveChapter
 import net.newpipe.newplayer.ui.videoplayer.STREAMSELECT_UI_BACKGROUND_COLOR
 import net.newpipe.newplayer.utils.ReorderHapticFeedbackType
 import net.newpipe.newplayer.utils.getInsets