diff --git a/index.html b/index.html
index d361c2f..00cdd51 100644
--- a/index.html
+++ b/index.html
@@ -7,8 +7,9 @@
     <script type="importmap">
       {
         "imports": {
+          "@std/assert/": "https://esm.sh/jsr/@std/assert/",
           "@f-stack/functorial": "./build/packages/functorial/src/reactive.js",
-          "@f-stack/reflow": "./packages/reflow/src/html.js"
+          "@f-stack/reflow": "./build/packages/reflow/src/mod.js"
         }
       }
     </script>
diff --git a/playground/components/Article.ts b/playground/components/Article.ts
index a263308..949fb1c 100644
--- a/playground/components/Article.ts
+++ b/playground/components/Article.ts
@@ -1,5 +1,5 @@
 import { html } from "@f-stack/reflow";
-import { Counter } from "../pages/reactivity/1-state-and-derived/Counter.ts";
+import { Counter } from "./Counter.ts";
 
 export const Article = (props: { title: string }) => {
   return html`
diff --git a/playground/pages/reactivity/1-state-and-derived/Counter.ts b/playground/components/Counter.ts
similarity index 100%
rename from playground/pages/reactivity/1-state-and-derived/Counter.ts
rename to playground/components/Counter.ts
diff --git a/playground/components/Hi.ts b/playground/components/Hi.ts
deleted file mode 100644
index 8bbde53..0000000
--- a/playground/components/Hi.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { html } from "@f-stack/reflow";
-
-export const Hi = () => {
-  return html`
-    <div>Hi</div>
-  `;
-};
diff --git a/playground/pages/reactivity/2-cleanup/Cleanup.ts b/playground/pages/reactivity/Cleanup.ts
similarity index 100%
rename from playground/pages/reactivity/2-cleanup/Cleanup.ts
rename to playground/pages/reactivity/Cleanup.ts
diff --git a/playground/pages/reactivity/objects/ObjectPage.ts b/playground/pages/reactivity/ObjectPage.ts
similarity index 100%
rename from playground/pages/reactivity/objects/ObjectPage.ts
rename to playground/pages/reactivity/ObjectPage.ts
diff --git a/playground/pages/reactivity/3-shared-state/SharedState.ts b/playground/pages/reactivity/SharedState.ts
similarity index 54%
rename from playground/pages/reactivity/3-shared-state/SharedState.ts
rename to playground/pages/reactivity/SharedState.ts
index ca8a7c5..d6bb57a 100644
--- a/playground/pages/reactivity/3-shared-state/SharedState.ts
+++ b/playground/pages/reactivity/SharedState.ts
@@ -1,14 +1,14 @@
-import { derived, reactive } from "@f-stack/functorial";
+import { reactive } from "@f-stack/functorial";
 import { html, on } from "@f-stack/reflow";
 
-const state = reactive({
-  count: 0,
+const count = reactive({
+  value: 0,
 });
 
 export const Counter = () => {
   return html`
-    <button ${on({ click: () => state.count++ })}>
-      Click ${derived(() => state.count)}
+    <button ${on({ click: () => count.value++ })}>
+      Click ${count}
     </button>
   `;
 };
diff --git a/playground/pages/reactivity/writable-derived/WritableDerived.ts b/playground/pages/reactivity/WritableDerived.ts
similarity index 100%
rename from playground/pages/reactivity/writable-derived/WritableDerived.ts
rename to playground/pages/reactivity/WritableDerived.ts
diff --git a/playground/pages/sinks/Attach.ts b/playground/pages/sinks/Attach.ts
index e96f705..412ffb1 100644
--- a/playground/pages/sinks/Attach.ts
+++ b/playground/pages/sinks/Attach.ts
@@ -1,65 +1,48 @@
-import { listen, reactive } from "@f-stack/functorial";
-import { attach, attr, html, on, show } from "@f-stack/reflow";
+import { reactive } from "@f-stack/functorial";
+import { attach, attr, component, html, on, show } from "@f-stack/reflow";
 
 export const AttachPage = () => {
-  const form = reactive({ value: "Bob" });
-  const color = reactive({ value: "#40E0D0" });
-  const display = reactive({ value: true });
+  const state = reactive({ color: "#40E0D0", show: true });
 
   return html`
-    <form>
-      <label>username:
-        <input type="text" ${attach((i: HTMLInputElement) => {
-          i.defaultValue = form.value;
-        })} ${on<HTMLInputElement>({
-          input: function () {
-            form.value = this.value;
-          },
-        })}>
-      </label>
-      <button type="reset">Reset</button>
-    </form>
-
     <div>
       <input type="color" ${attr({
-        get value() {
-          return color.value;
-        },
+        value: state.color,
       })} ${on<HTMLInputElement>({
         input: function () {
-          color.value = this.value;
+          state.color = this.value;
         },
       })}>
-      <button ${on({
-        click: () => {
-          display.value = !display.value;
-        },
-      })}>Show</button>
+      <button ${on({ click: () => state.show = !state.show })}>Toggle</button>
     </div>
 
-    ${show(() => display.value, () =>
-      html`
-        <canvas width="300" height="300" ${attach(
-          (canvas: HTMLCanvasElement) => {
-            const context = canvas.getContext("2d");
+    ${show(
+      () => state.show,
+      component(function () {
+        return html`
+          <canvas width="300" height="300" ${attach(
+            (canvas: HTMLCanvasElement) => {
+              const context = canvas.getContext("2d");
 
-            if (context) {
-              const draw = (color: string) => {
-                context.fillStyle = color;
-                context.fillRect(0, 0, 200, 200);
-              };
+              if (context) {
+                const draw = (color: string) => {
+                  context.fillStyle = color;
+                  context.fillRect(0, 0, 200, 200);
+                };
 
-              draw(color.value);
+                draw(state.color);
 
-              listen(color, (e) => {
-                console.log(e);
-                if (e.type !== "update") return;
-                draw(e.newValue);
-              });
-            }
-          },
-        )}>Enable JS</canvas>
-      `)}
+                this.listen(state, (e) => {
+                  console.log(e);
+                  if (e.type !== "update") return;
+                  draw(e.newValue);
+                });
+              }
+            },
+          )}>Enable JS</canvas>
+        `;
+      }),
+    )}
 
     <style>
     html { scrollbar-gutter: stable; }
