diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt
index 0741c272a98..84121eb3225 100644
--- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt
+++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt
@@ -5,8 +5,9 @@ import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.ui.res.stringResource
 import org.schabi.newpipe.R
-import org.schabi.newpipe.compose.screen.ScaffoldWithToolbar
-import org.schabi.newpipe.compose.theme.AppTheme
+import org.schabi.newpipe.ui.components.common.ScaffoldWithToolbar
+import org.schabi.newpipe.ui.screens.AboutScreen
+import org.schabi.newpipe.ui.theme.AppTheme
 import org.schabi.newpipe.util.Localization
 
 class AboutActivity : AppCompatActivity() {
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 469d88ec091..b788932a269 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/about/AboutClasses.kt b/app/src/main/java/org/schabi/newpipe/ui/components/about/AboutClasses.kt
similarity index 93%
rename from app/src/main/java/org/schabi/newpipe/about/AboutClasses.kt
rename to app/src/main/java/org/schabi/newpipe/ui/components/about/AboutClasses.kt
index bacd944c6db..dcc22dd81a4 100644
--- a/app/src/main/java/org/schabi/newpipe/about/AboutClasses.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/components/about/AboutClasses.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.about
+package org.schabi.newpipe.ui.components.about
 
 import android.content.Context
 import androidx.annotation.StringRes
diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutTab.kt b/app/src/main/java/org/schabi/newpipe/ui/components/about/AboutTab.kt
similarity index 98%
rename from app/src/main/java/org/schabi/newpipe/about/AboutTab.kt
rename to app/src/main/java/org/schabi/newpipe/ui/components/about/AboutTab.kt
index 020c57e796b..6b7dc09b805 100644
--- a/app/src/main/java/org/schabi/newpipe/about/AboutTab.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/components/about/AboutTab.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.about
+package org.schabi.newpipe.ui.components.about
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Column
diff --git a/app/src/main/java/org/schabi/newpipe/about/LicenseTab.kt b/app/src/main/java/org/schabi/newpipe/ui/components/about/LicenseTab.kt
similarity index 99%
rename from app/src/main/java/org/schabi/newpipe/about/LicenseTab.kt
rename to app/src/main/java/org/schabi/newpipe/ui/components/about/LicenseTab.kt
index a42cf864c44..ca736f80839 100644
--- a/app/src/main/java/org/schabi/newpipe/about/LicenseTab.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/components/about/LicenseTab.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.about
+package org.schabi.newpipe.ui.components.about
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
diff --git a/app/src/main/java/org/schabi/newpipe/about/StandardLicenses.kt b/app/src/main/java/org/schabi/newpipe/ui/components/about/StandardLicenses.kt
similarity index 92%
rename from app/src/main/java/org/schabi/newpipe/about/StandardLicenses.kt
rename to app/src/main/java/org/schabi/newpipe/ui/components/about/StandardLicenses.kt
index c5b9618fe1e..ce29bfd8afb 100644
--- a/app/src/main/java/org/schabi/newpipe/about/StandardLicenses.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/components/about/StandardLicenses.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.about
+package org.schabi.newpipe.ui.components.about
 
 /**
  * Class containing information about standard software licenses.
diff --git a/app/src/main/java/org/schabi/newpipe/compose/screen/ScaffoldWithToolbar.kt b/app/src/main/java/org/schabi/newpipe/ui/components/common/ScaffoldWithToolbar.kt
similarity index 96%
rename from app/src/main/java/org/schabi/newpipe/compose/screen/ScaffoldWithToolbar.kt
rename to app/src/main/java/org/schabi/newpipe/ui/components/common/ScaffoldWithToolbar.kt
index 52e982c3b9c..bd0b6359cdd 100644
--- a/app/src/main/java/org/schabi/newpipe/compose/screen/ScaffoldWithToolbar.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/components/common/ScaffoldWithToolbar.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.compose.screen
+package org.schabi.newpipe.ui.components.common
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.RowScope
diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutScreen.kt b/app/src/main/java/org/schabi/newpipe/ui/screens/AboutScreen.kt
similarity index 94%
rename from app/src/main/java/org/schabi/newpipe/about/AboutScreen.kt
rename to app/src/main/java/org/schabi/newpipe/ui/screens/AboutScreen.kt
index fc3f7048232..9ed4be8df57 100644
--- a/app/src/main/java/org/schabi/newpipe/about/AboutScreen.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/screens/AboutScreen.kt
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.about
+package org.schabi.newpipe.ui.screens
 
 import android.content.res.Configuration
 import androidx.collection.intListOf
@@ -30,7 +30,9 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import my.nanihadesuka.compose.ColumnScrollbar
 import org.schabi.newpipe.R
-import org.schabi.newpipe.compose.theme.AppTheme
+import org.schabi.newpipe.ui.components.about.AboutTab
+import org.schabi.newpipe.ui.components.about.LicenseTab
+import org.schabi.newpipe.ui.theme.AppTheme
 
 private val TITLES = intListOf(R.string.tab_about, R.string.tab_licenses)
 
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 0aa330390af..b61906ebed6 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 274fa9d435b..d8104d7aea8 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 1c9325f964c..846794d725c 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