diff --git a/orx-shapes/README.md b/orx-shapes/README.md
index 4d9c71d7f..361379964 100644
--- a/orx-shapes/README.md
+++ b/orx-shapes/README.md
@@ -49,150 +49,150 @@ Collection of 2D shape generators and modifiers.
 
 ![adjust-DemoAdjustContourContinue01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/adjust-DemoAdjustContourContinue01Kt.png)
 
-### DemoAdjustContour08
-[source code](src/jvmDemo/kotlin/DemoAdjustContour08.kt)
+### alphashape/DemoAlphaShape
+[source code](src/jvmDemo/kotlin/alphashape/DemoAlphaShape.kt)
 
-![DemoAdjustContour08Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoAdjustContour08Kt.png)
+![alphashape-DemoAlphaShapeKt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/alphashape-DemoAlphaShapeKt.png)
 
-### DemoAlphaShape
-[source code](src/jvmDemo/kotlin/DemoAlphaShape.kt)
+### arrangement/DemoArrangement01
+[source code](src/jvmDemo/kotlin/arrangement/DemoArrangement01.kt)
 
-![DemoAlphaShapeKt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoAlphaShapeKt.png)
+![arrangement-DemoArrangement01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/arrangement-DemoArrangement01Kt.png)
 
-### DemoArc01
-[source code](src/jvmDemo/kotlin/DemoArc01.kt)
+### arrangement/DemoArrangement02
+[source code](src/jvmDemo/kotlin/arrangement/DemoArrangement02.kt)
 
-![DemoArc01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoArc01Kt.png)
+![arrangement-DemoArrangement02Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/arrangement-DemoArrangement02Kt.png)
 
-### DemoArrangement01
-[source code](src/jvmDemo/kotlin/DemoArrangement01.kt)
+### bezierpatch/DemoBezierPatch01
+[source code](src/jvmDemo/kotlin/bezierpatch/DemoBezierPatch01.kt)
 
-![DemoArrangement01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoArrangement01Kt.png)
+![bezierpatch-DemoBezierPatch01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/bezierpatch-DemoBezierPatch01Kt.png)
 
-### DemoArrangement02
-[source code](src/jvmDemo/kotlin/DemoArrangement02.kt)
+### bezierpatch/DemoBezierPatch02
+[source code](src/jvmDemo/kotlin/bezierpatch/DemoBezierPatch02.kt)
 
-![DemoArrangement02Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoArrangement02Kt.png)
+![bezierpatch-DemoBezierPatch02Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/bezierpatch-DemoBezierPatch02Kt.png)
 
-### DemoBezierPatch01
-[source code](src/jvmDemo/kotlin/DemoBezierPatch01.kt)
+### bezierpatch/DemoBezierPatch03
+[source code](src/jvmDemo/kotlin/bezierpatch/DemoBezierPatch03.kt)
 
-![DemoBezierPatch01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoBezierPatch01Kt.png)
+![bezierpatch-DemoBezierPatch03Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/bezierpatch-DemoBezierPatch03Kt.png)
 
-### DemoBezierPatch02
-[source code](src/jvmDemo/kotlin/DemoBezierPatch02.kt)
+### bezierpatch/DemoBezierPatch04
+[source code](src/jvmDemo/kotlin/bezierpatch/DemoBezierPatch04.kt)
 
-![DemoBezierPatch02Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoBezierPatch02Kt.png)
+![bezierpatch-DemoBezierPatch04Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/bezierpatch-DemoBezierPatch04Kt.png)
 
-### DemoBezierPatch03
-[source code](src/jvmDemo/kotlin/DemoBezierPatch03.kt)
+### bezierpatch/DemoBezierPatch05
+[source code](src/jvmDemo/kotlin/bezierpatch/DemoBezierPatch05.kt)
 
-![DemoBezierPatch03Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoBezierPatch03Kt.png)
+![bezierpatch-DemoBezierPatch05Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/bezierpatch-DemoBezierPatch05Kt.png)
 
-### DemoBezierPatch04
-[source code](src/jvmDemo/kotlin/DemoBezierPatch04.kt)
+### bezierpatch/DemoBezierPatchDrawer01
+[source code](src/jvmDemo/kotlin/bezierpatch/DemoBezierPatchDrawer01.kt)
 
-![DemoBezierPatch04Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoBezierPatch04Kt.png)
+![bezierpatch-DemoBezierPatchDrawer01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/bezierpatch-DemoBezierPatchDrawer01Kt.png)
 
