diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
new file mode 100644
index 0000000..5f63ce9
--- /dev/null
+++ b/androidApp/build.gradle.kts
@@ -0,0 +1,28 @@
+plugins {
+    alias(libs.plugins.androidApplication)
+    alias(libs.plugins.composeMultiplatform)
+    alias(libs.plugins.composeCompiler)
+}
+
+android {
+    namespace = "plus.rua.project"
+    compileSdk = libs.versions.android.compileSdk.get().toInt()
+
+    defaultConfig {
+        applicationId = "plus.rua.project"
+        minSdk = libs.versions.android.minSdk.get().toInt()
+        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        versionCode = 1
+        versionName = "1.0"
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+}
+
+dependencies {
+    implementation(project(":shared"))
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.compose.uiToolingPreview)
+}
diff --git a/composeApp/src/androidMain/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml
similarity index 100%
rename from composeApp/src/androidMain/AndroidManifest.xml
rename to androidApp/src/main/AndroidManifest.xml
diff --git a/composeApp/src/androidMain/kotlin/plus/rua/project/MainActivity.kt b/androidApp/src/main/kotlin/plus/rua/project/MainActivity.kt
similarity index 100%
rename from composeApp/src/androidMain/kotlin/plus/rua/project/MainActivity.kt
rename to androidApp/src/main/kotlin/plus/rua/project/MainActivity.kt
diff --git a/composeApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml b/androidApp/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from composeApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml
rename to androidApp/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/composeApp/src/androidMain/res/drawable/ic_launcher_background.xml b/androidApp/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from composeApp/src/androidMain/res/drawable/ic_launcher_background.xml
rename to androidApp/src/main/res/drawable/ic_launcher_background.xml
diff --git a/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml b/androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml
rename to androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml b/androidApp/src/main/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 androidApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png
rename to androidApp/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png b/androidApp/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png
rename to androidApp/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png
rename to androidApp/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png b/androidApp/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png
rename to androidApp/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png
rename to androidApp/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png b/androidApp/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png
rename to androidApp/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png
rename to androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png b/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png
rename to androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png b/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png
rename to androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png b/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/composeApp/src/androidMain/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml
similarity index 100%
rename from composeApp/src/androidMain/res/values/strings.xml
rename to androidApp/src/main/res/values/strings.xml
diff --git a/gradle.properties b/gradle.properties
index 3915578..9c2f0cf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,13 +10,7 @@ org.gradle.caching=true
 #Android
 android.nonTransitiveRClass=true
 android.useAndroidX=true
-android.defaults.buildfeatures.resvalues=true
-android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
-android.enableAppCompileTimeRClass=false
-android.usesSdkInManifest.disallowed=false
 android.uniquePackageNames=false
 android.dependency.useConstraints=true
 android.r8.strictFullModeForKeepRules=false
-android.r8.optimizedResourceShrinking=false
-android.builtInKotlin=false
-android.newDsl=false
+android.generateSyncIssueWhenLibraryConstraintsAreEnabled=false
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a13a392..7727015 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -28,4 +28,5 @@ dependencyResolutionManagement {
     }
 }
 
