From 4407fc3de6c0d8bfe9486030c08e31db394e6bc9 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Sat, 3 Feb 2024 18:02:41 +0700
Subject: [PATCH] Merge stuff

---
 .idea/gradle.xml                              | 20 +------
 build.gradle.kts                              | 55 +++++++++++++++----
 buildSrc/build.gradle.kts                     |  8 ---
 collect/build.gradle.kts                      | 37 -------------
 core/build.gradle.kts                         | 38 -------------
 gradle.properties                             |  3 +-
 gson-linear-algebra/build.gradle.kts          | 21 +++++++
 .../kommons/gson/AABBTypeAdapter.kt           |  0
 .../kommons/gson/AABBiTypeAdapter.kt          |  0
 .../kommons/gson/Vector2dTypeAdapter.kt       |  0
 .../kommons/gson/Vector2fTypeAdapter.kt       |  0
 .../kommons/gson/Vector2iTypeAdapter.kt       |  0
 .../kommons/gson/Vector4dTypeAdapter.kt       |  0
 .../kommons/gson/Vector4iTypeAdapter.kt       |  0
 gson-math/build.gradle.kts                    | 41 --------------
 gson/build.gradle.kts                         |  7 ++-
 .../kommons/gson/ColorTypeAdapter.kt          |  0
 io-math/build.gradle.kts                      | 33 -----------
 io/build.gradle.kts                           | 31 -----------
 linear-algebra/build.gradle.kts               |  8 +--
 math/build.gradle.kts                         | 31 -----------
 networking/build.gradle.kts                   | 34 ------------
 settings.gradle.kts                           | 10 +---
 .../ru/dbotthepony/kommons/arrays/Array2D.kt  |  0
 .../kommons/arrays/Boolean2DArray.kt          |  0
 .../dbotthepony/kommons/arrays/Byte2DArray.kt |  0
 .../dbotthepony/kommons/arrays/Char2DArray.kt |  0
 .../kommons/arrays/Double2DArray.kt           |  0
 .../kommons/arrays/Float2DArray.kt            |  0
 .../dbotthepony/kommons/arrays/Int2DArray.kt  |  0
 .../dbotthepony/kommons/arrays/Long2DArray.kt |  0
 .../dbotthepony/kommons/arrays/MatrixOps.kt   |  0
 .../kommons/arrays/Object2DArray.kt           |  0
 .../kommons/arrays/Short2DArray.kt            |  0
 .../kommons/collect/CollectionUtils.kt        |  0
 .../kommons/collect/ConditionalEnumSet.kt     |  0
 .../kommons/collect/ConditionalSet.kt         |  0
 .../kommons/collect/ConditionalSupplierSet.kt |  0
 .../dbotthepony/kommons/collect/ProxiedMap.kt |  0
 .../kommons/collect/StreamyIterators.kt       |  0
 .../kommons/collect/SupplierList.kt           |  0
 .../kommons/collect/SupplierMap.kt            |  0
 .../ru/dbotthepony/kommons/core/Either.kt     |  0
 .../dbotthepony/kommons/core/GetterSetter.kt  |  0
 .../ru/dbotthepony/kommons/core/KOptional.kt  |  0
 .../ru/dbotthepony/kommons/core/Struct.kt     |  0
 .../kommons/event/IBooleanSubscriptable.kt    |  0
 .../kommons/event/IDoubleSubcripable.kt       |  0
 .../kommons/event/IFloatSubcripable.kt        |  0
 .../kommons/event/IIntSubcripable.kt          |  0
 .../kommons/event/ILongSubcripable.kt         |  0
 .../kommons/event/ISubscriptable.kt           |  0
 .../kommons/event/IUnitSubscripable.kt        |  0
 .../kommons/io/CollectionStreamCodec.kt       |  0
 .../ru/dbotthepony/kommons/io/DecimalIO.kt    |  0
 .../dbotthepony/kommons/io/EnumValueCodec.kt  |  0
 .../ru/dbotthepony/kommons/io/IStreamCodec.kt |  0
 .../kommons/io/InputStreamUtils.kt            |  0
 .../kommons/io/OutputStreamUtils.kt           |  0
 .../ru/dbotthepony/kommons/io/StreamCodecs.kt |  0
 .../ru/dbotthepony/kommons/math/Bezier.kt     |  0
 .../ru/dbotthepony/kommons/math/Binomial.kt   |  0
 .../ru/dbotthepony/kommons/math/Decimal.kt    |  0
 .../ru/dbotthepony/kommons/math/HSVColor.kt   |  0
 .../ru/dbotthepony/kommons/math/Intersect.kt  |  0
 .../ru/dbotthepony/kommons/math/Lerp.kt       |  0
 .../ru/dbotthepony/kommons/math/RGBAColor.kt  |  0
 .../kommons/networking/ChangesetAction.kt     |  0
 .../kommons/networking/FieldAccess.kt         |  0
 .../kommons/networking/FieldGetter.kt         |  0
 .../kommons/networking/FieldSetter.kt         |  0
 .../kommons/networking/FieldSynchronizer.kt   |  0
 .../dbotthepony/kommons/networking/Fields.kt  |  0
 .../kommons/networking/MapChangeset.kt        |  0
 .../kommons/networking/MutableFields.kt       |  0
 .../kommons/networking/SetChangeset.kt        |  0
 .../kommons/util/BooleanConsumer.kt           |  0
 .../kommons/util/ComparatorUtils.kt           |  0
 .../dbotthepony/kommons/util/FloatConsumer.kt |  0
 .../dbotthepony/kommons/util/FloatSupplier.kt |  0
 80 files changed, 78 insertions(+), 299 deletions(-)
 delete mode 100644 buildSrc/build.gradle.kts
 delete mode 100644 collect/build.gradle.kts
 delete mode 100644 core/build.gradle.kts
 create mode 100644 gson-linear-algebra/build.gradle.kts
 rename {gson-math => gson-linear-algebra}/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBTypeAdapter.kt (100%)
 rename {gson-math => gson-linear-algebra}/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBiTypeAdapter.kt (100%)
 rename {gson-math => gson-linear-algebra}/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector2dTypeAdapter.kt (100%)
 rename {gson-math => gson-linear-algebra}/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector2fTypeAdapter.kt (100%)
 rename {gson-math => gson-linear-algebra}/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector2iTypeAdapter.kt (100%)
 rename {gson-math => gson-linear-algebra}/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector4dTypeAdapter.kt (100%)
 rename {gson-math => gson-linear-algebra}/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector4iTypeAdapter.kt (100%)
 delete mode 100644 gson-math/build.gradle.kts
 rename {gson-math => gson}/src/main/kotlin/ru/dbotthepony/kommons/gson/ColorTypeAdapter.kt (100%)
 delete mode 100644 io-math/build.gradle.kts
 delete mode 100644 io/build.gradle.kts
 delete mode 100644 math/build.gradle.kts
 delete mode 100644 networking/build.gradle.kts
 rename {collect/src => src}/main/kotlin/ru/dbotthepony/kommons/arrays/Array2D.kt (100%)
 rename {collect/src => src}/main/kotlin/ru/dbotthepony/kommons/arrays/Boolean2DArray.kt (100%)
 rename {collect/src => src}/main/kotlin/ru/dbotthepony/kommons/arrays/Byte2DArray.kt (100%)
 rename {collect/src => src}/main/kotlin/ru/dbotthepony/kommons/arrays/Char2DArray.kt (100%)
 rename {collect/src => src}/main/kotlin/ru/dbotthepony/kommons/arrays/Double2DArray.kt (100%)
 rename {collect/src => src}/main/kotlin/ru/dbotthepony/kommons/arrays/Float2DArray.kt (100%)
 rename {collect/src => src}/main/kotlin/ru/dbotthepony/kommons/arrays/Int2DArray.kt (100%)
 rename {collect/src => src}/main/kotlin/ru/dbotthepony/kommons/arrays/Long2DArray.kt (100%)
 rename {collect/src => src}/main/kotlin/ru/dbotthepony/kommons/arrays/MatrixOps.kt (100%)
 rename {collect/src => src}/main/kotlin/ru/dbotthepony/kommons/arrays/Object2DArray.kt (100%)
 rename {collect/src => src}/main/kotlin/ru/dbotthepony/kommons/arrays/Short2DArray.kt (100%)
 rename {collect/src => src}/main/kotlin/ru/dbotthepony/kommons/collect/CollectionUtils.kt (100%)
 rename {collect/src => src}/main/kotlin/ru/dbotthepony/kommons/collect/ConditionalEnumSet.kt (100%)
 rename {collect/src => src}/main/kotlin/ru/dbotthepony/kommons/collect/ConditionalSet.kt (100%)
 rename {collect/src => src}/main/kotlin/ru/dbotthepony/kommons/collect/ConditionalSupplierSet.kt (100%)
 rename {collect/src => src}/main/kotlin/ru/dbotthepony/kommons/collect/ProxiedMap.kt (100%)
 rename {collect/src => src}/main/kotlin/ru/dbotthepony/kommons/collect/StreamyIterators.kt (100%)
 rename {collect/src => src}/main/kotlin/ru/dbotthepony/kommons/collect/SupplierList.kt (100%)
 rename {collect/src => src}/main/kotlin/ru/dbotthepony/kommons/collect/SupplierMap.kt (100%)
 rename {core/src => src}/main/kotlin/ru/dbotthepony/kommons/core/Either.kt (100%)
 rename {core/src => src}/main/kotlin/ru/dbotthepony/kommons/core/GetterSetter.kt (100%)
 rename {core/src => src}/main/kotlin/ru/dbotthepony/kommons/core/KOptional.kt (100%)
 rename {core/src => src}/main/kotlin/ru/dbotthepony/kommons/core/Struct.kt (100%)
 rename {core/src => src}/main/kotlin/ru/dbotthepony/kommons/event/IBooleanSubscriptable.kt (100%)
 rename {core/src => src}/main/kotlin/ru/dbotthepony/kommons/event/IDoubleSubcripable.kt (100%)
 rename {core/src => src}/main/kotlin/ru/dbotthepony/kommons/event/IFloatSubcripable.kt (100%)
 rename {core/src => src}/main/kotlin/ru/dbotthepony/kommons/event/IIntSubcripable.kt (100%)
 rename {core/src => src}/main/kotlin/ru/dbotthepony/kommons/event/ILongSubcripable.kt (100%)
 rename {core/src => src}/main/kotlin/ru/dbotthepony/kommons/event/ISubscriptable.kt (100%)
 rename {core/src => src}/main/kotlin/ru/dbotthepony/kommons/event/IUnitSubscripable.kt (100%)
 rename {io/src => src}/main/kotlin/ru/dbotthepony/kommons/io/CollectionStreamCodec.kt (100%)
 rename {io-math/src => src}/main/kotlin/ru/dbotthepony/kommons/io/DecimalIO.kt (100%)
 rename {io/src => src}/main/kotlin/ru/dbotthepony/kommons/io/EnumValueCodec.kt (100%)
 rename {io/src => src}/main/kotlin/ru/dbotthepony/kommons/io/IStreamCodec.kt (100%)
 rename {io/src => src}/main/kotlin/ru/dbotthepony/kommons/io/InputStreamUtils.kt (100%)
 rename {io/src => src}/main/kotlin/ru/dbotthepony/kommons/io/OutputStreamUtils.kt (100%)
 rename {io/src => src}/main/kotlin/ru/dbotthepony/kommons/io/StreamCodecs.kt (100%)
 rename {math/src => src}/main/kotlin/ru/dbotthepony/kommons/math/Bezier.kt (100%)
 rename {math/src => src}/main/kotlin/ru/dbotthepony/kommons/math/Binomial.kt (100%)
 rename {math/src => src}/main/kotlin/ru/dbotthepony/kommons/math/Decimal.kt (100%)
 rename {math/src => src}/main/kotlin/ru/dbotthepony/kommons/math/HSVColor.kt (100%)
 rename {math/src => src}/main/kotlin/ru/dbotthepony/kommons/math/Intersect.kt (100%)
 rename {math/src => src}/main/kotlin/ru/dbotthepony/kommons/math/Lerp.kt (100%)
 rename {math/src => src}/main/kotlin/ru/dbotthepony/kommons/math/RGBAColor.kt (100%)
 rename {networking/src => src}/main/kotlin/ru/dbotthepony/kommons/networking/ChangesetAction.kt (100%)
 rename {networking/src => src}/main/kotlin/ru/dbotthepony/kommons/networking/FieldAccess.kt (100%)
 rename {networking/src => src}/main/kotlin/ru/dbotthepony/kommons/networking/FieldGetter.kt (100%)
 rename {networking/src => src}/main/kotlin/ru/dbotthepony/kommons/networking/FieldSetter.kt (100%)
 rename {networking/src => src}/main/kotlin/ru/dbotthepony/kommons/networking/FieldSynchronizer.kt (100%)
 rename {networking/src => src}/main/kotlin/ru/dbotthepony/kommons/networking/Fields.kt (100%)
 rename {networking/src => src}/main/kotlin/ru/dbotthepony/kommons/networking/MapChangeset.kt (100%)
 rename {networking/src => src}/main/kotlin/ru/dbotthepony/kommons/networking/MutableFields.kt (100%)
 rename {networking/src => src}/main/kotlin/ru/dbotthepony/kommons/networking/SetChangeset.kt (100%)
 rename {core/src => src}/main/kotlin/ru/dbotthepony/kommons/util/BooleanConsumer.kt (100%)
 rename {core/src => src}/main/kotlin/ru/dbotthepony/kommons/util/ComparatorUtils.kt (100%)
 rename {core/src => src}/main/kotlin/ru/dbotthepony/kommons/util/FloatConsumer.kt (100%)
 rename {core/src => src}/main/kotlin/ru/dbotthepony/kommons/util/FloatSupplier.kt (100%)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 10078e7..93b9c80 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,33 +4,15 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT">