-### DemoBezierPatch05
-[source code](src/jvmDemo/kotlin/DemoBezierPatch05.kt)
+### bezierpatch/DemoBezierPatchDrawer02
+[source code](src/jvmDemo/kotlin/bezierpatch/DemoBezierPatchDrawer02.kt)
 
-![DemoBezierPatch05Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoBezierPatch05Kt.png)
+![bezierpatch-DemoBezierPatchDrawer02Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/bezierpatch-DemoBezierPatchDrawer02Kt.png)
 
-### DemoBezierPatchDrawer01
-[source code](src/jvmDemo/kotlin/DemoBezierPatchDrawer01.kt)
+### bezierpatch/DemoBezierPatchDrawer03
+[source code](src/jvmDemo/kotlin/bezierpatch/DemoBezierPatchDrawer03.kt)
 
-![DemoBezierPatchDrawer01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoBezierPatchDrawer01Kt.png)
+![bezierpatch-DemoBezierPatchDrawer03Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/bezierpatch-DemoBezierPatchDrawer03Kt.png)
 
-### DemoBezierPatchDrawer02
-[source code](src/jvmDemo/kotlin/DemoBezierPatchDrawer02.kt)
+### bezierpatch/DemoBezierPatches01
+[source code](src/jvmDemo/kotlin/bezierpatch/DemoBezierPatches01.kt)
 
-![DemoBezierPatchDrawer02Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoBezierPatchDrawer02Kt.png)
+![bezierpatch-DemoBezierPatches01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/bezierpatch-DemoBezierPatches01Kt.png)
 
-### DemoBezierPatchDrawer03
-[source code](src/jvmDemo/kotlin/DemoBezierPatchDrawer03.kt)
+### DemoAdjustContour08
+[source code](src/jvmDemo/kotlin/DemoAdjustContour08.kt)
 
-![DemoBezierPatchDrawer03Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoBezierPatchDrawer03Kt.png)
+![DemoAdjustContour08Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoAdjustContour08Kt.png)
 
-### DemoBezierPatches01
-[source code](src/jvmDemo/kotlin/DemoBezierPatches01.kt)
+### hobbycurve/DemoHobbyCurve01
+[source code](src/jvmDemo/kotlin/hobbycurve/DemoHobbyCurve01.kt)
 
-![DemoBezierPatches01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoBezierPatches01Kt.png)
+![hobbycurve-DemoHobbyCurve01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/hobbycurve-DemoHobbyCurve01Kt.png)
 
-### DemoHobbyCurve01
-[source code](src/jvmDemo/kotlin/DemoHobbyCurve01.kt)
+### hobbycurve/DemoHobbyCurve02
+[source code](src/jvmDemo/kotlin/hobbycurve/DemoHobbyCurve02.kt)
 
-![DemoHobbyCurve01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoHobbyCurve01Kt.png)
+![hobbycurve-DemoHobbyCurve02Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/hobbycurve-DemoHobbyCurve02Kt.png)
 
-### DemoHobbyCurve02
-[source code](src/jvmDemo/kotlin/DemoHobbyCurve02.kt)
+### primitives/DemoArc01
+[source code](src/jvmDemo/kotlin/primitives/DemoArc01.kt)
 
-![DemoHobbyCurve02Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoHobbyCurve02Kt.png)
+![primitives-DemoArc01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/primitives-DemoArc01Kt.png)
 
-### DemoNet01
-[source code](src/jvmDemo/kotlin/DemoNet01.kt)
+### primitives/DemoNet01
+[source code](src/jvmDemo/kotlin/primitives/DemoNet01.kt)
 
-![DemoNet01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoNet01Kt.png)
+![primitives-DemoNet01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/primitives-DemoNet01Kt.png)
 
-### DemoPulley01
-[source code](src/jvmDemo/kotlin/DemoPulley01.kt)
+### primitives/DemoPulley01
+[source code](src/jvmDemo/kotlin/primitives/DemoPulley01.kt)
 
-![DemoPulley01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoPulley01Kt.png)
+![primitives-DemoPulley01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/primitives-DemoPulley01Kt.png)
 
-### DemoRectangleGrid01
-[source code](src/jvmDemo/kotlin/DemoRectangleGrid01.kt)
+### primitives/DemoRectangleGrid01
+[source code](src/jvmDemo/kotlin/primitives/DemoRectangleGrid01.kt)
 
