diff --git a/all/dotSCAD.scad b/all/dotSCAD.scad
index 8f6ed763..b8291089 100644
--- a/all/dotSCAD.scad
+++ b/all/dotSCAD.scad
@@ -27,15 +27,8 @@ include <in_polyline.scad>;
 include <in_shape.scad>;
 include <line2d.scad>;
 include <line3d.scad>;
-include <m_cumulate.scad>;
-include <m_mirror.scad>;
-include <m_rotation.scad>;
-include <m_scaling.scad>;
-include <m_shearing.scad>;
-include <m_translation.scad>;
 include <midpt_smooth.scad>;
 include <multi_line_text.scad>;
-include <parse_number.scad>;
 include <path_extrude.scad>;
 include <path_scaling_sections.scad>;
 include <paths2sections.scad>;
@@ -65,18 +58,29 @@ include <shape_trapezium.scad>;
 include <shear.scad>;
 include <sphere_spiral.scad>;
 include <sphere_spiral_extrude.scad>;
-include <split_str.scad>;
 include <starburst.scad>;
 include <stereographic_extrude.scad>;
-include <sub_str.scad>;
 include <torus_knot.scad>;
 include <triangulate.scad>;
 include <trim_shape.scad>;
 include <voronoi2d.scad>;
 include <voronoi3d.scad>;
+include <util/parse_number.scad>;
+include <util/split_str.scad>;
+include <util/sub_str.scad>;
+include <util/reverse.scad>;
+include <util/slice.scad>;
+include <matrix/m_cumulate.scad>;
+include <matrix/m_mirror.scad>;
+include <matrix/m_rotation.scad>;
+include <matrix/m_scaling.scad>;
+include <matrix/m_shearing.scad>;
+include <matrix/m_translation.scad>;
 include <turtle/turtle2d.scad>;
 include <turtle/turtle3d.scad>;
 include <pixel/px_line.scad>;
 include <pixel/px_polyline.scad>;
 include <pixel/px_circle.scad>;
-include <pixel/px_cylinder.scad>;
\ No newline at end of file
+include <pixel/px_cylinder.scad>;
+include <pixel/px_sphere.scad>;
+include <pixel/px_polygon.scad>;
\ No newline at end of file