-            <builds>
-              <build path="$PROJECT_DIR$/buildSrc" name="buildSrc">
-                <projects>
-                  <project path="$PROJECT_DIR$/buildSrc" />
-                </projects>
-              </build>
-            </builds>
-          </compositeBuild>
-        </compositeConfiguration>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/buildSrc" />
-            <option value="$PROJECT_DIR$/collect" />
-            <option value="$PROJECT_DIR$/core" />
             <option value="$PROJECT_DIR$/gson" />
-            <option value="$PROJECT_DIR$/gson-math" />
+            <option value="$PROJECT_DIR$/gson-linear-algebra" />
             <option value="$PROJECT_DIR$/guava" />
-            <option value="$PROJECT_DIR$/io" />
-            <option value="$PROJECT_DIR$/io-math" />
             <option value="$PROJECT_DIR$/linear-algebra" />
-            <option value="$PROJECT_DIR$/math" />
-            <option value="$PROJECT_DIR$/networking" />
           </set>
         </option>
       </GradleProjectSettings>
diff --git a/build.gradle.kts b/build.gradle.kts
index c380ff6..1fe81a3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,18 +16,23 @@ tasks.compileKotlin {
 	}
 }
 
-tasks.jar {
-	from(project(":core").sourceSets.main.get().output)
-	from(project(":io").sourceSets.main.get().output)
-	from(project(":io-math").sourceSets.main.get().output)
-	from(project(":math").sourceSets.main.get().output)
-	from(project(":collect").sourceSets.main.get().output)
-	from(project(":guava").sourceSets.main.get().output)
-	from(project(":networking").sourceSets.main.get().output)
-}
-
 val projectGroup: String by project
 val projectVersion: String by project
