diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/CreateModuleScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/CreateModuleScope.kt
index 6fa127a..52aab05 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/CreateModuleScope.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/CreateModuleScope.kt
@@ -6,7 +6,6 @@ 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, RK : Any> {
@@ -17,7 +16,7 @@ public interface CreateModuleScope<mUE : Any, RK : Any> {
 	public fun <tUE : Any> createTable(
 		lifeTime: Table.LifeTime = Table.LifeTime.DATABASE_SCOPE,
 		namespace: Namespace<mUE, RK> = this.rootNs,
-		name: String, initializer: TableConstructor<tUE, RK>
+		name: String, initializer: Table.Constructor<tUE, RK>
 	): Table<tUE, mUE, RK>
 
 	public fun moduleScopedObject(namespace: Namespace<mUE, RK> = this.rootNs, name: String): ModuleScopedObject<mUE, RK>
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/UpgradeModuleScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/UpgradeModuleScope.kt
index 44cf17d..7ac8ab6 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/UpgradeModuleScope.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/module/UpgradeModuleScope.kt
@@ -5,7 +5,6 @@ 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, RK : Any> : CreateModuleScope<nmUE, RK> {
@@ -15,23 +14,23 @@ public interface UpgradeModuleScope<nmUE : Any, omUE : Any, RK : Any> : CreateMo
 	public fun <tUE : Any> keepAndRenameTable(table: Table<tUE, omUE, RK>, newNamespace: Namespace<nmUE, RK>): Table<tUE, nmUE, RK>
 	public fun <tUE : Any> keepAndRenameTable(table: Table<tUE, omUE, RK>, newNamespace: Namespace<nmUE, RK>, newName: String): Table<tUE, nmUE, RK>
 
-	public fun <ntUE : Any, otUE : Any> upgradeTable(oldTable: Table<otUE, omUE, RK>, upgrade: TableUpgrade<ntUE, otUE, RK>): Table<ntUE, nmUE, RK>
+	public fun <ntUE : Any, otUE : Any> upgradeTable(oldTable: Table<otUE, omUE, RK>, upgrade: Table.Upgrade<ntUE, otUE, RK>): Table<ntUE, nmUE, RK>
 	public fun <ntUE : Any, otUE : Any> upgradeAndRenameTable(
 		table: Table<otUE, omUE, RK>,
 		newName: String,
-		upgrade: TableUpgrade<ntUE, otUE, RK>
+		upgrade: Table.Upgrade<ntUE, otUE, RK>
 	): Table<ntUE, nmUE, RK>
 
 	public fun <ntUE : Any, otUE : Any> upgradeAndRenameTable(
 		table: Table<otUE, omUE, RK>,
 		newNamespace: Namespace<nmUE, RK>,
-		upgrade: TableUpgrade<ntUE, otUE, RK>
+		upgrade: Table.Upgrade<ntUE, otUE, RK>
 	): Table<ntUE, nmUE, RK>
 
 	public fun <ntUE : Any, otUE : Any> upgradeAndRenameTable(
 		table: Table<otUE, omUE, RK>,
 		newNamespace: Namespace<nmUE, RK>,
-		upgrade: TableUpgrade<ntUE, otUE, RK>,
+		upgrade: Table.Upgrade<ntUE, otUE, RK>,
 		newName: String
 	): Table<ntUE, nmUE, RK>
 
@@ -49,7 +48,7 @@ public interface UpgradeModuleScope<nmUE : Any, omUE : Any, RK : Any> : CreateMo
 	public fun <ntUE : Any, otUE : Any> importAndUpgradeTable(
 		namespace: Namespace<nmUE, RK> = this.rootNs, name: String,
 		table: Table<otUE, *, RK>,
-		upgrade: TableUpgrade<ntUE, otUE, RK>
+		upgrade: Table.Upgrade<ntUE, otUE, RK>
 	): Table<ntUE, nmUE, RK>
 
 	public fun <smUE : Any> keepModule(module: Module<smUE, RK>): Module<smUE, RK>
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/Table.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/Table.kt
index eee04bc..820cdea 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/Table.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/Table.kt
@@ -36,4 +36,12 @@ public interface Table<UE : Any, mUE : Any, RUNTIME_KEY : Any> {
 	@Suppress("INAPPLICABLE_JVM_NAME")
 	@get:JvmName("getLifeTime")
 	public val lifeTime: LifeTime
+
+	public interface Constructor<tUE : Any, RK : Any> {
+		public fun createTable(context: TableConstructorScope<tUE, RK>): tUE
+	}
+
+	public interface Upgrade<tnUE : Any, toUE : Any, RK : Any> {
+		public fun upgradeTable(oldTable: toUE, context: TableUpgradeScope<tnUE, toUE, RK>): tnUE
+	}
 }
\ No newline at end of file
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableConstructor.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableConstructor.kt
deleted file mode 100644
index 08f51a3..0000000
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableConstructor.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package ru.landgrafhomyak.db.skeleton1.api.table
-
-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, RK : Any> {
-	public fun createTable(context: Scope<tUE, RK>): tUE
-
-	public interface Scope<tUE : Any, RK : Any> {
-		public fun <RT> column(name: String, type: DatabaseType.ImplementationsProvider<RT>, manualCreate: Boolean = false): Column<RT, tUE, RK>
-		public fun <RT, ttUE : Any> columnWithBoundType(name: String, foreign: Column<RT, ttUE, RK>): Column<RT, tUE, RK>
-
-		public fun tableScopedObject(name: String): TableScopedObject<tUE, RK>
-
-		public fun addAlterStatement(stmt: _Statement.Void2Void<*, RK>)
-		public fun addAlterStatement(stmt: RawStatement.Void2Void.ImplementationsProvider<*>)
-
-		@LowLevelApi
-		public fun <sUE : Any> _addAlterStatement(stmt: _Statement.Void2Void<sUE, RK>): InputRow._Scope<sUE, RK, Unit>
-
-		@LowLevelApi
-		public fun <sUE : Any> _addAlterStatement(stmt: RawStatement.Params2Void.ImplementationsProvider<sUE>): InputRow._Scope<sUE, RK, Unit>
-	}
-}
\ No newline at end of file
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableConstructorScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableConstructorScope.kt
new file mode 100644
index 0000000..a5c9bdf
--- /dev/null
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableConstructorScope.kt
@@ -0,0 +1,24 @@
+package ru.landgrafhomyak.db.skeleton1.api.table
+
+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 TableConstructorScope<tUE : Any, RK : Any> {
+	public fun <RT> column(name: String, type: DatabaseType.ImplementationsProvider<RT>, manualCreate: Boolean = false): Column<RT, tUE, RK>
+	public fun <RT, ttUE : Any> columnWithBoundType(name: String, foreign: Column<RT, ttUE, RK>): Column<RT, tUE, RK>
+
+	public fun tableScopedObject(name: String): TableScopedObject<tUE, RK>
+
+	public fun addAlterStatement(stmt: _Statement.Void2Void<*, RK>)
+	public fun addAlterStatement(stmt: RawStatement.Void2Void.ImplementationsProvider<*>)
+
+	@LowLevelApi
+	public fun <sUE : Any> _addAlterStatement(stmt: _Statement.Void2Void<sUE, RK>): InputRow._Scope<sUE, RK, Unit>
+
+	@LowLevelApi
+	public fun <sUE : Any> _addAlterStatement(stmt: RawStatement.Params2Void.ImplementationsProvider<sUE>): InputRow._Scope<sUE, RK, Unit>
+}
\ No newline at end of file
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableUpgrade.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableUpgrade.kt
deleted file mode 100644
index e260bf0..0000000
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableUpgrade.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package ru.landgrafhomyak.db.skeleton1.api.table
-
-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, RK : Any> {
-	public fun upgradeTable(oldTable: toUE, context: Scope<tnUE, toUE, RK>): tnUE
-
-	public interface Scope<tnUE : Any, toUE : Any, RK : Any> : TableConstructor.Scope<tnUE, RK> {
-		public fun <RT> keepColumn(c: Column<RT, toUE, RK>): Column<RT, tnUE, RK>
-		public fun <RT> renameColumn(c: Column<RT, toUE, RK>, newName: String): Column<RT, tnUE, RK>
-		public fun removeColumn(c: Column<*, toUE, RK>)
-		public fun <RT> removeColumnAfterUpgrade(c: Column<RT, toUE, RK>): Column<RT, tnUE, RK>
-
-		public fun <RT> keepColumnWithBoundType(c: Column<RT, toUE, RK>): Column<RT, tnUE, RK>
-		public fun <RT> unbindAndKeepColumnWithBoundType(c: Column<RT, toUE, RK>): Column<RT, tnUE, RK>
-		public fun <RT> renameColumnWithBoundType(c: Column<RT, toUE, RK>, newName: String): Column<RT, tnUE, RK>
-		public fun <RT> unbindAndRenameColumnWithBoundType(c: Column<RT, toUE, RK>, newName: String): Column<RT, tnUE, RK>
-		public fun removeColumnWithBoundType(c: Column<*, toUE, RK>)
-		public fun <RT> removeColumnWithBoundTypeAfterUpgrade(c: Column<RT, toUE, RK>): Column<RT, tnUE, RK>
-
-		public fun keepTableScopedObject(obj: TableScopedObject<toUE, RK>): TableScopedObject<tnUE, RK>
-		public fun renameTableScopedObject(obj: TableScopedObject<toUE, RK>, newName: String): TableScopedObject<tnUE, RK>
-		public fun removeTableScopedObject(obj: TableScopedObject<toUE, RK>): TableScopedObject<tnUE, RK>
-
-
-		public fun addAlterStatementAfterUpgrade(stmt: _Statement.Void2Void<*, RK>)
-		public fun addAlterStatementAfterUpgrade(stmt: RawStatement.Void2Void.ImplementationsProvider<*>)
-
-		@LowLevelApi
-		public fun <sUE : Any> _addAlterStatementAfterUpgrade(stmt: _Statement.Params2Void<sUE, RK>): InputRow._Scope<sUE, RK, Unit>
-
-		@LowLevelApi
-		public fun <sUE : Any> _addAlterStatementAfterUpgrade(stmt: RawStatement.Params2Void.ImplementationsProvider<sUE>): InputRow._Scope<sUE, RK, Unit>
-	}
-}
\ No newline at end of file
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableUpgradeScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableUpgradeScope.kt
new file mode 100644
index 0000000..57c5d9f
--- /dev/null
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/skeleton1/api/table/TableUpgradeScope.kt
@@ -0,0 +1,34 @@
+package ru.landgrafhomyak.db.skeleton1.api.table
+
+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 TableUpgradeScope<tnUE : Any, toUE : Any, RK : Any> : TableConstructorScope<tnUE, RK> {
+	public fun <RT> keepColumn(c: Column<RT, toUE, RK>): Column<RT, tnUE, RK>
+	public fun <RT> renameColumn(c: Column<RT, toUE, RK>, newName: String): Column<RT, tnUE, RK>
+	public fun removeColumn(c: Column<*, toUE, RK>)
+	public fun <RT> removeColumnAfterUpgrade(c: Column<RT, toUE, RK>): Column<RT, tnUE, RK>
+
+	public fun <RT> keepColumnWithBoundType(c: Column<RT, toUE, RK>): Column<RT, tnUE, RK>
+	public fun <RT> unbindAndKeepColumnWithBoundType(c: Column<RT, toUE, RK>): Column<RT, tnUE, RK>
+	public fun <RT> renameColumnWithBoundType(c: Column<RT, toUE, RK>, newName: String): Column<RT, tnUE, RK>
+	public fun <RT> unbindAndRenameColumnWithBoundType(c: Column<RT, toUE, RK>, newName: String): Column<RT, tnUE, RK>
+	public fun removeColumnWithBoundType(c: Column<*, toUE, RK>)
+	public fun <RT> removeColumnWithBoundTypeAfterUpgrade(c: Column<RT, toUE, RK>): Column<RT, tnUE, RK>
+
+	public fun keepTableScopedObject(obj: TableScopedObject<toUE, RK>): TableScopedObject<tnUE, RK>
+	public fun renameTableScopedObject(obj: TableScopedObject<toUE, RK>, newName: String): TableScopedObject<tnUE, RK>
+	public fun removeTableScopedObject(obj: TableScopedObject<toUE, RK>): TableScopedObject<tnUE, RK>
+
+
+	public fun addAlterStatementAfterUpgrade(stmt: _Statement.Void2Void<*, RK>)
+	public fun addAlterStatementAfterUpgrade(stmt: RawStatement.Void2Void.ImplementationsProvider<*>)
+
+	@LowLevelApi
+	public fun <sUE : Any> _addAlterStatementAfterUpgrade(stmt: _Statement.Params2Void<sUE, RK>): InputRow._Scope<sUE, RK, Unit>
+
+	@LowLevelApi
+	public fun <sUE : Any> _addAlterStatementAfterUpgrade(stmt: RawStatement.Params2Void.ImplementationsProvider<sUE>): InputRow._Scope<sUE, RK, Unit>
+}
\ No newline at end of file