diff --git a/demo/proximity-based-communication-and-event-propagators.html b/demo/proximity-based-communication-and-event-propagators.html
index 24e20a3..e9ed830 100644
--- a/demo/proximity-based-communication-and-event-propagators.html
+++ b/demo/proximity-based-communication-and-event-propagators.html
@@ -91,17 +91,11 @@
 
     <script type="module">
       import '../src/standalone/folk-shape.ts';
-      import { FolkMap } from '../src/folk-map.ts';
-      import { FolkWeather } from '../src/folk-weather.ts';
+      import { FolkMap } from '../src/standalone/folk-map.ts';
+      import { FolkWeather } from '../src/standalone/folk-weather.ts';
       import { GeoWiki } from './src/geo-wiki.ts';
-      import { FolkCluster, FolkProximity } from '../src/folk-proximity.ts';
-      import { FolkEventPropagator } from '../src/folk-event-propagator.ts';
-
-      FolkMap.define();
-      FolkCluster.define();
-      FolkProximity.define();
-      FolkWeather.define();
-      FolkEventPropagator.define();
+      import { FolkCluster } from '../src/standalone/folk-proximity.ts';
+      import '../src/standalone/folk-event-propagator.ts';
 
       FolkCluster.registerElement({
         constructor: FolkMap,
diff --git a/demo/proximity-based-communication.html b/demo/proximity-based-communication.html
index d0c92ca..7d8f988 100644
--- a/demo/proximity-based-communication.html
+++ b/demo/proximity-based-communication.html
@@ -77,15 +77,10 @@
 
     <script type="module">
       import '../src/standalone/folk-shape.ts';
-      import { FolkMap } from '../src/folk-map.ts';
-      import { FolkWeather } from '../src/folk-weather.ts';
+      import { FolkMap } from '../src/standalone/folk-map.ts';
+      import { FolkWeather } from '../src/standalone/folk-weather.ts';
       import { GeoWiki } from './src/geo-wiki.ts';
-      import { FolkCluster, FolkProximity } from '../src/folk-proximity.ts';
-
-      FolkMap.define();
-      FolkCluster.define();
-      FolkProximity.define();
-      FolkWeather.define();
+      import { FolkCluster } from '../src/standalone/folk-proximity.ts';
 
       FolkCluster.registerElement({
         constructor: FolkMap,
diff --git a/src/standalone/folk-arrow.ts b/src/standalone/folk-arrow.ts
index 7f6f932..9cb279c 100644
--- a/src/standalone/folk-arrow.ts
+++ b/src/standalone/folk-arrow.ts
@@ -1,3 +1,5 @@
 import { FolkArrow } from '../folk-arrow';
 
 FolkArrow.define();
+
+export { FolkArrow };
diff --git a/src/standalone/folk-distance-field.ts b/src/standalone/folk-distance-field.ts
index 85a6f18..c23e3c2 100644
--- a/src/standalone/folk-distance-field.ts
+++ b/src/standalone/folk-distance-field.ts
@@ -1,3 +1,5 @@
 import { FolkDistanceField } from '../folk-distance-field';
 
 FolkDistanceField.define();
+
+export { FolkDistanceField };
diff --git a/src/standalone/folk-event-propagator.ts b/src/standalone/folk-event-propagator.ts
index c1c130d..de31b56 100644
--- a/src/standalone/folk-event-propagator.ts
+++ b/src/standalone/folk-event-propagator.ts
@@ -1,3 +1,5 @@
 import { FolkEventPropagator } from '../folk-event-propagator';
 
 FolkEventPropagator.define();
+
+export { FolkEventPropagator };
diff --git a/src/standalone/folk-hull.ts b/src/standalone/folk-hull.ts
index 65120e7..3ec7a06 100644
--- a/src/standalone/folk-hull.ts
+++ b/src/standalone/folk-hull.ts
@@ -1,3 +1,5 @@
 import { FolkHull } from '../folk-hull';
 
 FolkHull.define();
+
+export { FolkHull };
diff --git a/src/standalone/folk-ink.ts b/src/standalone/folk-ink.ts
index 31e6f91..1524d2f 100644
--- a/src/standalone/folk-ink.ts
+++ b/src/standalone/folk-ink.ts
@@ -1,3 +1,5 @@
 import { FolkInk } from '../folk-ink';
 
 FolkInk.define();
+
+export { FolkInk };
diff --git a/src/standalone/folk-llm.ts b/src/standalone/folk-llm.ts
index fb530b0..09ad510 100644
--- a/src/standalone/folk-llm.ts
+++ b/src/standalone/folk-llm.ts
@@ -1,3 +1,5 @@
 import { FolkLLM } from '../folk-llm';
 
 FolkLLM.define();
+
+export { FolkLLM };
diff --git a/src/standalone/folk-map.ts b/src/standalone/folk-map.ts
index e06d9a9..ca52188 100644
--- a/src/standalone/folk-map.ts
+++ b/src/standalone/folk-map.ts
@@ -1,3 +1,5 @@
 import { FolkMap } from '../folk-map';
 
 FolkMap.define();
+
+export { FolkMap };
diff --git a/src/standalone/folk-metronome.ts b/src/standalone/folk-metronome.ts
index bc29bc4..4960174 100644
--- a/src/standalone/folk-metronome.ts
+++ b/src/standalone/folk-metronome.ts
@@ -1,3 +1,5 @@
 import { FolkMetronome } from '../folk-metronome';
 
 FolkMetronome.define();
+
+export { FolkMetronome };
diff --git a/src/standalone/folk-proximity.ts b/src/standalone/folk-proximity.ts
index 4f8f45e..676a280 100644
--- a/src/standalone/folk-proximity.ts
+++ b/src/standalone/folk-proximity.ts
@@ -1,3 +1,5 @@
-import { FolkProximity } from '../folk-proximity';
+import { FolkProximity, FolkCluster } from '../folk-proximity';
 
 FolkProximity.define();
+
+export { FolkProximity, FolkCluster };
diff --git a/src/standalone/folk-rope.ts b/src/standalone/folk-rope.ts
index c9f3558..7d0298e 100644
--- a/src/standalone/folk-rope.ts
+++ b/src/standalone/folk-rope.ts
@@ -1,3 +1,5 @@
 import { FolkRope } from '../folk-rope';
 
 FolkRope.define();
+
+export { FolkRope };
diff --git a/src/standalone/folk-shape.ts b/src/standalone/folk-shape.ts
index 053782f..019a53b 100644
--- a/src/standalone/folk-shape.ts
+++ b/src/standalone/folk-shape.ts
@@ -1,3 +1,5 @@
 import { FolkShape } from '../folk-shape';
 
 FolkShape.define();
+
+export { FolkShape };
diff --git a/src/standalone/folk-space.ts b/src/standalone/folk-space.ts
index 8385cf1..51caa04 100644
--- a/src/standalone/folk-space.ts
+++ b/src/standalone/folk-space.ts
@@ -1,3 +1,5 @@
 import { FolkSpace } from '../folk-space';
 
 FolkSpace.define();
+
+export { FolkSpace };
diff --git a/src/standalone/folk-spreadsheet.ts b/src/standalone/folk-spreadsheet.ts
index 5db8030..3547d8e 100644
--- a/src/standalone/folk-spreadsheet.ts
+++ b/src/standalone/folk-spreadsheet.ts
@@ -1,3 +1,5 @@
-import { FolkSpreadsheet } from '../folk-spreadsheet';
+import { FolkSpreadsheet, FolkSpreadSheetCell, FolkSpreadsheetHeader } from '../folk-spreadsheet';
 
 FolkSpreadsheet.define();
+
+export { FolkSpreadsheet, FolkSpreadSheetCell, FolkSpreadsheetHeader };
diff --git a/src/standalone/folk-timer.ts b/src/standalone/folk-timer.ts
index eb84946..19c5b31 100644
--- a/src/standalone/folk-timer.ts
+++ b/src/standalone/folk-timer.ts
@@ -1,3 +1,5 @@
 import { FolkTimer } from '../folk-timer';
 
 FolkTimer.define();
+
+export { FolkTimer };
diff --git a/src/standalone/folk-toolbar.ts b/src/standalone/folk-toolbar.ts
index 7c82a9d..65efce5 100644
--- a/src/standalone/folk-toolbar.ts
+++ b/src/standalone/folk-toolbar.ts
@@ -2,3 +2,5 @@ import './folk-event-propagator';
 import { FolkToolbar } from '../folk-toolbar';
 
 FolkToolbar.define();
+
+export { FolkToolbar };
diff --git a/src/standalone/folk-weather.ts b/src/standalone/folk-weather.ts
index c2d0ecc..67593bf 100644
--- a/src/standalone/folk-weather.ts
+++ b/src/standalone/folk-weather.ts
@@ -1,3 +1,5 @@
 import { FolkWeather } from '../folk-weather';
 
 FolkWeather.define();
+
+export { FolkWeather };
diff --git a/src/standalone/folk-xanadu.ts b/src/standalone/folk-xanadu.ts
index 14521ee..aedd4b4 100644
--- a/src/standalone/folk-xanadu.ts
+++ b/src/standalone/folk-xanadu.ts
@@ -1,3 +1,5 @@
 import { FolkXanadu } from '../folk-xanadu';
 
 FolkXanadu.define();
+
+export { FolkXanadu };