+val specifyKotlinAsDependency: String by project
+val fastutilVersion: String by project
+
+dependencies {
+	testImplementation("org.jetbrains.kotlin:kotlin-test")
+
+	implementation("it.unimi.dsi:fastutil:$fastutilVersion")
+}
+
+tasks {
+	create("sourceJar", org.gradle.jvm.tasks.Jar::class.java) {
+		archiveClassifier.set("sources")
+		from(sourceSets.main.get().allSource)
+	}
+}
 
 version = projectVersion
 group = projectGroup
@@ -77,3 +82,33 @@ subprojects {
 		}
 	}
 }
+
+publishing {
+	publications {
+		create<MavenPublication>("mavenJava") {
+			from(components["java"])
+			artifact(tasks["sourceJar"])
+
+			pom {
+				dependencies {
+					if (specifyKotlinAsDependency.toBoolean()) implementation(kotlin("stdlib"))
+
+					implementation("it.unimi.dsi:fastutil:[8.0,)")
+				}
+			}
+		}
+	}
+
+	repositories {
+		maven {
+			url = uri("sftp://maven@dbotthepony.ru:22/maven")
+
+			credentials {
+				val mavenUser: String by project
+				val mavenPassword: String by project
+				username = mavenUser
+				password = mavenPassword
+			}
+		}
+	}
+}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
deleted file mode 100644
index 48ce654..0000000
--- a/buildSrc/build.gradle.kts
+++ /dev/null
@@ -1,8 +0,0 @@
-
-plugins {
-	kotlin("jvm") version "1.8.0"
-}
-
-repositories {
-	mavenCentral()
-}
diff --git a/collect/build.gradle.kts b/collect/build.gradle.kts
deleted file mode 100644
index 71e469e..0000000
--- a/collect/build.gradle.kts
+++ /dev/null
@@ -1,37 +0,0 @@
-plugins {
-    kotlin("jvm")
-    `maven-publish`
-}
-
-val specifyKotlinAsDependency: String by project
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
-
-kotlin {
-    jvmToolchain(17)
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            from(components["java"])
-            artifact(tasks["sourceJar"])
-
-            pom {
-                dependencies {
-                    if (specifyKotlinAsDependency.toBoolean()) implementation(kotlin("stdlib"))
-                }
-            }
-        }
-    }
-}
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
deleted file mode 100644
index fb55b21..0000000
--- a/core/build.gradle.kts
+++ /dev/null
@@ -1,38 +0,0 @@
-
-plugins {
-    kotlin("jvm")
-    `maven-publish`
-}
-
-val specifyKotlinAsDependency: String by project
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
-
-kotlin {
-    jvmToolchain(17)
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            from(components["java"])
-            artifact(tasks["sourceJar"])
-
-            pom {
-                dependencies {
-                    if (specifyKotlinAsDependency.toBoolean()) implementation(kotlin("stdlib"))
-                }
-            }
-        }
-    }
-}
diff --git a/gradle.properties b/gradle.properties
index 7093051..53cfe66 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,8 @@ kotlin.code.style=official
 specifyKotlinAsDependency=false
 
 projectGroup=ru.dbotthepony.kommons
