diff --git a/common/build.gradle b/kmath-common/build.gradle
similarity index 100%
rename from common/build.gradle
rename to kmath-common/build.gradle
diff --git a/common/src/main/kotlin/scientifik/kmath/operations/Algebra.kt b/kmath-common/src/main/kotlin/scientifik/kmath/operations/Algebra.kt
similarity index 100%
rename from common/src/main/kotlin/scientifik/kmath/operations/Algebra.kt
rename to kmath-common/src/main/kotlin/scientifik/kmath/operations/Algebra.kt
diff --git a/common/src/main/kotlin/scientifik/kmath/operations/Fields.kt b/kmath-common/src/main/kotlin/scientifik/kmath/operations/Fields.kt
similarity index 100%
rename from common/src/main/kotlin/scientifik/kmath/operations/Fields.kt
rename to kmath-common/src/main/kotlin/scientifik/kmath/operations/Fields.kt
diff --git a/common/src/main/kotlin/scientifik/kmath/operations/OptionalOperations.kt b/kmath-common/src/main/kotlin/scientifik/kmath/operations/OptionalOperations.kt
similarity index 100%
rename from common/src/main/kotlin/scientifik/kmath/operations/OptionalOperations.kt
rename to kmath-common/src/main/kotlin/scientifik/kmath/operations/OptionalOperations.kt
diff --git a/common/src/main/kotlin/scientifik/kmath/structures/LinearAlgrebra.kt b/kmath-common/src/main/kotlin/scientifik/kmath/structures/LinearAlgrebra.kt
similarity index 100%
rename from common/src/main/kotlin/scientifik/kmath/structures/LinearAlgrebra.kt
rename to kmath-common/src/main/kotlin/scientifik/kmath/structures/LinearAlgrebra.kt
diff --git a/common/src/main/kotlin/scientifik/kmath/structures/NDArray.kt b/kmath-common/src/main/kotlin/scientifik/kmath/structures/NDArray.kt
similarity index 100%
rename from common/src/main/kotlin/scientifik/kmath/structures/NDArray.kt
rename to kmath-common/src/main/kotlin/scientifik/kmath/structures/NDArray.kt
diff --git a/common/src/test/kotlin/scientifik/kmath/operations/RealFieldTest.kt b/kmath-common/src/test/kotlin/scientifik/kmath/operations/RealFieldTest.kt
similarity index 100%
rename from common/src/test/kotlin/scientifik/kmath/operations/RealFieldTest.kt
rename to kmath-common/src/test/kotlin/scientifik/kmath/operations/RealFieldTest.kt
diff --git a/jvm/build.gradle b/kmath-jvm/build.gradle
similarity index 87%
rename from jvm/build.gradle
rename to kmath-jvm/build.gradle
index 6dc9a0303..82bda0270 100644
--- a/jvm/build.gradle
+++ b/kmath-jvm/build.gradle
@@ -5,7 +5,7 @@ repositories {
 }
 
 dependencies {
-    expectedBy project(":common")
+    expectedBy project(":kmath-common")
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     testCompile "junit:junit:4.12"
     testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
diff --git a/jvm/src/main/kotlin/scientifik/kmath/structures/RealNDArray.kt b/kmath-jvm/src/main/kotlin/scientifik/kmath/structures/RealNDArray.kt
similarity index 100%
rename from jvm/src/main/kotlin/scientifik/kmath/structures/RealNDArray.kt
rename to kmath-jvm/src/main/kotlin/scientifik/kmath/structures/RealNDArray.kt
diff --git a/jvm/src/test/kotlin/scientifik/kmath/structures/ArrayMatrixTest.kt b/kmath-jvm/src/test/kotlin/scientifik/kmath/structures/ArrayMatrixTest.kt
similarity index 100%
rename from jvm/src/test/kotlin/scientifik/kmath/structures/ArrayMatrixTest.kt
rename to kmath-jvm/src/test/kotlin/scientifik/kmath/structures/ArrayMatrixTest.kt
diff --git a/jvm/src/test/kotlin/scientifik/kmath/structures/RealNDFieldTest.kt b/kmath-jvm/src/test/kotlin/scientifik/kmath/structures/RealNDFieldTest.kt
similarity index 100%
rename from jvm/src/test/kotlin/scientifik/kmath/structures/RealNDFieldTest.kt
rename to kmath-jvm/src/test/kotlin/scientifik/kmath/structures/RealNDFieldTest.kt
diff --git a/settings.gradle b/settings.gradle
index a60b00349..9dce0ac08 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
 rootProject.name = 'kmath'
-include 'common'
-include 'jvm'
+include 'kmath-common'
+include 'kmath-jvm'