diff --git a/tools/singleton-manager/demo/fail/node_modules/overlays/index.js b/tools/singleton-manager/demo/fail/node_modules/overlays/index.js
deleted file mode 100644
index 6e7a29fdd..000000000
--- a/tools/singleton-manager/demo/fail/node_modules/overlays/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-export class OverlaysManager {
-  name = 'OverlayManager 1.x';
-
-  blockBody = false;
-
-  constructor() {
-    this._setupBlocker();
-  }
-
-  _setupBlocker() {
-    const blocker = document.createElement('div');
-    blocker.setAttribute('style', 'border: 2px solid #8d0606; margin: 10px; padding: 10px; width: 140px; text-align: center;');
-    blocker.innerText = `Blocker for ${this.name}`;
-
-    document.body.appendChild(blocker);
-
-    this.blocker = blocker;
-  }
-
-  block() {
-    this.blockBody = true;
-    this.blocker.style.backgroundColor = '#ff6161';
-  }
-
-  unBlock() {
-    this.blockBody = false;
-    this.blocker.style.backgroundColor = 'transparent';
-  }
-}
diff --git a/tools/singleton-manager/demo/fail/node_modules/overlays/instance.js b/tools/singleton-manager/demo/fail/node_modules/overlays/instance.js
deleted file mode 100644
index f73ca3b47..000000000
--- a/tools/singleton-manager/demo/fail/node_modules/overlays/instance.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { OverlaysManager } from './index.js';
-
-export const overlays = new OverlaysManager();
diff --git a/tools/singleton-manager/demo/fail/node_modules/overlays/package.json b/tools/singleton-manager/demo/fail/node_modules/overlays/package.json
deleted file mode 100644
index 0cbd136ec..000000000
--- a/tools/singleton-manager/demo/fail/node_modules/overlays/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "overlays",
-  "version": "1.0.0"
-}
diff --git a/tools/singleton-manager/demo/fail/node_modules/page-a/package.json b/tools/singleton-manager/demo/fail/node_modules/page-a/package.json
deleted file mode 100644
index 2c77c4dee..000000000
--- a/tools/singleton-manager/demo/fail/node_modules/page-a/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "page-a",
-  "version": "1.0.0",
-  "dependencies": {
-    "overlays": "^1.0.0"
-  }
-}
diff --git a/tools/singleton-manager/demo/fail/node_modules/page-a/page-a.js b/tools/singleton-manager/demo/fail/node_modules/page-a/page-a.js
deleted file mode 100644
index 21fd3dde5..000000000
--- a/tools/singleton-manager/demo/fail/node_modules/page-a/page-a.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { LitElement, html, css } from 'lit-element';
-import { overlays } from 'overlays/instance.js';
-
-export class PageA extends LitElement {
-  static get styles() {
-    return css`
-      :host {
-        display: block;
-        padding: 10px;
-        border: 2px solid #ccc;
-      }
-    `;
-  }
-
-  render() {
-    return html`
-      <h3>I am page A</h3>
-      <p>Overlays Status:</p>
-      <p>Name: ${overlays.name}</p>
-      <p>Blocked: ${overlays.blockBody}</p>
-      <button @click=${() => {
-        overlays.block(); this.requestUpdate();
-      }}>block</button>
-      <button @click=${() => {
-        overlays.unBlock(); this.requestUpdate();
-      }}>un-block</button>
-      <button @click=${() => {
-        this.requestUpdate();
-      }}>refresh</button>
-    `;
-  }
-}
-
-customElements.define('page-a', PageA);
diff --git a/tools/singleton-manager/demo/fail/node_modules/page-b/node_modules/overlays/index.js b/tools/singleton-manager/demo/fail/node_modules/page-b/node_modules/overlays/index.js
deleted file mode 100644
index 5d97b1522..000000000
--- a/tools/singleton-manager/demo/fail/node_modules/page-b/node_modules/overlays/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-export class OverlaysManager {
-  name = 'OverlayManager 2.x';
-
-  _blockBody = false;
-
-  constructor() {
-    this._setupBlocker();
-  }
-
-  _setupBlocker() {
-    const blocker = document.createElement('div');
-    blocker.setAttribute('style', 'border: 2px solid #8d0606; margin: 10px; padding: 10px; width: 140px; text-align: center;');
-    blocker.innerText = `Blocker for ${this.name}`;
-
-    document.body.appendChild(blocker);
-
-    this.blocker = blocker;
-  }
-
-  blockBody() {
-    this._blockBody = true;
-    this.blocker.style.backgroundColor = '#ff6161';
-  }
-
-  unBlockBody() {
-    this._blockBody = false;
-    this.blocker.style.backgroundColor = 'transparent';
-  }
-}
diff --git a/tools/singleton-manager/demo/fail/node_modules/page-b/node_modules/overlays/instance.js b/tools/singleton-manager/demo/fail/node_modules/page-b/node_modules/overlays/instance.js
deleted file mode 100644
index f73ca3b47..000000000
--- a/tools/singleton-manager/demo/fail/node_modules/page-b/node_modules/overlays/instance.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { OverlaysManager } from './index.js';
-
-export const overlays = new OverlaysManager();
diff --git a/tools/singleton-manager/demo/fail/node_modules/page-b/node_modules/overlays/package.json b/tools/singleton-manager/demo/fail/node_modules/page-b/node_modules/overlays/package.json
deleted file mode 100644
index 5e83291f8..000000000
--- a/tools/singleton-manager/demo/fail/node_modules/page-b/node_modules/overlays/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "overlays",
-  "version": "2.0.0"
-}
diff --git a/tools/singleton-manager/demo/fail/node_modules/page-b/package.json b/tools/singleton-manager/demo/fail/node_modules/page-b/package.json
deleted file mode 100644
index cd0fdbef4..000000000
--- a/tools/singleton-manager/demo/fail/node_modules/page-b/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "page-b",
-  "version": "1.0.0",
-  "dependencies": {
-    "overlays": "^2.0.0"
-  }
-}
diff --git a/tools/singleton-manager/demo/fail/node_modules/page-b/page-b.js b/tools/singleton-manager/demo/fail/node_modules/page-b/page-b.js
deleted file mode 100644
index 94a90c0c0..000000000
--- a/tools/singleton-manager/demo/fail/node_modules/page-b/page-b.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { LitElement, html, css } from 'lit-element';
-import { overlays } from 'overlays/instance.js';
-
-export class PageB extends LitElement {
-  static get styles() {
-    return css`
-      :host {
-        display: block;
-        padding: 10px;
-        border: 2px solid #ccc;
-      }
-    `;
-  }
-
-  render() {
-    return html`
-      <h3>I am page B</h3>
-      <p>Overlays Status:</p>
-      <p>Name: ${overlays.name}</p>
-      <p>Blocked: ${overlays._blockBody}</p>
-      <button @click=${() => {
-        overlays.blockBody(); this.requestUpdate();
-      }}>block</button>
-      <button @click=${() => {
-        overlays.unBlockBody(); this.requestUpdate();
-      }}>un-block</button>
-      <button @click=${() => {
-        this.requestUpdate();
-      }}>refresh</button>
-    `;
-  }
-}
-
-customElements.define('page-b', PageB);
diff --git a/tools/singleton-manager/demo/singleton-complex/node_modules/overlays/index.js b/tools/singleton-manager/demo/singleton-complex/node_modules/overlays/index.js
deleted file mode 100644
index 6e7a29fdd..000000000
--- a/tools/singleton-manager/demo/singleton-complex/node_modules/overlays/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-export class OverlaysManager {
-  name = 'OverlayManager 1.x';
-
-  blockBody = false;
-
-  constructor() {
-    this._setupBlocker();
-  }
-
-  _setupBlocker() {
-    const blocker = document.createElement('div');
-    blocker.setAttribute('style', 'border: 2px solid #8d0606; margin: 10px; padding: 10px; width: 140px; text-align: center;');
-    blocker.innerText = `Blocker for ${this.name}`;
-
-    document.body.appendChild(blocker);
-
-    this.blocker = blocker;
-  }
-
-  block() {
-    this.blockBody = true;
-    this.blocker.style.backgroundColor = '#ff6161';
-  }
-
-  unBlock() {
-    this.blockBody = false;
-    this.blocker.style.backgroundColor = 'transparent';
-  }
-}
diff --git a/tools/singleton-manager/demo/singleton-complex/node_modules/overlays/instance.js b/tools/singleton-manager/demo/singleton-complex/node_modules/overlays/instance.js
deleted file mode 100644
index 7d3333a5f..000000000
--- a/tools/singleton-manager/demo/singleton-complex/node_modules/overlays/instance.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import { OverlaysManager } from './index.js';
-import { singletonManager } from '../../../../index.js';
-
-export const overlays = singletonManager.get('overlays::overlays::1.x') || new OverlaysManager();
diff --git a/tools/singleton-manager/demo/singleton-complex/node_modules/overlays/package.json b/tools/singleton-manager/demo/singleton-complex/node_modules/overlays/package.json
deleted file mode 100644
index 0cbd136ec..000000000
--- a/tools/singleton-manager/demo/singleton-complex/node_modules/overlays/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "overlays",
-  "version": "1.0.0"
-}
diff --git a/tools/singleton-manager/demo/singleton-complex/node_modules/page-a/package.json b/tools/singleton-manager/demo/singleton-complex/node_modules/page-a/package.json
deleted file mode 100644
index 2c77c4dee..000000000
--- a/tools/singleton-manager/demo/singleton-complex/node_modules/page-a/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "page-a",
-  "version": "1.0.0",
-  "dependencies": {
-    "overlays": "^1.0.0"
-  }
-}
diff --git a/tools/singleton-manager/demo/singleton-complex/node_modules/page-a/page-a.js b/tools/singleton-manager/demo/singleton-complex/node_modules/page-a/page-a.js
deleted file mode 100644
index 714486f76..000000000
--- a/tools/singleton-manager/demo/singleton-complex/node_modules/page-a/page-a.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import { LitElement, html, css } from 'lit-element';
-import { overlays } from 'overlays/instance.js';
-
-export class PageA extends LitElement {
-  static get styles() {
-    return css`
-      :host {
-        display: block;
-        padding: 10px;
-        border: 2px solid #ccc;
-      }
-    `;
-  }
-
-  render() {
-    return html`
-      <h3>I am page A</h3>
-      <p>Overlays Status:</p>
-      <p>Name: ${overlays.name}</p>
-      <p>Blocked: ${overlays.blockBody}</p>
-      <button @click=${() => {
-        overlays.block(); this.requestUpdate();
-      }}>block</button>
-      <button @click=${() => {
-        overlays.unBlock(); this.requestUpdate();
-      }}>un-block</button>
-      <button @click=${() => {
-        this.requestUpdate();
-      }}>refresh</button>
-    `;
-  }
-}
-
-
-customElements.define('page-a', PageA);
diff --git a/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/node_modules/overlays/index.js b/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/node_modules/overlays/index.js
deleted file mode 100644
index 5d97b1522..000000000
--- a/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/node_modules/overlays/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-export class OverlaysManager {
-  name = 'OverlayManager 2.x';
-
-  _blockBody = false;
-
-  constructor() {
-    this._setupBlocker();
-  }
-
-  _setupBlocker() {
-    const blocker = document.createElement('div');
-    blocker.setAttribute('style', 'border: 2px solid #8d0606; margin: 10px; padding: 10px; width: 140px; text-align: center;');
-    blocker.innerText = `Blocker for ${this.name}`;
-
-    document.body.appendChild(blocker);
-
-    this.blocker = blocker;
-  }
-
-  blockBody() {
-    this._blockBody = true;
-    this.blocker.style.backgroundColor = '#ff6161';
-  }
-
-  unBlockBody() {
-    this._blockBody = false;
-    this.blocker.style.backgroundColor = 'transparent';
-  }
-}
diff --git a/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/node_modules/overlays/instance.js b/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/node_modules/overlays/instance.js
deleted file mode 100644
index 50b46d1a1..000000000
--- a/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/node_modules/overlays/instance.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import { OverlaysManager } from './index.js';
-import { singletonManager } from '../../../../../../index.js';
-
-export const overlays = singletonManager.get('overlays::overlays::2.x') || new OverlaysManager();
diff --git a/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/node_modules/overlays/package.json b/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/node_modules/overlays/package.json
deleted file mode 100644
index 5e83291f8..000000000
--- a/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/node_modules/overlays/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "overlays",
-  "version": "2.0.0"
-}
diff --git a/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/package.json b/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/package.json
deleted file mode 100644
index cd0fdbef4..000000000
--- a/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "page-b",
-  "version": "1.0.0",
-  "dependencies": {
-    "overlays": "^2.0.0"
-  }
-}
diff --git a/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/page-b.js b/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/page-b.js
deleted file mode 100644
index bc65fde08..000000000
--- a/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/page-b.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import { LitElement, html, css } from 'lit-element';
-import { overlays } from 'overlays/instance.js';
-
-export class PageB extends LitElement {
-  getInstance(sym, fallback) {
-    const ev = new CustomEvent('request-instance', {
-      detail: { key: sym },
-      bubbles: true,
-      cancelable: true,
-      composed: true,
-    });
-    this.dispatchEvent(ev);
-    return ev.detail.instance || fallback();
-  }
-
-  connectedCallback() {
-    super.connectedCallback();
-  }
-
-  static get styles() {
-    return css`
-      :host {
-        display: block;
-        padding: 10px;
-        border: 2px solid #ccc;
-      }
-    `;
-  }
-
-  render() {
-    return html`
-      <h3>I am page B</h3>
-      <p>Overlays Status:</p>
-      <p>Name: ${overlays.name}</p>
-      <p>Blocked: ${overlays._blockBody}</p>
-      <button @click=${() => {
-        overlays.blockBody(); this.requestUpdate();
-      }}>block</button>
-      <button @click=${() => {
-        overlays.unBlockBody(); this.requestUpdate();
-      }}>un-block</button>
-      <button @click=${() => {
-        this.requestUpdate();
-      }}>refresh</button>
-    `;
-  }
-}
-
-customElements.define('page-b', PageB);
diff --git a/tools/singleton-manager/demo/singleton/node_modules/overlays/index.js b/tools/singleton-manager/demo/singleton/node_modules/overlays/index.js
deleted file mode 100644
index 6e7a29fdd..000000000
--- a/tools/singleton-manager/demo/singleton/node_modules/overlays/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-export class OverlaysManager {
-  name = 'OverlayManager 1.x';
-
-  blockBody = false;
-
-  constructor() {
-    this._setupBlocker();
-  }
-
-  _setupBlocker() {
-    const blocker = document.createElement('div');
-    blocker.setAttribute('style', 'border: 2px solid #8d0606; margin: 10px; padding: 10px; width: 140px; text-align: center;');
-    blocker.innerText = `Blocker for ${this.name}`;
-
-    document.body.appendChild(blocker);
-
-    this.blocker = blocker;
-  }
-
-  block() {
-    this.blockBody = true;
-    this.blocker.style.backgroundColor = '#ff6161';
-  }
-
-  unBlock() {
-    this.blockBody = false;
-    this.blocker.style.backgroundColor = 'transparent';
-  }
-}
diff --git a/tools/singleton-manager/demo/singleton/node_modules/overlays/instance.js b/tools/singleton-manager/demo/singleton/node_modules/overlays/instance.js
deleted file mode 100644
index 7d3333a5f..000000000
--- a/tools/singleton-manager/demo/singleton/node_modules/overlays/instance.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import { OverlaysManager } from './index.js';
-import { singletonManager } from '../../../../index.js';
-
-export const overlays = singletonManager.get('overlays::overlays::1.x') || new OverlaysManager();
diff --git a/tools/singleton-manager/demo/singleton/node_modules/overlays/package.json b/tools/singleton-manager/demo/singleton/node_modules/overlays/package.json
deleted file mode 100644
index 0cbd136ec..000000000
--- a/tools/singleton-manager/demo/singleton/node_modules/overlays/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "overlays",
-  "version": "1.0.0"
-}
diff --git a/tools/singleton-manager/demo/singleton/node_modules/page-a/package.json b/tools/singleton-manager/demo/singleton/node_modules/page-a/package.json
deleted file mode 100644
index 2c77c4dee..000000000
--- a/tools/singleton-manager/demo/singleton/node_modules/page-a/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "page-a",
-  "version": "1.0.0",
-  "dependencies": {
-    "overlays": "^1.0.0"
-  }
-}
diff --git a/tools/singleton-manager/demo/singleton/node_modules/page-a/page-a.js b/tools/singleton-manager/demo/singleton/node_modules/page-a/page-a.js
deleted file mode 100644
index 21fd3dde5..000000000
--- a/tools/singleton-manager/demo/singleton/node_modules/page-a/page-a.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { LitElement, html, css } from 'lit-element';
-import { overlays } from 'overlays/instance.js';
-
-export class PageA extends LitElement {
-  static get styles() {
-    return css`
-      :host {
-        display: block;
-        padding: 10px;
-        border: 2px solid #ccc;
-      }
-    `;
-  }
-
-  render() {
-    return html`
-      <h3>I am page A</h3>
-      <p>Overlays Status:</p>
-      <p>Name: ${overlays.name}</p>
-      <p>Blocked: ${overlays.blockBody}</p>
-      <button @click=${() => {
-        overlays.block(); this.requestUpdate();
-      }}>block</button>
-      <button @click=${() => {
-        overlays.unBlock(); this.requestUpdate();
-      }}>un-block</button>
-      <button @click=${() => {
-        this.requestUpdate();
-      }}>refresh</button>
-    `;
-  }
-}
-
-customElements.define('page-a', PageA);
diff --git a/tools/singleton-manager/demo/singleton/node_modules/page-b/node_modules/overlays/index.js b/tools/singleton-manager/demo/singleton/node_modules/page-b/node_modules/overlays/index.js
deleted file mode 100644
index 5df4fe7d3..000000000
--- a/tools/singleton-manager/demo/singleton/node_modules/page-b/node_modules/overlays/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-export class OverlaysManager {
-  name = 'OverlayManager 2.x';
-
-  blockBody = false;
-
-  constructor() {
-    this._setupBlocker();
-  }
-
-  _setupBlocker() {
-    const blocker = document.createElement('div');
-    blocker.setAttribute('style', 'border: 2px solid #8d0606; margin: 10px; padding: 10px; width: 140px; text-align: center;');
-    blocker.innerText = `Blocker for ${this.name}`;
-
-    document.body.appendChild(blocker);
-
-    this.blocker = blocker;
-  }
-
-  blockingBody() {
-    this.blockBody = true;
-    this.blocker.style.backgroundColor = '#ff6161';
-  }
-
-  unBlockingBody() {
-    this.blockBody = false;
-    this.blocker.style.backgroundColor = 'transparent';
-  }
-}
diff --git a/tools/singleton-manager/demo/singleton/node_modules/page-b/node_modules/overlays/instance.js b/tools/singleton-manager/demo/singleton/node_modules/page-b/node_modules/overlays/instance.js
deleted file mode 100644
index 50b46d1a1..000000000
--- a/tools/singleton-manager/demo/singleton/node_modules/page-b/node_modules/overlays/instance.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import { OverlaysManager } from './index.js';
-import { singletonManager } from '../../../../../../index.js';
-
-export const overlays = singletonManager.get('overlays::overlays::2.x') || new OverlaysManager();
diff --git a/tools/singleton-manager/demo/singleton/node_modules/page-b/node_modules/overlays/package.json b/tools/singleton-manager/demo/singleton/node_modules/page-b/node_modules/overlays/package.json
deleted file mode 100644
index 5e83291f8..000000000
--- a/tools/singleton-manager/demo/singleton/node_modules/page-b/node_modules/overlays/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "overlays",
-  "version": "2.0.0"
-}
diff --git a/tools/singleton-manager/demo/singleton/node_modules/page-b/package.json b/tools/singleton-manager/demo/singleton/node_modules/page-b/package.json
deleted file mode 100644
index cd0fdbef4..000000000
--- a/tools/singleton-manager/demo/singleton/node_modules/page-b/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "page-b",
-  "version": "1.0.0",
-  "dependencies": {
-    "overlays": "^2.0.0"
-  }
-}
diff --git a/tools/singleton-manager/demo/singleton/node_modules/page-b/page-b.js b/tools/singleton-manager/demo/singleton/node_modules/page-b/page-b.js
deleted file mode 100644
index 41fa08ad4..000000000
--- a/tools/singleton-manager/demo/singleton/node_modules/page-b/page-b.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { LitElement, html, css } from 'lit-element';
-import { overlays } from 'overlays/instance.js';
-
-export class PageB extends LitElement {
-  static get styles() {
-    return css`
-      :host {
-        display: block;
-        padding: 10px;
-        border: 2px solid #ccc;
-      }
-    `;
-  }
-
-  render() {
-    return html`
-      <h3>I am page B</h3>
-      <p>Overlays Status:</p>
-      <p>Name: ${overlays.name}</p>
-      <p>Blocked: ${overlays.blockBody}</p>
-      <button @click=${() => {
-        overlays.blockingBody(); this.requestUpdate();
-      }}>block</button>
-      <button @click=${() => {
-        overlays.unBlockingBody(); this.requestUpdate();
-      }}>un-block</button>
-      <button @click=${() => {
-        this.requestUpdate();
-      }}>refresh</button>
-    `;
-  }
-}
-
-customElements.define('page-b', PageB);