-projectVersion=1.1.0
+projectVersion=1.2.0
 
 guavaDepVersion=33.0.0
 gsonDepVersion=2.8.9
+fastutilVersion=8.5.6
diff --git a/gson-linear-algebra/build.gradle.kts b/gson-linear-algebra/build.gradle.kts
new file mode 100644
index 0000000..300a6d6
--- /dev/null
+++ b/gson-linear-algebra/build.gradle.kts
@@ -0,0 +1,21 @@
+
+plugins {
+    kotlin("jvm")
+}
+
+repositories {
+    mavenCentral()
+}
+
+val gsonDepVersion: String by project
+val specifyKotlinAsDependency: String by project
+
+dependencies {
+    testImplementation("org.jetbrains.kotlin:kotlin-test")
+
+	implementation(project(":linear-algebra"))
+	implementation(project(":gson"))
+	implementation(project(":"))
+
+    implementation("com.google.code.gson:gson:$gsonDepVersion")
+}
diff --git a/gson-math/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBTypeAdapter.kt b/gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBTypeAdapter.kt
similarity index 100%
rename from gson-math/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBTypeAdapter.kt
rename to gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBTypeAdapter.kt
diff --git a/gson-math/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBiTypeAdapter.kt b/gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBiTypeAdapter.kt
similarity index 100%
rename from gson-math/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBiTypeAdapter.kt
rename to gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBiTypeAdapter.kt
diff --git a/gson-math/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector2dTypeAdapter.kt b/gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector2dTypeAdapter.kt
similarity index 100%
rename from gson-math/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector2dTypeAdapter.kt
rename to gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector2dTypeAdapter.kt
diff --git a/gson-math/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector2fTypeAdapter.kt b/gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector2fTypeAdapter.kt
similarity index 100%
rename from gson-math/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector2fTypeAdapter.kt
rename to gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector2fTypeAdapter.kt
diff --git a/gson-math/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector2iTypeAdapter.kt b/gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector2iTypeAdapter.kt
similarity index 100%
rename from gson-math/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector2iTypeAdapter.kt
rename to gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector2iTypeAdapter.kt
diff --git a/gson-math/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector4dTypeAdapter.kt b/gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector4dTypeAdapter.kt
similarity index 100%
rename from gson-math/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector4dTypeAdapter.kt
rename to gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector4dTypeAdapter.kt
diff --git a/gson-math/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector4iTypeAdapter.kt b/gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector4iTypeAdapter.kt
similarity index 100%
rename from gson-math/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector4iTypeAdapter.kt
rename to gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/Vector4iTypeAdapter.kt
diff --git a/gson-math/build.gradle.kts b/gson-math/build.gradle.kts
deleted file mode 100644
index 9e97dbb..0000000
--- a/gson-math/build.gradle.kts
+++ /dev/null
@@ -1,41 +0,0 @@
-
-plugins {
-    kotlin("jvm")
-}
-
-repositories {
-    mavenCentral()
-}
-
-val gsonDepVersion: String by project
-val specifyKotlinAsDependency: String by project
-
-dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
-
-    implementation("com.google.code.gson:gson:$gsonDepVersion")
-    implementation(project(":gson"))
-    implementation(project(":core"))
-    implementation(project(":math"))
-    implementation(project(":linear-algebra"))
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            from(components["java"])
-            artifact(tasks["sourceJar"])
-
-            pom {
-                dependencies {
-                    if (specifyKotlinAsDependency.toBoolean()) implementation(kotlin("stdlib"))
-                    implementation("com.google.guava:guava:[2.0,)")
-                    implementation(project(":gson"))
-                    implementation(project(":core"))
-                    implementation(project(":math"))
-                    implementation(project(":linear-algebra"))
-                }
-            }
-        }
-    }
-}
diff --git a/gson/build.gradle.kts b/gson/build.gradle.kts
index 0efc703..db8c484 100644
--- a/gson/build.gradle.kts
+++ b/gson/build.gradle.kts
@@ -9,12 +9,14 @@ repositories {
 
 val gsonDepVersion: String by project
 val specifyKotlinAsDependency: String by project
+val fastutilVersion: String by project
 
 dependencies {
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 
     implementation("com.google.code.gson:gson:$gsonDepVersion")
-    implementation(project(":core"))
+    implementation(project(":"))
+    implementation("it.unimi.dsi:fastutil:$fastutilVersion")
 }
 
 publishing {
@@ -27,7 +29,8 @@ publishing {
                 dependencies {
                     if (specifyKotlinAsDependency.toBoolean()) implementation(kotlin("stdlib"))
                     implementation("com.google.guava:guava:[2.0,)")
-                    implementation(project(":core"))
+                    implementation("it.unimi.dsi:fastutil:[8.0,)")
+                    implementation(project(":"))
                 }
             }
         }
diff --git a/gson-math/src/main/kotlin/ru/dbotthepony/kommons/gson/ColorTypeAdapter.kt b/gson/src/main/kotlin/ru/dbotthepony/kommons/gson/ColorTypeAdapter.kt
similarity index 100%
rename from gson-math/src/main/kotlin/ru/dbotthepony/kommons/gson/ColorTypeAdapter.kt
rename to gson/src/main/kotlin/ru/dbotthepony/kommons/gson/ColorTypeAdapter.kt
diff --git a/io-math/build.gradle.kts b/io-math/build.gradle.kts
deleted file mode 100644
index 4fc1d3e..0000000
--- a/io-math/build.gradle.kts
+++ /dev/null
@@ -1,33 +0,0 @@
-plugins {
-    kotlin("jvm")
-    `maven-publish`
-}
-
-val specifyKotlinAsDependency: String by project
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
-    implementation(project(":io"))
-    implementation(project(":math"))
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            from(components["java"])
-            artifact(tasks["sourceJar"])
-
-            pom {
-                dependencies {
-                    if (specifyKotlinAsDependency.toBoolean()) implementation(kotlin("stdlib"))
-                    implementation(project(":io"))
-                    implementation(project(":math"))
-                }
-            }
-        }
-    }
-}
diff --git a/io/build.gradle.kts b/io/build.gradle.kts
deleted file mode 100644
index 9e0b2c2..0000000
--- a/io/build.gradle.kts
+++ /dev/null
@@ -1,31 +0,0 @@
-plugins {
-    kotlin("jvm")
-    `maven-publish`
-}
-
-val specifyKotlinAsDependency: String by project
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
-    implementation(project(":core"))
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            from(components["java"])
-            artifact(tasks["sourceJar"])
-
-            pom {
-                dependencies {
-                    if (specifyKotlinAsDependency.toBoolean()) implementation(kotlin("stdlib"))
-                    implementation(project(":core"))
-                }
-            }
-        }
-    }
-}
diff --git a/linear-algebra/build.gradle.kts b/linear-algebra/build.gradle.kts
index aa9d26e..19c70ff 100644
--- a/linear-algebra/build.gradle.kts
+++ b/linear-algebra/build.gradle.kts
@@ -12,9 +12,7 @@ repositories {
 dependencies {
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 
-    implementation(project(":collect"))
-    implementation(project(":math"))
-    implementation(project(":core"))
+    implementation(project(":"))
 }
 
 publishing {
@@ -27,9 +25,7 @@ publishing {
                 dependencies {
                     if (specifyKotlinAsDependency.toBoolean()) implementation(kotlin("stdlib"))
 
-                    implementation(project(":collect"))
-                    implementation(project(":math"))
-                    implementation(project(":core"))
+                    implementation(project(":"))
                 }
             }
         }
diff --git a/math/build.gradle.kts b/math/build.gradle.kts
deleted file mode 100644
index 4f8f9b5..0000000
--- a/math/build.gradle.kts
+++ /dev/null
@@ -1,31 +0,0 @@
-plugins {
-    kotlin("jvm")
-    `maven-publish`
-}
-
-val specifyKotlinAsDependency: String by project
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
-
-    implementation(project(":core"))
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            from(components["java"])
-            artifact(tasks["sourceJar"])
-
-            pom {
-                dependencies {
-                    if (specifyKotlinAsDependency.toBoolean()) implementation(kotlin("stdlib"))
-                }
-            }
-        }
-    }
-}
diff --git a/networking/build.gradle.kts b/networking/build.gradle.kts
deleted file mode 100644
index e8c9208..0000000
--- a/networking/build.gradle.kts
+++ /dev/null
@@ -1,34 +0,0 @@
-
-plugins {
-    kotlin("jvm")
-    `maven-publish`
-}
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
-    implementation(project(":core"))
-    implementation(project(":io"))
-    implementation(project(":collect"))
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            from(components["java"])
-            artifact(tasks["sourceJar"])
-
-            pom {
-                dependencies {
-                    implementation(kotlin("stdlib"))
-                    implementation(project(":core"))
-                    implementation(project(":io"))
-                    implementation(project(":collect"))
-                }
-            }
-        }
-    }
-}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b5d4569..1c6b94a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,13 +5,7 @@ plugins {
 }
 
 rootProject.name = "kommons"
