diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45f53c6..0e3d8af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.2.0
+
+* Versions
+  * `Kotlin`: `1.9.0`
+  * `Coroutines`: `1.7.3`
+  * `Klock`: `4.0.9`
+
 ## 2.1.2
 
 * Versions
diff --git a/build.gradle b/build.gradle
index 3362158..5b1c7a9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -97,7 +97,7 @@ kotlin {
                 implementation kotlin('test-js')
             }
         }
-        androidTest {
+        androidUnitTest {
             dependencies {
                 implementation kotlin('test-junit')
             }
diff --git a/gradle.properties b/gradle.properties
index d121917..10116fa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,13 +9,13 @@ android.useAndroidX=true
 android.enableJetifier=false
 
 
-kotlin_version=1.8.22
-kotlin_coroutines_version=1.7.2
+kotlin_version=1.9.0
+kotlin_coroutines_version=1.7.3
 kotlin_serialization_version=1.5.1
 
 dokka_version=1.8.20
 
-klockVersion=4.0.3
+klockVersion=4.0.9
 
 ## Github reease
 
@@ -36,5 +36,5 @@ androidx_work_version=2.8.1
 
 ## Common
 
-version=2.1.2
-android_code_version=29
+version=2.2.0
+android_code_version=30
diff --git a/src/main/kotlin/dev/inmo/krontab/KronSchedulerWork.kt b/src/androidMain/kotlin/KronSchedulerWork.kt
similarity index 100%
rename from src/main/kotlin/dev/inmo/krontab/KronSchedulerWork.kt
rename to src/androidMain/kotlin/KronSchedulerWork.kt
diff --git a/src/main/kotlin/dev/inmo/krontab/KrontabTemplateSchedulerWork.kt b/src/androidMain/kotlin/KrontabTemplateSchedulerWork.kt
similarity index 100%
rename from src/main/kotlin/dev/inmo/krontab/KrontabTemplateSchedulerWork.kt
rename to src/androidMain/kotlin/KrontabTemplateSchedulerWork.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/Executes.kt b/src/commonMain/kotlin/Executes.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/Executes.kt
rename to src/commonMain/kotlin/Executes.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/KronScheduler.kt b/src/commonMain/kotlin/KronScheduler.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/KronScheduler.kt
rename to src/commonMain/kotlin/KronScheduler.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/KronSchedulerTz.kt b/src/commonMain/kotlin/KronSchedulerTz.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/KronSchedulerTz.kt
rename to src/commonMain/kotlin/KronSchedulerTz.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/KronSchedulersMerging.kt b/src/commonMain/kotlin/KronSchedulersMerging.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/KronSchedulersMerging.kt
rename to src/commonMain/kotlin/KronSchedulersMerging.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/KrontabConfig.kt b/src/commonMain/kotlin/KrontabConfig.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/KrontabConfig.kt
rename to src/commonMain/kotlin/KrontabConfig.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/KrontabTemplateWrapper.kt b/src/commonMain/kotlin/KrontabTemplateWrapper.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/KrontabTemplateWrapper.kt
rename to src/commonMain/kotlin/KrontabTemplateWrapper.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/LambdaKronScheduler.kt b/src/commonMain/kotlin/LambdaKronScheduler.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/LambdaKronScheduler.kt
rename to src/commonMain/kotlin/LambdaKronScheduler.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/LambdaKronSchedulerTz.kt b/src/commonMain/kotlin/LambdaKronSchedulerTz.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/LambdaKronSchedulerTz.kt
rename to src/commonMain/kotlin/LambdaKronSchedulerTz.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/SchedulerShortcuts.kt b/src/commonMain/kotlin/SchedulerShortcuts.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/SchedulerShortcuts.kt
rename to src/commonMain/kotlin/SchedulerShortcuts.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/StringParser.kt b/src/commonMain/kotlin/StringParser.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/StringParser.kt
rename to src/commonMain/kotlin/StringParser.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/builder/SchedulerBuilder.kt b/src/commonMain/kotlin/builder/SchedulerBuilder.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/builder/SchedulerBuilder.kt
rename to src/commonMain/kotlin/builder/SchedulerBuilder.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/builder/TimeBuilder.kt b/src/commonMain/kotlin/builder/TimeBuilder.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/builder/TimeBuilder.kt
rename to src/commonMain/kotlin/builder/TimeBuilder.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/collection/CollectionFunctions.kt b/src/commonMain/kotlin/collection/CollectionFunctions.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/collection/CollectionFunctions.kt
rename to src/commonMain/kotlin/collection/CollectionFunctions.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/collection/CollectionKronScheduler.kt b/src/commonMain/kotlin/collection/CollectionKronScheduler.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/collection/CollectionKronScheduler.kt
rename to src/commonMain/kotlin/collection/CollectionKronScheduler.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/internal/CronDateTime.kt b/src/commonMain/kotlin/internal/CronDateTime.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/internal/CronDateTime.kt
rename to src/commonMain/kotlin/internal/CronDateTime.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/internal/CronDateTimeScheduler.kt b/src/commonMain/kotlin/internal/CronDateTimeScheduler.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/internal/CronDateTimeScheduler.kt
rename to src/commonMain/kotlin/internal/CronDateTimeScheduler.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/internal/CronDateTimeSchedulerTz.kt b/src/commonMain/kotlin/internal/CronDateTimeSchedulerTz.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/internal/CronDateTimeSchedulerTz.kt
rename to src/commonMain/kotlin/internal/CronDateTimeSchedulerTz.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/internal/Defaults.kt b/src/commonMain/kotlin/internal/Defaults.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/internal/Defaults.kt
rename to src/commonMain/kotlin/internal/Defaults.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/internal/NearDateTimeCalculator.kt b/src/commonMain/kotlin/internal/NearDateTimeCalculator.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/internal/NearDateTimeCalculator.kt
rename to src/commonMain/kotlin/internal/NearDateTimeCalculator.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/internal/Parser.kt b/src/commonMain/kotlin/internal/Parser.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/internal/Parser.kt
rename to src/commonMain/kotlin/internal/Parser.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/internal/Ranges.kt b/src/commonMain/kotlin/internal/Ranges.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/internal/Ranges.kt
rename to src/commonMain/kotlin/internal/Ranges.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/utils/DateTimeCopy.kt b/src/commonMain/kotlin/utils/DateTimeCopy.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/utils/DateTimeCopy.kt
rename to src/commonMain/kotlin/utils/DateTimeCopy.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/utils/SchedulerFlow.kt b/src/commonMain/kotlin/utils/SchedulerFlow.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/utils/SchedulerFlow.kt
rename to src/commonMain/kotlin/utils/SchedulerFlow.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/utils/Typealiases.kt b/src/commonMain/kotlin/utils/Typealiases.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/utils/Typealiases.kt
rename to src/commonMain/kotlin/utils/Typealiases.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/utils/flows/DateTimeFilters.kt b/src/commonMain/kotlin/utils/flows/DateTimeFilters.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/utils/flows/DateTimeFilters.kt
rename to src/commonMain/kotlin/utils/flows/DateTimeFilters.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/utils/flows/DateTimeTzFilters.kt b/src/commonMain/kotlin/utils/flows/DateTimeTzFilters.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/utils/flows/DateTimeTzFilters.kt
rename to src/commonMain/kotlin/utils/flows/DateTimeTzFilters.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/utils/flows/DateTimeTzWhen.kt b/src/commonMain/kotlin/utils/flows/DateTimeTzWhen.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/utils/flows/DateTimeTzWhen.kt
rename to src/commonMain/kotlin/utils/flows/DateTimeTzWhen.kt
diff --git a/src/commonMain/kotlin/dev/inmo/krontab/utils/flows/DateTimeWhen.kt b/src/commonMain/kotlin/utils/flows/DateTimeWhen.kt
similarity index 100%
rename from src/commonMain/kotlin/dev/inmo/krontab/utils/flows/DateTimeWhen.kt
rename to src/commonMain/kotlin/utils/flows/DateTimeWhen.kt
diff --git a/src/commonTest/kotlin/dev/inmo/krontab/utils/CheckMonthsAndDaysCorrectWork.kt b/src/commonTest/kotlin/CheckMonthsAndDaysCorrectWork.kt
similarity index 100%
rename from src/commonTest/kotlin/dev/inmo/krontab/utils/CheckMonthsAndDaysCorrectWork.kt
rename to src/commonTest/kotlin/CheckMonthsAndDaysCorrectWork.kt
diff --git a/src/commonTest/kotlin/dev/inmo/krontab/utils/FailJob.kt b/src/commonTest/kotlin/FailJob.kt
similarity index 100%
rename from src/commonTest/kotlin/dev/inmo/krontab/utils/FailJob.kt
rename to src/commonTest/kotlin/FailJob.kt
diff --git a/src/commonTest/kotlin/dev/inmo/krontab/utils/SchedulerFlow.kt b/src/commonTest/kotlin/SchedulerFlow.kt
similarity index 100%
rename from src/commonTest/kotlin/dev/inmo/krontab/utils/SchedulerFlow.kt
rename to src/commonTest/kotlin/SchedulerFlow.kt
diff --git a/src/commonTest/kotlin/dev/inmo/krontab/utils/StringParseTest.kt b/src/commonTest/kotlin/StringParseTest.kt
similarity index 100%
rename from src/commonTest/kotlin/dev/inmo/krontab/utils/StringParseTest.kt
rename to src/commonTest/kotlin/StringParseTest.kt
diff --git a/src/commonTest/kotlin/dev/inmo/krontab/utils/TimeZoneTest.kt b/src/commonTest/kotlin/TimeZoneTest.kt
similarity index 100%
rename from src/commonTest/kotlin/dev/inmo/krontab/utils/TimeZoneTest.kt
rename to src/commonTest/kotlin/TimeZoneTest.kt
diff --git a/src/commonTest/kotlin/dev/inmo/krontab/utils/WeekDaysTest.kt b/src/commonTest/kotlin/WeekDaysTest.kt
similarity index 100%
rename from src/commonTest/kotlin/dev/inmo/krontab/utils/WeekDaysTest.kt
rename to src/commonTest/kotlin/WeekDaysTest.kt