diff --git a/demo/collision.html b/demo/collision.html
index 005aad5..385439b 100644
--- a/demo/collision.html
+++ b/demo/collision.html
@@ -29,7 +29,7 @@
     <spatial-geometry x="200" y="200" width="50" height="50">Shape with some text</spatial-geometry>
 
     <script type="module">
-      import { SpatialGeometry } from '../src/elements/spatial-geometry.ts';
+      import { SpatialGeometry } from '../src/canvas/spatial-geometry.ts';
 
       SpatialGeometry.register();
       const geometryElements = document.querySelectorAll('spatial-geometry');
diff --git a/demo/maps.html b/demo/maps.html
index 23d719c..1e53e47 100644
--- a/demo/maps.html
+++ b/demo/maps.html
@@ -50,7 +50,7 @@
     </spatial-geometry>
 
     <script type="module">
-      import { SpatialGeometry } from '../src/elements/spatial-geometry.ts';
+      import { SpatialGeometry } from '../src/canvas/spatial-geometry.ts';
       import { LeafletMap } from '../src/maps';
       SpatialGeometry.register();
       LeafletMap.register();
diff --git a/demo/shapes.html b/demo/shapes.html
index 9799ad9..a5bcc82 100644
--- a/demo/shapes.html
+++ b/demo/shapes.html
@@ -32,7 +32,7 @@
     <spatial-geometry x="100" y="100" width="50" height="50">Shape with some text</spatial-geometry>
 
     <script type="module">
-      import { SpatialGeometry } from '../src/elements/spatial-geometry.ts';
+      import { SpatialGeometry } from '../src/canvas/spatial-geometry.ts';
 
       SpatialGeometry.register();
     </script>
diff --git a/src/elements/spatial-canvas.ts b/src/canvas/spatial-canvas.ts
similarity index 100%
rename from src/elements/spatial-canvas.ts
rename to src/canvas/spatial-canvas.ts
diff --git a/src/elements/spatial-geometry.ts b/src/canvas/spatial-geometry.ts
similarity index 100%
rename from src/elements/spatial-geometry.ts
rename to src/canvas/spatial-geometry.ts