-include("core")
-include("networking")
-include("io")
-include("math")
-include("io-math")
-include("collect")
 include("guava")
-include("linear-algebra")
-include("gson-math")
 include("gson")
+include("linear-algebra")
+include("gson-linear-algebra")
diff --git a/collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Array2D.kt b/src/main/kotlin/ru/dbotthepony/kommons/arrays/Array2D.kt
similarity index 100%
rename from collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Array2D.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/arrays/Array2D.kt
diff --git a/collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Boolean2DArray.kt b/src/main/kotlin/ru/dbotthepony/kommons/arrays/Boolean2DArray.kt
similarity index 100%
rename from collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Boolean2DArray.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/arrays/Boolean2DArray.kt
diff --git a/collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Byte2DArray.kt b/src/main/kotlin/ru/dbotthepony/kommons/arrays/Byte2DArray.kt
similarity index 100%
rename from collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Byte2DArray.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/arrays/Byte2DArray.kt
diff --git a/collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Char2DArray.kt b/src/main/kotlin/ru/dbotthepony/kommons/arrays/Char2DArray.kt
similarity index 100%
rename from collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Char2DArray.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/arrays/Char2DArray.kt
diff --git a/collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Double2DArray.kt b/src/main/kotlin/ru/dbotthepony/kommons/arrays/Double2DArray.kt
similarity index 100%
rename from collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Double2DArray.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/arrays/Double2DArray.kt
diff --git a/collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Float2DArray.kt b/src/main/kotlin/ru/dbotthepony/kommons/arrays/Float2DArray.kt
similarity index 100%
rename from collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Float2DArray.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/arrays/Float2DArray.kt
diff --git a/collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Int2DArray.kt b/src/main/kotlin/ru/dbotthepony/kommons/arrays/Int2DArray.kt
similarity index 100%
rename from collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Int2DArray.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/arrays/Int2DArray.kt
diff --git a/collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Long2DArray.kt b/src/main/kotlin/ru/dbotthepony/kommons/arrays/Long2DArray.kt
similarity index 100%
rename from collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Long2DArray.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/arrays/Long2DArray.kt
diff --git a/collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/MatrixOps.kt b/src/main/kotlin/ru/dbotthepony/kommons/arrays/MatrixOps.kt
similarity index 100%
rename from collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/MatrixOps.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/arrays/MatrixOps.kt
diff --git a/collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Object2DArray.kt b/src/main/kotlin/ru/dbotthepony/kommons/arrays/Object2DArray.kt
similarity index 100%
rename from collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Object2DArray.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/arrays/Object2DArray.kt
diff --git a/collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Short2DArray.kt b/src/main/kotlin/ru/dbotthepony/kommons/arrays/Short2DArray.kt
similarity index 100%
rename from collect/src/main/kotlin/ru/dbotthepony/kommons/arrays/Short2DArray.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/arrays/Short2DArray.kt
diff --git a/collect/src/main/kotlin/ru/dbotthepony/kommons/collect/CollectionUtils.kt b/src/main/kotlin/ru/dbotthepony/kommons/collect/CollectionUtils.kt
similarity index 100%
rename from collect/src/main/kotlin/ru/dbotthepony/kommons/collect/CollectionUtils.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/collect/CollectionUtils.kt
diff --git a/collect/src/main/kotlin/ru/dbotthepony/kommons/collect/ConditionalEnumSet.kt b/src/main/kotlin/ru/dbotthepony/kommons/collect/ConditionalEnumSet.kt
similarity index 100%
rename from collect/src/main/kotlin/ru/dbotthepony/kommons/collect/ConditionalEnumSet.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/collect/ConditionalEnumSet.kt
diff --git a/collect/src/main/kotlin/ru/dbotthepony/kommons/collect/ConditionalSet.kt b/src/main/kotlin/ru/dbotthepony/kommons/collect/ConditionalSet.kt
similarity index 100%
rename from collect/src/main/kotlin/ru/dbotthepony/kommons/collect/ConditionalSet.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/collect/ConditionalSet.kt
diff --git a/collect/src/main/kotlin/ru/dbotthepony/kommons/collect/ConditionalSupplierSet.kt b/src/main/kotlin/ru/dbotthepony/kommons/collect/ConditionalSupplierSet.kt
similarity index 100%
rename from collect/src/main/kotlin/ru/dbotthepony/kommons/collect/ConditionalSupplierSet.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/collect/ConditionalSupplierSet.kt
diff --git a/collect/src/main/kotlin/ru/dbotthepony/kommons/collect/ProxiedMap.kt b/src/main/kotlin/ru/dbotthepony/kommons/collect/ProxiedMap.kt
similarity index 100%
rename from collect/src/main/kotlin/ru/dbotthepony/kommons/collect/ProxiedMap.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/collect/ProxiedMap.kt
diff --git a/collect/src/main/kotlin/ru/dbotthepony/kommons/collect/StreamyIterators.kt b/src/main/kotlin/ru/dbotthepony/kommons/collect/StreamyIterators.kt
similarity index 100%
rename from collect/src/main/kotlin/ru/dbotthepony/kommons/collect/StreamyIterators.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/collect/StreamyIterators.kt
diff --git a/collect/src/main/kotlin/ru/dbotthepony/kommons/collect/SupplierList.kt b/src/main/kotlin/ru/dbotthepony/kommons/collect/SupplierList.kt
similarity index 100%
rename from collect/src/main/kotlin/ru/dbotthepony/kommons/collect/SupplierList.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/collect/SupplierList.kt
diff --git a/collect/src/main/kotlin/ru/dbotthepony/kommons/collect/SupplierMap.kt b/src/main/kotlin/ru/dbotthepony/kommons/collect/SupplierMap.kt
similarity index 100%
rename from collect/src/main/kotlin/ru/dbotthepony/kommons/collect/SupplierMap.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/collect/SupplierMap.kt
diff --git a/core/src/main/kotlin/ru/dbotthepony/kommons/core/Either.kt b/src/main/kotlin/ru/dbotthepony/kommons/core/Either.kt
similarity index 100%
rename from core/src/main/kotlin/ru/dbotthepony/kommons/core/Either.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/core/Either.kt
diff --git a/core/src/main/kotlin/ru/dbotthepony/kommons/core/GetterSetter.kt b/src/main/kotlin/ru/dbotthepony/kommons/core/GetterSetter.kt
similarity index 100%
rename from core/src/main/kotlin/ru/dbotthepony/kommons/core/GetterSetter.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/core/GetterSetter.kt
diff --git a/core/src/main/kotlin/ru/dbotthepony/kommons/core/KOptional.kt b/src/main/kotlin/ru/dbotthepony/kommons/core/KOptional.kt
similarity index 100%
rename from core/src/main/kotlin/ru/dbotthepony/kommons/core/KOptional.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/core/KOptional.kt
diff --git a/core/src/main/kotlin/ru/dbotthepony/kommons/core/Struct.kt b/src/main/kotlin/ru/dbotthepony/kommons/core/Struct.kt
similarity index 100%
rename from core/src/main/kotlin/ru/dbotthepony/kommons/core/Struct.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/core/Struct.kt
diff --git a/core/src/main/kotlin/ru/dbotthepony/kommons/event/IBooleanSubscriptable.kt b/src/main/kotlin/ru/dbotthepony/kommons/event/IBooleanSubscriptable.kt
similarity index 100%
rename from core/src/main/kotlin/ru/dbotthepony/kommons/event/IBooleanSubscriptable.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/event/IBooleanSubscriptable.kt
diff --git a/core/src/main/kotlin/ru/dbotthepony/kommons/event/IDoubleSubcripable.kt b/src/main/kotlin/ru/dbotthepony/kommons/event/IDoubleSubcripable.kt
similarity index 100%
rename from core/src/main/kotlin/ru/dbotthepony/kommons/event/IDoubleSubcripable.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/event/IDoubleSubcripable.kt
diff --git a/core/src/main/kotlin/ru/dbotthepony/kommons/event/IFloatSubcripable.kt b/src/main/kotlin/ru/dbotthepony/kommons/event/IFloatSubcripable.kt
similarity index 100%
rename from core/src/main/kotlin/ru/dbotthepony/kommons/event/IFloatSubcripable.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/event/IFloatSubcripable.kt
diff --git a/core/src/main/kotlin/ru/dbotthepony/kommons/event/IIntSubcripable.kt b/src/main/kotlin/ru/dbotthepony/kommons/event/IIntSubcripable.kt
similarity index 100%
rename from core/src/main/kotlin/ru/dbotthepony/kommons/event/IIntSubcripable.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/event/IIntSubcripable.kt
diff --git a/core/src/main/kotlin/ru/dbotthepony/kommons/event/ILongSubcripable.kt b/src/main/kotlin/ru/dbotthepony/kommons/event/ILongSubcripable.kt
similarity index 100%
rename from core/src/main/kotlin/ru/dbotthepony/kommons/event/ILongSubcripable.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/event/ILongSubcripable.kt
diff --git a/core/src/main/kotlin/ru/dbotthepony/kommons/event/ISubscriptable.kt b/src/main/kotlin/ru/dbotthepony/kommons/event/ISubscriptable.kt
similarity index 100%
rename from core/src/main/kotlin/ru/dbotthepony/kommons/event/ISubscriptable.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/event/ISubscriptable.kt
diff --git a/core/src/main/kotlin/ru/dbotthepony/kommons/event/IUnitSubscripable.kt b/src/main/kotlin/ru/dbotthepony/kommons/event/IUnitSubscripable.kt
similarity index 100%
rename from core/src/main/kotlin/ru/dbotthepony/kommons/event/IUnitSubscripable.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/event/IUnitSubscripable.kt
diff --git a/io/src/main/kotlin/ru/dbotthepony/kommons/io/CollectionStreamCodec.kt b/src/main/kotlin/ru/dbotthepony/kommons/io/CollectionStreamCodec.kt
similarity index 100%
rename from io/src/main/kotlin/ru/dbotthepony/kommons/io/CollectionStreamCodec.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/io/CollectionStreamCodec.kt
diff --git a/io-math/src/main/kotlin/ru/dbotthepony/kommons/io/DecimalIO.kt b/src/main/kotlin/ru/dbotthepony/kommons/io/DecimalIO.kt
similarity index 100%
rename from io-math/src/main/kotlin/ru/dbotthepony/kommons/io/DecimalIO.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/io/DecimalIO.kt
diff --git a/io/src/main/kotlin/ru/dbotthepony/kommons/io/EnumValueCodec.kt b/src/main/kotlin/ru/dbotthepony/kommons/io/EnumValueCodec.kt
similarity index 100%
rename from io/src/main/kotlin/ru/dbotthepony/kommons/io/EnumValueCodec.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/io/EnumValueCodec.kt
diff --git a/io/src/main/kotlin/ru/dbotthepony/kommons/io/IStreamCodec.kt b/src/main/kotlin/ru/dbotthepony/kommons/io/IStreamCodec.kt
similarity index 100%
rename from io/src/main/kotlin/ru/dbotthepony/kommons/io/IStreamCodec.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/io/IStreamCodec.kt
diff --git a/io/src/main/kotlin/ru/dbotthepony/kommons/io/InputStreamUtils.kt b/src/main/kotlin/ru/dbotthepony/kommons/io/InputStreamUtils.kt
similarity index 100%
rename from io/src/main/kotlin/ru/dbotthepony/kommons/io/InputStreamUtils.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/io/InputStreamUtils.kt
diff --git a/io/src/main/kotlin/ru/dbotthepony/kommons/io/OutputStreamUtils.kt b/src/main/kotlin/ru/dbotthepony/kommons/io/OutputStreamUtils.kt
similarity index 100%
rename from io/src/main/kotlin/ru/dbotthepony/kommons/io/OutputStreamUtils.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/io/OutputStreamUtils.kt
diff --git a/io/src/main/kotlin/ru/dbotthepony/kommons/io/StreamCodecs.kt b/src/main/kotlin/ru/dbotthepony/kommons/io/StreamCodecs.kt
similarity index 100%
rename from io/src/main/kotlin/ru/dbotthepony/kommons/io/StreamCodecs.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/io/StreamCodecs.kt
diff --git a/math/src/main/kotlin/ru/dbotthepony/kommons/math/Bezier.kt b/src/main/kotlin/ru/dbotthepony/kommons/math/Bezier.kt
similarity index 100%
rename from math/src/main/kotlin/ru/dbotthepony/kommons/math/Bezier.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/math/Bezier.kt
diff --git a/math/src/main/kotlin/ru/dbotthepony/kommons/math/Binomial.kt b/src/main/kotlin/ru/dbotthepony/kommons/math/Binomial.kt
similarity index 100%
rename from math/src/main/kotlin/ru/dbotthepony/kommons/math/Binomial.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/math/Binomial.kt
diff --git a/math/src/main/kotlin/ru/dbotthepony/kommons/math/Decimal.kt b/src/main/kotlin/ru/dbotthepony/kommons/math/Decimal.kt
similarity index 100%
rename from math/src/main/kotlin/ru/dbotthepony/kommons/math/Decimal.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/math/Decimal.kt
diff --git a/math/src/main/kotlin/ru/dbotthepony/kommons/math/HSVColor.kt b/src/main/kotlin/ru/dbotthepony/kommons/math/HSVColor.kt
similarity index 100%
rename from math/src/main/kotlin/ru/dbotthepony/kommons/math/HSVColor.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/math/HSVColor.kt
diff --git a/math/src/main/kotlin/ru/dbotthepony/kommons/math/Intersect.kt b/src/main/kotlin/ru/dbotthepony/kommons/math/Intersect.kt
similarity index 100%
rename from math/src/main/kotlin/ru/dbotthepony/kommons/math/Intersect.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/math/Intersect.kt
diff --git a/math/src/main/kotlin/ru/dbotthepony/kommons/math/Lerp.kt b/src/main/kotlin/ru/dbotthepony/kommons/math/Lerp.kt
similarity index 100%
rename from math/src/main/kotlin/ru/dbotthepony/kommons/math/Lerp.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/math/Lerp.kt
diff --git a/math/src/main/kotlin/ru/dbotthepony/kommons/math/RGBAColor.kt b/src/main/kotlin/ru/dbotthepony/kommons/math/RGBAColor.kt
similarity index 100%
rename from math/src/main/kotlin/ru/dbotthepony/kommons/math/RGBAColor.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/math/RGBAColor.kt
diff --git a/networking/src/main/kotlin/ru/dbotthepony/kommons/networking/ChangesetAction.kt b/src/main/kotlin/ru/dbotthepony/kommons/networking/ChangesetAction.kt
similarity index 100%
rename from networking/src/main/kotlin/ru/dbotthepony/kommons/networking/ChangesetAction.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/networking/ChangesetAction.kt
diff --git a/networking/src/main/kotlin/ru/dbotthepony/kommons/networking/FieldAccess.kt b/src/main/kotlin/ru/dbotthepony/kommons/networking/FieldAccess.kt
similarity index 100%
rename from networking/src/main/kotlin/ru/dbotthepony/kommons/networking/FieldAccess.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/networking/FieldAccess.kt
diff --git a/networking/src/main/kotlin/ru/dbotthepony/kommons/networking/FieldGetter.kt b/src/main/kotlin/ru/dbotthepony/kommons/networking/FieldGetter.kt
similarity index 100%
rename from networking/src/main/kotlin/ru/dbotthepony/kommons/networking/FieldGetter.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/networking/FieldGetter.kt
diff --git a/networking/src/main/kotlin/ru/dbotthepony/kommons/networking/FieldSetter.kt b/src/main/kotlin/ru/dbotthepony/kommons/networking/FieldSetter.kt
similarity index 100%
rename from networking/src/main/kotlin/ru/dbotthepony/kommons/networking/FieldSetter.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/networking/FieldSetter.kt
diff --git a/networking/src/main/kotlin/ru/dbotthepony/kommons/networking/FieldSynchronizer.kt b/src/main/kotlin/ru/dbotthepony/kommons/networking/FieldSynchronizer.kt
similarity index 100%
rename from networking/src/main/kotlin/ru/dbotthepony/kommons/networking/FieldSynchronizer.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/networking/FieldSynchronizer.kt
diff --git a/networking/src/main/kotlin/ru/dbotthepony/kommons/networking/Fields.kt b/src/main/kotlin/ru/dbotthepony/kommons/networking/Fields.kt
similarity index 100%
rename from networking/src/main/kotlin/ru/dbotthepony/kommons/networking/Fields.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/networking/Fields.kt
diff --git a/networking/src/main/kotlin/ru/dbotthepony/kommons/networking/MapChangeset.kt b/src/main/kotlin/ru/dbotthepony/kommons/networking/MapChangeset.kt
similarity index 100%
rename from networking/src/main/kotlin/ru/dbotthepony/kommons/networking/MapChangeset.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/networking/MapChangeset.kt
diff --git a/networking/src/main/kotlin/ru/dbotthepony/kommons/networking/MutableFields.kt b/src/main/kotlin/ru/dbotthepony/kommons/networking/MutableFields.kt
similarity index 100%
rename from networking/src/main/kotlin/ru/dbotthepony/kommons/networking/MutableFields.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/networking/MutableFields.kt
diff --git a/networking/src/main/kotlin/ru/dbotthepony/kommons/networking/SetChangeset.kt b/src/main/kotlin/ru/dbotthepony/kommons/networking/SetChangeset.kt
similarity index 100%
rename from networking/src/main/kotlin/ru/dbotthepony/kommons/networking/SetChangeset.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/networking/SetChangeset.kt
diff --git a/core/src/main/kotlin/ru/dbotthepony/kommons/util/BooleanConsumer.kt b/src/main/kotlin/ru/dbotthepony/kommons/util/BooleanConsumer.kt
similarity index 100%
rename from core/src/main/kotlin/ru/dbotthepony/kommons/util/BooleanConsumer.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/util/BooleanConsumer.kt
diff --git a/core/src/main/kotlin/ru/dbotthepony/kommons/util/ComparatorUtils.kt b/src/main/kotlin/ru/dbotthepony/kommons/util/ComparatorUtils.kt
similarity index 100%
rename from core/src/main/kotlin/ru/dbotthepony/kommons/util/ComparatorUtils.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/util/ComparatorUtils.kt
diff --git a/core/src/main/kotlin/ru/dbotthepony/kommons/util/FloatConsumer.kt b/src/main/kotlin/ru/dbotthepony/kommons/util/FloatConsumer.kt
similarity index 100%
rename from core/src/main/kotlin/ru/dbotthepony/kommons/util/FloatConsumer.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/util/FloatConsumer.kt
diff --git a/core/src/main/kotlin/ru/dbotthepony/kommons/util/FloatSupplier.kt b/src/main/kotlin/ru/dbotthepony/kommons/util/FloatSupplier.kt
similarity index 100%
rename from core/src/main/kotlin/ru/dbotthepony/kommons/util/FloatSupplier.kt
rename to src/main/kotlin/ru/dbotthepony/kommons/util/FloatSupplier.kt