diff --git a/settings.gradle.kts b/settings.gradle.kts
index a38ba24..c4af316 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -32,5 +32,5 @@ plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }
 
-include(":composeApp")
 include(":core")
+include(":ui")
diff --git a/composeApp/build.gradle.kts b/ui/build.gradle.kts
similarity index 100%
rename from composeApp/build.gradle.kts
rename to ui/build.gradle.kts
diff --git a/composeApp/src/androidMain/AndroidManifest.xml b/ui/src/androidMain/AndroidManifest.xml
similarity index 100%
rename from composeApp/src/androidMain/AndroidManifest.xml
rename to ui/src/androidMain/AndroidManifest.xml
diff --git a/composeApp/src/androidMain/kotlin/moe/lava/neon/MainActivity.kt b/ui/src/androidMain/kotlin/moe/lava/neon/MainActivity.kt
similarity index 100%
rename from composeApp/src/androidMain/kotlin/moe/lava/neon/MainActivity.kt
rename to ui/src/androidMain/kotlin/moe/lava/neon/MainActivity.kt
diff --git a/composeApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml b/ui/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from composeApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml
rename to ui/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/composeApp/src/androidMain/res/drawable/ic_launcher_background.xml b/ui/src/androidMain/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from composeApp/src/androidMain/res/drawable/ic_launcher_background.xml
rename to ui/src/androidMain/res/drawable/ic_launcher_background.xml
diff --git a/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml b/ui/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml
rename to ui/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml b/ui/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to ui/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png b/ui/src/androidMain/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png
rename to ui/src/androidMain/res/mipmap-hdpi/ic_launcher.png
diff --git a/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png b/ui/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png
rename to ui/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png b/ui/src/androidMain/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png
rename to ui/src/androidMain/res/mipmap-mdpi/ic_launcher.png
diff --git a/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png b/ui/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png
rename to ui/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png b/ui/src/androidMain/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png
rename to ui/src/androidMain/res/mipmap-xhdpi/ic_launcher.png
diff --git a/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png b/ui/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png
rename to ui/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png b/ui/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png
rename to ui/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png b/ui/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png
rename to ui/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png b/ui/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png
rename to ui/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png b/ui/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to ui/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/composeApp/src/androidMain/res/values/strings.xml b/ui/src/androidMain/res/values/strings.xml
similarity index 100%
rename from composeApp/src/androidMain/res/values/strings.xml
rename to ui/src/androidMain/res/values/strings.xml
diff --git a/composeApp/src/commonMain/composeResources/drawable/compose-multiplatform.xml b/ui/src/commonMain/composeResources/drawable/compose-multiplatform.xml
similarity index 100%
rename from composeApp/src/commonMain/composeResources/drawable/compose-multiplatform.xml
rename to ui/src/commonMain/composeResources/drawable/compose-multiplatform.xml
diff --git a/composeApp/src/commonMain/kotlin/moe/lava/neon/ui/App.kt b/ui/src/commonMain/kotlin/moe/lava/neon/ui/App.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/moe/lava/neon/ui/App.kt
rename to ui/src/commonMain/kotlin/moe/lava/neon/ui/App.kt
diff --git a/composeApp/src/commonMain/kotlin/moe/lava/neon/ui/Greeting.kt b/ui/src/commonMain/kotlin/moe/lava/neon/ui/Greeting.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/moe/lava/neon/ui/Greeting.kt
rename to ui/src/commonMain/kotlin/moe/lava/neon/ui/Greeting.kt
diff --git a/composeApp/src/commonMain/kotlin/moe/lava/neon/ui/di/AppUiGraph.kt b/ui/src/commonMain/kotlin/moe/lava/neon/ui/di/AppUiGraph.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/moe/lava/neon/ui/di/AppUiGraph.kt
rename to ui/src/commonMain/kotlin/moe/lava/neon/ui/di/AppUiGraph.kt
diff --git a/composeApp/src/commonMain/kotlin/moe/lava/neon/ui/screens/Login.kt b/ui/src/commonMain/kotlin/moe/lava/neon/ui/screens/Login.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/moe/lava/neon/ui/screens/Login.kt
rename to ui/src/commonMain/kotlin/moe/lava/neon/ui/screens/Login.kt
diff --git a/composeApp/src/commonMain/kotlin/moe/lava/neon/ui/screens/Sample.kt b/ui/src/commonMain/kotlin/moe/lava/neon/ui/screens/Sample.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/moe/lava/neon/ui/screens/Sample.kt
rename to ui/src/commonMain/kotlin/moe/lava/neon/ui/screens/Sample.kt
diff --git a/composeApp/src/commonTest/kotlin/moe/lava/neon/ComposeAppCommonTest.kt b/ui/src/commonTest/kotlin/moe/lava/neon/ComposeAppCommonTest.kt
similarity index 100%
rename from composeApp/src/commonTest/kotlin/moe/lava/neon/ComposeAppCommonTest.kt
rename to ui/src/commonTest/kotlin/moe/lava/neon/ComposeAppCommonTest.kt
diff --git a/composeApp/src/jvmMain/kotlin/moe/lava/neon/main.kt b/ui/src/jvmMain/kotlin/moe/lava/neon/main.kt
similarity index 100%
rename from composeApp/src/jvmMain/kotlin/moe/lava/neon/main.kt
rename to ui/src/jvmMain/kotlin/moe/lava/neon/main.kt