-include(":composeApp")
\ No newline at end of file
+include(":shared")
+include(":androidApp")
\ No newline at end of file
diff --git a/composeApp/build.gradle.kts b/shared/build.gradle.kts
similarity index 61%
rename from composeApp/build.gradle.kts
rename to shared/build.gradle.kts
index 02cd7db..c0bc9f4 100644
--- a/composeApp/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -1,20 +1,25 @@
-import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
-    alias(libs.plugins.androidApplication)
+    id("com.android.kotlin.multiplatform.library")
     alias(libs.plugins.composeMultiplatform)
     alias(libs.plugins.composeCompiler)
 }
 
 kotlin {
-    androidTarget {
+    android {
+        namespace = "plus.rua.project.shared"
+        compileSdk = libs.versions.android.compileSdk.get().toInt()
+        minSdk = libs.versions.android.minSdk.get().toInt()
+
+        withHostTest {}
+
         compilerOptions {
             jvmTarget.set(JvmTarget.JVM_17)
         }
     }
-    
+
     listOf(
         iosArm64(),
         iosSimulatorArm64()
@@ -24,7 +29,7 @@ kotlin {
             isStatic = true
         }
     }
-    
+
     sourceSets {
         androidMain.dependencies {
             implementation(libs.compose.uiToolingPreview)
@@ -45,35 +50,3 @@ kotlin {
         }
     }
 }
-
-android {
-    namespace = "plus.rua.project"
-    compileSdk = libs.versions.android.compileSdk.get().toInt()
-
-    defaultConfig {
-        applicationId = "plus.rua.project"
-        minSdk = libs.versions.android.minSdk.get().toInt()
-        targetSdk = libs.versions.android.targetSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
-    }
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-}
-
-dependencies {
-    debugImplementation(libs.compose.uiTooling)
-}
-
diff --git a/composeApp/src/androidMain/kotlin/plus/rua/project/Platform.android.kt b/shared/src/androidMain/kotlin/plus/rua/project/Platform.android.kt
similarity index 100%
rename from composeApp/src/androidMain/kotlin/plus/rua/project/Platform.android.kt
rename to shared/src/androidMain/kotlin/plus/rua/project/Platform.android.kt
diff --git a/composeApp/src/commonMain/composeResources/drawable/compose-multiplatform.xml b/shared/src/commonMain/composeResources/drawable/compose-multiplatform.xml
similarity index 100%
rename from composeApp/src/commonMain/composeResources/drawable/compose-multiplatform.xml
rename to shared/src/commonMain/composeResources/drawable/compose-multiplatform.xml
diff --git a/composeApp/src/commonMain/kotlin/plus/rua/project/App.kt b/shared/src/commonMain/kotlin/plus/rua/project/App.kt
similarity index 93%
rename from composeApp/src/commonMain/kotlin/plus/rua/project/App.kt
rename to shared/src/commonMain/kotlin/plus/rua/project/App.kt
index fbf7d7d..0252a93 100644
--- a/composeApp/src/commonMain/kotlin/plus/rua/project/App.kt
+++ b/shared/src/commonMain/kotlin/plus/rua/project/App.kt
@@ -16,8 +16,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import org.jetbrains.compose.resources.painterResource
 
-import yaya.composeapp.generated.resources.Res
-import yaya.composeapp.generated.resources.compose_multiplatform
+import yaya.shared.generated.resources.Res
+import yaya.shared.generated.resources.compose_multiplatform
 
 @Composable
 @Preview
diff --git a/composeApp/src/commonMain/kotlin/plus/rua/project/Greeting.kt b/shared/src/commonMain/kotlin/plus/rua/project/Greeting.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/plus/rua/project/Greeting.kt
rename to shared/src/commonMain/kotlin/plus/rua/project/Greeting.kt
diff --git a/composeApp/src/commonMain/kotlin/plus/rua/project/Platform.kt b/shared/src/commonMain/kotlin/plus/rua/project/Platform.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/plus/rua/project/Platform.kt
rename to shared/src/commonMain/kotlin/plus/rua/project/Platform.kt
diff --git a/composeApp/src/commonTest/kotlin/plus/rua/project/ComposeAppCommonTest.kt b/shared/src/commonTest/kotlin/plus/rua/project/ComposeAppCommonTest.kt
similarity index 100%
rename from composeApp/src/commonTest/kotlin/plus/rua/project/ComposeAppCommonTest.kt
rename to shared/src/commonTest/kotlin/plus/rua/project/ComposeAppCommonTest.kt
diff --git a/composeApp/src/iosMain/kotlin/plus/rua/project/MainViewController.kt b/shared/src/iosMain/kotlin/plus/rua/project/MainViewController.kt
similarity index 100%
rename from composeApp/src/iosMain/kotlin/plus/rua/project/MainViewController.kt
rename to shared/src/iosMain/kotlin/plus/rua/project/MainViewController.kt
diff --git a/composeApp/src/iosMain/kotlin/plus/rua/project/Platform.ios.kt b/shared/src/iosMain/kotlin/plus/rua/project/Platform.ios.kt
similarity index 100%
rename from composeApp/src/iosMain/kotlin/plus/rua/project/Platform.ios.kt
rename to shared/src/iosMain/kotlin/plus/rua/project/Platform.ios.kt