diff --git a/build.gradle.kts b/build.gradle.kts
index a9ec90c..a721ef9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,7 +10,7 @@ val kmathVersion: String by extra("0.3.1-dev-RC")
 
 allprojects {
     group = "center.sciprog"
-    version = "0.2.2-dev-11"
+    version = "0.2.2-dev-12"
 
     repositories {
         mavenLocal()
diff --git a/demo/maps/build.gradle.kts b/demo/maps/build.gradle.kts
index 02c651f..c9a83f8 100644
--- a/demo/maps/build.gradle.kts
+++ b/demo/maps/build.gradle.kts
@@ -9,9 +9,7 @@ val ktorVersion: String by rootProject.extra
 
 kotlin {
     jvmToolchain(11)
-    jvm {
-        withJava()
-    }
+    jvm()
     sourceSets {
         val jvmMain by getting {
             dependencies {
diff --git a/demo/polygon-editor/build.gradle.kts b/demo/polygon-editor/build.gradle.kts
index 66e621f..b4bbb88 100644
--- a/demo/polygon-editor/build.gradle.kts
+++ b/demo/polygon-editor/build.gradle.kts
@@ -8,12 +8,8 @@ plugins {
 val ktorVersion: String by rootProject.extra
 
 kotlin {
-    jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "11"
-        }
-        withJava()
-    }
+    jvm()
+    jvmToolchain(11)
     sourceSets {
         val jvmMain by getting {
             dependencies {
diff --git a/demo/scheme/build.gradle.kts b/demo/scheme/build.gradle.kts
index e8c8e15..845f9bd 100644
--- a/demo/scheme/build.gradle.kts
+++ b/demo/scheme/build.gradle.kts
@@ -8,12 +8,8 @@ plugins {
 val ktorVersion: String by rootProject.extra
 
 kotlin {
-    jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "11"
-        }
-        withJava()
-    }
+    jvm()
+    jvmToolchain(11)
     sourceSets {
         val jvmMain by getting {
             dependencies {
diff --git a/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/scheme/SchemeView.kt b/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/scheme/SchemeView.kt
index e05582f..f482df8 100644
--- a/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/scheme/SchemeView.kt
+++ b/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/scheme/SchemeView.kt
@@ -25,7 +25,7 @@ public fun SchemeView(
     state: XYViewScope,
     features: FeatureGroup<XY>,
     modifier: Modifier = Modifier.fillMaxSize(),
-) = key(state, features) {
+): Unit = key(state, features) {
     with(state) {
         //Can't do that inside canvas
         val painterCache: Map<PainterFeature<XY>, Painter> =
diff --git a/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/svg/SvgDrawScope.kt b/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/svg/SvgDrawScope.kt
index e221fa6..024a4ea 100644
--- a/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/svg/SvgDrawScope.kt
+++ b/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/svg/SvgDrawScope.kt
@@ -18,7 +18,7 @@ import java.awt.Color as AWTColor
 public class SvgDrawScope(
     private val graphics: SVGGraphics2D,
     size: Size,
-    val defaultStrokeWidth: Float = 1f,
+    private val defaultStrokeWidth: Float = 1f,
 ) : DrawScope {
 
     override val layoutDirection: LayoutDirection
@@ -459,7 +459,7 @@ public class SvgDrawScope(
         }
     }
 
-    fun drawText(
+    public fun drawText(
         text: String,
         x: Float,
         y: Float,
diff --git a/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/svg/exportToSvg.kt b/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/svg/exportToSvg.kt
index 0dfb04e..0424bbf 100644
--- a/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/svg/exportToSvg.kt
+++ b/maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/svg/exportToSvg.kt
@@ -18,18 +18,18 @@ import java.awt.Font.PLAIN
 import kotlin.math.abs
 
 
-class FeatureStateSnapshot<T : Any>(
-    val features: Map<String, Feature<T>>,
-    val painterCache: Map<PainterFeature<T>, Painter>,
+public class FeatureStateSnapshot<T : Any>(
+    public val features: Map<String, Feature<T>>,
+    internal val painterCache: Map<PainterFeature<T>, Painter>,
 )
 
 @Composable
-fun <T : Any> FeatureGroup<T>.snapshot(): FeatureStateSnapshot<T> = FeatureStateSnapshot(
+public fun <T : Any> FeatureGroup<T>.snapshot(): FeatureStateSnapshot<T> = FeatureStateSnapshot(
     featureMap,
     features.filterIsInstance<PainterFeature<T>>().associateWith { it.getPainter() }
 )
 
-fun FeatureStateSnapshot<XY>.generateSvg(
+public fun FeatureStateSnapshot<XY>.generateSvg(
     viewPoint: ViewPoint<XY>,
     width: Double,
     height: Double,
@@ -174,7 +174,7 @@ fun FeatureStateSnapshot<XY>.generateSvg(
     return svgGraphics2D.getSVGElement(id)
 }
 
-fun FeatureStateSnapshot<XY>.exportToSvg(
+public fun FeatureStateSnapshot<XY>.exportToSvg(
     viewPoint: ViewPoint<XY>,
     width: Double,
     height: Double,
diff --git a/trajectory-kt/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt b/trajectory-kt/src/commonMain/kotlin/space/kscience/trajectory/DubinsPath.kt
similarity index 99%
rename from trajectory-kt/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
rename to trajectory-kt/src/commonMain/kotlin/space/kscience/trajectory/DubinsPath.kt
index a1563b2..086c841 100644
--- a/trajectory-kt/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPath.kt
+++ b/trajectory-kt/src/commonMain/kotlin/space/kscience/trajectory/DubinsPath.kt
@@ -3,11 +3,11 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.trajectory
+package space.kscience.trajectory
 
 import space.kscience.kmath.geometry.*
 import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
-import space.kscience.kmath.trajectory.Trajectory2D.*
+import space.kscience.trajectory.Trajectory2D.*
 import kotlin.math.acos
 
 internal fun DubinsPose2D.getLeftCircle(radius: Double): Circle2D = getTangentCircles(radius).first
diff --git a/trajectory-kt/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt b/trajectory-kt/src/commonMain/kotlin/space/kscience/trajectory/DubinsPose2D.kt
similarity index 96%
rename from trajectory-kt/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
rename to trajectory-kt/src/commonMain/kotlin/space/kscience/trajectory/DubinsPose2D.kt
index 078e158..36e4412 100644
--- a/trajectory-kt/src/commonMain/kotlin/space/kscience/kmath/trajectory/DubinsPose2D.kt
+++ b/trajectory-kt/src/commonMain/kotlin/space/kscience/trajectory/DubinsPose2D.kt
@@ -4,7 +4,7 @@
  */
 @file:UseSerializers(Euclidean2DSpace.VectorSerializer::class)
 
-package space.kscience.kmath.trajectory
+package space.kscience.trajectory
 
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialName
diff --git a/trajectory-kt/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt b/trajectory-kt/src/commonMain/kotlin/space/kscience/trajectory/Obstacle.kt
similarity index 99%
rename from trajectory-kt/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
rename to trajectory-kt/src/commonMain/kotlin/space/kscience/trajectory/Obstacle.kt
index ee2a679..e769a2f 100644
--- a/trajectory-kt/src/commonMain/kotlin/space/kscience/kmath/trajectory/Obstacle.kt
+++ b/trajectory-kt/src/commonMain/kotlin/space/kscience/trajectory/Obstacle.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.trajectory
+package space.kscience.trajectory
 
 import space.kscience.kmath.geometry.*
 import space.kscience.kmath.geometry.Euclidean2DSpace.distanceTo
diff --git a/trajectory-kt/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt b/trajectory-kt/src/commonMain/kotlin/space/kscience/trajectory/Trajectory2D.kt
similarity index 99%
rename from trajectory-kt/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
rename to trajectory-kt/src/commonMain/kotlin/space/kscience/trajectory/Trajectory2D.kt
index 36d997f..5eb84a6 100644
--- a/trajectory-kt/src/commonMain/kotlin/space/kscience/kmath/trajectory/Trajectory2D.kt
+++ b/trajectory-kt/src/commonMain/kotlin/space/kscience/trajectory/Trajectory2D.kt
@@ -4,7 +4,7 @@
  */
 @file:UseSerializers(Euclidean2DSpace.VectorSerializer::class)
 
-package space.kscience.kmath.trajectory
+package space.kscience.trajectory
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTests.kt b/trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/DubinsTests.kt
similarity index 98%
rename from trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTests.kt
rename to trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/DubinsTests.kt
index 80f7173..3402bf5 100644
--- a/trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/DubinsTests.kt
+++ b/trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/DubinsTests.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.trajectory
+package space.kscience.trajectory
 
 import space.kscience.kmath.geometry.Euclidean2DSpace
 import space.kscience.kmath.geometry.equalsFloat
diff --git a/trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/ObstacleTest.kt b/trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/ObstacleTest.kt
similarity index 98%
rename from trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/ObstacleTest.kt
rename to trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/ObstacleTest.kt
index cd57c00..6186c18 100644
--- a/trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/ObstacleTest.kt
+++ b/trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/ObstacleTest.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.trajectory
+package space.kscience.trajectory
 
 import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.Euclidean2DSpace.vector
diff --git a/trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt b/trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/TangentTest.kt
similarity index 97%
rename from trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
rename to trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/TangentTest.kt
index 2b2d86f..e5831b0 100644
--- a/trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/TangentTest.kt
+++ b/trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/TangentTest.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.trajectory
+package space.kscience.trajectory
 
 import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.Euclidean2DSpace
diff --git a/trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt b/trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/math.kt
similarity index 95%
rename from trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt
rename to trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/math.kt
index 8b8ccf9..f86a0e1 100644
--- a/trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/math.kt
+++ b/trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/math.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.trajectory
+package space.kscience.trajectory
 
 import space.kscience.kmath.geometry.Euclidean2DSpace
 import space.kscience.kmath.geometry.equalsFloat
diff --git a/trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt b/trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/segments/ArcTests.kt
similarity index 84%
rename from trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
rename to trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/segments/ArcTests.kt
index b3825b9..ff4aef9 100644
--- a/trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/ArcTests.kt
+++ b/trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/segments/ArcTests.kt
@@ -3,14 +3,14 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.trajectory.segments
+package space.kscience.trajectory.segments
 
 import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.Euclidean2DSpace
 import space.kscience.kmath.geometry.circumference
 import space.kscience.kmath.geometry.degrees
-import space.kscience.kmath.trajectory.CircleTrajectory2D
-import space.kscience.kmath.trajectory.Trajectory2D
+import space.kscience.trajectory.CircleTrajectory2D
+import space.kscience.trajectory.Trajectory2D
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt b/trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/segments/CircleTests.kt
similarity index 93%
rename from trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
rename to trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/segments/CircleTests.kt
index c3fca06..67fffb9 100644
--- a/trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/CircleTests.kt
+++ b/trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/segments/CircleTests.kt
@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.trajectory.segments
+package space.kscience.trajectory.segments
 
 import space.kscience.kmath.geometry.Circle2D
 import space.kscience.kmath.geometry.Euclidean2DSpace
diff --git a/trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt b/trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/segments/LineTests.kt
similarity index 91%
rename from trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
rename to trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/segments/LineTests.kt
index 54deb21..58de772 100644
--- a/trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/trajectory/segments/LineTests.kt
+++ b/trajectory-kt/src/commonTest/kotlin/space/kscience/trajectory/segments/LineTests.kt
@@ -3,11 +3,11 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package space.kscience.kmath.trajectory.segments
+package space.kscience.trajectory.segments
 
 import space.kscience.kmath.geometry.Euclidean2DSpace
 import space.kscience.kmath.geometry.degrees
-import space.kscience.kmath.trajectory.StraightTrajectory2D
+import space.kscience.trajectory.StraightTrajectory2D
 import kotlin.math.pow
 import kotlin.math.sqrt
 import kotlin.test.Test