diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt
index 3fabf6fd..ae3cce3c 100644
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt
@@ -25,6 +25,11 @@ import com.google.accompanist.insets.ProvideWindowInsets
 import com.google.accompanist.insets.navigationBarsPadding
 import com.google.accompanist.insets.statusBarsPadding
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
+import dev.msfjarvis.claw.android.ui.decorations.ClawAppBar
+import dev.msfjarvis.claw.android.ui.decorations.ClawFab
+import dev.msfjarvis.claw.android.ui.lists.DatabasePosts
+import dev.msfjarvis.claw.android.ui.lists.HottestPosts
+import dev.msfjarvis.claw.android.ui.navigation.Destinations
 import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
 import dev.msfjarvis.claw.common.comments.CommentsPage
 import dev.msfjarvis.claw.common.comments.HTMLConverter
diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ClawAppBar.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawAppBar.kt
similarity index 91%
rename from android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ClawAppBar.kt
rename to android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawAppBar.kt
index 0e87bab1..6c6521ca 100644
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ClawAppBar.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawAppBar.kt
@@ -1,4 +1,4 @@
-package dev.msfjarvis.claw.android.ui
+package dev.msfjarvis.claw.android.ui.decorations
 
 import androidx.compose.material3.SmallTopAppBar
 import androidx.compose.material3.Text
diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ClawFab.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawFab.kt
similarity index 97%
rename from android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ClawFab.kt
rename to android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawFab.kt
index c9cb668a..72cdd2dd 100644
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ClawFab.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawFab.kt
@@ -1,4 +1,4 @@
-package dev.msfjarvis.claw.android.ui
+package dev.msfjarvis.claw.android.ui.decorations
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.ExperimentalAnimationApi
diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ext.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ext.kt
index b4f63804..fee22060 100644
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ext.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ext.kt
@@ -14,6 +14,7 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
 import androidx.compose.ui.input.nestedscroll.NestedScrollSource
 import androidx.navigation.NavController
+import dev.msfjarvis.claw.android.ui.navigation.Destinations
 import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
 import dev.msfjarvis.claw.common.posts.PostActions
 import dev.msfjarvis.claw.common.theme.DarkThemeColors
diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/DatabasePosts.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/DatabasePosts.kt
similarity index 96%
rename from android/src/main/kotlin/dev/msfjarvis/claw/android/ui/DatabasePosts.kt
rename to android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/DatabasePosts.kt
index c98ca84c..56a5dbbb 100644
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/DatabasePosts.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/DatabasePosts.kt
@@ -1,4 +1,4 @@
-package dev.msfjarvis.claw.android.ui
+package dev.msfjarvis.claw.android.ui.lists
 
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/HottestPosts.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/HottestPosts.kt
similarity index 96%
rename from android/src/main/kotlin/dev/msfjarvis/claw/android/ui/HottestPosts.kt
rename to android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/HottestPosts.kt
index 57708e18..0248a3ce 100644
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/HottestPosts.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/HottestPosts.kt
@@ -1,4 +1,4 @@
-package dev.msfjarvis.claw.android.ui
+package dev.msfjarvis.claw.android.ui.lists
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/NetworkPosts.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPosts.kt
similarity index 96%
rename from android/src/main/kotlin/dev/msfjarvis/claw/android/ui/NetworkPosts.kt
rename to android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPosts.kt
index daa17961..595fa8b6 100644
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/NetworkPosts.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPosts.kt
@@ -1,4 +1,4 @@
-package dev.msfjarvis.claw.android.ui
+package dev.msfjarvis.claw.android.ui.lists
 
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/Destinations.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/navigation/Destinations.kt
similarity index 86%
rename from android/src/main/kotlin/dev/msfjarvis/claw/android/ui/Destinations.kt
rename to android/src/main/kotlin/dev/msfjarvis/claw/android/ui/navigation/Destinations.kt
index c46436d0..d422a429 100644
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/Destinations.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/navigation/Destinations.kt
@@ -1,4 +1,4 @@
-package dev.msfjarvis.claw.android.ui
+package dev.msfjarvis.claw.android.ui.navigation
 
 sealed class Destinations(internal val route: String) {
   object Hottest : Destinations("hottest") {