diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffcd63a7274..44ac9bb66b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,7 +120,7 @@ set_property(TARGET OpenSCAD PROPERTY CXX_STANDARD_REQUIRED ON)
 set_property(TARGET OpenSCAD PROPERTY EXPORT_COMPILE_COMMANDS ON)
 set_property(TARGET OpenSCAD PROPERTY LINKER_LANGUAGE CXX)
 # Verbose link step
-if(("${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "GNU") OR 
+if(("${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "GNU") OR
    ("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang|Clang|GNU"))
   target_link_options(OpenSCAD BEFORE PRIVATE "-v")
 endif()
@@ -211,7 +211,7 @@ find_package(PkgConfig)
 
 add_subdirectory(submodules)
 
-# The submodules will set up mimalloc if needed, and we need to defer any 
+# The submodules will set up mimalloc if needed, and we need to defer any
 # target_link_libraries() calls until after that.
 
 if (MXECROSS)
@@ -732,67 +732,63 @@ endif()
 set(CORE_SOURCES
   src/Feature.cc
   src/FontCache.cc
-  src/handle_dep.cc
   src/LibraryInfo.cc
   src/RenderStatistic.cc
-  src/version.cc
+  src/core/AST.cc
   src/core/Arguments.cc
-  src/core/Builtins.cc
+  src/core/Assignment.cc
   src/core/BuiltinContext.cc
+  src/core/Builtins.cc
+  src/core/CSGNode.cc
+  src/core/CSGTreeEvaluator.cc
   src/core/CgalAdvNode.cc
   src/core/Children.cc
   src/core/ColorNode.cc
   src/core/Context.cc
   src/core/ContextFrame.cc
   src/core/ContextMemoryManager.cc
-  src/core/control.cc
-  src/core/CSGNode.cc
   src/core/CsgOpNode.cc
-  src/core/CSGTreeEvaluator.cc
-  src/core/customizer/Annotation.cc
-  src/core/customizer/CommentParser.cc
+  src/core/DrawingCallback.cc
   src/core/EvaluationSession.cc
   src/core/Expression.cc
-  src/core/builtin_functions.cc
-  src/core/function.cc
+  src/core/FreetypeRenderer.cc
   src/core/FunctionType.cc
+  src/core/GroupModule.cc
   src/core/ImportNode.cc
   src/core/LinearExtrudeNode.cc
   src/core/LocalScope.cc
-  src/core/ScopeContext.cc
-  src/core/module.cc
-  src/core/node.cc
+  src/core/ModuleInstantiation.cc
   src/core/NodeDumper.cc
+  src/core/NodeVisitor.cc
   src/core/OffsetNode.cc
   src/core/Parameters.cc
-  src/core/parsersettings.cc
-  src/core/primitives.cc
-  src/core/progress.cc
   src/core/ProjectionNode.cc
   src/core/RenderNode.cc
   src/core/RenderVariables.cc
-  src/core/DrawingCallback.cc
   src/core/RotateExtrudeNode.cc
+  src/core/ScopeContext.cc
+  src/core/SourceFile.cc
+  src/core/SourceFileCache.cc
+  src/core/StatCache.cc
   src/core/SurfaceNode.cc
   src/core/TextNode.cc
   src/core/TransformNode.cc
+  src/core/Tree.cc
   src/core/UndefType.cc
-  src/core/Value.cc
-  src/core/Assignment.cc
-  src/core/AST.cc
-  src/core/FreetypeRenderer.cc
-  src/core/GroupModule.cc
-  src/core/ModuleInstantiation.cc
-  src/core/NodeVisitor.cc
-  src/core/SourceFile.cc
-  src/core/SourceFileCache.cc
-  src/core/StatCache.cc
   src/core/UserModule.cc
-  src/core/Tree.cc
+  src/core/Value.cc
+  src/core/builtin_functions.cc
+  src/core/control.cc
+  src/core/customizer/Annotation.cc
+  src/core/customizer/CommentParser.cc
   src/core/customizer/ParameterObject.cc
   src/core/customizer/ParameterSet.cc
-  src/ext/lodepng/lodepng.cpp
-  src/ext/polyclipping/clipper.cpp
+  src/core/function.cc
+  src/core/module.cc
+  src/core/node.cc
+  src/core/parsersettings.cc
+  src/core/primitives.cc
+  src/core/progress.cc
   src/ext/libtess2/Source/bucketalloc.c
   src/ext/libtess2/Source/dict.c
   src/ext/libtess2/Source/geom.c
@@ -800,23 +796,26 @@ set(CORE_SOURCES
   src/ext/libtess2/Source/priorityq.c
   src/ext/libtess2/Source/sweep.c
   src/ext/libtess2/Source/tess.c
+  src/ext/lodepng/lodepng.cpp
+  src/ext/polyclipping/clipper.cpp
   src/geometry/ClipperUtils.cc
   src/geometry/Geometry.cc
   src/geometry/GeometryCache.cc
+  src/geometry/GeometryEvaluator.cc
   src/geometry/GeometryUtils.cc
-  src/geometry/Polygon2d.cc
-  src/geometry/linalg.cc
   src/geometry/PolySet.cc
   src/geometry/PolySetBuilder.cc
   src/geometry/PolySetUtils.cc
-  src/geometry/GeometryEvaluator.cc
-  src/geometry/linear_extrude.cc
+  src/geometry/Polygon2d.cc
   src/geometry/boolean_utils.cc
-  src/glview/OffscreenContextFactory.cc
-  src/glview/RenderSettings.cc
+  src/geometry/linalg.cc
+  src/geometry/linear_extrude.cc
   src/glview/Camera.cc
   src/glview/ColorMap.cc
+  src/glview/OffscreenContextFactory.cc
+  src/glview/RenderSettings.cc
   src/glview/preview/CSGTreeNormalizer.cc
+  src/handle_dep.cc
   src/io/DxfData.cc
   src/io/dxfdim.cc
   src/io/export.cc
@@ -824,44 +823,45 @@ set(CORE_SOURCES
   src/io/export_dxf.cc
   src/io/export_obj.cc
   src/io/export_off.cc
-  src/io/export_wrl.cc
+  src/io/export_param.cc
   src/io/export_pdf.cc
   src/io/export_stl.cc
   src/io/export_svg.cc
-  src/io/export_param.cc
+  src/io/export_wrl.cc
   src/io/fileutils.cc
   src/io/import_amf.cc
-  src/io/import_stl.cc
+  src/io/import_json.cc
   src/io/import_obj.cc
   src/io/import_off.cc
+  src/io/import_stl.cc
   src/io/import_svg.cc
-  src/io/import_json.cc
-  src/io/libsvg/circle.cc
-  src/io/libsvg/data.cc
-  src/io/libsvg/ellipse.cc
-  src/io/libsvg/group.cc
-  src/io/libsvg/libsvg.cc
-  src/io/libsvg/line.cc
-  src/io/libsvg/path.cc
-  src/io/libsvg/polygon.cc
-  src/io/libsvg/polyline.cc
-  src/io/libsvg/rect.cc
-  src/io/libsvg/shape.cc
-  src/io/libsvg/svgpage.cc
-  src/io/libsvg/text.cc
-  src/io/libsvg/transformation.cc
-  src/io/libsvg/tspan.cc
-  src/io/libsvg/use.cc
-  src/io/libsvg/util.cc
+  src/libsvg/circle.cc
+  src/libsvg/data.cc
+  src/libsvg/ellipse.cc
+  src/libsvg/group.cc
+  src/libsvg/libsvg.cc
+  src/libsvg/line.cc
+  src/libsvg/path.cc
+  src/libsvg/polygon.cc
+  src/libsvg/polyline.cc
+  src/libsvg/rect.cc
+  src/libsvg/shape.cc
+  src/libsvg/svgpage.cc
+  src/libsvg/text.cc
+  src/libsvg/transformation.cc
+  src/libsvg/tspan.cc
+  src/libsvg/use.cc
+  src/libsvg/util.cc
   src/platform/PlatformUtils.cc
+  src/utils/StackCheck.h
   src/utils/boost-utils.cc
   src/utils/calc.cc
   src/utils/degree_trig.cc
   src/utils/hash.cc
   src/utils/printutils.cc
-  src/utils/StackCheck.h
   src/utils/svg.cc
   src/utils/version_check.h
+  src/version.cc
   ${LIB3MF_SOURCES}
   ${PLATFORM_SOURCES}
   ${FLEX_openscad_lexer_OUTPUTS}
@@ -921,7 +921,7 @@ set(MANIFOLD_CGAL_SOURCES
 if(EXPERIMENTAL AND ENABLE_TBB)
   # Note: currently only Manifold-related code makes use of TBB parallelization
   # ("exact" CGAL numerics are not thread-safe)
-  target_compile_options(OpenSCAD PRIVATE 
+  target_compile_options(OpenSCAD PRIVATE
     -DENABLE_TBB
   )
   find_package(TBB QUIET)
diff --git a/src/io/libsvg/LICENSE b/src/libsvg/LICENSE
similarity index 100%
rename from src/io/libsvg/LICENSE
rename to src/libsvg/LICENSE
diff --git a/src/io/libsvg/circle.cc b/src/libsvg/circle.cc
similarity index 100%
rename from src/io/libsvg/circle.cc
rename to src/libsvg/circle.cc
diff --git a/src/io/libsvg/circle.h b/src/libsvg/circle.h
similarity index 100%
rename from src/io/libsvg/circle.h
rename to src/libsvg/circle.h
diff --git a/src/io/libsvg/data.cc b/src/libsvg/data.cc
similarity index 100%
rename from src/io/libsvg/data.cc
rename to src/libsvg/data.cc
diff --git a/src/io/libsvg/data.h b/src/libsvg/data.h
similarity index 100%
rename from src/io/libsvg/data.h
rename to src/libsvg/data.h
diff --git a/src/io/libsvg/ellipse.cc b/src/libsvg/ellipse.cc
similarity index 100%
rename from src/io/libsvg/ellipse.cc
rename to src/libsvg/ellipse.cc
diff --git a/src/io/libsvg/ellipse.h b/src/libsvg/ellipse.h
similarity index 100%
rename from src/io/libsvg/ellipse.h
rename to src/libsvg/ellipse.h
diff --git a/src/io/libsvg/group.cc b/src/libsvg/group.cc
similarity index 100%
rename from src/io/libsvg/group.cc
rename to src/libsvg/group.cc
diff --git a/src/io/libsvg/group.h b/src/libsvg/group.h
similarity index 100%
rename from src/io/libsvg/group.h
rename to src/libsvg/group.h
diff --git a/src/io/libsvg/libsvg.cc b/src/libsvg/libsvg.cc
similarity index 100%
rename from src/io/libsvg/libsvg.cc
rename to src/libsvg/libsvg.cc
diff --git a/src/io/libsvg/libsvg.h b/src/libsvg/libsvg.h
similarity index 100%
rename from src/io/libsvg/libsvg.h
rename to src/libsvg/libsvg.h
diff --git a/src/io/libsvg/line.cc b/src/libsvg/line.cc
similarity index 100%
rename from src/io/libsvg/line.cc
rename to src/libsvg/line.cc
diff --git a/src/io/libsvg/line.h b/src/libsvg/line.h
similarity index 100%
rename from src/io/libsvg/line.h
rename to src/libsvg/line.h
diff --git a/src/io/libsvg/path.cc b/src/libsvg/path.cc
similarity index 100%
rename from src/io/libsvg/path.cc
rename to src/libsvg/path.cc
diff --git a/src/io/libsvg/path.h b/src/libsvg/path.h
similarity index 100%
rename from src/io/libsvg/path.h
rename to src/libsvg/path.h
diff --git a/src/io/libsvg/polygon.cc b/src/libsvg/polygon.cc
similarity index 100%
rename from src/io/libsvg/polygon.cc
rename to src/libsvg/polygon.cc
diff --git a/src/io/libsvg/polygon.h b/src/libsvg/polygon.h
similarity index 100%
rename from src/io/libsvg/polygon.h
rename to src/libsvg/polygon.h
diff --git a/src/io/libsvg/polyline.cc b/src/libsvg/polyline.cc
similarity index 100%
rename from src/io/libsvg/polyline.cc
rename to src/libsvg/polyline.cc
diff --git a/src/io/libsvg/polyline.h b/src/libsvg/polyline.h
similarity index 100%
rename from src/io/libsvg/polyline.h
rename to src/libsvg/polyline.h
diff --git a/src/io/libsvg/rect.cc b/src/libsvg/rect.cc
similarity index 100%
rename from src/io/libsvg/rect.cc
rename to src/libsvg/rect.cc
diff --git a/src/io/libsvg/rect.h b/src/libsvg/rect.h
similarity index 100%
rename from src/io/libsvg/rect.h
rename to src/libsvg/rect.h
diff --git a/src/io/libsvg/shape.cc b/src/libsvg/shape.cc
similarity index 100%
rename from src/io/libsvg/shape.cc
rename to src/libsvg/shape.cc
diff --git a/src/io/libsvg/shape.h b/src/libsvg/shape.h
similarity index 100%
rename from src/io/libsvg/shape.h
rename to src/libsvg/shape.h
diff --git a/src/io/libsvg/svgpage.cc b/src/libsvg/svgpage.cc
similarity index 100%
rename from src/io/libsvg/svgpage.cc
rename to src/libsvg/svgpage.cc
diff --git a/src/io/libsvg/svgpage.h b/src/libsvg/svgpage.h
similarity index 100%
rename from src/io/libsvg/svgpage.h
rename to src/libsvg/svgpage.h
diff --git a/src/io/libsvg/text.cc b/src/libsvg/text.cc
similarity index 100%
rename from src/io/libsvg/text.cc
rename to src/libsvg/text.cc
diff --git a/src/io/libsvg/text.h b/src/libsvg/text.h
similarity index 100%
rename from src/io/libsvg/text.h
rename to src/libsvg/text.h
diff --git a/src/io/libsvg/transformation.cc b/src/libsvg/transformation.cc
similarity index 100%
rename from src/io/libsvg/transformation.cc
rename to src/libsvg/transformation.cc
diff --git a/src/io/libsvg/transformation.h b/src/libsvg/transformation.h
similarity index 100%
rename from src/io/libsvg/transformation.h
rename to src/libsvg/transformation.h
diff --git a/src/io/libsvg/tspan.cc b/src/libsvg/tspan.cc
similarity index 100%
rename from src/io/libsvg/tspan.cc
rename to src/libsvg/tspan.cc
diff --git a/src/io/libsvg/tspan.h b/src/libsvg/tspan.h
similarity index 100%
rename from src/io/libsvg/tspan.h
rename to src/libsvg/tspan.h
diff --git a/src/io/libsvg/use.cc b/src/libsvg/use.cc
similarity index 100%
rename from src/io/libsvg/use.cc
rename to src/libsvg/use.cc
diff --git a/src/io/libsvg/use.h b/src/libsvg/use.h
similarity index 100%
rename from src/io/libsvg/use.h
rename to src/libsvg/use.h
diff --git a/src/io/libsvg/util.cc b/src/libsvg/util.cc
similarity index 100%
rename from src/io/libsvg/util.cc
rename to src/libsvg/util.cc
diff --git a/src/io/libsvg/util.h b/src/libsvg/util.h
similarity index 100%
rename from src/io/libsvg/util.h
rename to src/libsvg/util.h