diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4297fa2..80eb7b0 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,5 +1,2 @@
-plugins {
-	id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
-}
-rootProject.name = "sql-skeleton-0-api"
+rootProject.name = "db-skeleton-1-api"
 
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/ConfigurationError.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/ConfigurationError.kt
similarity index 84%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/ConfigurationError.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/ConfigurationError.kt
index d1ae00b..28db034 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/ConfigurationError.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/ConfigurationError.kt
@@ -1,4 +1,4 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api
+package ru.landgrafhomyak.db.skeleton1.api
 
 public open class ConfigurationError : Error {
 	public constructor() : super()
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/misc/DatabaseType.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/DatabaseType.kt
similarity index 84%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/misc/DatabaseType.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/DatabaseType.kt
index 3cbd32e..aef36ec 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/misc/DatabaseType.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/DatabaseType.kt
@@ -1,7 +1,4 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.misc
-
-import ru.landgrafhomyak.db.sql_skeleton_0.api.raw.DriverType
-
+package ru.landgrafhomyak.db.skeleton1.api
 
 public interface DatabaseType<@Suppress("unused") RUNTIME_TYPE : Any?> {
 	public fun interface ImplementationsProvider<RUNTIME_TYPE> {
@@ -16,4 +13,4 @@ public interface DatabaseType<@Suppress("unused") RUNTIME_TYPE : Any?> {
 					DATABASE_TYPE : DATABASE_TYPE_UNBOUND
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/DebugApi.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/DebugApi.kt
similarity index 78%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/DebugApi.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/DebugApi.kt
index b2f30a8..6efe081 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/DebugApi.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/DebugApi.kt
@@ -1,4 +1,4 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api
+package ru.landgrafhomyak.db.skeleton1.api
 
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY)
 @Retention(AnnotationRetention.BINARY)
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/raw/DriverType.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/DriverType.kt
similarity index 80%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/raw/DriverType.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/DriverType.kt
index 7431708..5a27647 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/raw/DriverType.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/DriverType.kt
@@ -1,7 +1,6 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.raw
+package ru.landgrafhomyak.db.skeleton1.api
 
-import ru.landgrafhomyak.db.sql_skeleton_0.api.misc.DatabaseType
-import ru.landgrafhomyak.db.sql_skeleton_0.api.queries.RawStatement
+import ru.landgrafhomyak.db.skeleton1.api.statement.RawStatement
 
 public interface DriverType<
 		DATABASE_TYPE : DatabaseType<*>,
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/ExecutionException.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/ExecutionException.kt
similarity index 85%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/ExecutionException.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/ExecutionException.kt
index 597ecb1..5cdc277 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/ExecutionException.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/ExecutionException.kt
@@ -1,4 +1,4 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api
+package ru.landgrafhomyak.db.skeleton1.api
 
 public open class ExecutionException : RuntimeException {
 	public constructor() : super()
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/InvalidRowIdError.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/InvalidRowIdError.kt
similarity index 59%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/InvalidRowIdError.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/InvalidRowIdError.kt
index 6fca266..2b0f0a5 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/InvalidRowIdError.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/InvalidRowIdError.kt
@@ -1,6 +1,6 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api
+package ru.landgrafhomyak.db.skeleton1.api
 
 import kotlin.jvm.JvmField
-import ru.landgrafhomyak.db.sql_skeleton_0.api.table.RowId
+import ru.landgrafhomyak.db.skeleton1.api.table.RowId
 
 public class InvalidRowIdError(@JvmField public val badRowId: RowId<*>) : Error("Referenced row was removed from table: $badRowId")
\ No newline at end of file
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/LowLevelApi.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/LowLevelApi.kt
similarity index 78%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/LowLevelApi.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/LowLevelApi.kt
index 7a274a5..a55fca9 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/LowLevelApi.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/LowLevelApi.kt
@@ -1,4 +1,4 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api
+package ru.landgrafhomyak.db.skeleton1.api
 
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY)
 @Retention(AnnotationRetention.BINARY)
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/CreateModuleScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/CreateModuleScope.kt
similarity index 74%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/CreateModuleScope.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/CreateModuleScope.kt
index 059b11f..220110c 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/CreateModuleScope.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/CreateModuleScope.kt
@@ -1,12 +1,12 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.module
+package ru.landgrafhomyak.db.skeleton1.api.module
 
 import kotlin.jvm.JvmName
-import ru.landgrafhomyak.db.sql_skeleton_0.api.LowLevelApi
-import ru.landgrafhomyak.db.sql_skeleton_0.api.queries.RawStatement
-import ru.landgrafhomyak.db.sql_skeleton_0.api.queries._Statement
-import ru.landgrafhomyak.db.sql_skeleton_0.api.table.Table
-import ru.landgrafhomyak.db.sql_skeleton_0.api.runtime.InputRow
-import ru.landgrafhomyak.db.sql_skeleton_0.api.table.TableConstructor
+import ru.landgrafhomyak.db.skeleton1.api.LowLevelApi
+import ru.landgrafhomyak.db.skeleton1.api.statement.RawStatement
+import ru.landgrafhomyak.db.skeleton1.api.statement._Statement
+import ru.landgrafhomyak.db.skeleton1.api.table.Table
+import ru.landgrafhomyak.db.skeleton1.api.runtime.InputRow
+import ru.landgrafhomyak.db.skeleton1.api.table.TableConstructor
 
 
 public interface CreateModuleScope<mUE : Any, RUNTIME_KEY : Any> {
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/Module.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/Module.kt
similarity index 82%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/Module.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/Module.kt
index 58eaad3..e1988d0 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/Module.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/Module.kt
@@ -1,10 +1,10 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.module
+package ru.landgrafhomyak.db.skeleton1.api.module
 
 import kotlin.jvm.JvmName
-import ru.landgrafhomyak.db.sql_skeleton_0.api.DebugApi
-import ru.landgrafhomyak.db.sql_skeleton_0.api.LowLevelApi
-import ru.landgrafhomyak.db.sql_skeleton_0.api.queries.QueriesCompiler
-import ru.landgrafhomyak.db.sql_skeleton_0.api.runtime.Transaction
+import ru.landgrafhomyak.db.skeleton1.api.DebugApi
+import ru.landgrafhomyak.db.skeleton1.api.LowLevelApi
+import ru.landgrafhomyak.db.skeleton1.api.statement.QueriesCompiler
+import ru.landgrafhomyak.db.skeleton1.api.runtime.Transaction
 
 
 public interface Module<mUE : Any, RUNTIME_KEY : Any> {
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/ModuleScopedObject.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/ModuleScopedObject.kt
similarity index 57%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/ModuleScopedObject.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/ModuleScopedObject.kt
index 6546372..bef0678 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/ModuleScopedObject.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/ModuleScopedObject.kt
@@ -1,7 +1,6 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.module
+package ru.landgrafhomyak.db.skeleton1.api.module
 
-import ru.landgrafhomyak.db.sql_skeleton_0.api.DebugApi
-import ru.landgrafhomyak.db.sql_skeleton_0.api.table.Table
+import ru.landgrafhomyak.db.skeleton1.api.DebugApi
 
 public interface ModuleScopedObject<mUE : Any, RUNTIME_KEY : Any> {
 
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/Namespace.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/Namespace.kt
similarity index 75%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/Namespace.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/Namespace.kt
index 65240a9..5de4652 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/Namespace.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/Namespace.kt
@@ -1,7 +1,7 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.module
+package ru.landgrafhomyak.db.skeleton1.api.module
 
 import kotlin.jvm.JvmName
-import ru.landgrafhomyak.db.sql_skeleton_0.api.DebugApi
+import ru.landgrafhomyak.db.skeleton1.api.DebugApi
 
 public interface Namespace<mUE : Any, RUNTIME_KEY : Any> {
 	@DebugApi
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/UpgradeModuleScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/UpgradeModuleScope.kt
similarity index 87%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/UpgradeModuleScope.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/UpgradeModuleScope.kt
index c7c1f0b..97349d5 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/UpgradeModuleScope.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/UpgradeModuleScope.kt
@@ -1,12 +1,11 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.module
+package ru.landgrafhomyak.db.skeleton1.api.module
 
-import ru.landgrafhomyak.db.sql_skeleton_0.api.LowLevelApi
-import ru.landgrafhomyak.db.sql_skeleton_0.api.queries.RawStatement
-import ru.landgrafhomyak.db.sql_skeleton_0.api.queries._Statement
-import ru.landgrafhomyak.db.sql_skeleton_0.api.runtime.InputRow
-import ru.landgrafhomyak.db.sql_skeleton_0.api.table.Table
-import ru.landgrafhomyak.db.sql_skeleton_0.api.table.TableConstructor
-import ru.landgrafhomyak.db.sql_skeleton_0.api.table.TableUpgrade
+import ru.landgrafhomyak.db.skeleton1.api.LowLevelApi
+import ru.landgrafhomyak.db.skeleton1.api.statement.RawStatement
+import ru.landgrafhomyak.db.skeleton1.api.statement._Statement
+import ru.landgrafhomyak.db.skeleton1.api.runtime.InputRow
+import ru.landgrafhomyak.db.skeleton1.api.table.Table
+import ru.landgrafhomyak.db.skeleton1.api.table.TableUpgrade
 
 
 public interface UpgradeModuleScope<nmUE : Any, omUE : Any, RUNTIME_KEY : Any> : CreateModuleScope<nmUE, RUNTIME_KEY> {
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/runtime/Executor.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/Executor.kt
similarity index 57%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/runtime/Executor.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/Executor.kt
index 741d9c8..30d1b82 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/runtime/Executor.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/Executor.kt
@@ -1,6 +1,6 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.runtime
+package ru.landgrafhomyak.db.skeleton1.api.runtime
 
-import ru.landgrafhomyak.db.sql_skeleton_0.api.LowLevelApi
+import ru.landgrafhomyak.db.skeleton1.api.LowLevelApi
 
 public interface Executor<RUNTIME_KEY : Any> {
 	@Suppress("FunctionName")
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/runtime/InputRow.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/InputRow.kt
similarity index 91%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/runtime/InputRow.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/InputRow.kt
index 2e3d82c..4ad0d9e 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/runtime/InputRow.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/InputRow.kt
@@ -1,8 +1,8 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.runtime
+package ru.landgrafhomyak.db.skeleton1.api.runtime
 
 import kotlin.jvm.JvmName
-import ru.landgrafhomyak.db.sql_skeleton_0.api.LowLevelApi
-import ru.landgrafhomyak.db.sql_skeleton_0.api.misc.QueryParam
+import ru.landgrafhomyak.db.skeleton1.api.LowLevelApi
+import ru.landgrafhomyak.db.skeleton1.api.statement.QueryParam
 
 public interface InputRow<qUE : Any> {
 	@Suppress("INAPPLICABLE_JVM_NAME")
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/runtime/OutputRow.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/OutputRow.kt
similarity index 90%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/runtime/OutputRow.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/OutputRow.kt
index e6cf541..8618a28 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/runtime/OutputRow.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/OutputRow.kt
@@ -1,8 +1,8 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.runtime
+package ru.landgrafhomyak.db.skeleton1.api.runtime
 
 import kotlin.jvm.JvmName
-import ru.landgrafhomyak.db.sql_skeleton_0.api.LowLevelApi
-import ru.landgrafhomyak.db.sql_skeleton_0.api.misc.Column
+import ru.landgrafhomyak.db.skeleton1.api.LowLevelApi
+import ru.landgrafhomyak.db.skeleton1.api.table.Column
 
 public interface OutputRow<qUE : Any> {
 	@Suppress("INAPPLICABLE_JVM_NAME")
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/runtime/Transaction.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/Transaction.kt
similarity index 91%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/runtime/Transaction.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/Transaction.kt
index 6561ed1..3fa241a 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/runtime/Transaction.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/runtime/Transaction.kt
@@ -1,7 +1,7 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.runtime
+package ru.landgrafhomyak.db.skeleton1.api.runtime
 
-import ru.landgrafhomyak.db.sql_skeleton_0.api.LowLevelApi
-import ru.landgrafhomyak.db.sql_skeleton_0.api.queries._Statement
+import ru.landgrafhomyak.db.skeleton1.api.LowLevelApi
+import ru.landgrafhomyak.db.skeleton1.api.statement._Statement
 
 public interface Transaction<RUNTIME_KEY : Any> {
 	public suspend fun <qUE : Any?> executeQuery_void2void(compiledQuery: _Statement.Void2Void<qUE, RUNTIME_KEY>)
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/queries/QueriesCompiler.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/QueriesCompiler.kt
similarity index 95%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/queries/QueriesCompiler.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/QueriesCompiler.kt
index 35ada87..7737e3c 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/queries/QueriesCompiler.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/QueriesCompiler.kt
@@ -1,4 +1,4 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.queries
+package ru.landgrafhomyak.db.skeleton1.api.statement
 
 public interface QueriesCompiler<RUNTIME_KEY : Any> {
 	public fun <qUE : Any?> raw_void2void(constructor: RawStatement.Void2Void.ImplementationsProvider<qUE>): RawStatement.Void2Void<qUE, RUNTIME_KEY>
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/misc/QueryParam.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/QueryParam.kt
similarity index 61%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/misc/QueryParam.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/QueryParam.kt
index 81ff848..70ff3bb 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/misc/QueryParam.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/QueryParam.kt
@@ -1,7 +1,7 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.misc
+package ru.landgrafhomyak.db.skeleton1.api.statement
 
 import kotlin.jvm.JvmName
-import ru.landgrafhomyak.db.sql_skeleton_0.api.DebugApi
+import ru.landgrafhomyak.db.skeleton1.api.DebugApi
 
 public interface QueryParam<RT, oqUE : Any> {
 	@DebugApi
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/queries/RawStatement.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/RawStatement.kt
similarity index 98%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/queries/RawStatement.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/RawStatement.kt
index 3d47684..8f78de1 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/queries/RawStatement.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/RawStatement.kt
@@ -1,6 +1,6 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.queries
+package ru.landgrafhomyak.db.skeleton1.api.statement
 
-import ru.landgrafhomyak.db.sql_skeleton_0.api.raw.DriverType
+import ru.landgrafhomyak.db.skeleton1.api.DriverType
 
 public interface RawStatement<qUE : Any?, RUNTIME_KEY : Any> : _Statement<qUE, RUNTIME_KEY> {
 	public override val uExt: qUE
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/queries/_Statement.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/_Statement.kt
similarity index 94%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/queries/_Statement.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/_Statement.kt
index 48c3786..957c337 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/queries/_Statement.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/statement/_Statement.kt
@@ -1,4 +1,4 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.queries
+package ru.landgrafhomyak.db.skeleton1.api.statement
 
 import kotlin.jvm.JvmName
 
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/misc/Column.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/Column.kt
similarity index 73%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/misc/Column.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/Column.kt
index 63ff0a1..46a1032 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/misc/Column.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/Column.kt
@@ -1,8 +1,8 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.misc
+package ru.landgrafhomyak.db.skeleton1.api.table
 
 import kotlin.jvm.JvmName
-import ru.landgrafhomyak.db.sql_skeleton_0.api.DebugApi
-import ru.landgrafhomyak.db.sql_skeleton_0.api.table.Table
+import ru.landgrafhomyak.db.skeleton1.api.DebugApi
+import ru.landgrafhomyak.db.skeleton1.api.DatabaseType
 
 public interface Column<RUNTIME_TYPE, TABLE_USER_EXTENSION : Any, RUNTIME_KEY : Any> {
 	@DebugApi
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/table/Table.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/Table.kt
similarity index 75%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/table/Table.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/Table.kt
index 3f002e6..eee04bc 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/table/Table.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/Table.kt
@@ -1,9 +1,9 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.table
+package ru.landgrafhomyak.db.skeleton1.api.table
 
 import kotlin.jvm.JvmName
-import ru.landgrafhomyak.db.sql_skeleton_0.api.DebugApi
-import ru.landgrafhomyak.db.sql_skeleton_0.api.module.Module
-import ru.landgrafhomyak.db.sql_skeleton_0.api.module.Namespace
+import ru.landgrafhomyak.db.skeleton1.api.DebugApi
+import ru.landgrafhomyak.db.skeleton1.api.module.Module
+import ru.landgrafhomyak.db.skeleton1.api.module.Namespace
 
 public interface Table<UE : Any, mUE : Any, RUNTIME_KEY : Any> {
 	@Suppress("INAPPLICABLE_JVM_NAME")
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/table/TableConstructor.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableConstructor.kt
similarity index 69%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/table/TableConstructor.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableConstructor.kt
index 7b748b9..da8fa3d 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/table/TableConstructor.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableConstructor.kt
@@ -1,11 +1,10 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.table
+package ru.landgrafhomyak.db.skeleton1.api.table
 
-import ru.landgrafhomyak.db.sql_skeleton_0.api.LowLevelApi
-import ru.landgrafhomyak.db.sql_skeleton_0.api.misc.Column
-import ru.landgrafhomyak.db.sql_skeleton_0.api.misc.DatabaseType
-import ru.landgrafhomyak.db.sql_skeleton_0.api.queries.RawStatement
-import ru.landgrafhomyak.db.sql_skeleton_0.api.queries._Statement
-import ru.landgrafhomyak.db.sql_skeleton_0.api.runtime.InputRow
+import ru.landgrafhomyak.db.skeleton1.api.LowLevelApi
+import ru.landgrafhomyak.db.skeleton1.api.DatabaseType
+import ru.landgrafhomyak.db.skeleton1.api.statement.RawStatement
+import ru.landgrafhomyak.db.skeleton1.api.statement._Statement
+import ru.landgrafhomyak.db.skeleton1.api.runtime.InputRow
 
 
 public interface TableConstructor<tUE : Any, RUNTIME_KEY : Any> {
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/table/TableScopedObject.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableScopedObject.kt
similarity index 59%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/table/TableScopedObject.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableScopedObject.kt
index ccb743a..a4463a1 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/table/TableScopedObject.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableScopedObject.kt
@@ -1,6 +1,6 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.table
+package ru.landgrafhomyak.db.skeleton1.api.table
 
-import ru.landgrafhomyak.db.sql_skeleton_0.api.DebugApi
+import ru.landgrafhomyak.db.skeleton1.api.DebugApi
 
 public interface TableScopedObject<tUE : Any, RUNTIME_KEY : Any> {
 	@DebugApi
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/table/TableUpgrade.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableUpgrade.kt
similarity index 85%
rename from src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/table/TableUpgrade.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableUpgrade.kt
index ea34e59..84d31ca 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/table/TableUpgrade.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableUpgrade.kt
@@ -1,10 +1,9 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.table
+package ru.landgrafhomyak.db.skeleton1.api.table
 
-import ru.landgrafhomyak.db.sql_skeleton_0.api.LowLevelApi
-import ru.landgrafhomyak.db.sql_skeleton_0.api.misc.Column
-import ru.landgrafhomyak.db.sql_skeleton_0.api.queries.RawStatement
-import ru.landgrafhomyak.db.sql_skeleton_0.api.queries._Statement
-import ru.landgrafhomyak.db.sql_skeleton_0.api.runtime.InputRow
+import ru.landgrafhomyak.db.skeleton1.api.LowLevelApi
+import ru.landgrafhomyak.db.skeleton1.api.statement.RawStatement
+import ru.landgrafhomyak.db.skeleton1.api.statement._Statement
+import ru.landgrafhomyak.db.skeleton1.api.runtime.InputRow
 
 
 public interface TableUpgrade<tnUE : Any, toUE : Any, RUNTIME_KEY : Any> {