diff --git a/.gitignore b/.gitignore
index 6a0b2d872..a74a2124f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,9 @@ yarn-error.log
 *.d.ts
 !packages/**/*/types/**/*
 !packages/**/index.d.ts
+!packages-node/**/*/types/**/*
+!packages-node/**/index.d.ts
+!packages-node/**/types.d.ts
 
 ## temp folders
 /.tmp/
diff --git a/.storybook/main.js b/.storybook/main.js
index 37270ae79..81b7fdd96 100644
--- a/.storybook/main.js
+++ b/.storybook/main.js
@@ -3,16 +3,15 @@ const path = require('path');
 
 module.exports = {
   stories: [
-    '../packages/*/README.md',
-    '../packages/*/docs/*.md',
-    '../packages/*/docs/!(assets)**/*.md',
+    '../{packages,packages-node}/*/README.md',
+    '../{packages,packages-node}/*/docs/*.md',
+    '../{packages,packages-node}/*/docs/!(assets)**/*.md',
+    '../packages/helpers/*/README.md',
     '../docs/README.md',
     '../docs/**/*.md',
     '../README.md',
     '../demo/README.md',
     '../demo/docs/*.md',
-    '../packages/helpers/README.md',
-    '../packages/helpers/*/README.md',
   ],
   addons: [
     // order of tabs in addons panel
diff --git a/bundlesize/all.js b/bundlesize/all.js
index 617d494d5..c95fa9709 100644
--- a/bundlesize/all.js
+++ b/bundlesize/all.js
@@ -1,7 +1,10 @@
+import '../packages/accordion/index.js';
 import '../packages/ajax/index.js';
 import '../packages/button/index.js';
 import '../packages/calendar/index.js';
 import '../packages/checkbox-group/index.js';
+import '../packages/collapsible/index.js';
+import '../packages/combobox/index.js';
 import '../packages/core/index.js';
 import '../packages/dialog/index.js';
 import '../packages/fieldset/index.js';
@@ -13,8 +16,13 @@ import '../packages/input-amount/index.js';
 import '../packages/input-date/index.js';
 import '../packages/input-email/index.js';
 import '../packages/input-iban/index.js';
+import '../packages/input-range/index.js';
+import '../packages/input-stepper/index.js';
+import '../packages/listbox/index.js';
 import '../packages/localize/index.js';
 import '../packages/overlays/index.js';
+import '../packages/pagination/index.js';
+import '../packages/progress-indicator/index.js';
 import '../packages/radio-group/index.js';
 import '../packages/select/index.js';
 import '../packages/select-rich/index.js';
diff --git a/package.json b/package.json
index aa6e798d8..c8abe75be 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,8 @@
   "name": "@lion/root",
   "license": "MIT",
   "workspaces": [
-    "packages/*"
+    "packages/*",
+    "packages-node/*"
   ],
   "scripts": {
     "build:docs": "wca analyze \"packages/tabs/**/*.js\"",
diff --git a/packages/babel-plugin-extend-docs/CHANGELOG.md b/packages-node/babel-plugin-extend-docs/CHANGELOG.md
similarity index 100%
rename from packages/babel-plugin-extend-docs/CHANGELOG.md
rename to packages-node/babel-plugin-extend-docs/CHANGELOG.md
diff --git a/packages/babel-plugin-extend-docs/README.md b/packages-node/babel-plugin-extend-docs/README.md
similarity index 97%
rename from packages/babel-plugin-extend-docs/README.md
rename to packages-node/babel-plugin-extend-docs/README.md
index d44315876..e53a3bafb 100644
--- a/packages/babel-plugin-extend-docs/README.md
+++ b/packages-node/babel-plugin-extend-docs/README.md
@@ -184,8 +184,8 @@ customElements.define('my-app', MyApp);
 
 ## Full Demo & Api Example
 
-You can run the example locally via `npm run start` or look at its [source code](https://github.com/ing-bank/lion/tree/master/packages/babel-plugin-extend-docs/demo/).
-_Note we are configuring babel via the [server.config.js](https://github.com/ing-bank/lion/tree/master/packages/babel-plugin-extend-docs/demo/server.config.js)_
+You can run the example locally via `npm run start` or look at its [source code](https://github.com/ing-bank/lion/tree/master/packages-node/babel-plugin-extend-docs/demo/).
+_Note we are configuring babel via the [server.config.js](https://github.com/ing-bank/lion/tree/master/packages-node/babel-plugin-extend-docs/demo/server.config.js)_
 
 👉 _babel.config.js_
 
diff --git a/packages/babel-plugin-extend-docs/demo/index.html b/packages-node/babel-plugin-extend-docs/demo/index.html
similarity index 100%
rename from packages/babel-plugin-extend-docs/demo/index.html
rename to packages-node/babel-plugin-extend-docs/demo/index.html
diff --git a/packages/babel-plugin-extend-docs/demo/my-app.demo.js b/packages-node/babel-plugin-extend-docs/demo/my-app.demo.js
similarity index 100%
rename from packages/babel-plugin-extend-docs/demo/my-app.demo.js
rename to packages-node/babel-plugin-extend-docs/demo/my-app.demo.js
diff --git a/packages/babel-plugin-extend-docs/demo/my-counter.js b/packages-node/babel-plugin-extend-docs/demo/my-counter.js
similarity index 100%
rename from packages/babel-plugin-extend-docs/demo/my-counter.js
rename to packages-node/babel-plugin-extend-docs/demo/my-counter.js
diff --git a/packages/babel-plugin-extend-docs/demo/my-extension/MyExtension.js b/packages-node/babel-plugin-extend-docs/demo/my-extension/MyExtension.js
similarity index 100%
rename from packages/babel-plugin-extend-docs/demo/my-extension/MyExtension.js
rename to packages-node/babel-plugin-extend-docs/demo/my-extension/MyExtension.js
diff --git a/packages/babel-plugin-extend-docs/demo/my-extension/index.js b/packages-node/babel-plugin-extend-docs/demo/my-extension/index.js
similarity index 100%
rename from packages/babel-plugin-extend-docs/demo/my-extension/index.js
rename to packages-node/babel-plugin-extend-docs/demo/my-extension/index.js
diff --git a/packages/babel-plugin-extend-docs/demo/my-extension/my-extension.js b/packages-node/babel-plugin-extend-docs/demo/my-extension/my-extension.js
similarity index 100%
rename from packages/babel-plugin-extend-docs/demo/my-extension/my-extension.js
rename to packages-node/babel-plugin-extend-docs/demo/my-extension/my-extension.js
diff --git a/packages/babel-plugin-extend-docs/demo/server.config.js b/packages-node/babel-plugin-extend-docs/demo/server.config.js
similarity index 93%
rename from packages/babel-plugin-extend-docs/demo/server.config.js
rename to packages-node/babel-plugin-extend-docs/demo/server.config.js
index 63cfd6766..92e89bb66 100644
--- a/packages/babel-plugin-extend-docs/demo/server.config.js
+++ b/packages-node/babel-plugin-extend-docs/demo/server.config.js
@@ -25,7 +25,7 @@ const extendDocsConfig = {
 module.exports = {
   nodeResolve: true,
   watch: true,
-  open: 'packages/babel-plugin-extend-docs/demo/',
+  open: 'packages-node/babel-plugin-extend-docs/demo/',
   babel: true,
   babelConfig: {
     overrides: [
diff --git a/packages/babel-plugin-extend-docs/demo/server.no-babel.config.js b/packages-node/babel-plugin-extend-docs/demo/server.no-babel.config.js
similarity index 50%
rename from packages/babel-plugin-extend-docs/demo/server.no-babel.config.js
rename to packages-node/babel-plugin-extend-docs/demo/server.no-babel.config.js
index 46f31ac7e..f61281d94 100644
--- a/packages/babel-plugin-extend-docs/demo/server.no-babel.config.js
+++ b/packages-node/babel-plugin-extend-docs/demo/server.no-babel.config.js
@@ -1,5 +1,5 @@
 module.exports = {
   nodeResolve: true,
   watch: true,
-  open: 'packages/babel-plugin-extend-docs/demo/',
+  open: 'packages-node/babel-plugin-extend-docs/demo/',
 };
diff --git a/packages/babel-plugin-extend-docs/demo/src/MyCounter.js b/packages-node/babel-plugin-extend-docs/demo/src/MyCounter.js
similarity index 100%
rename from packages/babel-plugin-extend-docs/demo/src/MyCounter.js
rename to packages-node/babel-plugin-extend-docs/demo/src/MyCounter.js
diff --git a/packages/babel-plugin-extend-docs/index.js b/packages-node/babel-plugin-extend-docs/index.js
similarity index 100%
rename from packages/babel-plugin-extend-docs/index.js
rename to packages-node/babel-plugin-extend-docs/index.js
diff --git a/packages/babel-plugin-extend-docs/package.json b/packages-node/babel-plugin-extend-docs/package.json
similarity index 94%
rename from packages/babel-plugin-extend-docs/package.json
rename to packages-node/babel-plugin-extend-docs/package.json
index 50c718229..60d3866b5 100644
--- a/packages/babel-plugin-extend-docs/package.json
+++ b/packages-node/babel-plugin-extend-docs/package.json
@@ -8,7 +8,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/babel-plugin-extend-docs"
+    "directory": "packages-node/babel-plugin-extend-docs"
   },
   "main": "index.js",
   "files": [
diff --git a/packages/babel-plugin-extend-docs/src/babelPluginExtendDocs.js b/packages-node/babel-plugin-extend-docs/src/babelPluginExtendDocs.js
similarity index 100%
rename from packages/babel-plugin-extend-docs/src/babelPluginExtendDocs.js
rename to packages-node/babel-plugin-extend-docs/src/babelPluginExtendDocs.js
diff --git a/packages/babel-plugin-extend-docs/src/handleImports.js b/packages-node/babel-plugin-extend-docs/src/handleImports.js
similarity index 100%
rename from packages/babel-plugin-extend-docs/src/handleImports.js
rename to packages-node/babel-plugin-extend-docs/src/handleImports.js
diff --git a/packages/babel-plugin-extend-docs/src/helpers.js b/packages-node/babel-plugin-extend-docs/src/helpers.js
similarity index 100%
rename from packages/babel-plugin-extend-docs/src/helpers.js
rename to packages-node/babel-plugin-extend-docs/src/helpers.js
diff --git a/packages/babel-plugin-extend-docs/src/validateOptions.js b/packages-node/babel-plugin-extend-docs/src/validateOptions.js
similarity index 100%
rename from packages/babel-plugin-extend-docs/src/validateOptions.js
rename to packages-node/babel-plugin-extend-docs/src/validateOptions.js
diff --git a/packages/babel-plugin-extend-docs/test-node/babelPluginExtendDocs.test.js b/packages-node/babel-plugin-extend-docs/test-node/babelPluginExtendDocs.test.js
similarity index 100%
rename from packages/babel-plugin-extend-docs/test-node/babelPluginExtendDocs.test.js
rename to packages-node/babel-plugin-extend-docs/test-node/babelPluginExtendDocs.test.js
diff --git a/packages/babel-plugin-extend-docs/test-node/helpers.js b/packages-node/babel-plugin-extend-docs/test-node/helpers.js
similarity index 100%
rename from packages/babel-plugin-extend-docs/test-node/helpers.js
rename to packages-node/babel-plugin-extend-docs/test-node/helpers.js
diff --git a/packages/babel-plugin-extend-docs/test-node/integration.test.js b/packages-node/babel-plugin-extend-docs/test-node/integration.test.js
similarity index 100%
rename from packages/babel-plugin-extend-docs/test-node/integration.test.js
rename to packages-node/babel-plugin-extend-docs/test-node/integration.test.js
diff --git a/packages/babel-plugin-extend-docs/test-node/validateOptions.test.js b/packages-node/babel-plugin-extend-docs/test-node/validateOptions.test.js
similarity index 100%
rename from packages/babel-plugin-extend-docs/test-node/validateOptions.test.js
rename to packages-node/babel-plugin-extend-docs/test-node/validateOptions.test.js
diff --git a/packages/providence-analytics/.gitignore b/packages-node/providence-analytics/.gitignore
similarity index 100%
rename from packages/providence-analytics/.gitignore
rename to packages-node/providence-analytics/.gitignore
diff --git a/packages/providence-analytics/CHANGELOG.md b/packages-node/providence-analytics/CHANGELOG.md
similarity index 100%
rename from packages/providence-analytics/CHANGELOG.md
rename to packages-node/providence-analytics/CHANGELOG.md
diff --git a/packages/providence-analytics/README.md b/packages-node/providence-analytics/README.md
similarity index 100%
rename from packages/providence-analytics/README.md
rename to packages-node/providence-analytics/README.md
diff --git a/packages/providence-analytics/dashboard/src/app/components/p-table/PTable.js b/packages-node/providence-analytics/dashboard/src/app/components/p-table/PTable.js
similarity index 100%
rename from packages/providence-analytics/dashboard/src/app/components/p-table/PTable.js
rename to packages-node/providence-analytics/dashboard/src/app/components/p-table/PTable.js
diff --git a/packages/providence-analytics/dashboard/src/app/p-board.js b/packages-node/providence-analytics/dashboard/src/app/p-board.js
similarity index 100%
rename from packages/providence-analytics/dashboard/src/app/p-board.js
rename to packages-node/providence-analytics/dashboard/src/app/p-board.js
diff --git a/packages/providence-analytics/dashboard/src/app/styles/global.css.js b/packages-node/providence-analytics/dashboard/src/app/styles/global.css.js
similarity index 100%
rename from packages/providence-analytics/dashboard/src/app/styles/global.css.js
rename to packages-node/providence-analytics/dashboard/src/app/styles/global.css.js
diff --git a/packages/providence-analytics/dashboard/src/app/styles/tableDecoration.css.js b/packages-node/providence-analytics/dashboard/src/app/styles/tableDecoration.css.js
similarity index 100%
rename from packages/providence-analytics/dashboard/src/app/styles/tableDecoration.css.js
rename to packages-node/providence-analytics/dashboard/src/app/styles/tableDecoration.css.js
diff --git a/packages/providence-analytics/dashboard/src/app/styles/tooltip.css.js b/packages-node/providence-analytics/dashboard/src/app/styles/tooltip.css.js
similarity index 100%
rename from packages/providence-analytics/dashboard/src/app/styles/tooltip.css.js
rename to packages-node/providence-analytics/dashboard/src/app/styles/tooltip.css.js
diff --git a/packages/providence-analytics/dashboard/src/app/styles/utils.css.js b/packages-node/providence-analytics/dashboard/src/app/styles/utils.css.js
similarity index 100%
rename from packages/providence-analytics/dashboard/src/app/styles/utils.css.js
rename to packages-node/providence-analytics/dashboard/src/app/styles/utils.css.js
diff --git a/packages/providence-analytics/dashboard/src/app/tooltipComponentStyles.js b/packages-node/providence-analytics/dashboard/src/app/tooltipComponentStyles.js
similarity index 100%
rename from packages/providence-analytics/dashboard/src/app/tooltipComponentStyles.js
rename to packages-node/providence-analytics/dashboard/src/app/tooltipComponentStyles.js
diff --git a/packages/providence-analytics/dashboard/src/app/utils/DecorateMixin.js b/packages-node/providence-analytics/dashboard/src/app/utils/DecorateMixin.js
similarity index 100%
rename from packages/providence-analytics/dashboard/src/app/utils/DecorateMixin.js
rename to packages-node/providence-analytics/dashboard/src/app/utils/DecorateMixin.js
diff --git a/packages/providence-analytics/dashboard/src/app/utils/GlobalDecorator.js b/packages-node/providence-analytics/dashboard/src/app/utils/GlobalDecorator.js
similarity index 100%
rename from packages/providence-analytics/dashboard/src/app/utils/GlobalDecorator.js
rename to packages-node/providence-analytics/dashboard/src/app/utils/GlobalDecorator.js
diff --git a/packages/providence-analytics/dashboard/src/app/utils/downloadFile.js b/packages-node/providence-analytics/dashboard/src/app/utils/downloadFile.js
similarity index 100%
rename from packages/providence-analytics/dashboard/src/app/utils/downloadFile.js
rename to packages-node/providence-analytics/dashboard/src/app/utils/downloadFile.js
diff --git a/packages/providence-analytics/dashboard/src/index.html b/packages-node/providence-analytics/dashboard/src/index.html
similarity index 100%
rename from packages/providence-analytics/dashboard/src/index.html
rename to packages-node/providence-analytics/dashboard/src/index.html
diff --git a/packages/providence-analytics/dashboard/src/server.js b/packages-node/providence-analytics/dashboard/src/server.js
similarity index 97%
rename from packages/providence-analytics/dashboard/src/server.js
rename to packages-node/providence-analytics/dashboard/src/server.js
index e3540142f..2543ecf14 100644
--- a/packages/providence-analytics/dashboard/src/server.js
+++ b/packages-node/providence-analytics/dashboard/src/server.js
@@ -64,7 +64,7 @@ function transformToProjectNames(collections) {
 
 const pathFromServerRootToHere = `/${pathLib.relative(process.cwd(), __dirname)}`;
 
-// Needed for dev purposes (we call it from ./packages/providence-analytics/ instead of ./)
+// Needed for dev purposes (we call it from ./packages-node/providence-analytics/ instead of ./)
 // Allows es-dev-server to find the right moduleDirs
 const fromPackageRoot = process.argv.includes('--serve-from-package-root');
 const moduleRoot = fromPackageRoot ? pathLib.resolve(process.cwd(), '../../') : process.cwd();
diff --git a/packages/providence-analytics/dev-assets/analyzer-query.gif b/packages-node/providence-analytics/dev-assets/analyzer-query.gif
similarity index 100%
rename from packages/providence-analytics/dev-assets/analyzer-query.gif
rename to packages-node/providence-analytics/dev-assets/analyzer-query.gif
diff --git a/packages/providence-analytics/dev-assets/feature-query.gif b/packages-node/providence-analytics/dev-assets/feature-query.gif
similarity index 100%
rename from packages/providence-analytics/dev-assets/feature-query.gif
rename to packages-node/providence-analytics/dev-assets/feature-query.gif
diff --git a/packages/providence-analytics/dev-assets/provicli.gif b/packages-node/providence-analytics/dev-assets/provicli.gif
similarity index 100%
rename from packages/providence-analytics/dev-assets/provicli.gif
rename to packages-node/providence-analytics/dev-assets/provicli.gif
diff --git a/packages/providence-analytics/dev-assets/providash.gif b/packages-node/providence-analytics/dev-assets/providash.gif
similarity index 100%
rename from packages/providence-analytics/dev-assets/providash.gif
rename to packages-node/providence-analytics/dev-assets/providash.gif
diff --git a/packages/providence-analytics/docs/Analyzer.md b/packages-node/providence-analytics/docs/Analyzer.md
similarity index 100%
rename from packages/providence-analytics/docs/Analyzer.md
rename to packages-node/providence-analytics/docs/Analyzer.md
diff --git a/packages/providence-analytics/docs/Dashboard.md b/packages-node/providence-analytics/docs/Dashboard.md
similarity index 100%
rename from packages/providence-analytics/docs/Dashboard.md
rename to packages-node/providence-analytics/docs/Dashboard.md
diff --git a/packages/providence-analytics/docs/LocalConfiguration.md b/packages-node/providence-analytics/docs/LocalConfiguration.md
similarity index 100%
rename from packages/providence-analytics/docs/LocalConfiguration.md
rename to packages-node/providence-analytics/docs/LocalConfiguration.md
diff --git a/packages/providence-analytics/docs/QueryResult.md b/packages-node/providence-analytics/docs/QueryResult.md
similarity index 100%
rename from packages/providence-analytics/docs/QueryResult.md
rename to packages-node/providence-analytics/docs/QueryResult.md
diff --git a/packages/providence-analytics/docs/_mermaid.svg.js b/packages-node/providence-analytics/docs/_mermaid.svg.js
similarity index 100%
rename from packages/providence-analytics/docs/_mermaid.svg.js
rename to packages-node/providence-analytics/docs/_mermaid.svg.js
diff --git a/packages/providence-analytics/package.json b/packages-node/providence-analytics/package.json
similarity index 97%
rename from packages/providence-analytics/package.json
rename to packages-node/providence-analytics/package.json
index 15ca6cbae..a94449faf 100644
--- a/packages/providence-analytics/package.json
+++ b/packages-node/providence-analytics/package.json
@@ -8,7 +8,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/providence-analytics"
+    "directory": "packages-node/providence-analytics"
   },
   "main": "./src/program/providence.js",
   "bin": {
diff --git a/packages/providence-analytics/providence.conf.js b/packages-node/providence-analytics/providence.conf.js
similarity index 100%
rename from packages/providence-analytics/providence.conf.js
rename to packages-node/providence-analytics/providence.conf.js
diff --git a/packages/providence-analytics/rm-submodule.sh b/packages-node/providence-analytics/rm-submodule.sh
similarity index 100%
rename from packages/providence-analytics/rm-submodule.sh
rename to packages-node/providence-analytics/rm-submodule.sh
diff --git a/packages/providence-analytics/src/cli/cli-helpers.js b/packages-node/providence-analytics/src/cli/cli-helpers.js
similarity index 100%
rename from packages/providence-analytics/src/cli/cli-helpers.js
rename to packages-node/providence-analytics/src/cli/cli-helpers.js
diff --git a/packages/providence-analytics/src/cli/cli.js b/packages-node/providence-analytics/src/cli/cli.js
similarity index 100%
rename from packages/providence-analytics/src/cli/cli.js
rename to packages-node/providence-analytics/src/cli/cli.js
diff --git a/packages/providence-analytics/src/cli/index.js b/packages-node/providence-analytics/src/cli/index.js
similarity index 100%
rename from packages/providence-analytics/src/cli/index.js
rename to packages-node/providence-analytics/src/cli/index.js
diff --git a/packages/providence-analytics/src/cli/launch-providence-with-extend-docs.js b/packages-node/providence-analytics/src/cli/launch-providence-with-extend-docs.js
similarity index 100%
rename from packages/providence-analytics/src/cli/launch-providence-with-extend-docs.js
rename to packages-node/providence-analytics/src/cli/launch-providence-with-extend-docs.js
diff --git a/packages/providence-analytics/src/cli/prompt-analyzer-menu.js b/packages-node/providence-analytics/src/cli/prompt-analyzer-menu.js
similarity index 100%
rename from packages/providence-analytics/src/cli/prompt-analyzer-menu.js
rename to packages-node/providence-analytics/src/cli/prompt-analyzer-menu.js
diff --git a/packages/providence-analytics/src/program/analyzers/find-classes.js b/packages-node/providence-analytics/src/program/analyzers/find-classes.js
similarity index 100%
rename from packages/providence-analytics/src/program/analyzers/find-classes.js
rename to packages-node/providence-analytics/src/program/analyzers/find-classes.js
diff --git a/packages/providence-analytics/src/program/analyzers/find-customelements.js b/packages-node/providence-analytics/src/program/analyzers/find-customelements.js
similarity index 100%
rename from packages/providence-analytics/src/program/analyzers/find-customelements.js
rename to packages-node/providence-analytics/src/program/analyzers/find-customelements.js
diff --git a/packages/providence-analytics/src/program/analyzers/find-exports.js b/packages-node/providence-analytics/src/program/analyzers/find-exports.js
similarity index 100%
rename from packages/providence-analytics/src/program/analyzers/find-exports.js
rename to packages-node/providence-analytics/src/program/analyzers/find-exports.js
diff --git a/packages/providence-analytics/src/program/analyzers/find-imports.js b/packages-node/providence-analytics/src/program/analyzers/find-imports.js
similarity index 100%
rename from packages/providence-analytics/src/program/analyzers/find-imports.js
rename to packages-node/providence-analytics/src/program/analyzers/find-imports.js
diff --git a/packages/providence-analytics/src/program/analyzers/helpers/Analyzer.js b/packages-node/providence-analytics/src/program/analyzers/helpers/Analyzer.js
similarity index 100%
rename from packages/providence-analytics/src/program/analyzers/helpers/Analyzer.js
rename to packages-node/providence-analytics/src/program/analyzers/helpers/Analyzer.js
diff --git a/packages/providence-analytics/src/program/analyzers/helpers/from-import-to-export-perspective.js b/packages-node/providence-analytics/src/program/analyzers/helpers/from-import-to-export-perspective.js
similarity index 100%
rename from packages/providence-analytics/src/program/analyzers/helpers/from-import-to-export-perspective.js
rename to packages-node/providence-analytics/src/program/analyzers/helpers/from-import-to-export-perspective.js
diff --git a/packages/providence-analytics/src/program/analyzers/helpers/normalize-source-paths.js b/packages-node/providence-analytics/src/program/analyzers/helpers/normalize-source-paths.js
similarity index 100%
rename from packages/providence-analytics/src/program/analyzers/helpers/normalize-source-paths.js
rename to packages-node/providence-analytics/src/program/analyzers/helpers/normalize-source-paths.js
diff --git a/packages/providence-analytics/src/program/analyzers/helpers/track-down-identifier.js b/packages-node/providence-analytics/src/program/analyzers/helpers/track-down-identifier.js
similarity index 100%
rename from packages/providence-analytics/src/program/analyzers/helpers/track-down-identifier.js
rename to packages-node/providence-analytics/src/program/analyzers/helpers/track-down-identifier.js
diff --git a/packages/providence-analytics/src/program/analyzers/match-imports.js b/packages-node/providence-analytics/src/program/analyzers/match-imports.js
similarity index 100%
rename from packages/providence-analytics/src/program/analyzers/match-imports.js
rename to packages-node/providence-analytics/src/program/analyzers/match-imports.js
diff --git a/packages/providence-analytics/src/program/analyzers/match-paths.js b/packages-node/providence-analytics/src/program/analyzers/match-paths.js
similarity index 100%
rename from packages/providence-analytics/src/program/analyzers/match-paths.js
rename to packages-node/providence-analytics/src/program/analyzers/match-paths.js
diff --git a/packages/providence-analytics/src/program/analyzers/match-subclasses.js b/packages-node/providence-analytics/src/program/analyzers/match-subclasses.js
similarity index 100%
rename from packages/providence-analytics/src/program/analyzers/match-subclasses.js
rename to packages-node/providence-analytics/src/program/analyzers/match-subclasses.js
diff --git a/packages/providence-analytics/src/program/analyzers/post-processors/sort-by-specifier.js b/packages-node/providence-analytics/src/program/analyzers/post-processors/sort-by-specifier.js
similarity index 100%
rename from packages/providence-analytics/src/program/analyzers/post-processors/sort-by-specifier.js
rename to packages-node/providence-analytics/src/program/analyzers/post-processors/sort-by-specifier.js
diff --git a/packages/providence-analytics/src/program/analyzers/types.d.ts b/packages-node/providence-analytics/src/program/analyzers/types.d.ts
similarity index 100%
rename from packages/providence-analytics/src/program/analyzers/types.d.ts
rename to packages-node/providence-analytics/src/program/analyzers/types.d.ts
diff --git a/packages/providence-analytics/src/program/providence.js b/packages-node/providence-analytics/src/program/providence.js
similarity index 100%
rename from packages/providence-analytics/src/program/providence.js
rename to packages-node/providence-analytics/src/program/providence.js
diff --git a/packages/providence-analytics/src/program/services/AstService.js b/packages-node/providence-analytics/src/program/services/AstService.js
similarity index 100%
rename from packages/providence-analytics/src/program/services/AstService.js
rename to packages-node/providence-analytics/src/program/services/AstService.js
diff --git a/packages/providence-analytics/src/program/services/InputDataService.js b/packages-node/providence-analytics/src/program/services/InputDataService.js
similarity index 100%
rename from packages/providence-analytics/src/program/services/InputDataService.js
rename to packages-node/providence-analytics/src/program/services/InputDataService.js
diff --git a/packages/providence-analytics/src/program/services/LogService.js b/packages-node/providence-analytics/src/program/services/LogService.js
similarity index 100%
rename from packages/providence-analytics/src/program/services/LogService.js
rename to packages-node/providence-analytics/src/program/services/LogService.js
diff --git a/packages/providence-analytics/src/program/services/QueryService.js b/packages-node/providence-analytics/src/program/services/QueryService.js
similarity index 100%
rename from packages/providence-analytics/src/program/services/QueryService.js
rename to packages-node/providence-analytics/src/program/services/QueryService.js
diff --git a/packages/providence-analytics/src/program/services/ReportService.js b/packages-node/providence-analytics/src/program/services/ReportService.js
similarity index 100%
rename from packages/providence-analytics/src/program/services/ReportService.js
rename to packages-node/providence-analytics/src/program/services/ReportService.js
diff --git a/packages/providence-analytics/src/program/types/index.js b/packages-node/providence-analytics/src/program/types/index.js
similarity index 100%
rename from packages/providence-analytics/src/program/types/index.js
rename to packages-node/providence-analytics/src/program/types/index.js
diff --git a/packages/providence-analytics/src/program/utils/async-array-utils.js b/packages-node/providence-analytics/src/program/utils/async-array-utils.js
similarity index 100%
rename from packages/providence-analytics/src/program/utils/async-array-utils.js
rename to packages-node/providence-analytics/src/program/utils/async-array-utils.js
diff --git a/packages/providence-analytics/src/program/utils/get-file-path-relative-from-root.js b/packages-node/providence-analytics/src/program/utils/get-file-path-relative-from-root.js
similarity index 100%
rename from packages/providence-analytics/src/program/utils/get-file-path-relative-from-root.js
rename to packages-node/providence-analytics/src/program/utils/get-file-path-relative-from-root.js
diff --git a/packages/providence-analytics/src/program/utils/get-hash.js b/packages-node/providence-analytics/src/program/utils/get-hash.js
similarity index 100%
rename from packages/providence-analytics/src/program/utils/get-hash.js
rename to packages-node/providence-analytics/src/program/utils/get-hash.js
diff --git a/packages/providence-analytics/src/program/utils/jsdoc-comment-parser.js b/packages-node/providence-analytics/src/program/utils/jsdoc-comment-parser.js
similarity index 100%
rename from packages/providence-analytics/src/program/utils/jsdoc-comment-parser.js
rename to packages-node/providence-analytics/src/program/utils/jsdoc-comment-parser.js
diff --git a/packages/providence-analytics/src/program/utils/lit-to-obj.js b/packages-node/providence-analytics/src/program/utils/lit-to-obj.js
similarity index 100%
rename from packages/providence-analytics/src/program/utils/lit-to-obj.js
rename to packages-node/providence-analytics/src/program/utils/lit-to-obj.js
diff --git a/packages/providence-analytics/src/program/utils/memoize.js b/packages-node/providence-analytics/src/program/utils/memoize.js
similarity index 100%
rename from packages/providence-analytics/src/program/utils/memoize.js
rename to packages-node/providence-analytics/src/program/utils/memoize.js
diff --git a/packages/providence-analytics/src/program/utils/read-package-tree-with-bower-support.js b/packages-node/providence-analytics/src/program/utils/read-package-tree-with-bower-support.js
similarity index 100%
rename from packages/providence-analytics/src/program/utils/read-package-tree-with-bower-support.js
rename to packages-node/providence-analytics/src/program/utils/read-package-tree-with-bower-support.js
diff --git a/packages/providence-analytics/src/program/utils/relative-source-path.js b/packages-node/providence-analytics/src/program/utils/relative-source-path.js
similarity index 100%
rename from packages/providence-analytics/src/program/utils/relative-source-path.js
rename to packages-node/providence-analytics/src/program/utils/relative-source-path.js
diff --git a/packages/providence-analytics/src/program/utils/resolve-import-path.js b/packages-node/providence-analytics/src/program/utils/resolve-import-path.js
similarity index 100%
rename from packages/providence-analytics/src/program/utils/resolve-import-path.js
rename to packages-node/providence-analytics/src/program/utils/resolve-import-path.js
diff --git a/packages/providence-analytics/src/program/utils/to-posix-path.js b/packages-node/providence-analytics/src/program/utils/to-posix-path.js
similarity index 100%
rename from packages/providence-analytics/src/program/utils/to-posix-path.js
rename to packages-node/providence-analytics/src/program/utils/to-posix-path.js
diff --git a/packages/providence-analytics/src/program/utils/traverse-html.js b/packages-node/providence-analytics/src/program/utils/traverse-html.js
similarity index 100%
rename from packages/providence-analytics/src/program/utils/traverse-html.js
rename to packages-node/providence-analytics/src/program/utils/traverse-html.js
diff --git a/packages/providence-analytics/test-helpers/mock-log-service-helpers.js b/packages-node/providence-analytics/test-helpers/mock-log-service-helpers.js
similarity index 100%
rename from packages/providence-analytics/test-helpers/mock-log-service-helpers.js
rename to packages-node/providence-analytics/test-helpers/mock-log-service-helpers.js
diff --git a/packages/providence-analytics/test-helpers/mock-project-helpers.js b/packages-node/providence-analytics/test-helpers/mock-project-helpers.js
similarity index 100%
rename from packages/providence-analytics/test-helpers/mock-project-helpers.js
rename to packages-node/providence-analytics/test-helpers/mock-project-helpers.js
diff --git a/packages/providence-analytics/test-helpers/mock-report-service-helpers.js b/packages-node/providence-analytics/test-helpers/mock-report-service-helpers.js
similarity index 100%
rename from packages/providence-analytics/test-helpers/mock-report-service-helpers.js
rename to packages-node/providence-analytics/test-helpers/mock-report-service-helpers.js
diff --git a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-classes.json b/packages-node/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-classes.json
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-classes.json
rename to packages-node/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-classes.json
diff --git a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-customelements.json b/packages-node/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-customelements.json
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-customelements.json
rename to packages-node/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-customelements.json
diff --git a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-exports.json b/packages-node/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-exports.json
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-exports.json
rename to packages-node/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-exports.json
diff --git a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-imports.json b/packages-node/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-imports.json
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-imports.json
rename to packages-node/providence-analytics/test-helpers/project-mocks-analyzer-outputs/find-imports.json
diff --git a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-imports.json b/packages-node/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-imports.json
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-imports.json
rename to packages-node/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-imports.json
diff --git a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-paths.json b/packages-node/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-paths.json
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-paths.json
rename to packages-node/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-paths.json
diff --git a/packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-subclasses.json b/packages-node/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-subclasses.json
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-subclasses.json
rename to packages-node/providence-analytics/test-helpers/project-mocks-analyzer-outputs/match-subclasses.json
diff --git a/packages/providence-analytics/test-helpers/project-mocks/README.md b/packages-node/providence-analytics/test-helpers/project-mocks/README.md
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks/README.md
rename to packages-node/providence-analytics/test-helpers/project-mocks/README.md
diff --git a/packages/providence-analytics/test-helpers/project-mocks/importing-target-project/.gitignore b/packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/.gitignore
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks/importing-target-project/.gitignore
rename to packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/.gitignore
diff --git a/packages/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/index.js b/packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/index.js
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/index.js
rename to packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/index.js
diff --git a/packages/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/not-imported.js b/packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/not-imported.js
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/not-imported.js
rename to packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/not-imported.js
diff --git a/packages/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/package.json b/packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/package.json
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/package.json
rename to packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/package.json
diff --git a/packages/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/ref-component.js b/packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/ref-component.js
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/ref-component.js
rename to packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/ref-component.js
diff --git a/packages/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/ref-src/core.js b/packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/ref-src/core.js
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/ref-src/core.js
rename to packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/ref-src/core.js
diff --git a/packages/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/ref-src/folder/index.js b/packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/ref-src/folder/index.js
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/ref-src/folder/index.js
rename to packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/node_modules/exporting-ref-project/ref-src/folder/index.js
diff --git a/packages/providence-analytics/test-helpers/project-mocks/importing-target-project/package.json b/packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/package.json
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks/importing-target-project/package.json
rename to packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/package.json
diff --git a/packages/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/find-customelements/multiple.js b/packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/find-customelements/multiple.js
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/find-customelements/multiple.js
rename to packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/find-customelements/multiple.js
diff --git a/packages/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/find-imports/all-notations.js b/packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/find-imports/all-notations.js
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/find-imports/all-notations.js
rename to packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/find-imports/all-notations.js
diff --git a/packages/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/match-imports/deep-imports.js b/packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/match-imports/deep-imports.js
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/match-imports/deep-imports.js
rename to packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/match-imports/deep-imports.js
diff --git a/packages/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/match-imports/root-level-imports.js b/packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/match-imports/root-level-imports.js
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/match-imports/root-level-imports.js
rename to packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/match-imports/root-level-imports.js
diff --git a/packages/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/match-subclasses/ExtendedComp.js b/packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/match-subclasses/ExtendedComp.js
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/match-subclasses/ExtendedComp.js
rename to packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/match-subclasses/ExtendedComp.js
diff --git a/packages/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/match-subclasses/internalProxy.js b/packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/match-subclasses/internalProxy.js
similarity index 100%
rename from packages/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/match-subclasses/internalProxy.js
rename to packages-node/providence-analytics/test-helpers/project-mocks/importing-target-project/target-src/match-subclasses/internalProxy.js
diff --git a/packages/providence-analytics/test-helpers/templates/analyzer-template.js b/packages-node/providence-analytics/test-helpers/templates/analyzer-template.js
similarity index 100%
rename from packages/providence-analytics/test-helpers/templates/analyzer-template.js
rename to packages-node/providence-analytics/test-helpers/templates/analyzer-template.js
diff --git a/packages/providence-analytics/test-helpers/templates/post-processor-template.js b/packages-node/providence-analytics/test-helpers/templates/post-processor-template.js
similarity index 100%
rename from packages/providence-analytics/test-helpers/templates/post-processor-template.js
rename to packages-node/providence-analytics/test-helpers/templates/post-processor-template.js
diff --git a/packages/providence-analytics/test-node/cli/cli.test.js b/packages-node/providence-analytics/test-node/cli/cli.test.js
similarity index 100%
rename from packages/providence-analytics/test-node/cli/cli.test.js
rename to packages-node/providence-analytics/test-node/cli/cli.test.js
diff --git a/packages/providence-analytics/test-node/program/Analyzer.testx.js b/packages-node/providence-analytics/test-node/program/Analyzer.testx.js
similarity index 100%
rename from packages/providence-analytics/test-node/program/Analyzer.testx.js
rename to packages-node/providence-analytics/test-node/program/Analyzer.testx.js
diff --git a/packages/providence-analytics/test-node/program/analyzers/e2e/all-analyzers.e2e.js b/packages-node/providence-analytics/test-node/program/analyzers/e2e/all-analyzers.e2e.js
similarity index 100%
rename from packages/providence-analytics/test-node/program/analyzers/e2e/all-analyzers.e2e.js
rename to packages-node/providence-analytics/test-node/program/analyzers/e2e/all-analyzers.e2e.js
diff --git a/packages/providence-analytics/test-node/program/analyzers/find-classes.test.js b/packages-node/providence-analytics/test-node/program/analyzers/find-classes.test.js
similarity index 100%
rename from packages/providence-analytics/test-node/program/analyzers/find-classes.test.js
rename to packages-node/providence-analytics/test-node/program/analyzers/find-classes.test.js
diff --git a/packages/providence-analytics/test-node/program/analyzers/find-customelements.test.js b/packages-node/providence-analytics/test-node/program/analyzers/find-customelements.test.js
similarity index 100%
rename from packages/providence-analytics/test-node/program/analyzers/find-customelements.test.js
rename to packages-node/providence-analytics/test-node/program/analyzers/find-customelements.test.js
diff --git a/packages/providence-analytics/test-node/program/analyzers/find-exports.test.js b/packages-node/providence-analytics/test-node/program/analyzers/find-exports.test.js
similarity index 100%
rename from packages/providence-analytics/test-node/program/analyzers/find-exports.test.js
rename to packages-node/providence-analytics/test-node/program/analyzers/find-exports.test.js
diff --git a/packages/providence-analytics/test-node/program/analyzers/find-imports.test.js b/packages-node/providence-analytics/test-node/program/analyzers/find-imports.test.js
similarity index 100%
rename from packages/providence-analytics/test-node/program/analyzers/find-imports.test.js
rename to packages-node/providence-analytics/test-node/program/analyzers/find-imports.test.js
diff --git a/packages/providence-analytics/test-node/program/analyzers/helpers/track-down-identifier.test.js b/packages-node/providence-analytics/test-node/program/analyzers/helpers/track-down-identifier.test.js
similarity index 100%
rename from packages/providence-analytics/test-node/program/analyzers/helpers/track-down-identifier.test.js
rename to packages-node/providence-analytics/test-node/program/analyzers/helpers/track-down-identifier.test.js
diff --git a/packages/providence-analytics/test-node/program/analyzers/match-imports.test.js b/packages-node/providence-analytics/test-node/program/analyzers/match-imports.test.js
similarity index 100%
rename from packages/providence-analytics/test-node/program/analyzers/match-imports.test.js
rename to packages-node/providence-analytics/test-node/program/analyzers/match-imports.test.js
diff --git a/packages/providence-analytics/test-node/program/analyzers/match-paths.test.js b/packages-node/providence-analytics/test-node/program/analyzers/match-paths.test.js
similarity index 100%
rename from packages/providence-analytics/test-node/program/analyzers/match-paths.test.js
rename to packages-node/providence-analytics/test-node/program/analyzers/match-paths.test.js
diff --git a/packages/providence-analytics/test-node/program/analyzers/match-subclasses.test.js b/packages-node/providence-analytics/test-node/program/analyzers/match-subclasses.test.js
similarity index 100%
rename from packages/providence-analytics/test-node/program/analyzers/match-subclasses.test.js
rename to packages-node/providence-analytics/test-node/program/analyzers/match-subclasses.test.js
diff --git a/packages/providence-analytics/test-node/program/services/InputDataService.test.js b/packages-node/providence-analytics/test-node/program/services/InputDataService.test.js
similarity index 100%
rename from packages/providence-analytics/test-node/program/services/InputDataService.test.js
rename to packages-node/providence-analytics/test-node/program/services/InputDataService.test.js
diff --git a/packages/remark-extend/CHANGELOG.md b/packages-node/remark-extend/CHANGELOG.md
similarity index 100%
rename from packages/remark-extend/CHANGELOG.md
rename to packages-node/remark-extend/CHANGELOG.md
diff --git a/packages/remark-extend/README.md b/packages-node/remark-extend/README.md
similarity index 100%
rename from packages/remark-extend/README.md
rename to packages-node/remark-extend/README.md
diff --git a/packages/remark-extend/index.js b/packages-node/remark-extend/index.js
similarity index 100%
rename from packages/remark-extend/index.js
rename to packages-node/remark-extend/index.js
diff --git a/packages/remark-extend/package.json b/packages-node/remark-extend/package.json
similarity index 95%
rename from packages/remark-extend/package.json
rename to packages-node/remark-extend/package.json
index 9be76d0f2..7227f7010 100644
--- a/packages/remark-extend/package.json
+++ b/packages-node/remark-extend/package.json
@@ -8,7 +8,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/ing-bank/lion.git",
-    "directory": "packages/remark-extend"
+    "directory": "packages-node/remark-extend"
   },
   "main": "index.js",
   "files": [
diff --git a/packages/remark-extend/src/remarkExtend.js b/packages-node/remark-extend/src/remarkExtend.js
similarity index 100%
rename from packages/remark-extend/src/remarkExtend.js
rename to packages-node/remark-extend/src/remarkExtend.js
diff --git a/packages/remark-extend/test-node/remark-extend.test.js b/packages-node/remark-extend/test-node/remark-extend.test.js
similarity index 100%
rename from packages/remark-extend/test-node/remark-extend.test.js
rename to packages-node/remark-extend/test-node/remark-extend.test.js
diff --git a/packages/singleton-manager/demo/fail/server.js b/packages/singleton-manager/demo/fail/server.js
index 18b5bf47a..99ad6c6c9 100644
--- a/packages/singleton-manager/demo/fail/server.js
+++ b/packages/singleton-manager/demo/fail/server.js
@@ -1,6 +1,6 @@
 module.exports = {
   rootDir: '../../',
-  appIndex: 'packages/singleton-manager/demo/fail/index.html',
+  appIndex: 'packages-node/singleton-manager/demo/fail/index.html',
   nodeResolve: true,
   open: true,
 };
diff --git a/packages/singleton-manager/demo/singleton-complex/server.js b/packages/singleton-manager/demo/singleton-complex/server.js
index 788b87ad1..c3a448304 100644
--- a/packages/singleton-manager/demo/singleton-complex/server.js
+++ b/packages/singleton-manager/demo/singleton-complex/server.js
@@ -1,6 +1,6 @@
 module.exports = {
   rootDir: '../../',
-  appIndex: 'packages/singleton-manager/demo/singleton-complex/index.html',
+  appIndex: 'packages-node/singleton-manager/demo/singleton-complex/index.html',
   nodeResolve: true,
   open: true,
 };
diff --git a/packages/singleton-manager/demo/singleton/server.js b/packages/singleton-manager/demo/singleton/server.js
index abf7e629c..d7d73ecb4 100644
--- a/packages/singleton-manager/demo/singleton/server.js
+++ b/packages/singleton-manager/demo/singleton/server.js
@@ -1,6 +1,6 @@
 module.exports = {
   rootDir: '../../',
-  appIndex: 'packages/singleton-manager/demo/singleton/index.html',
+  appIndex: 'packages-node/singleton-manager/demo/singleton/index.html',
   nodeResolve: true,
   open: true,
 };
diff --git a/scripts/lint-versions.js b/scripts/lint-versions.js
index ca1b40150..9d6c330f9 100644
--- a/scripts/lint-versions.js
+++ b/scripts/lint-versions.js
@@ -52,31 +52,33 @@ function compareVersions(versionsA, versionsB) {
   };
 }
 
-let currentVersions = readPackageJsonDeps('./package.json');
 let endReturn = 0;
+function lintVersions(folder) {
+  let currentVersions = readPackageJsonDeps('./package.json');
 
-// find all versions in the monorepo
-getDirectories('./packages').forEach(subPackage => {
-  const filePath = `./packages/${subPackage}/package.json`;
-  currentVersions = { ...currentVersions, ...readPackageJsonNameVersion(filePath) };
-});
-
-// lint all versions in packages
-getDirectories('./packages').forEach(subPackage => {
-  const filePath = `./packages/${subPackage}/package.json`;
-  const subPackageVersions = readPackageJsonDeps(filePath);
-  const { output, newVersions } = compareVersions(currentVersions, subPackageVersions);
-  currentVersions = { ...newVersions };
-  if (output) {
-    console.log(`Version mismatches found in "${filePath}":`);
-    console.log(output);
-    console.log();
-    endReturn = 1;
-  }
-});
+  // find all versions in the monorepo
+  getDirectories(`./${folder}`).forEach(subPackage => {
+    const filePath = `./${folder}/${subPackage}/package.json`;
+    currentVersions = { ...currentVersions, ...readPackageJsonNameVersion(filePath) };
+  });
 
+  // lint all versions in folder
+  getDirectories(`./${folder}`).forEach(subPackage => {
+    const filePath = `./${folder}/${subPackage}/package.json`;
+    const subPackageVersions = readPackageJsonDeps(filePath);
+    const { output, newVersions } = compareVersions(currentVersions, subPackageVersions);
+    currentVersions = { ...newVersions };
+    if (output) {
+      console.log(`Version mismatches found in "${filePath}":`);
+      console.log(output);
+      console.log();
+      endReturn = 1;
+    }
+  });
+}
+lintVersions('packages');
+lintVersions('packages-node');
 if (endReturn === 0) {
   console.log('All versions are aligned 💪');
 }
-
 process.exit(endReturn);
diff --git a/scripts/workspaces-scripts.mjs b/scripts/workspaces-scripts.mjs
index 5d5b16b2a..5a2485d24 100644
--- a/scripts/workspaces-scripts.mjs
+++ b/scripts/workspaces-scripts.mjs
@@ -28,8 +28,12 @@ function findPackagesWithScript(directory) {
 }
 
 const packagesDir = join(moduleDir, '..', 'packages');
+const packagesNodeDir = join(moduleDir, '..', 'packages-node');
 
-const packagesWithScript = [...findPackagesWithScript(packagesDir)];
+const packagesWithScript = [
+  ...findPackagesWithScript(packagesDir),
+  ...findPackagesWithScript(packagesNodeDir),
+];
 
 const commands = packagesWithScript.map(pkgPath => ({
   name: basename(pkgPath),
diff --git a/tools/singleton-manager/demo/fail/node_modules/overlays/index.js b/tools/singleton-manager/demo/fail/node_modules/overlays/index.js
new file mode 100644
index 000000000..6e7a29fdd
--- /dev/null
+++ b/tools/singleton-manager/demo/fail/node_modules/overlays/index.js
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 000000000..f73ca3b47
--- /dev/null
+++ b/tools/singleton-manager/demo/fail/node_modules/overlays/instance.js
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000..0cbd136ec
--- /dev/null
+++ b/tools/singleton-manager/demo/fail/node_modules/overlays/package.json
@@ -0,0 +1,4 @@
+{
+  "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
new file mode 100644
index 000000000..2c77c4dee
--- /dev/null
+++ b/tools/singleton-manager/demo/fail/node_modules/page-a/package.json
@@ -0,0 +1,7 @@
+{
+  "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
new file mode 100644
index 000000000..21fd3dde5
--- /dev/null
+++ b/tools/singleton-manager/demo/fail/node_modules/page-a/page-a.js
@@ -0,0 +1,34 @@
+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
new file mode 100644
index 000000000..5d97b1522
--- /dev/null
+++ b/tools/singleton-manager/demo/fail/node_modules/page-b/node_modules/overlays/index.js
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 000000000..f73ca3b47
--- /dev/null
+++ b/tools/singleton-manager/demo/fail/node_modules/page-b/node_modules/overlays/instance.js
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000..5e83291f8
--- /dev/null
+++ b/tools/singleton-manager/demo/fail/node_modules/page-b/node_modules/overlays/package.json
@@ -0,0 +1,4 @@
+{
+  "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
new file mode 100644
index 000000000..cd0fdbef4
--- /dev/null
+++ b/tools/singleton-manager/demo/fail/node_modules/page-b/package.json
@@ -0,0 +1,7 @@
+{
+  "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
new file mode 100644
index 000000000..94a90c0c0
--- /dev/null
+++ b/tools/singleton-manager/demo/fail/node_modules/page-b/page-b.js
@@ -0,0 +1,34 @@
+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
new file mode 100644
index 000000000..6e7a29fdd
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton-complex/node_modules/overlays/index.js
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 000000000..7d3333a5f
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton-complex/node_modules/overlays/instance.js
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 000000000..0cbd136ec
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton-complex/node_modules/overlays/package.json
@@ -0,0 +1,4 @@
+{
+  "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
new file mode 100644
index 000000000..2c77c4dee
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton-complex/node_modules/page-a/package.json
@@ -0,0 +1,7 @@
+{
+  "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
new file mode 100644
index 000000000..714486f76
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton-complex/node_modules/page-a/page-a.js
@@ -0,0 +1,35 @@
+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
new file mode 100644
index 000000000..5d97b1522
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/node_modules/overlays/index.js
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 000000000..50b46d1a1
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/node_modules/overlays/instance.js
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 000000000..5e83291f8
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/node_modules/overlays/package.json
@@ -0,0 +1,4 @@
+{
+  "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
new file mode 100644
index 000000000..cd0fdbef4
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/package.json
@@ -0,0 +1,7 @@
+{
+  "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
new file mode 100644
index 000000000..bc65fde08
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton-complex/node_modules/page-b/page-b.js
@@ -0,0 +1,49 @@
+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
new file mode 100644
index 000000000..6e7a29fdd
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton/node_modules/overlays/index.js
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 000000000..7d3333a5f
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton/node_modules/overlays/instance.js
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 000000000..0cbd136ec
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton/node_modules/overlays/package.json
@@ -0,0 +1,4 @@
+{
+  "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
new file mode 100644
index 000000000..2c77c4dee
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton/node_modules/page-a/package.json
@@ -0,0 +1,7 @@
+{
+  "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
new file mode 100644
index 000000000..21fd3dde5
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton/node_modules/page-a/page-a.js
@@ -0,0 +1,34 @@
+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
new file mode 100644
index 000000000..5df4fe7d3
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton/node_modules/page-b/node_modules/overlays/index.js
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 000000000..50b46d1a1
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton/node_modules/page-b/node_modules/overlays/instance.js
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 000000000..5e83291f8
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton/node_modules/page-b/node_modules/overlays/package.json
@@ -0,0 +1,4 @@
+{
+  "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
new file mode 100644
index 000000000..cd0fdbef4
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton/node_modules/page-b/package.json
@@ -0,0 +1,7 @@
+{
+  "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
new file mode 100644
index 000000000..41fa08ad4
--- /dev/null
+++ b/tools/singleton-manager/demo/singleton/node_modules/page-b/page-b.js
@@ -0,0 +1,34 @@
+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);
diff --git a/tsconfig.build.types.json b/tsconfig.build.types.json
index 7eb84e822..a22ccdfb3 100644
--- a/tsconfig.build.types.json
+++ b/tsconfig.build.types.json
@@ -12,16 +12,18 @@
     "**/dist/**/*",
     "packages/**/test-helpers",
     "packages/**/docs/**/*",
-    "packages/babel-plugin-extend-docs/**/*.js",
-    "packages/providence-analytics/**/*.js",
-    "packages/remark-extend/**/*.js",
-    "packages/select-rich/test/**/*.js", // TODO: Needs to get typed!
-    "packages/overlays/test/utils-tests/**/*.js", // TODO: Needs to get typed!
-    "packages/form-integrations/test/**/*.js", // TODO: Needs to get typed!
     "packages/combobox/test/**/*.js", // TODO: Needs to get typed!
-    // ignore test/demos for singleton manager until overlays are typed as it's used in there
+    "packages/form-integrations/test/**/*.js", // TODO: Needs to get typed!
+    "packages/overlays/test/utils-tests/**/*.js", // TODO: Needs to get typed!
+    "packages/select-rich/test/**/*.js", // TODO: Needs to get typed!
     "packages/singleton-manager/demo/",
     "packages/singleton-manager/test/",
+    // ignore test/demos for singleton manager until overlays are typed as it's used in there
+    "packages-node/**/test-helpers",
+    "packages-node/**/docs/**/*",
+    "packages-node/babel-plugin-extend-docs/**/*.js",
+    "packages/providence-analytics/**/*.js",
+    "packages-node/remark-extend/**/*.js",
     // specific for building types
     "packages/core/index.js"
   ]
diff --git a/tsconfig.json b/tsconfig.json
index e5394d49b..4819d0f7a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,7 +14,7 @@
     "esModuleInterop": true,
     "suppressImplicitAnyIndexErrors": true
   },
-  "include": ["packages/**/*.js"],
+  "include": ["packages/**/*.js", "packages-node/**/*.js"],
   "exclude": [
     "node_modules",
     "**/node_modules/*",
@@ -22,15 +22,17 @@
     "**/dist/**/*",
     "packages/**/test-helpers",
     "packages/**/docs/**/*",
-    "packages/babel-plugin-extend-docs/**/*.js",
-    "packages/providence-analytics/**/*.js",
-    "packages/remark-extend/**/*.js",
-    "packages/select-rich/test/**/*.js", // TODO: Needs to get typed!
-    "packages/overlays/test/utils-tests/**/*.js", // TODO: Needs to get typed!
-    "packages/form-integrations/test/**/*.js", // TODO: Needs to get typed!
     "packages/combobox/test/**/*.js", // TODO: Needs to get typed!
-    // ignore test/demos for singleton manager until overlays are typed as it's used in there
+    "packages/form-integrations/test/**/*.js", // TODO: Needs to get typed!
+    "packages/overlays/test/utils-tests/**/*.js", // TODO: Needs to get typed!
+    "packages/select-rich/test/**/*.js", // TODO: Needs to get typed!
     "packages/singleton-manager/demo/",
-    "packages/singleton-manager/test/"
+    "packages/singleton-manager/test/",
+    // ignore test/demos for singleton manager until overlays are typed as it's used in there
+    "packages-node/**/test-helpers",
+    "packages-node/**/docs/**/*",
+    "packages-node/babel-plugin-extend-docs/**/*.js",
+    "packages-node/providence-analytics/**/*.js",
+    "packages-node/remark-extend/**/*.js"
   ]
 }