diff --git a/playground/pages/sinks/Attr.ts b/playground/pages/sinks/Attr.ts
index 7fd2464..f630ef7 100644
--- a/playground/pages/sinks/Attr.ts
+++ b/playground/pages/sinks/Attr.ts
@@ -11,7 +11,7 @@ export const Attr = () => {
       return disabled.value;
     },
   });
-  const input = reactive({ text: "hello", number: 10 });
+  const user = reactive({ name: "Bob" });
 
   return html`
     <p>
@@ -48,26 +48,18 @@ export const Attr = () => {
         },
       })}>Remove disabled attribute</button>
     </p>
-    <h2>Two-way bindings</h2>
-    <div>
-      <input type="text" ${attr({
-        get value() {
-          return input.text;
-        },
-      })} ${on<HTMLInputElement>({
-        input: function () {
-          input.text = this.value;
-        },
-      })}>
-      <input type="number" ${attr({
-        get value() {
-          return input.number;
-        },
-      })} ${on<HTMLInputElement>({
-        input: function () {
-          input.number = this.valueAsNumber;
-        },
-      })}>
-    </div>
+    <h2>Reset values</h2>
+    <form>
+      <label>username:
+        <input type="text" ${attr({
+          value: user.name,
+        })} ${on<HTMLInputElement>({
+          input: function () {
+            user.name = this.value;
+          },
+        })}>
+      </label>
+      <button type="reset">Reset</button>
+    </form>
   `;
 };
diff --git a/playground/pages/templating/bases/hello.css b/playground/pages/templating/hello.css
similarity index 72%
rename from playground/pages/templating/bases/hello.css
rename to playground/pages/templating/hello.css
index d9dfbc3..7b924f9 100644
--- a/playground/pages/templating/bases/hello.css
+++ b/playground/pages/templating/hello.css
@@ -1,4 +1,4 @@
-@scope ([scope="1"]) to ([scope]) {
+@scope ([scope]) to ([scope]) {
   p {
     color: goldenrod;
     font-family: "Comic Sans MS", cursive;
diff --git a/playground/pages/templating/bases/Hello.ts b/playground/pages/templating/html.ts
similarity index 79%
rename from playground/pages/templating/bases/Hello.ts
rename to playground/pages/templating/html.ts
index 4d14777..3a8ac4f 100644
--- a/playground/pages/templating/bases/Hello.ts
+++ b/playground/pages/templating/html.ts
@@ -1,6 +1,6 @@
 import { attr, html } from "@f-stack/reflow";
 // @ts-ignore works in Chrome
-// import styles from "./hello.css" with { type: "css" };
+import styles from "./hello.css" with { type: "css" };
 
 document.adoptedStyleSheets.push(styles);
 
@@ -11,10 +11,9 @@ const Nested = () => {
 };
 
 /**
- * Showcase simple interpolation
+ * Primitive interpolation
  */
-export const Hello = () => {
-  // Add data
+export const HtmlPage = () => {
   const name = "World";
   const src =
     "https://images.dog.ceo/breeds/terrier-patterdale/dog-1268559_640.jpg";
diff --git a/playground/render.ts b/playground/render.ts
index c5cf654..6dc8d44 100644
--- a/playground/render.ts
+++ b/playground/render.ts
@@ -1,3 +1,3 @@
-import { Counter } from "./pages/reactivity/1-state-and-derived/Counter.ts";
+import { Counter } from "./components/Counter.ts";
 
 document.body.replaceChildren(Counter().fragment);