diff --git a/demo/embeddable-llm-with-propagators.html b/demo/embeddable-llm-with-propagators.html
index 370f191..5d34c6d 100644
--- a/demo/embeddable-llm-with-propagators.html
+++ b/demo/embeddable-llm-with-propagators.html
@@ -108,7 +108,7 @@
     <script type="module">
       import '../src/standalone/folk-shape.ts';
       import '../src/standalone/folk-llm.ts';
-      import '../src/standalone/folk-timer.ts';
+      import './src/folk-timer.ts';
       import '../src/standalone/folk-event-propagator.ts';
     </script>
   </body>
diff --git a/demo/proximity-based-communication-and-event-propagators.html b/demo/proximity-based-communication-and-event-propagators.html
index 028170f..781e82f 100644
--- a/demo/proximity-based-communication-and-event-propagators.html
+++ b/demo/proximity-based-communication-and-event-propagators.html
@@ -90,7 +90,7 @@
     <script type="module">
       import '../src/standalone/folk-shape.ts';
       import { FolkMap } from '../src/standalone/folk-map.ts';
-      import { FolkWeather } from '../src/standalone/folk-weather.ts';
+      import { FolkWeather } from './src/folk-weather.ts';
       import { GeoWiki } from './src/geo-wiki.ts';
       import { FolkCluster } from '../src/standalone/folk-proximity.ts';
       import '../src/standalone/folk-event-propagator.ts';
diff --git a/demo/proximity-based-communication.html b/demo/proximity-based-communication.html
index e098513..dd1d368 100644
--- a/demo/proximity-based-communication.html
+++ b/demo/proximity-based-communication.html
@@ -77,7 +77,7 @@
     <script type="module">
       import '../src/standalone/folk-shape.ts';
       import { FolkMap } from '../src/standalone/folk-map.ts';
-      import { FolkWeather } from '../src/standalone/folk-weather.ts';
+      import { FolkWeather } from './src/folk-weather.ts';
       import { GeoWiki } from './src/geo-wiki.ts';
       import { FolkCluster } from '../src/standalone/folk-proximity.ts';
 
diff --git a/src/folk-timer.ts b/demo/src/folk-timer.ts
similarity index 90%
rename from src/folk-timer.ts
rename to demo/src/folk-timer.ts
index 56c71e1..9f9e2cf 100644
--- a/src/folk-timer.ts
+++ b/demo/src/folk-timer.ts
@@ -1,4 +1,4 @@
-import { FolkElement } from './common/folk-element';
+import { FolkElement } from '../../src/common/folk-element';
 
 declare global {
   interface HTMLElementTagNameMap {
@@ -43,3 +43,5 @@ export class FolkTimer extends FolkElement {
     this.renderRoot.textContent = (time / 1000).toFixed(1);
   };
 }
+
+FolkTimer.define();
diff --git a/src/folk-weather.ts b/demo/src/folk-weather.ts
similarity index 96%
rename from src/folk-weather.ts
rename to demo/src/folk-weather.ts
index b1916f5..ca0eee1 100644
--- a/src/folk-weather.ts
+++ b/demo/src/folk-weather.ts
@@ -1,4 +1,4 @@
-import { html } from './common/tags';
+import { html } from '../../src/common/tags';
 
 interface Weather {
   temperature: string;
@@ -71,3 +71,5 @@ export class FolkWeather extends HTMLElement {
     `);
   }
 }
+
+FolkWeather.define();
diff --git a/src/standalone/folk-timer.ts b/src/standalone/folk-timer.ts
deleted file mode 100644
index 19c5b31..0000000
--- a/src/standalone/folk-timer.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { FolkTimer } from '../folk-timer';
-
-FolkTimer.define();
-
-export { FolkTimer };
diff --git a/src/standalone/folk-weather.ts b/src/standalone/folk-weather.ts
deleted file mode 100644
index 67593bf..0000000
--- a/src/standalone/folk-weather.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { FolkWeather } from '../folk-weather';
-
-FolkWeather.define();
-
-export { FolkWeather };