diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.kt b/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.kt
index 22cff9a53..10eea4e78 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.kt
@@ -8,8 +8,8 @@ import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.viewmodel.compose.viewModel
-import org.schabi.newpipe.compose.comment.CommentSection
-import org.schabi.newpipe.compose.theme.AppTheme
+import org.schabi.newpipe.ui.components.comment.CommentSection
+import org.schabi.newpipe.ui.theme.AppTheme
 import org.schabi.newpipe.util.KEY_SERVICE_ID
 import org.schabi.newpipe.util.KEY_URL
 import org.schabi.newpipe.viewmodels.CommentsViewModel
diff --git a/app/src/main/java/org/schabi/newpipe/compose/Toolbar.kt b/app/src/main/java/org/schabi/newpipe/ui/Toolbar.kt
similarity index 97%
rename from app/src/main/java/org/schabi/newpipe/compose/Toolbar.kt
rename to app/src/main/java/org/schabi/newpipe/ui/Toolbar.kt
index 469d88ec0..b788932a2 100644
--- a/app/src/main/java/org/schabi/newpipe/compose/Toolbar.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/Toolbar.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose
+package org.schabi.newpipe.ui
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -27,8 +27,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import org.schabi.newpipe.R
-import org.schabi.newpipe.compose.theme.AppTheme
-import org.schabi.newpipe.compose.theme.SizeTokens
+import org.schabi.newpipe.ui.theme.AppTheme
+import org.schabi.newpipe.ui.theme.SizeTokens
 
 @Composable
 fun TextAction(text: String, modifier: Modifier = Modifier) {
diff --git a/app/src/main/java/org/schabi/newpipe/compose/comment/Comment.kt b/app/src/main/java/org/schabi/newpipe/ui/components/comment/Comment.kt
similarity index 98%
rename from app/src/main/java/org/schabi/newpipe/compose/comment/Comment.kt
rename to app/src/main/java/org/schabi/newpipe/ui/components/comment/Comment.kt
index 00f07932f..8ecc87fdd 100644
--- a/app/src/main/java/org/schabi/newpipe/compose/comment/Comment.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/components/comment/Comment.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose.comment
+package org.schabi.newpipe.ui.components.comment
 
 import android.content.res.Configuration
 import androidx.compose.animation.animateContentSize
@@ -42,12 +42,12 @@ import androidx.paging.PagingConfig
 import androidx.paging.cachedIn
 import coil.compose.AsyncImage
 import org.schabi.newpipe.R
-import org.schabi.newpipe.compose.common.DescriptionText
-import org.schabi.newpipe.compose.theme.AppTheme
 import org.schabi.newpipe.extractor.Page
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem
 import org.schabi.newpipe.extractor.stream.Description
 import org.schabi.newpipe.paging.CommentsSource
+import org.schabi.newpipe.ui.components.common.DescriptionText
+import org.schabi.newpipe.ui.theme.AppTheme
 import org.schabi.newpipe.util.Localization
 import org.schabi.newpipe.util.NavigationHelper
 import org.schabi.newpipe.util.image.ImageStrategy
diff --git a/app/src/main/java/org/schabi/newpipe/compose/comment/CommentRepliesHeader.kt b/app/src/main/java/org/schabi/newpipe/ui/components/comment/CommentRepliesHeader.kt
similarity index 96%
rename from app/src/main/java/org/schabi/newpipe/compose/comment/CommentRepliesHeader.kt
rename to app/src/main/java/org/schabi/newpipe/ui/components/comment/CommentRepliesHeader.kt
index d4e4fd36c..a8e33a49d 100644
--- a/app/src/main/java/org/schabi/newpipe/compose/comment/CommentRepliesHeader.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/components/comment/CommentRepliesHeader.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose.comment
+package org.schabi.newpipe.ui.components.comment
 
 import android.content.res.Configuration
 import androidx.compose.foundation.Image
@@ -25,10 +25,10 @@ import androidx.compose.ui.unit.dp
 import androidx.fragment.app.FragmentActivity
 import coil.compose.AsyncImage
 import org.schabi.newpipe.R
-import org.schabi.newpipe.compose.common.DescriptionText
-import org.schabi.newpipe.compose.theme.AppTheme
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem
 import org.schabi.newpipe.extractor.stream.Description
+import org.schabi.newpipe.ui.components.common.DescriptionText
+import org.schabi.newpipe.ui.theme.AppTheme
 import org.schabi.newpipe.util.Localization
 import org.schabi.newpipe.util.NavigationHelper
 import org.schabi.newpipe.util.image.ImageStrategy
diff --git a/app/src/main/java/org/schabi/newpipe/compose/comment/CommentSection.kt b/app/src/main/java/org/schabi/newpipe/ui/components/comment/CommentSection.kt
similarity index 97%
rename from app/src/main/java/org/schabi/newpipe/compose/comment/CommentSection.kt
rename to app/src/main/java/org/schabi/newpipe/ui/components/comment/CommentSection.kt
index 5d5ad3b76..3f2a5a1ac 100644
--- a/app/src/main/java/org/schabi/newpipe/compose/comment/CommentSection.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/components/comment/CommentSection.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose.comment
+package org.schabi.newpipe.ui.components.comment
 
 import android.content.res.Configuration
 import androidx.compose.foundation.layout.Column
@@ -31,11 +31,11 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 import my.nanihadesuka.compose.LazyColumnScrollbar
 import org.schabi.newpipe.R
-import org.schabi.newpipe.compose.common.LoadingIndicator
-import org.schabi.newpipe.compose.theme.AppTheme
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem
 import org.schabi.newpipe.extractor.stream.Description
 import org.schabi.newpipe.paging.CommentsDisabledException
+import org.schabi.newpipe.ui.components.common.LoadingIndicator
+import org.schabi.newpipe.ui.theme.AppTheme
 
 @Composable
 fun CommentSection(
diff --git a/app/src/main/java/org/schabi/newpipe/compose/common/DescriptionText.kt b/app/src/main/java/org/schabi/newpipe/ui/components/common/DescriptionText.kt
similarity index 96%
rename from app/src/main/java/org/schabi/newpipe/compose/common/DescriptionText.kt
rename to app/src/main/java/org/schabi/newpipe/ui/components/common/DescriptionText.kt
index 614a36cce..59ce07c94 100644
--- a/app/src/main/java/org/schabi/newpipe/compose/common/DescriptionText.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/components/common/DescriptionText.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose.common
+package org.schabi.newpipe.ui.components.common
 
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.Text
diff --git a/app/src/main/java/org/schabi/newpipe/compose/common/LoadingIndicator.kt b/app/src/main/java/org/schabi/newpipe/ui/components/common/LoadingIndicator.kt
similarity index 92%
rename from app/src/main/java/org/schabi/newpipe/compose/common/LoadingIndicator.kt
rename to app/src/main/java/org/schabi/newpipe/ui/components/common/LoadingIndicator.kt
index 6ddea9d7a..3bfe1dee4 100644
--- a/app/src/main/java/org/schabi/newpipe/compose/common/LoadingIndicator.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/components/common/LoadingIndicator.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose.common
+package org.schabi.newpipe.ui.components.common
 
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.wrapContentSize
diff --git a/app/src/main/java/org/schabi/newpipe/compose/theme/Color.kt b/app/src/main/java/org/schabi/newpipe/ui/theme/Color.kt
similarity index 98%
rename from app/src/main/java/org/schabi/newpipe/compose/theme/Color.kt
rename to app/src/main/java/org/schabi/newpipe/ui/theme/Color.kt
index 0aa330390..b61906ebe 100644
--- a/app/src/main/java/org/schabi/newpipe/compose/theme/Color.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/theme/Color.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose.theme
+package org.schabi.newpipe.ui.theme
 
 import androidx.compose.ui.graphics.Color
 
diff --git a/app/src/main/java/org/schabi/newpipe/compose/theme/SizeTokens.kt b/app/src/main/java/org/schabi/newpipe/ui/theme/SizeTokens.kt
similarity index 88%
rename from app/src/main/java/org/schabi/newpipe/compose/theme/SizeTokens.kt
rename to app/src/main/java/org/schabi/newpipe/ui/theme/SizeTokens.kt
index 274fa9d43..d8104d7ae 100644
--- a/app/src/main/java/org/schabi/newpipe/compose/theme/SizeTokens.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/theme/SizeTokens.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose.theme
+package org.schabi.newpipe.ui.theme
 
 import androidx.compose.ui.unit.dp
 
diff --git a/app/src/main/java/org/schabi/newpipe/compose/theme/Theme.kt b/app/src/main/java/org/schabi/newpipe/ui/theme/Theme.kt
similarity index 98%
rename from app/src/main/java/org/schabi/newpipe/compose/theme/Theme.kt
rename to app/src/main/java/org/schabi/newpipe/ui/theme/Theme.kt
index 1c9325f96..846794d72 100644
--- a/app/src/main/java/org/schabi/newpipe/compose/theme/Theme.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/theme/Theme.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose.theme
+package org.schabi.newpipe.ui.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme