diff --git a/core/build.gradle b/core/build.gradle
index 230f9a8c4..8e75130b3 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -51,6 +51,7 @@ kotlin {
 
     sourceSets {
         commonMain {
+            kotlin { srcDir "src/main/common" }
             dependencies {
                 implementation kotlin('stdlib-common')
                 implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.2.0-alpha-2'
@@ -58,6 +59,7 @@ kotlin {
         }
 
         commonTest {
+            kotlin { srcDir "src/test/common" }
             dependencies {
                 implementation kotlin('test-common')
                 implementation kotlin('test-annotations-common')
@@ -65,6 +67,7 @@ kotlin {
         }
 
         jvmMain {
+            kotlin { srcDir "src/main/jvm" }
             dependencies {
                 implementation kotlin('stdlib-jdk8')
                 implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.0-alpha-2'
@@ -72,6 +75,7 @@ kotlin {
         }
 
         jvmTest {
+            kotlin { srcDir "src/test/jvm" }
             dependencies {
                 implementation kotlin('test')
                 implementation kotlin('test-junit')
@@ -80,6 +84,7 @@ kotlin {
         }
 
         jsMain {
+            kotlin { srcDir "src/main/js" }
             dependencies {
                 implementation kotlin('stdlib-js')
                 implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.2.0-alpha-2'
@@ -87,18 +92,21 @@ kotlin {
         }
 
         jsTest {
+            kotlin { srcDir "src/test/js" }
             dependencies {
                 implementation kotlin('test-js')
             }
         }
 
         iosMain {
+            kotlin { srcDir "src/main/ios" }
             dependencies {
                 implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.2.0-alpha-2'
             }
         }
 
         iosTest {
+            kotlin { srcDir "src/test/ios" }
             dependencies {
                 implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.2.0-alpha-2'
             }
diff --git a/core/src/commonMain/kotlin/org/isoron/platform/concurrency/Observable.kt b/core/src/main/common/org/isoron/platform/concurrency/Observable.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/platform/concurrency/Observable.kt
rename to core/src/main/common/org/isoron/platform/concurrency/Observable.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/platform/gui/Canvas.kt b/core/src/main/common/org/isoron/platform/gui/Canvas.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/platform/gui/Canvas.kt
rename to core/src/main/common/org/isoron/platform/gui/Canvas.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/platform/gui/Colors.kt b/core/src/main/common/org/isoron/platform/gui/Colors.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/platform/gui/Colors.kt
rename to core/src/main/common/org/isoron/platform/gui/Colors.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/platform/gui/Component.kt b/core/src/main/common/org/isoron/platform/gui/Component.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/platform/gui/Component.kt
rename to core/src/main/common/org/isoron/platform/gui/Component.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/platform/gui/FontAwesome.kt b/core/src/main/common/org/isoron/platform/gui/FontAwesome.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/platform/gui/FontAwesome.kt
rename to core/src/main/common/org/isoron/platform/gui/FontAwesome.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/platform/io/Database.kt b/core/src/main/common/org/isoron/platform/io/Database.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/platform/io/Database.kt
rename to core/src/main/common/org/isoron/platform/io/Database.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/platform/io/Files.kt b/core/src/main/common/org/isoron/platform/io/Files.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/platform/io/Files.kt
rename to core/src/main/common/org/isoron/platform/io/Files.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/platform/io/Log.kt b/core/src/main/common/org/isoron/platform/io/Log.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/platform/io/Log.kt
rename to core/src/main/common/org/isoron/platform/io/Log.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/platform/io/Strings.kt b/core/src/main/common/org/isoron/platform/io/Strings.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/platform/io/Strings.kt
rename to core/src/main/common/org/isoron/platform/io/Strings.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/platform/time/Dates.kt b/core/src/main/common/org/isoron/platform/time/Dates.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/platform/time/Dates.kt
rename to core/src/main/common/org/isoron/platform/time/Dates.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/Config.kt b/core/src/main/common/org/isoron/uhabits/Config.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/Config.kt
rename to core/src/main/common/org/isoron/uhabits/Config.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/backend/Backend.kt b/core/src/main/common/org/isoron/uhabits/backend/Backend.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/backend/Backend.kt
rename to core/src/main/common/org/isoron/uhabits/backend/Backend.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/backend/MainScreenDataSource.kt b/core/src/main/common/org/isoron/uhabits/backend/MainScreenDataSource.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/backend/MainScreenDataSource.kt
rename to core/src/main/common/org/isoron/uhabits/backend/MainScreenDataSource.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/components/CalendarChart.kt b/core/src/main/common/org/isoron/uhabits/components/CalendarChart.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/components/CalendarChart.kt
rename to core/src/main/common/org/isoron/uhabits/components/CalendarChart.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/components/CheckmarkButton.kt b/core/src/main/common/org/isoron/uhabits/components/CheckmarkButton.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/components/CheckmarkButton.kt
rename to core/src/main/common/org/isoron/uhabits/components/CheckmarkButton.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/components/HabitListHeader.kt b/core/src/main/common/org/isoron/uhabits/components/HabitListHeader.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/components/HabitListHeader.kt
rename to core/src/main/common/org/isoron/uhabits/components/HabitListHeader.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/components/NumberButton.kt b/core/src/main/common/org/isoron/uhabits/components/NumberButton.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/components/NumberButton.kt
rename to core/src/main/common/org/isoron/uhabits/components/NumberButton.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/components/Ring.kt b/core/src/main/common/org/isoron/uhabits/components/Ring.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/components/Ring.kt
rename to core/src/main/common/org/isoron/uhabits/components/Ring.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/components/Themes.kt b/core/src/main/common/org/isoron/uhabits/components/Themes.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/components/Themes.kt
rename to core/src/main/common/org/isoron/uhabits/components/Themes.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/LocaleHelper.kt b/core/src/main/common/org/isoron/uhabits/i18n/LocaleHelper.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/LocaleHelper.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/LocaleHelper.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/Strings.kt b/core/src/main/common/org/isoron/uhabits/i18n/Strings.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/Strings.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/Strings.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsArabic.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsArabic.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsArabic.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsArabic.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsBasque.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsBasque.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsBasque.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsBasque.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsBulgarian.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsBulgarian.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsBulgarian.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsBulgarian.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsCatalan.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsCatalan.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsCatalan.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsCatalan.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsChineseCN.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsChineseCN.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsChineseCN.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsChineseCN.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsChineseTW.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsChineseTW.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsChineseTW.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsChineseTW.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsCroatian.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsCroatian.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsCroatian.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsCroatian.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsCzech.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsCzech.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsCzech.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsCzech.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsDanish.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsDanish.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsDanish.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsDanish.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsDutch.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsDutch.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsDutch.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsDutch.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsEsperanto.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsEsperanto.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsEsperanto.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsEsperanto.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsFinnish.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsFinnish.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsFinnish.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsFinnish.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsFrench.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsFrench.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsFrench.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsFrench.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsGerman.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsGerman.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsGerman.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsGerman.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsGreek.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsGreek.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsGreek.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsGreek.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsHebrew.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsHebrew.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsHebrew.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsHebrew.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsHindi.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsHindi.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsHindi.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsHindi.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsHungarian.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsHungarian.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsHungarian.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsHungarian.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsIndonesian.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsIndonesian.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsIndonesian.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsIndonesian.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsItalian.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsItalian.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsItalian.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsItalian.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsJapanese.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsJapanese.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsJapanese.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsJapanese.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsKorean.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsKorean.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsKorean.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsKorean.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsNorwegian.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsNorwegian.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsNorwegian.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsNorwegian.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsPersian.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsPersian.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsPersian.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsPersian.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsPolish.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsPolish.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsPolish.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsPolish.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsPortugueseBR.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsPortugueseBR.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsPortugueseBR.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsPortugueseBR.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsPortuguesePT.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsPortuguesePT.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsPortuguesePT.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsPortuguesePT.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsRomanian.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsRomanian.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsRomanian.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsRomanian.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsRussian.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsRussian.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsRussian.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsRussian.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsSerbian.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsSerbian.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsSerbian.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsSerbian.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsSlovak.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsSlovak.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsSlovak.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsSlovak.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsSpanish.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsSpanish.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsSpanish.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsSpanish.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsSwedish.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsSwedish.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsSwedish.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsSwedish.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsTurkish.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsTurkish.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsTurkish.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsTurkish.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsUkrainian.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsUkrainian.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsUkrainian.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsUkrainian.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsVietnamese.kt b/core/src/main/common/org/isoron/uhabits/i18n/StringsVietnamese.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/i18n/StringsVietnamese.kt
rename to core/src/main/common/org/isoron/uhabits/i18n/StringsVietnamese.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/models/Checkmark.kt b/core/src/main/common/org/isoron/uhabits/models/Checkmark.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/models/Checkmark.kt
rename to core/src/main/common/org/isoron/uhabits/models/Checkmark.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/models/CheckmarkList.kt b/core/src/main/common/org/isoron/uhabits/models/CheckmarkList.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/models/CheckmarkList.kt
rename to core/src/main/common/org/isoron/uhabits/models/CheckmarkList.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/models/CheckmarkRepository.kt b/core/src/main/common/org/isoron/uhabits/models/CheckmarkRepository.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/models/CheckmarkRepository.kt
rename to core/src/main/common/org/isoron/uhabits/models/CheckmarkRepository.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/models/Frequency.kt b/core/src/main/common/org/isoron/uhabits/models/Frequency.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/models/Frequency.kt
rename to core/src/main/common/org/isoron/uhabits/models/Frequency.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/models/Habit.kt b/core/src/main/common/org/isoron/uhabits/models/Habit.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/models/Habit.kt
rename to core/src/main/common/org/isoron/uhabits/models/Habit.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/models/HabitRepository.kt b/core/src/main/common/org/isoron/uhabits/models/HabitRepository.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/models/HabitRepository.kt
rename to core/src/main/common/org/isoron/uhabits/models/HabitRepository.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/models/HabitType.kt b/core/src/main/common/org/isoron/uhabits/models/HabitType.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/models/HabitType.kt
rename to core/src/main/common/org/isoron/uhabits/models/HabitType.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/models/Preferences.kt b/core/src/main/common/org/isoron/uhabits/models/Preferences.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/models/Preferences.kt
rename to core/src/main/common/org/isoron/uhabits/models/Preferences.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/models/PreferencesRepository.kt b/core/src/main/common/org/isoron/uhabits/models/PreferencesRepository.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/models/PreferencesRepository.kt
rename to core/src/main/common/org/isoron/uhabits/models/PreferencesRepository.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/models/Score.kt b/core/src/main/common/org/isoron/uhabits/models/Score.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/models/Score.kt
rename to core/src/main/common/org/isoron/uhabits/models/Score.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/models/ScoreList.kt b/core/src/main/common/org/isoron/uhabits/models/ScoreList.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/models/ScoreList.kt
rename to core/src/main/common/org/isoron/uhabits/models/ScoreList.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/models/Streak.kt b/core/src/main/common/org/isoron/uhabits/models/Streak.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/models/Streak.kt
rename to core/src/main/common/org/isoron/uhabits/models/Streak.kt
diff --git a/core/src/commonMain/kotlin/org/isoron/uhabits/models/StreakList.kt b/core/src/main/common/org/isoron/uhabits/models/StreakList.kt
similarity index 100%
rename from core/src/commonMain/kotlin/org/isoron/uhabits/models/StreakList.kt
rename to core/src/main/common/org/isoron/uhabits/models/StreakList.kt
diff --git a/core/src/iosMain/kotlin/org/isoron/platform/concurrency/UIDispatcher.kt b/core/src/main/ios/org/isoron/platform/concurrency/UIDispatcher.kt
similarity index 100%
rename from core/src/iosMain/kotlin/org/isoron/platform/concurrency/UIDispatcher.kt
rename to core/src/main/ios/org/isoron/platform/concurrency/UIDispatcher.kt
diff --git a/core/src/iosMain/kotlin/org/isoron/platform/gui/IosCanvas.kt b/core/src/main/ios/org/isoron/platform/gui/IosCanvas.kt
similarity index 100%
rename from core/src/iosMain/kotlin/org/isoron/platform/gui/IosCanvas.kt
rename to core/src/main/ios/org/isoron/platform/gui/IosCanvas.kt
diff --git a/core/src/iosMain/kotlin/org/isoron/platform/io/IosFiles.kt b/core/src/main/ios/org/isoron/platform/io/IosFiles.kt
similarity index 100%
rename from core/src/iosMain/kotlin/org/isoron/platform/io/IosFiles.kt
rename to core/src/main/ios/org/isoron/platform/io/IosFiles.kt
diff --git a/core/src/iosMain/kotlin/org/isoron/platform/io/Strings.kt b/core/src/main/ios/org/isoron/platform/io/Strings.kt
similarity index 100%
rename from core/src/iosMain/kotlin/org/isoron/platform/io/Strings.kt
rename to core/src/main/ios/org/isoron/platform/io/Strings.kt
diff --git a/core/src/iosMain/kotlin/org/isoron/platform/time/IosDates.kt b/core/src/main/ios/org/isoron/platform/time/IosDates.kt
similarity index 100%
rename from core/src/iosMain/kotlin/org/isoron/platform/time/IosDates.kt
rename to core/src/main/ios/org/isoron/platform/time/IosDates.kt
diff --git a/core/src/iosMain/kotlin/org/isoron/uhabits/IosLocaleHelper.kt b/core/src/main/ios/org/isoron/uhabits/IosLocaleHelper.kt
similarity index 100%
rename from core/src/iosMain/kotlin/org/isoron/uhabits/IosLocaleHelper.kt
rename to core/src/main/ios/org/isoron/uhabits/IosLocaleHelper.kt
diff --git a/core/src/jsMain/kotlin/org/isoron/platform/gui/HtmlCanvas.kt b/core/src/main/js/org/isoron/platform/gui/HtmlCanvas.kt
similarity index 100%
rename from core/src/jsMain/kotlin/org/isoron/platform/gui/HtmlCanvas.kt
rename to core/src/main/js/org/isoron/platform/gui/HtmlCanvas.kt
diff --git a/core/src/jsMain/kotlin/org/isoron/platform/io/JsDatabase.kt b/core/src/main/js/org/isoron/platform/io/JsDatabase.kt
similarity index 100%
rename from core/src/jsMain/kotlin/org/isoron/platform/io/JsDatabase.kt
rename to core/src/main/js/org/isoron/platform/io/JsDatabase.kt
diff --git a/core/src/jsMain/kotlin/org/isoron/platform/io/JsFiles.kt b/core/src/main/js/org/isoron/platform/io/JsFiles.kt
similarity index 100%
rename from core/src/jsMain/kotlin/org/isoron/platform/io/JsFiles.kt
rename to core/src/main/js/org/isoron/platform/io/JsFiles.kt
diff --git a/core/src/jsMain/kotlin/org/isoron/platform/io/sprintf.kt b/core/src/main/js/org/isoron/platform/io/sprintf.kt
similarity index 100%
rename from core/src/jsMain/kotlin/org/isoron/platform/io/sprintf.kt
rename to core/src/main/js/org/isoron/platform/io/sprintf.kt
diff --git a/core/src/jsMain/kotlin/org/isoron/platform/time/JsDates.kt b/core/src/main/js/org/isoron/platform/time/JsDates.kt
similarity index 100%
rename from core/src/jsMain/kotlin/org/isoron/platform/time/JsDates.kt
rename to core/src/main/js/org/isoron/platform/time/JsDates.kt
diff --git a/core/src/jvmMain/kotlin/org/isoron/platform/gui/JavaCanvas.kt b/core/src/main/jvm/org/isoron/platform/gui/JavaCanvas.kt
similarity index 100%
rename from core/src/jvmMain/kotlin/org/isoron/platform/gui/JavaCanvas.kt
rename to core/src/main/jvm/org/isoron/platform/gui/JavaCanvas.kt
diff --git a/core/src/jvmMain/kotlin/org/isoron/platform/io/JavaDatabase.kt b/core/src/main/jvm/org/isoron/platform/io/JavaDatabase.kt
similarity index 100%
rename from core/src/jvmMain/kotlin/org/isoron/platform/io/JavaDatabase.kt
rename to core/src/main/jvm/org/isoron/platform/io/JavaDatabase.kt
diff --git a/core/src/jvmMain/kotlin/org/isoron/platform/io/JavaFiles.kt b/core/src/main/jvm/org/isoron/platform/io/JavaFiles.kt
similarity index 100%
rename from core/src/jvmMain/kotlin/org/isoron/platform/io/JavaFiles.kt
rename to core/src/main/jvm/org/isoron/platform/io/JavaFiles.kt
diff --git a/core/src/jvmMain/kotlin/org/isoron/platform/io/Strings.kt b/core/src/main/jvm/org/isoron/platform/io/Strings.kt
similarity index 100%
rename from core/src/jvmMain/kotlin/org/isoron/platform/io/Strings.kt
rename to core/src/main/jvm/org/isoron/platform/io/Strings.kt
diff --git a/core/src/jvmMain/kotlin/org/isoron/platform/time/JavaDates.kt b/core/src/main/jvm/org/isoron/platform/time/JavaDates.kt
similarity index 100%
rename from core/src/jvmMain/kotlin/org/isoron/platform/time/JavaDates.kt
rename to core/src/main/jvm/org/isoron/platform/time/JavaDates.kt
diff --git a/core/src/commonTest/kotlin/org/isoron/AsyncTests.kt b/core/src/test/common/org/isoron/AsyncTests.kt
similarity index 100%
rename from core/src/commonTest/kotlin/org/isoron/AsyncTests.kt
rename to core/src/test/common/org/isoron/AsyncTests.kt
diff --git a/core/src/commonTest/kotlin/org/isoron/DependencyResolver.kt b/core/src/test/common/org/isoron/DependencyResolver.kt
similarity index 100%
rename from core/src/commonTest/kotlin/org/isoron/DependencyResolver.kt
rename to core/src/test/common/org/isoron/DependencyResolver.kt
diff --git a/core/src/commonTest/kotlin/org/isoron/platform/concurrency/ObservableTest.kt b/core/src/test/common/org/isoron/platform/concurrency/ObservableTest.kt
similarity index 100%
rename from core/src/commonTest/kotlin/org/isoron/platform/concurrency/ObservableTest.kt
rename to core/src/test/common/org/isoron/platform/concurrency/ObservableTest.kt
diff --git a/core/src/commonTest/kotlin/org/isoron/platform/gui/CanvasTest.kt b/core/src/test/common/org/isoron/platform/gui/CanvasTest.kt
similarity index 100%
rename from core/src/commonTest/kotlin/org/isoron/platform/gui/CanvasTest.kt
rename to core/src/test/common/org/isoron/platform/gui/CanvasTest.kt
diff --git a/core/src/commonTest/kotlin/org/isoron/platform/io/DatabaseTest.kt b/core/src/test/common/org/isoron/platform/io/DatabaseTest.kt
similarity index 100%
rename from core/src/commonTest/kotlin/org/isoron/platform/io/DatabaseTest.kt
rename to core/src/test/common/org/isoron/platform/io/DatabaseTest.kt
diff --git a/core/src/commonTest/kotlin/org/isoron/platform/io/FilesTest.kt b/core/src/test/common/org/isoron/platform/io/FilesTest.kt
similarity index 100%
rename from core/src/commonTest/kotlin/org/isoron/platform/io/FilesTest.kt
rename to core/src/test/common/org/isoron/platform/io/FilesTest.kt
diff --git a/core/src/commonTest/kotlin/org/isoron/platform/time/DatesTest.kt b/core/src/test/common/org/isoron/platform/time/DatesTest.kt
similarity index 100%
rename from core/src/commonTest/kotlin/org/isoron/platform/time/DatesTest.kt
rename to core/src/test/common/org/isoron/platform/time/DatesTest.kt
diff --git a/core/src/commonTest/kotlin/org/isoron/uhabits/models/CheckmarkListTest.kt b/core/src/test/common/org/isoron/uhabits/models/CheckmarkListTest.kt
similarity index 100%
rename from core/src/commonTest/kotlin/org/isoron/uhabits/models/CheckmarkListTest.kt
rename to core/src/test/common/org/isoron/uhabits/models/CheckmarkListTest.kt
diff --git a/core/src/commonTest/kotlin/org/isoron/uhabits/models/CheckmarkRepositoryTest.kt b/core/src/test/common/org/isoron/uhabits/models/CheckmarkRepositoryTest.kt
similarity index 100%
rename from core/src/commonTest/kotlin/org/isoron/uhabits/models/CheckmarkRepositoryTest.kt
rename to core/src/test/common/org/isoron/uhabits/models/CheckmarkRepositoryTest.kt
diff --git a/core/src/commonTest/kotlin/org/isoron/uhabits/models/HabitRepositoryTest.kt b/core/src/test/common/org/isoron/uhabits/models/HabitRepositoryTest.kt
similarity index 100%
rename from core/src/commonTest/kotlin/org/isoron/uhabits/models/HabitRepositoryTest.kt
rename to core/src/test/common/org/isoron/uhabits/models/HabitRepositoryTest.kt
diff --git a/core/src/commonTest/kotlin/org/isoron/uhabits/models/PreferencesRepositoryTest.kt b/core/src/test/common/org/isoron/uhabits/models/PreferencesRepositoryTest.kt
similarity index 100%
rename from core/src/commonTest/kotlin/org/isoron/uhabits/models/PreferencesRepositoryTest.kt
rename to core/src/test/common/org/isoron/uhabits/models/PreferencesRepositoryTest.kt
diff --git a/core/src/commonTest/kotlin/org/isoron/uhabits/models/ScoreListTest.kt b/core/src/test/common/org/isoron/uhabits/models/ScoreListTest.kt
similarity index 100%
rename from core/src/commonTest/kotlin/org/isoron/uhabits/models/ScoreListTest.kt
rename to core/src/test/common/org/isoron/uhabits/models/ScoreListTest.kt
diff --git a/core/src/iosTest/kotlin/org/isoron/DependencyResolver.kt b/core/src/test/ios/org/isoron/DependencyResolver.kt
similarity index 100%
rename from core/src/iosTest/kotlin/org/isoron/DependencyResolver.kt
rename to core/src/test/ios/org/isoron/DependencyResolver.kt
diff --git a/core/src/iosTest/kotlin/org/isoron/IosAsyncTests.kt b/core/src/test/ios/org/isoron/IosAsyncTests.kt
similarity index 100%
rename from core/src/iosTest/kotlin/org/isoron/IosAsyncTests.kt
rename to core/src/test/ios/org/isoron/IosAsyncTests.kt
diff --git a/core/src/jsTest/kotlin/org/isoron/DependencyResolver.kt b/core/src/test/js/org/isoron/DependencyResolver.kt
similarity index 100%
rename from core/src/jsTest/kotlin/org/isoron/DependencyResolver.kt
rename to core/src/test/js/org/isoron/DependencyResolver.kt
diff --git a/core/src/jsTest/kotlin/org/isoron/JsAsyncTests.kt b/core/src/test/js/org/isoron/JsAsyncTests.kt
similarity index 100%
rename from core/src/jsTest/kotlin/org/isoron/JsAsyncTests.kt
rename to core/src/test/js/org/isoron/JsAsyncTests.kt
diff --git a/core/src/jvmTest/kotlin/org/isoron/DependencyResolver.kt b/core/src/test/jvm/org/isoron/DependencyResolver.kt
similarity index 100%
rename from core/src/jvmTest/kotlin/org/isoron/DependencyResolver.kt
rename to core/src/test/jvm/org/isoron/DependencyResolver.kt
diff --git a/core/src/jvmTest/kotlin/org/isoron/JavaAsyncTests.kt b/core/src/test/jvm/org/isoron/JavaAsyncTests.kt
similarity index 100%
rename from core/src/jvmTest/kotlin/org/isoron/JavaAsyncTests.kt
rename to core/src/test/jvm/org/isoron/JavaAsyncTests.kt
diff --git a/core/src/jvmTest/kotlin/org/isoron/uhabits/BaseViewTest.kt b/core/src/test/jvm/org/isoron/uhabits/BaseViewTest.kt
similarity index 100%
rename from core/src/jvmTest/kotlin/org/isoron/uhabits/BaseViewTest.kt
rename to core/src/test/jvm/org/isoron/uhabits/BaseViewTest.kt
diff --git a/core/src/jvmTest/kotlin/org/isoron/uhabits/components/CalendarChartTest.kt b/core/src/test/jvm/org/isoron/uhabits/components/CalendarChartTest.kt
similarity index 100%
rename from core/src/jvmTest/kotlin/org/isoron/uhabits/components/CalendarChartTest.kt
rename to core/src/test/jvm/org/isoron/uhabits/components/CalendarChartTest.kt
diff --git a/core/src/jvmTest/kotlin/org/isoron/uhabits/components/CheckmarkButtonTest.kt b/core/src/test/jvm/org/isoron/uhabits/components/CheckmarkButtonTest.kt
similarity index 100%
rename from core/src/jvmTest/kotlin/org/isoron/uhabits/components/CheckmarkButtonTest.kt
rename to core/src/test/jvm/org/isoron/uhabits/components/CheckmarkButtonTest.kt
diff --git a/core/src/jvmTest/kotlin/org/isoron/uhabits/components/HabitListHeaderTest.kt b/core/src/test/jvm/org/isoron/uhabits/components/HabitListHeaderTest.kt
similarity index 100%
rename from core/src/jvmTest/kotlin/org/isoron/uhabits/components/HabitListHeaderTest.kt
rename to core/src/test/jvm/org/isoron/uhabits/components/HabitListHeaderTest.kt
diff --git a/core/src/jvmTest/kotlin/org/isoron/uhabits/components/NumberButtonTest.kt b/core/src/test/jvm/org/isoron/uhabits/components/NumberButtonTest.kt
similarity index 100%
rename from core/src/jvmTest/kotlin/org/isoron/uhabits/components/NumberButtonTest.kt
rename to core/src/test/jvm/org/isoron/uhabits/components/NumberButtonTest.kt
diff --git a/core/src/jvmTest/kotlin/org/isoron/uhabits/components/RingTest.kt b/core/src/test/jvm/org/isoron/uhabits/components/RingTest.kt
similarity index 100%
rename from core/src/jvmTest/kotlin/org/isoron/uhabits/components/RingTest.kt
rename to core/src/test/jvm/org/isoron/uhabits/components/RingTest.kt