diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/Expression.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/Expression.kt
index a73949f..1929ad8 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/Expression.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/Expression.kt
@@ -4,7 +4,7 @@ import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.LocalTime
-import ru.landgrafhomyak.serdha.api.v0.ddl.ColumnType
+import ru.landgrafhomyak.serdha.api.v0.ddl.types.ColumnType
 
 public interface Expression<RuntimeType, DatabaseType : ColumnType<RuntimeType>, OwnerBuilderUserExtension : Any> {
 	public interface Builder<OwnerBuilderUserExtension : Any> {
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/Module.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/module/Module.kt
similarity index 94%
rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/Module.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/module/Module.kt
index 9b9fa12..61b63c3 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/Module.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/module/Module.kt
@@ -1,4 +1,4 @@
-package ru.landgrafhomyak.serdha.api.v0.ddl
+package ru.landgrafhomyak.serdha.api.v0.ddl.module
 
 import kotlin.jvm.JvmName
 import ru.landgrafhomyak.serdha.api.v0.runtime.SynchronizedDatabase
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/ModuleCreator.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/module/ModuleCreator.kt
similarity index 98%
rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/ModuleCreator.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/module/ModuleCreator.kt
index e3fcc67..9f6b264 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/ModuleCreator.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/module/ModuleCreator.kt
@@ -1,5 +1,8 @@
-package ru.landgrafhomyak.serdha.api.v0.ddl
+package ru.landgrafhomyak.serdha.api.v0.ddl.module
 
+import ru.landgrafhomyak.serdha.api.v0.ddl.table.Table
+import ru.landgrafhomyak.serdha.api.v0.ddl.table.TableCreator
+import ru.landgrafhomyak.serdha.api.v0.ddl.table.TableUpdater
 import ru.landgrafhomyak.serdha.api.v0.dml.Delete
 import ru.landgrafhomyak.serdha.api.v0.dml.DeleteCreator
 import ru.landgrafhomyak.serdha.api.v0.dml.Insert
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/ModuleTemplate.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/module/ModuleTemplate.kt
similarity index 96%
rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/ModuleTemplate.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/module/ModuleTemplate.kt
index c2215e5..73da697 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/ModuleTemplate.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/module/ModuleTemplate.kt
@@ -1,4 +1,4 @@
-package ru.landgrafhomyak.serdha.api.v0.ddl
+package ru.landgrafhomyak.serdha.api.v0.ddl.module
 
 import ru.landgrafhomyak.serdha.api.v0.runtime.Transaction
 
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/Namespace.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/module/Namespace.kt
similarity index 77%
rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/Namespace.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/module/Namespace.kt
index af5011f..58f0e7e 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/Namespace.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/module/Namespace.kt
@@ -1,4 +1,4 @@
-package ru.landgrafhomyak.serdha.api.v0.ddl
+package ru.landgrafhomyak.serdha.api.v0.ddl.module
 
 public interface Namespace {
 	@Suppress("SpellCheckingInspection")
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/CheckConstraint.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/CheckConstraint.kt
similarity index 91%
rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/CheckConstraint.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/CheckConstraint.kt
index f2688a7..0e59b08 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/CheckConstraint.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/CheckConstraint.kt
@@ -1,7 +1,8 @@
-package ru.landgrafhomyak.serdha.api.v0.ddl
+package ru.landgrafhomyak.serdha.api.v0.ddl.table
 
 import kotlin.jvm.JvmName
 import ru.landgrafhomyak.serdha.api.v0.Expression
+import ru.landgrafhomyak.serdha.api.v0.ddl.types.ColumnType
 
 /**
  * Descriptor of 'check' constraint on columns. Used for schema manipulations.
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/Column.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/Column.kt
similarity index 91%
rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/Column.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/Column.kt
index 681f8f1..04a414f 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/Column.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/Column.kt
@@ -1,6 +1,7 @@
-package ru.landgrafhomyak.serdha.api.v0.ddl
+package ru.landgrafhomyak.serdha.api.v0.ddl.table
 
 import kotlin.jvm.JvmName
+import ru.landgrafhomyak.serdha.api.v0.ddl.types.ColumnType
 import ru.landgrafhomyak.serdha.api.v0.dml.SelectedTable
 
 /**
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/DefaultConstraint.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/DefaultConstraint.kt
similarity index 92%
rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/DefaultConstraint.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/DefaultConstraint.kt
index 56cec46..a83c19e 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/DefaultConstraint.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/DefaultConstraint.kt
@@ -1,7 +1,8 @@
-package ru.landgrafhomyak.serdha.api.v0.ddl
+package ru.landgrafhomyak.serdha.api.v0.ddl.table
 
 import kotlin.jvm.JvmName
 import ru.landgrafhomyak.serdha.api.v0.Expression
+import ru.landgrafhomyak.serdha.api.v0.ddl.types.ColumnType
 
 /**
  * Descriptor of default value attached to [column][Column]. Used for schema manipulations.
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/ForeignRowReference.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/ForeignRowReference.kt
similarity index 93%
rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/ForeignRowReference.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/ForeignRowReference.kt
index a7d72a7..0097836 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/ForeignRowReference.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/ForeignRowReference.kt
@@ -1,7 +1,8 @@
-package ru.landgrafhomyak.serdha.api.v0.ddl
+package ru.landgrafhomyak.serdha.api.v0.ddl.table
 
 import kotlin.jvm.JvmName
-import kotlin.jvm.JvmStatic
+import ru.landgrafhomyak.serdha.api.v0.ddl.types.ColumnType
+import ru.landgrafhomyak.serdha.api.v0.ddl.types.RowId
 
 /**
  * Descriptor of a reference to row in another table (== foreign key to `INTEGER PRIMARY KEY AUTOINCREMENT`). Used for schema manipulations.
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/Index.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/Index.kt
similarity index 94%
rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/Index.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/Index.kt
index a71d336..3f749be 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/Index.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/Index.kt
@@ -1,4 +1,4 @@
-package ru.landgrafhomyak.serdha.api.v0.ddl
+package ru.landgrafhomyak.serdha.api.v0.ddl.table
 
 import kotlin.jvm.JvmName
 
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/Table.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/Table.kt
similarity index 78%
rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/Table.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/Table.kt
index 29e0a5c..4c9a22c 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/Table.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/Table.kt
@@ -1,4 +1,6 @@
-package ru.landgrafhomyak.serdha.api.v0.ddl
+package ru.landgrafhomyak.serdha.api.v0.ddl.table
+
+import ru.landgrafhomyak.serdha.api.v0.ddl.module.Module
 
 public interface Table<UserExtension : Any, PreviousUserExtension : Any> {
 	public val userExtension: UserExtension
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/TableCreator.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/TableCreator.kt
similarity index 92%
rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/TableCreator.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/TableCreator.kt
index 5d51bee..328cd3f 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/TableCreator.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/TableCreator.kt
@@ -1,6 +1,8 @@
-package ru.landgrafhomyak.serdha.api.v0.ddl
+package ru.landgrafhomyak.serdha.api.v0.ddl.table
 
 import ru.landgrafhomyak.serdha.api.v0.Expression
+import ru.landgrafhomyak.serdha.api.v0.ddl.types.ColumnType
+import ru.landgrafhomyak.serdha.api.v0.ddl.types.RowId
 
 public interface TableCreator<TableUserExtension : Any> {
 	public val expressionBuilder: Expression.Builder<TableUserExtension>
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/TableUpdater.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/TableUpdater.kt
similarity index 97%
rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/TableUpdater.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/TableUpdater.kt
index 0e612f8..fd1e664 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/TableUpdater.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/TableUpdater.kt
@@ -1,6 +1,7 @@
-package ru.landgrafhomyak.serdha.api.v0.ddl
+package ru.landgrafhomyak.serdha.api.v0.ddl.table
 
 import ru.landgrafhomyak.serdha.api.v0.Expression
+import ru.landgrafhomyak.serdha.api.v0.ddl.types.ColumnType
 
 
 public interface TableUpdater<TableNewUserExtension : Any, TableOldUserExtension : Any> : TableCreator<TableNewUserExtension> {
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/UniqueIndex.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/UniqueIndex.kt
similarity index 72%
rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/UniqueIndex.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/UniqueIndex.kt
index 8ee6c09..105dc32 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/UniqueIndex.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/table/UniqueIndex.kt
@@ -1,4 +1,4 @@
-package ru.landgrafhomyak.serdha.api.v0.ddl
+package ru.landgrafhomyak.serdha.api.v0.ddl.table
 
 public interface UniqueIndex<OwnerTableUserExtension : Any> : Index<OwnerTableUserExtension> {
 	public val areNullsDistinct: Boolean
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/ColumnType.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/types/ColumnType.kt
similarity index 90%
rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/ColumnType.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/types/ColumnType.kt
index ab81c80..dd3d1ca 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/ColumnType.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/types/ColumnType.kt
@@ -1,4 +1,4 @@
-package ru.landgrafhomyak.serdha.api.v0.ddl
+package ru.landgrafhomyak.serdha.api.v0.ddl.types
 
 import kotlin.jvm.JvmField
 import kotlin.jvm.JvmName
@@ -6,6 +6,7 @@ import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.LocalTime
+import ru.landgrafhomyak.serdha.api.v0.ddl.table.Table
 
 /**
  * Descriptor of a database type.
@@ -40,117 +41,117 @@ public interface ColumnType<@Suppress("unused") RuntimeType> {
 		 */
 		@Suppress("INAPPLICABLE_JVM_NAME")
 		@get:JvmName("BOOLEAN")
-		public val BOOLEAN: ColumnType.BOOLEAN
+		public val BOOLEAN: BOOLEAN
 
 		/**
 		 * Descriptor of a signed integer type with size at least 8 bits. Can contain values in range `-128..127`.
 		 */
 		@Suppress("INAPPLICABLE_JVM_NAME")
 		@get:JvmName("INT_S8")
-		public val INT_S8: ColumnType.INT_S8
+		public val INT_S8: INT_S8
 
 		/**
 		 * Descriptor of an unsigned integer type with size at least 8 bits. Can contain values in range `0..255`.
 		 */
 		@Suppress("INAPPLICABLE_JVM_NAME")
 		@get:JvmName("INT_U8")
-		public val INT_U8: ColumnType.INT_U8
+		public val INT_U8: INT_U8
 
 		/**
 		 * Descriptor of a signed integer type with size at least 16 bits. Can contain values in range `-32768..32767`.
 		 */
 		@Suppress("INAPPLICABLE_JVM_NAME")
 		@get:JvmName("INT_S16")
-		public val INT_S16: ColumnType.INT_S16
+		public val INT_S16: INT_S16
 
 		/**
 		 * Descriptor of an unsigned integer type with size at least 16 bits. Can contain values in range `0..65535`.
 		 */
 		@Suppress("INAPPLICABLE_JVM_NAME")
 		@get:JvmName("INT_U16")
-		public val INT_U16: ColumnType.INT_U16
+		public val INT_U16: INT_U16
 
 		/**
 		 * Descriptor of a signed integer type with size at least 32 bits. Can contain values in range `-2147483648..2147483647`.
 		 */
 		@Suppress("INAPPLICABLE_JVM_NAME")
 		@get:JvmName("INT_S32")
-		public val INT_S32: ColumnType.INT_S32
+		public val INT_S32: INT_S32
 
 		/**
 		 * Descriptor of an unsigned integer type with size at least 32 bits. Can contain values in range `0..4294967295`.
 		 */
 		@Suppress("INAPPLICABLE_JVM_NAME")
 		@get:JvmName("INT_U32")
-		public val INT_U32: ColumnType.INT_U32
+		public val INT_U32: INT_U32
 
 		/**
 		 * Descriptor of a signed integer type with size at least 64 bits. Can contain values in range `-9223372036854775808..9223372036854775807`.
 		 */
 		@Suppress("INAPPLICABLE_JVM_NAME")
 		@get:JvmName("INT_S64")
-		public val INT_S64: ColumnType.INT_S64
+		public val INT_S64: INT_S64
 
 		/**
 		 * Descriptor of an unsigned integer type with size at least 64 bits. Can contain values in range `0..18446744073709551615`.
 		 */
 		@Suppress("INAPPLICABLE_JVM_NAME")
 		@get:JvmName("INT_U64")
-		public val INT_U64: ColumnType.INT_U64
+		public val INT_U64: INT_U64
 
 		/**
 		 * Descriptor of a local date type in some format like `(year, month, day)`. Day component can contain values in `1..31`, month in `1..12` and year in `-32768..32767`.
 		 */
 		@Suppress("INAPPLICABLE_JVM_NAME")
 		@get:JvmName("LOCAL_DATE")
-		public val LOCAL_DATE: ColumnType.LOCAL_DATE
+		public val LOCAL_DATE: LOCAL_DATE
 
 		/**
 		 * Descriptor of a local time type in some format like `(hour, minute, second)`. Hour component can contain values in `0..23`, minute in `0..59` and second in `0..59`.
 		 */
 		@Suppress("INAPPLICABLE_JVM_NAME")
 		@get:JvmName("LOCAL_TIME")
-		public val LOCAL_TIME: ColumnType.LOCAL_TIME
+		public val LOCAL_TIME: LOCAL_TIME
 
 		/**
 		 * Descriptor of union of types [LOCAL_DATE][ColumnType.Builder.LOCAL_DATE] and [LOCAL_TIME][ColumnType.Builder.LOCAL_TIME].
 		 */
 		@Suppress("INAPPLICABLE_JVM_NAME")
 		@get:JvmName("LOCAL_DATETIME")
-		public val LOCAL_DATETIME: ColumnType.LOCAL_DATETIME
+		public val LOCAL_DATETIME: LOCAL_DATETIME
 
 		/**
 		 * Descriptor of a timestamp type. Can contain values in `-9223372036854775808..9223372036854775807`
 		 */
 		@Suppress("INAPPLICABLE_JVM_NAME")
 		@get:JvmName("INSTANT")
-		public val INSTANT: ColumnType.INSTANT
+		public val INSTANT: INSTANT
 
 		/**
 		 * Descriptor of a single-precision floating-point number with size at least 32 bits. See [IEEE 754](https://en.wikipedia.org/wiki/IEEE_754).
 		 */
 		@Suppress("INAPPLICABLE_JVM_NAME")
 		@get:JvmName("FLOAT_32")
-		public val FLOAT_32: ColumnType.FLOAT_32
+		public val FLOAT_32: FLOAT_32
 
 		/**
 		 * Descriptor of a double-precision floating-point number with size at least 64 bits. See [IEEE 754](https://en.wikipedia.org/wiki/IEEE_754).
 		 */
 		@Suppress("INAPPLICABLE_JVM_NAME")
 		@get:JvmName("FLOAT_64")
-		public val FLOAT_64: ColumnType.FLOAT_64
+		public val FLOAT_64: FLOAT_64
 
 		//todo
-		public val STRING: ColumnType.STRING
+		public val STRING: STRING
 
 		//todo
-		public fun STRING(size: UInt): ColumnType.STRING
+		public fun STRING(size: UInt): STRING
 
 		//todo
-		public val BYTE_ARRAY: ColumnType.BYTE_ARRAY
+		public val BYTE_ARRAY: BYTE_ARRAY
 
 		//todo
-		public fun BYTE_ARRAY(size: UInt): ColumnType.BYTE_ARRAY
+		public fun BYTE_ARRAY(size: UInt): BYTE_ARRAY
 
 
 		/**
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/RowId.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/types/RowId.kt
similarity index 59%
rename from src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/RowId.kt
rename to src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/types/RowId.kt
index 6bb95d3..7ea7c17 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/RowId.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/ddl/types/RowId.kt
@@ -1,4 +1,4 @@
-package ru.landgrafhomyak.serdha.api.v0.ddl
+package ru.landgrafhomyak.serdha.api.v0.ddl.types
 
 
 public interface RowId<@Suppress("unused") OwnerTableUserExtension: Any>
\ No newline at end of file
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/DeleteCreator.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/DeleteCreator.kt
index 684309b..0e404d2 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/DeleteCreator.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/DeleteCreator.kt
@@ -1,7 +1,7 @@
 package ru.landgrafhomyak.serdha.api.v0.dml
 
 import ru.landgrafhomyak.serdha.api.v0.Expression
-import ru.landgrafhomyak.serdha.api.v0.ddl.ColumnType
+import ru.landgrafhomyak.serdha.api.v0.ddl.types.ColumnType
 
 public interface DeleteCreator<TargetTableUserExtension : Any, QueryUserExtension : Any> : _CommonQueryMethods<QueryUserExtension> {
 	public val targetTable: SelectedTable<TargetTableUserExtension, QueryUserExtension>
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/InputParam.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/InputParam.kt
index 4ef1d38..a35bf4d 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/InputParam.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/InputParam.kt
@@ -1,7 +1,7 @@
 package ru.landgrafhomyak.serdha.api.v0.dml
 
 import ru.landgrafhomyak.serdha.api.v0.Expression
-import ru.landgrafhomyak.serdha.api.v0.ddl.ColumnType
+import ru.landgrafhomyak.serdha.api.v0.ddl.types.ColumnType
 
 public interface InputParam<RuntimeType, DatabaseType : ColumnType<RuntimeType>, OwnerQueryUserExtension : Any> : Expression<RuntimeType, DatabaseType, OwnerQueryUserExtension> {
 	public val name: String
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/InsertCreator.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/InsertCreator.kt
index c9928ff..0bd5dbf 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/InsertCreator.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/InsertCreator.kt
@@ -1,9 +1,9 @@
 package ru.landgrafhomyak.serdha.api.v0.dml
 
 import ru.landgrafhomyak.serdha.api.v0.Expression
-import ru.landgrafhomyak.serdha.api.v0.ddl.Column
-import ru.landgrafhomyak.serdha.api.v0.ddl.ColumnType
-import ru.landgrafhomyak.serdha.api.v0.ddl.UniqueIndex
+import ru.landgrafhomyak.serdha.api.v0.ddl.table.Column
+import ru.landgrafhomyak.serdha.api.v0.ddl.types.ColumnType
+import ru.landgrafhomyak.serdha.api.v0.ddl.table.UniqueIndex
 
 public interface InsertCreator<TargetTableUserExtension : Any, QueryUserExtension : Any> : _CommonQueryMethods<QueryUserExtension> {
 	public val insertedValues: SelectedTable<TargetTableUserExtension, QueryUserExtension>
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/SelectCreator.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/SelectCreator.kt
index 8012a0a..77f2f9b 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/SelectCreator.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/SelectCreator.kt
@@ -1,9 +1,7 @@
 package ru.landgrafhomyak.serdha.api.v0.dml
 
 import ru.landgrafhomyak.serdha.api.v0.Expression
-import ru.landgrafhomyak.serdha.api.v0.ddl.Column
-import ru.landgrafhomyak.serdha.api.v0.ddl.ColumnType
-import ru.landgrafhomyak.serdha.api.v0.ddl.Table
+import ru.landgrafhomyak.serdha.api.v0.ddl.types.ColumnType
 
 public interface SelectCreator<QueryUserExtension : Any> : _CommonQueryMethods<QueryUserExtension>, _CommonQueryMethods._Returning<QueryUserExtension>{
 	public fun where(expression: Expression<Boolean, ColumnType.BOOLEAN, QueryUserExtension>)
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/SelectedTable.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/SelectedTable.kt
index 0bb0388..94dcf89 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/SelectedTable.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/SelectedTable.kt
@@ -1,8 +1,8 @@
 package ru.landgrafhomyak.serdha.api.v0.dml
 
 import ru.landgrafhomyak.serdha.api.v0.Expression
-import ru.landgrafhomyak.serdha.api.v0.ddl.Column
-import ru.landgrafhomyak.serdha.api.v0.ddl.ColumnType
+import ru.landgrafhomyak.serdha.api.v0.ddl.table.Column
+import ru.landgrafhomyak.serdha.api.v0.ddl.types.ColumnType
 
 public interface SelectedTable<SelectedTableUserExtension : Any, QueryUserExtension : Any> {
 	public fun <RuntimeType, DatabaseType : ColumnType<RuntimeType>> selectColumn(column: Column<RuntimeType, DatabaseType, SelectedTableUserExtension>): Expression<RuntimeType, DatabaseType, QueryUserExtension>
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/UpdateCreator.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/UpdateCreator.kt
index c457479..8b9b1f8 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/UpdateCreator.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/UpdateCreator.kt
@@ -1,9 +1,8 @@
 package ru.landgrafhomyak.serdha.api.v0.dml
 
 import ru.landgrafhomyak.serdha.api.v0.Expression
-import ru.landgrafhomyak.serdha.api.v0.ddl.Column
-import ru.landgrafhomyak.serdha.api.v0.ddl.ColumnType
-import ru.landgrafhomyak.serdha.api.v0.ddl.Table
+import ru.landgrafhomyak.serdha.api.v0.ddl.table.Column
+import ru.landgrafhomyak.serdha.api.v0.ddl.types.ColumnType
 
 public interface UpdateCreator<TargetTableUserExtension : Any, QueryUserExtension : Any> : _CommonQueryMethods<QueryUserExtension> {
 	public val targetTable: SelectedTable<TargetTableUserExtension, QueryUserExtension>
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/_CommonQueryMethods.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/_CommonQueryMethods.kt
index 06d11f9..7fb845e 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/_CommonQueryMethods.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/dml/_CommonQueryMethods.kt
@@ -2,9 +2,9 @@ package ru.landgrafhomyak.serdha.api.v0.dml
 
 import ru.landgrafhomyak.serdha.api.v0.Expression
 import ru.landgrafhomyak.serdha.api.v0.LowLevelApi
-import ru.landgrafhomyak.serdha.api.v0.ddl.Column
-import ru.landgrafhomyak.serdha.api.v0.ddl.ColumnType
-import ru.landgrafhomyak.serdha.api.v0.ddl.Table
+import ru.landgrafhomyak.serdha.api.v0.ddl.table.Column
+import ru.landgrafhomyak.serdha.api.v0.ddl.types.ColumnType
+import ru.landgrafhomyak.serdha.api.v0.ddl.table.Table
 import ru.landgrafhomyak.serdha.api.v0.runtime.ParametersSetter
 import ru.landgrafhomyak.serdha.api.v0.runtime._ParametersSetter
 
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/Row.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/Row.kt
index 12cd1be..ab52433 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/Row.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/Row.kt
@@ -1,6 +1,6 @@
 package ru.landgrafhomyak.serdha.api.v0.runtime
 
-import ru.landgrafhomyak.serdha.api.v0.ddl.Column
+import ru.landgrafhomyak.serdha.api.v0.ddl.table.Column
 
 public interface Row<QueryUserExtension : Any> {
 	public operator fun <RuntimeType> get(c: Column<RuntimeType, *, QueryUserExtension>): RuntimeType
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/SynchronizedDatabase.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/SynchronizedDatabase.kt
index 57a53d5..97ba347 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/SynchronizedDatabase.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/SynchronizedDatabase.kt
@@ -1,9 +1,9 @@
 package ru.landgrafhomyak.serdha.api.v0.runtime
 
 import ru.landgrafhomyak.serdha.api.v0.LowLevelApi
-import ru.landgrafhomyak.serdha.api.v0.ddl.Module
-import ru.landgrafhomyak.serdha.api.v0.ddl.RowId
-import ru.landgrafhomyak.serdha.api.v0.ddl.Table
+import ru.landgrafhomyak.serdha.api.v0.ddl.module.Module
+import ru.landgrafhomyak.serdha.api.v0.ddl.types.RowId
+import ru.landgrafhomyak.serdha.api.v0.ddl.table.Table
 import ru.landgrafhomyak.serdha.api.v0.dml.Delete
 import ru.landgrafhomyak.serdha.api.v0.dml.Insert
 import ru.landgrafhomyak.serdha.api.v0.dml.InsertCreator
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/UnsynchronizedDatabase.kt b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/UnsynchronizedDatabase.kt
index ae7e40d..9c0ecdf 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/UnsynchronizedDatabase.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/serdha/api/v0/runtime/UnsynchronizedDatabase.kt
@@ -1,6 +1,6 @@
 package ru.landgrafhomyak.serdha.api.v0.runtime
 
-import ru.landgrafhomyak.serdha.api.v0.ddl.ModuleTemplate
+import ru.landgrafhomyak.serdha.api.v0.ddl.module.ModuleTemplate
 
 @Suppress("SpellCheckingInspection")
 public interface UnsynchronizedDatabase {