diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
index 8a9794e6..ef313b38 100644
--- a/desktop/build.gradle.kts
+++ b/desktop/build.gradle.kts
@@ -23,6 +23,6 @@ dependencies {
 
 compose.desktop {
   application {
-    mainClass = "MainKt"
+    mainClass = "dev.msfjarvis.lobsters.ui.Main"
   }
 }
diff --git a/desktop/src/main/kotlin/ApiRepository.kt b/desktop/src/main/kotlin/dev.msfjarvis.lobsters.data/ApiRepository.kt
similarity index 94%
rename from desktop/src/main/kotlin/ApiRepository.kt
rename to desktop/src/main/kotlin/dev.msfjarvis.lobsters.data/ApiRepository.kt
index a345110f..e4a65eb8 100644
--- a/desktop/src/main/kotlin/ApiRepository.kt
+++ b/desktop/src/main/kotlin/dev.msfjarvis.lobsters.data/ApiRepository.kt
@@ -1,3 +1,5 @@
+package dev.msfjarvis.lobsters.data
+
 import com.squareup.moshi.Moshi
 import dev.msfjarvis.lobsters.data.api.LobstersApi
 import dev.msfjarvis.lobsters.model.LobstersPost
diff --git a/desktop/src/main/kotlin/LobstersItem.kt b/desktop/src/main/kotlin/dev.msfjarvis.lobsters.ui/LobstersItem.kt
similarity index 96%
rename from desktop/src/main/kotlin/LobstersItem.kt
rename to desktop/src/main/kotlin/dev.msfjarvis.lobsters.ui/LobstersItem.kt
index e607fe05..a516c906 100644
--- a/desktop/src/main/kotlin/LobstersItem.kt
+++ b/desktop/src/main/kotlin/dev.msfjarvis.lobsters.ui/LobstersItem.kt
@@ -1,3 +1,5 @@
+package dev.msfjarvis.lobsters.ui
+
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -17,6 +19,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import dev.msfjarvis.lobsters.data.local.SavedPost
+import dev.msfjarvis.lobsters.util.UrlLauncher
 import io.kamel.image.KamelImage
 import io.kamel.image.lazyImageResource
 import java.net.URI
diff --git a/desktop/src/main/kotlin/Main.kt b/desktop/src/main/kotlin/dev.msfjarvis.lobsters.ui/Main.kt
similarity index 95%
rename from desktop/src/main/kotlin/Main.kt
rename to desktop/src/main/kotlin/dev.msfjarvis.lobsters.ui/Main.kt
index 55138045..420a691b 100644
--- a/desktop/src/main/kotlin/Main.kt
+++ b/desktop/src/main/kotlin/dev.msfjarvis.lobsters.ui/Main.kt
@@ -1,3 +1,6 @@
+@file:JvmName("Main")
+package dev.msfjarvis.lobsters.ui
+
 import androidx.compose.desktop.Window
 import androidx.compose.foundation.VerticalScrollbar
 import androidx.compose.foundation.layout.Box
@@ -16,6 +19,7 @@ import dev.msfjarvis.lobsters.data.local.SavedPost
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import dev.msfjarvis.lobsters.data.ApiRepository
 import dev.msfjarvis.lobsters.model.LobstersPost
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/desktop/src/main/kotlin/Theme.kt b/desktop/src/main/kotlin/dev.msfjarvis.lobsters.ui/Theme.kt
similarity index 96%
rename from desktop/src/main/kotlin/Theme.kt
rename to desktop/src/main/kotlin/dev.msfjarvis.lobsters.ui/Theme.kt
index 512628b7..c01aa69c 100644
--- a/desktop/src/main/kotlin/Theme.kt
+++ b/desktop/src/main/kotlin/dev.msfjarvis.lobsters.ui/Theme.kt
@@ -1,4 +1,5 @@
 @file:Suppress("UNUSED")
+package dev.msfjarvis.lobsters.ui
 
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.darkColors
diff --git a/desktop/src/main/kotlin/UrlLauncher.kt b/desktop/src/main/kotlin/dev.msfjarvis.lobsters.util/UrlLauncher.kt
similarity index 87%
rename from desktop/src/main/kotlin/UrlLauncher.kt
rename to desktop/src/main/kotlin/dev.msfjarvis.lobsters.util/UrlLauncher.kt
index 3bd92c5f..5bf25d44 100644
--- a/desktop/src/main/kotlin/UrlLauncher.kt
+++ b/desktop/src/main/kotlin/dev.msfjarvis.lobsters.util/UrlLauncher.kt
@@ -1,3 +1,5 @@
+package dev.msfjarvis.lobsters.util
+
 import java.awt.Desktop
 import java.net.URI