diff --git a/.gitignore b/.gitignore
index bfa67fab..000a6446 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,7 @@
 /local.properties
 .idea/*
 .DS_Store
-/build
-*/build/
+build/
 /captures
 .externalNativeBuild
 .cxx
diff --git a/androidSample/.gitignore b/sample/androidApp/.gitignore
similarity index 100%
rename from androidSample/.gitignore
rename to sample/androidApp/.gitignore
diff --git a/androidSample/build.gradle.kts b/sample/androidApp/build.gradle.kts
similarity index 97%
rename from androidSample/build.gradle.kts
rename to sample/androidApp/build.gradle.kts
index 3b537908..ad962e63 100644
--- a/androidSample/build.gradle.kts
+++ b/sample/androidApp/build.gradle.kts
@@ -54,7 +54,7 @@ dependencies {
   implementation(libs.ui.tooling.preview)
   implementation(libs.material3)
 
-  implementation(projects.sampleCompose)
+  implementation(projects.sample.compose)
 
   debugImplementation(libs.ui.tooling)
   debugImplementation(libs.ui.test.manifest)
diff --git a/androidSample/proguard-rules.pro b/sample/androidApp/proguard-rules.pro
similarity index 100%
rename from androidSample/proguard-rules.pro
rename to sample/androidApp/proguard-rules.pro
diff --git a/androidSample/src/main/AndroidManifest.xml b/sample/androidApp/src/main/AndroidManifest.xml
similarity index 100%
rename from androidSample/src/main/AndroidManifest.xml
rename to sample/androidApp/src/main/AndroidManifest.xml
diff --git a/androidSample/src/main/kotlin/com/alorma/compose/settings/sample/MainActivity.kt b/sample/androidApp/src/main/kotlin/com/alorma/compose/settings/sample/MainActivity.kt
similarity index 100%
rename from androidSample/src/main/kotlin/com/alorma/compose/settings/sample/MainActivity.kt
rename to sample/androidApp/src/main/kotlin/com/alorma/compose/settings/sample/MainActivity.kt
diff --git a/androidSample/src/main/kotlin/com/alorma/compose/settings/sample/theme/Color.kt b/sample/androidApp/src/main/kotlin/com/alorma/compose/settings/sample/theme/Color.kt
similarity index 100%
rename from androidSample/src/main/kotlin/com/alorma/compose/settings/sample/theme/Color.kt
rename to sample/androidApp/src/main/kotlin/com/alorma/compose/settings/sample/theme/Color.kt
diff --git a/androidSample/src/main/kotlin/com/alorma/compose/settings/sample/theme/Theme.kt b/sample/androidApp/src/main/kotlin/com/alorma/compose/settings/sample/theme/Theme.kt
similarity index 100%
rename from androidSample/src/main/kotlin/com/alorma/compose/settings/sample/theme/Theme.kt
rename to sample/androidApp/src/main/kotlin/com/alorma/compose/settings/sample/theme/Theme.kt
diff --git a/androidSample/src/main/kotlin/com/alorma/compose/settings/sample/theme/Type.kt b/sample/androidApp/src/main/kotlin/com/alorma/compose/settings/sample/theme/Type.kt
similarity index 100%
rename from androidSample/src/main/kotlin/com/alorma/compose/settings/sample/theme/Type.kt
rename to sample/androidApp/src/main/kotlin/com/alorma/compose/settings/sample/theme/Type.kt
diff --git a/androidSample/src/main/res/drawable/ic_launcher_background.xml b/sample/androidApp/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from androidSample/src/main/res/drawable/ic_launcher_background.xml
rename to sample/androidApp/src/main/res/drawable/ic_launcher_background.xml
diff --git a/androidSample/src/main/res/drawable/ic_launcher_foreground.xml b/sample/androidApp/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from androidSample/src/main/res/drawable/ic_launcher_foreground.xml
rename to sample/androidApp/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/androidSample/src/main/res/mipmap-anydpi/ic_launcher.xml b/sample/androidApp/src/main/res/mipmap-anydpi/ic_launcher.xml
similarity index 100%
rename from androidSample/src/main/res/mipmap-anydpi/ic_launcher.xml
rename to sample/androidApp/src/main/res/mipmap-anydpi/ic_launcher.xml
diff --git a/androidSample/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/sample/androidApp/src/main/res/mipmap-anydpi/ic_launcher_round.xml
similarity index 100%
rename from androidSample/src/main/res/mipmap-anydpi/ic_launcher_round.xml
rename to sample/androidApp/src/main/res/mipmap-anydpi/ic_launcher_round.xml
diff --git a/androidSample/src/main/res/mipmap-hdpi/ic_launcher.webp b/sample/androidApp/src/main/res/mipmap-hdpi/ic_launcher.webp
similarity index 100%
rename from androidSample/src/main/res/mipmap-hdpi/ic_launcher.webp
rename to sample/androidApp/src/main/res/mipmap-hdpi/ic_launcher.webp
diff --git a/androidSample/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/sample/androidApp/src/main/res/mipmap-hdpi/ic_launcher_round.webp
similarity index 100%
rename from androidSample/src/main/res/mipmap-hdpi/ic_launcher_round.webp
rename to sample/androidApp/src/main/res/mipmap-hdpi/ic_launcher_round.webp
diff --git a/androidSample/src/main/res/mipmap-mdpi/ic_launcher.webp b/sample/androidApp/src/main/res/mipmap-mdpi/ic_launcher.webp
similarity index 100%
rename from androidSample/src/main/res/mipmap-mdpi/ic_launcher.webp
rename to sample/androidApp/src/main/res/mipmap-mdpi/ic_launcher.webp
diff --git a/androidSample/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/sample/androidApp/src/main/res/mipmap-mdpi/ic_launcher_round.webp
similarity index 100%
rename from androidSample/src/main/res/mipmap-mdpi/ic_launcher_round.webp
rename to sample/androidApp/src/main/res/mipmap-mdpi/ic_launcher_round.webp
diff --git a/androidSample/src/main/res/mipmap-xhdpi/ic_launcher.webp b/sample/androidApp/src/main/res/mipmap-xhdpi/ic_launcher.webp
similarity index 100%
rename from androidSample/src/main/res/mipmap-xhdpi/ic_launcher.webp
rename to sample/androidApp/src/main/res/mipmap-xhdpi/ic_launcher.webp
diff --git a/androidSample/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/sample/androidApp/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
similarity index 100%
rename from androidSample/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
rename to sample/androidApp/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
diff --git a/androidSample/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/sample/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.webp
similarity index 100%
rename from androidSample/src/main/res/mipmap-xxhdpi/ic_launcher.webp
rename to sample/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher.webp
diff --git a/androidSample/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/sample/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
similarity index 100%
rename from androidSample/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
rename to sample/androidApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
diff --git a/androidSample/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/sample/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
similarity index 100%
rename from androidSample/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
rename to sample/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
diff --git a/androidSample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/sample/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
similarity index 100%
rename from androidSample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
rename to sample/androidApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
diff --git a/androidSample/src/main/res/values/colors.xml b/sample/androidApp/src/main/res/values/colors.xml
similarity index 100%
rename from androidSample/src/main/res/values/colors.xml
rename to sample/androidApp/src/main/res/values/colors.xml
diff --git a/androidSample/src/main/res/values/strings.xml b/sample/androidApp/src/main/res/values/strings.xml
similarity index 100%
rename from androidSample/src/main/res/values/strings.xml
rename to sample/androidApp/src/main/res/values/strings.xml
diff --git a/androidSample/src/main/res/values/themes.xml b/sample/androidApp/src/main/res/values/themes.xml
similarity index 100%
rename from androidSample/src/main/res/values/themes.xml
rename to sample/androidApp/src/main/res/values/themes.xml
diff --git a/sampleCompose/build.gradle.kts b/sample/compose/build.gradle.kts
similarity index 100%
rename from sampleCompose/build.gradle.kts
rename to sample/compose/build.gradle.kts
diff --git a/sampleCompose/src/commonMain/kotlin/com.alorma.compose.settings.sample/SettingsScreen.kt b/sample/compose/src/commonMain/kotlin/com.alorma.compose.settings.sample/SettingsScreen.kt
similarity index 100%
rename from sampleCompose/src/commonMain/kotlin/com.alorma.compose.settings.sample/SettingsScreen.kt
rename to sample/compose/src/commonMain/kotlin/com.alorma.compose.settings.sample/SettingsScreen.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 684fbec6..941976da 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -18,8 +18,8 @@ dependencyResolutionManagement {
   }
 }
 
-include(":androidSample")
-include(":sampleCompose")
+include(":sample:androidApp")
+include(":sample:compose")
 
 include(":compose-settings-ui")
 include(":compose-settings-storage-base")