-![DemoRectangleGrid01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoRectangleGrid01Kt.png)
+![primitives-DemoRectangleGrid01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/primitives-DemoRectangleGrid01Kt.png)
 
-### DemoRectangleGrid02
-[source code](src/jvmDemo/kotlin/DemoRectangleGrid02.kt)
+### primitives/DemoRectangleGrid02
+[source code](src/jvmDemo/kotlin/primitives/DemoRectangleGrid02.kt)
 
-![DemoRectangleGrid02Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoRectangleGrid02Kt.png)
+![primitives-DemoRectangleGrid02Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/primitives-DemoRectangleGrid02Kt.png)
 
-### DemoRectifiedContour01
-[source code](src/jvmDemo/kotlin/DemoRectifiedContour01.kt)
+### primitives/DemoRegularPolygon
+[source code](src/jvmDemo/kotlin/primitives/DemoRegularPolygon.kt)
 
-![DemoRectifiedContour01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoRectifiedContour01Kt.png)
+![primitives-DemoRegularPolygonKt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/primitives-DemoRegularPolygonKt.png)
 
-### DemoRectifiedContour02
-[source code](src/jvmDemo/kotlin/DemoRectifiedContour02.kt)
+### primitives/DemoRegularStar01
+[source code](src/jvmDemo/kotlin/primitives/DemoRegularStar01.kt)
 
-![DemoRectifiedContour02Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoRectifiedContour02Kt.png)
+![primitives-DemoRegularStar01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/primitives-DemoRegularStar01Kt.png)
 
-### DemoRegularPolygon
-[source code](src/jvmDemo/kotlin/DemoRegularPolygon.kt)
+### primitives/DemoRegularStar02
+[source code](src/jvmDemo/kotlin/primitives/DemoRegularStar02.kt)
 
-![DemoRegularPolygonKt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoRegularPolygonKt.png)
+![primitives-DemoRegularStar02Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/primitives-DemoRegularStar02Kt.png)
 
-### DemoRegularStar01
-[source code](src/jvmDemo/kotlin/DemoRegularStar01.kt)
+### primitives/DemoRoundedRectangle
+[source code](src/jvmDemo/kotlin/primitives/DemoRoundedRectangle.kt)
 
-![DemoRegularStar01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoRegularStar01Kt.png)
+![primitives-DemoRoundedRectangleKt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/primitives-DemoRoundedRectangleKt.png)
 
-### DemoRegularStar02
-[source code](src/jvmDemo/kotlin/DemoRegularStar02.kt)
+### primitives/DemoSplit01
+[source code](src/jvmDemo/kotlin/primitives/DemoSplit01.kt)
 
-![DemoRegularStar02Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoRegularStar02Kt.png)
+![primitives-DemoSplit01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/primitives-DemoSplit01Kt.png)
 
-### DemoRoundedRectangle
-[source code](src/jvmDemo/kotlin/DemoRoundedRectangle.kt)
+### primitives/DemoTear01
+[source code](src/jvmDemo/kotlin/primitives/DemoTear01.kt)
 
-![DemoRoundedRectangleKt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoRoundedRectangleKt.png)
+![primitives-DemoTear01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/primitives-DemoTear01Kt.png)
 
-### DemoSplit01
-[source code](src/jvmDemo/kotlin/DemoSplit01.kt)
+### rectify/DemoRectifiedContour01
+[source code](src/jvmDemo/kotlin/rectify/DemoRectifiedContour01.kt)
 
-![DemoSplit01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoSplit01Kt.png)
+![rectify-DemoRectifiedContour01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/rectify-DemoRectifiedContour01Kt.png)
 
-### DemoTear01
-[source code](src/jvmDemo/kotlin/DemoTear01.kt)
+### rectify/DemoRectifiedContour02
+[source code](src/jvmDemo/kotlin/rectify/DemoRectifiedContour02.kt)
 
-![DemoTear01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoTear01Kt.png)
+![rectify-DemoRectifiedContour02Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/rectify-DemoRectifiedContour02Kt.png)
 
-### DemoText01
-[source code](src/jvmDemo/kotlin/DemoText01.kt)
+### text/DemoText01
+[source code](src/jvmDemo/kotlin/text/DemoText01.kt)
 
-![DemoText01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/DemoText01Kt.png)
+![text-DemoText01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-shapes/images/text-DemoText01Kt.png)
 
 ### tunni/DemoTunniAdjuster01
 [source code](src/jvmDemo/kotlin/tunni/DemoTunniAdjuster01.kt)