diff --git a/examples/css/base.css b/examples/base.css
similarity index 100%
rename from examples/css/base.css
rename to examples/base.css
diff --git a/examples/generic_editor.html b/examples/generic_editor.html
deleted file mode 100644
index 510b01bc..00000000
--- a/examples/generic_editor.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!doctype html>
-
-<html lang="en">
-  <head>
-    <title>Generic editor - OpenChemLib JS examples</title>
-    <link rel="stylesheet" href="css/base.css" />
-    <link rel="stylesheet" href="css/generic_editor.css" />
-  </head>
-  <body>
-    <h1>Generic editor</h1>
-    <div id="editor-area"></div>
-    <div id="events-area"></div>
-    <script type="module" src="generic_editor.ts"></script>
-  </body>
-</html>
diff --git a/examples/generic_editor.ts b/examples/generic_editor.ts
deleted file mode 100644
index b758fa1c..00000000
--- a/examples/generic_editor.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import OCL from '../distesm/full.pretty';
-
-const editorArea = document.getElementById('editor-area') as HTMLElement;
-const eventsArea = document.getElementById('events-area') as HTMLElement;
-
-const editor = new OCL.CanvasEditor(editorArea);
-
-const molecule = OCL.Molecule.fromSmiles('COCO');
-editor.setMolecule(molecule);
-
-editor.setOnChangeListener((event) => {
-  console.log('change', event);
-  eventsArea.innerText = `Type: ${event.type}; User event: ${event.isUserEvent}`;
-});
diff --git a/examples/generic_editor_poc.html b/examples/generic_editor/demo.html
similarity index 85%
rename from examples/generic_editor_poc.html
rename to examples/generic_editor/demo.html
index 40b1676b..6df46f1b 100644
--- a/examples/generic_editor_poc.html
+++ b/examples/generic_editor/demo.html
@@ -3,7 +3,9 @@
 <html lang="en">
   <head>
     <title>Generic editor - PoC</title>
-    <script type="module" src="generic_editor_poc.ts"></script>
+    <link rel="stylesheet" href="../base.css" />
+    <link rel="stylesheet" href="demo/demo.css" />
+    <script type="module" src="demo/demo.ts"></script>
   </head>
   <body style="font-family: sans-serif">
     <div
diff --git a/examples/css/generic_editor.css b/examples/generic_editor/demo/demo.css
similarity index 100%
rename from examples/css/generic_editor.css
rename to examples/generic_editor/demo/demo.css
diff --git a/examples/generic_editor_poc.ts b/examples/generic_editor/demo/demo.ts
similarity index 99%
rename from examples/generic_editor_poc.ts
rename to examples/generic_editor/demo/demo.ts
index c098bccf..182df257 100644
--- a/examples/generic_editor_poc.ts
+++ b/examples/generic_editor/demo/demo.ts
@@ -1,4 +1,4 @@
-import OCL from '../distesm/full.pretty';
+import OCL from '../../../distesm/full.pretty';
 
 const { CanvasEditor, Molecule, Reaction } = OCL;
 
diff --git a/examples/index.html b/examples/index.html
index 42332487..a62a0e85 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -3,13 +3,17 @@
 <html lang="en">
   <head>
     <title>OpenChemLib JS examples</title>
-    <link rel="stylesheet" href="css/base.css" />
+    <link rel="stylesheet" href="base.css" />
   </head>
   <body>
     <h1>OpenChemLib JS examples</h1>
-    <ul>
-      <li><a href="generic_editor.html">Generic editor</a></li>
-      <li><a href="generic_editor_poc.html">Generic editor (PoC)</a></li>
-    </ul>
+    <section>
+      <h2>Generic editor</h2>
+      <ul>
+        <li>
+          <a href="generic_editor/demo.html">Demo</a>
+        </li>
+      </ul>
+    </section>
   </body>
 </html>
