diff --git a/docs/fundamentals/tools/singleton-manager/overview.md b/docs/fundamentals/tools/singleton-manager/overview.md
index 19d791f8e..484927365 100644
--- a/docs/fundamentals/tools/singleton-manager/overview.md
+++ b/docs/fundamentals/tools/singleton-manager/overview.md
@@ -160,7 +160,7 @@ Steps to reproduce:
 2. Page B => "Blocked: false" (even when hitting the refresh button)
 
 ➡️ See [it on the example page](./example-fail/index.md). <br>
-➡️ See [the code](https://github.com/ing-bank/lion/tree/master/docs/docs/tools/singleton-manager/example-fail/demo-app.js).
+➡️ See [the code](https://github.com/ing-bank/lion/tree/master/docs/fundamentals/tools/singleton-manager/example-fail/demo-app.js).
 
 ---
 
@@ -203,7 +203,7 @@ npm run start:singleton
 ```
 
 ➡️ See [it on the example page](./example-success/index.md). <br>
-➡️ See [the code](https://github.com/ing-bank/lion/tree/master/docs/docs/tools/singleton-manager/example-success/demo-app.js).
+➡️ See [the code](https://github.com/ing-bank/lion/tree/master/docs/fundamentals/tools/singleton-manager/example-success/demo-app.js).
 
 ---
 
@@ -244,7 +244,7 @@ npm run start:singleton-complex
 ```
 
 ➡️ See [it on the example page](./example-complex/index.md). <br>
-➡️ See [the code](https://github.com/ing-bank/lion/tree/master/docs/docs/tools/singleton-manager/example-complex/demo-app.js).
+➡️ See [the code](https://github.com/ing-bank/lion/tree/master/docs/fundamentals/tools/singleton-manager/example-complex/demo-app.js).
 
 ---
 
diff --git a/packages-node/babel-plugin-extend-docs/README.md b/packages-node/babel-plugin-extend-docs/README.md
index 728bfa23d..c1e45141e 100644
--- a/packages-node/babel-plugin-extend-docs/README.md
+++ b/packages-node/babel-plugin-extend-docs/README.md
@@ -1,3 +1,3 @@
 # Babel Plugin Extend Docs
 
-[=> See Source <=](../../docs/docs/node-tools/babel-plugin-extend-docs/overview.md)
+[=> See Source <=](../../docs/fundamentals/node-tools/babel-plugin-extend-docs/overview.md)
diff --git a/packages-node/babel-plugin-extend-docs/docs/overview.md b/packages-node/babel-plugin-extend-docs/docs/overview.md
index 7664d3e61..5313f8441 100644
--- a/packages-node/babel-plugin-extend-docs/docs/overview.md
+++ b/packages-node/babel-plugin-extend-docs/docs/overview.md
@@ -1,3 +1,3 @@
 # Babel Plugin Extend Docs
 
-[=> See Source <=](../../../docs/docs/node-tools/babel-plugin-extend-docs/overview.md)
+[=> See Source <=](../../../docs/fundamentals/node-tools/babel-plugin-extend-docs/overview.md)
diff --git a/packages-node/providence-analytics/README.md b/packages-node/providence-analytics/README.md
index 41ed58c6a..9cb361076 100644
--- a/packages-node/providence-analytics/README.md
+++ b/packages-node/providence-analytics/README.md
@@ -1,3 +1,3 @@
 # Providence
 
-[=> See Source <=](../../docs/docs/node-tools/providence-analytics/overview.md)
+[=> See Source <=](../../docs/fundamentals/node-tools/providence-analytics/overview.md)
diff --git a/packages-node/providence-analytics/docs/Dashboard.md b/packages-node/providence-analytics/docs/Dashboard.md
index 528b07dd3..035d66ff5 100644
--- a/packages-node/providence-analytics/docs/Dashboard.md
+++ b/packages-node/providence-analytics/docs/Dashboard.md
@@ -1,3 +1,3 @@
 # Dashboard
 
-[=> See Source <=](../../../docs/docs/node-tools/providence-analytics/dashboard.md)
+[=> See Source <=](../../../docs/fundamentals/node-tools/providence-analytics/dashboard.md)
diff --git a/packages-node/providence-analytics/docs/LocalConfiguration.md b/packages-node/providence-analytics/docs/LocalConfiguration.md
index e09da8ec2..7edd05ba8 100644
--- a/packages-node/providence-analytics/docs/LocalConfiguration.md
+++ b/packages-node/providence-analytics/docs/LocalConfiguration.md
@@ -1,3 +1,3 @@
 # Local configuration
 
-[=> See Source <=](../../../docs/docs/node-tools/providence-analytics/LocalConfiguration.md)
+[=> See Source <=](../../../docs/fundamentals/node-tools/providence-analytics/LocalConfiguration.md)
diff --git a/packages-node/providence-analytics/docs/overview.md b/packages-node/providence-analytics/docs/overview.md
index 27b803c75..09af2c2f5 100644
--- a/packages-node/providence-analytics/docs/overview.md
+++ b/packages-node/providence-analytics/docs/overview.md
@@ -1,3 +1,3 @@
 # Providence
 
-[=> See Source <=](../../../docs/docs/node-tools/providence-analytics/overview.md)
+[=> See Source <=](../../../docs/fundamentals/node-tools/providence-analytics/overview.md)
diff --git a/packages-node/publish-docs/src/PublishDocs.js b/packages-node/publish-docs/src/PublishDocs.js
index 616240c1c..78e4a5d03 100644
--- a/packages-node/publish-docs/src/PublishDocs.js
+++ b/packages-node/publish-docs/src/PublishDocs.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import fs from 'fs-extra';
 import path from 'path';
 import { listFiles } from './listFiles.js';
@@ -162,14 +163,20 @@ export class PublishDocs {
           }
           const rawImportFilePath = matches[1];
           const importFilePath = path.join(path.dirname(file), rawImportFilePath);
-          let newFileContent = await fs.promises.readFile(importFilePath, 'utf8');
+          try {
+            let newFileContent = await fs.promises.readFile(importFilePath, 'utf8');
 
-          newFileContent = rewriteLinksInMdContent(newFileContent, importFilePath, {
-            gitHubUrl: this.options.gitHubUrl,
-            gitRootDir: this.options.gitRootDir,
-          });
+            newFileContent = rewriteLinksInMdContent(newFileContent, importFilePath, {
+              gitHubUrl: this.options.gitHubUrl,
+              gitRootDir: this.options.gitRootDir,
+            });
 
-          await fs.promises.writeFile(file, newFileContent);
+            await fs.promises.writeFile(file, newFileContent);
+          } catch (err) {
+            throw new Error(
+              [`Error in "${file}":`, `- Could not find import file ${importFilePath}`].join('\n'),
+            );
+          }
         }
       }
     }
diff --git a/packages-node/rocket-preset-extend-lion-docs/README.md b/packages-node/rocket-preset-extend-lion-docs/README.md
index ed09149f3..d7a957bcc 100644
--- a/packages-node/rocket-preset-extend-lion-docs/README.md
+++ b/packages-node/rocket-preset-extend-lion-docs/README.md
@@ -1,3 +1,3 @@
 # Rocket Preset Extend Lion Docs
 
-[=> See Source <=](../../docs/docs/node-tools/rocket-preset-extend-lion-docs/overview.md)
+[=> See Source <=](../../docs/fundamentals/node-tools/rocket-preset-extend-lion-docs/overview.md)
diff --git a/packages-node/rocket-preset-extend-lion-docs/docs/overview.md b/packages-node/rocket-preset-extend-lion-docs/docs/overview.md
index ed09149f3..ab9e9b328 100644
--- a/packages-node/rocket-preset-extend-lion-docs/docs/overview.md
+++ b/packages-node/rocket-preset-extend-lion-docs/docs/overview.md
@@ -1,3 +1,3 @@
 # Rocket Preset Extend Lion Docs
 
-[=> See Source <=](../../docs/docs/node-tools/rocket-preset-extend-lion-docs/overview.md)
+[=> See Source <=](../../../docs/fundamentals/node-tools/rocket-preset-extend-lion-docs/overview.md)
diff --git a/packages/ajax/README.md b/packages/ajax/README.md
index 229166492..241719261 100644
--- a/packages/ajax/README.md
+++ b/packages/ajax/README.md
@@ -1,3 +1,3 @@
 # Lion Ajax
 
-[=> See Source <=](../../docs/docs/tools/ajax/overview.md)
+[=> See Source <=](../../docs/fundamentals/tools/ajax/overview.md)
diff --git a/packages/ajax/docs/overview.md b/packages/ajax/docs/overview.md
index 7b858e9b2..53f187cce 100644
--- a/packages/ajax/docs/overview.md
+++ b/packages/ajax/docs/overview.md
@@ -1,3 +1,3 @@
 # Lion Ajax Overview
 
-[=> See Source <=](../../../docs/docs/tools/ajax/overview.md)
+[=> See Source <=](../../../docs/fundamentals/tools/ajax/overview.md)
diff --git a/packages/ajax/docs/use-cases.md b/packages/ajax/docs/use-cases.md
index 961488a57..2303e9b8d 100644
--- a/packages/ajax/docs/use-cases.md
+++ b/packages/ajax/docs/use-cases.md
@@ -1,3 +1,3 @@
 # Lion Ajax Use Cases
 
-[=> See Source <=](../../../docs/docs/tools/ajax/use-cases.md)
+[=> See Source <=](../../../docs/fundamentals/tools/ajax/use-cases.md)
diff --git a/packages/ajax/package.json b/packages/ajax/package.json
index b761a4c1d..7855f1479 100644
--- a/packages/ajax/package.json
+++ b/packages/ajax/package.json
@@ -27,7 +27,7 @@
     "debug": "cd ../../ && npm run debug -- --group ajax",
     "debug:firefox": "cd ../../ && npm run debug:firefox -- --group ajax",
     "debug:webkit": "cd ../../ && npm run debug:webkit -- --group ajax",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../ --copy-dir docs/docs/tools/ajax/assets",
+    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../ --copy-dir docs/fundamentals/tools/ajax/assets",
     "prepublishOnly": "npm run publish-docs",
     "test": "cd ../../ && npm run test:browser -- --group ajax"
   },
diff --git a/packages/core/README.md b/packages/core/README.md
index c3be73104..c81005266 100644
--- a/packages/core/README.md
+++ b/packages/core/README.md
@@ -1,3 +1,3 @@
 # Lion Core
 
-[=> See Source <=](../../docs/docs/systems/core/overview.md)
+[=> See Source <=](../../docs/fundamentals/systems/core/overview.md)
diff --git a/packages/core/docs/guides/principles/index.md b/packages/core/docs/guides/principles/index.md
index c2ca69a7d..1be2e33d8 100644
--- a/packages/core/docs/guides/principles/index.md
+++ b/packages/core/docs/guides/principles/index.md
@@ -1,3 +1,3 @@
 # Principles
 
-[=> See Source <=](../../../../../docs/guides/guides/principles/index.md)
+[=> See Source <=](../../../../../docs/guides/principles/index.md)
diff --git a/packages/core/docs/overview.md b/packages/core/docs/overview.md
index 511d0d2ca..5e415b391 100644
--- a/packages/core/docs/overview.md
+++ b/packages/core/docs/overview.md
@@ -1,3 +1,3 @@
 # Lion Core Overview
 
-[=> See Source <=](../../../docs/docs/systems/core/overview.md)
+[=> See Source <=](../../../docs/fundamentals/systems/core/overview.md)
diff --git a/packages/core/docs/rationales/side-effects.md b/packages/core/docs/rationales/side-effects.md
index 5dccb75b2..93412b0ae 100644
--- a/packages/core/docs/rationales/side-effects.md
+++ b/packages/core/docs/rationales/side-effects.md
@@ -1,3 +1,3 @@
 # Side Effects
 
-[=> See Source <=](../../../../docs/docs/rationales/side-effects.md)
+[=> See Source <=](../../../../docs/fundamentals/rationales/side-effects.md)
diff --git a/packages/form-integrations/docs/styling.md b/packages/form-integrations/docs/styling.md
index 02cde3832..fe4706021 100644
--- a/packages/form-integrations/docs/styling.md
+++ b/packages/form-integrations/docs/styling.md
@@ -1,3 +1,3 @@
 # Form System Styling
 
-[=> See Source <=](../../../docs/docs/fundamentals/systems/form/styling.md)
+[=> See Source <=](../../../docs/fundamentals/systems/form/styling.md)
diff --git a/packages/form-integrations/docs/use-cases.md b/packages/form-integrations/docs/use-cases.md
index 5202f63f7..844f413c4 100644
--- a/packages/form-integrations/docs/use-cases.md
+++ b/packages/form-integrations/docs/use-cases.md
@@ -1,3 +1,3 @@
 # Form System Use Cases
 
-[=> See Source <=](../../../docs/docs/fundamentals/systems/form/use-cases.md)
+[=> See Source <=](../../../docs/fundamentals/systems/form/use-cases.md)
diff --git a/packages/form-integrations/package.json b/packages/form-integrations/package.json
index 2d2d44806..70ea2e1ff 100644
--- a/packages/form-integrations/package.json
+++ b/packages/form-integrations/package.json
@@ -27,7 +27,7 @@
     "debug": "cd ../../ && npm run debug -- --group form-integrations",
     "debug:firefox": "cd ../../ && npm run debug:firefox -- --group form-integrations",
     "debug:webkit": "cd ../../ && npm run debug:webkit -- --group form-integrations",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../ --copy-dir docs/docs/fundamentals/systems/form/assets",
+    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../ --copy-dir docs/fundamentals/systems/form/assets",
     "prepublishOnly": "npm run publish-docs",
     "test": "cd ../../ && npm run test:browser -- --group form-integrations"
   },
diff --git a/packages/helpers/README.md b/packages/helpers/README.md
index 7efdd0c10..910e8b4cb 100644
--- a/packages/helpers/README.md
+++ b/packages/helpers/README.md
@@ -1,3 +1,3 @@
 # Lion Helpers
 
-[=> See Source <=](../../docs/docs/tools/helpers/overview.md)
+[=> See Source <=](../../docs/fundamentals/tools/helpers/overview.md)
diff --git a/packages/helpers/docs/action-logger.md b/packages/helpers/docs/action-logger.md
index d2127946f..7650a9776 100644
--- a/packages/helpers/docs/action-logger.md
+++ b/packages/helpers/docs/action-logger.md
@@ -1,3 +1,3 @@
 # Action Logger
 
-[=> See Source <=](../../../docs/docs/tools/helpers/action-logger.md)
+[=> See Source <=](../../../docs/fundamentals/tools/helpers/action-logger.md)
diff --git a/packages/helpers/docs/overview.md b/packages/helpers/docs/overview.md
index 758e0dbb0..5db2b6e68 100644
--- a/packages/helpers/docs/overview.md
+++ b/packages/helpers/docs/overview.md
@@ -1,3 +1,3 @@
 # Lion Helpers
 
-[=> See Source <=](../../../docs/docs/tools/helpers/overview.md)
+[=> See Source <=](../../../docs/fundamentals/tools/helpers/overview.md)
diff --git a/packages/icon/package.json b/packages/icon/package.json
index 21057f6e0..bd0ee0b46 100644
--- a/packages/icon/package.json
+++ b/packages/icon/package.json
@@ -28,7 +28,7 @@
     "debug": "cd ../../ && npm run debug -- --group icon",
     "debug:firefox": "cd ../../ && npm run debug:firefox -- --group icon",
     "debug:webkit": "cd ../../ && npm run debug:webkit -- --group icon",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../ --copy-dir docs/components/icons/icon/assets",
+    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../ --copy-dir docs/components/icon/assets",
     "prepublishOnly": "npm run publish-docs && npm run custom-elements-manifest",
     "test": "cd ../../ && npm run test:browser -- --group icon"
   },
diff --git a/packages/localize/README.md b/packages/localize/README.md
index 867f268eb..501db3062 100644
--- a/packages/localize/README.md
+++ b/packages/localize/README.md
@@ -1,3 +1,3 @@
 # Lion Localize
 
-[=> See Source <=](../../docs/docs/systems/localize/overview.md)
+[=> See Source <=](../../docs/fundamentals/systems/localize/overview.md)
diff --git a/packages/localize/docs/overview.md b/packages/localize/docs/overview.md
index f12e99180..c86f86343 100644
--- a/packages/localize/docs/overview.md
+++ b/packages/localize/docs/overview.md
@@ -1,3 +1,3 @@
 # Localize System Overview
 
-[=> See Source <=](../../../docs/docs/systems/localize/overview.md)
+[=> See Source <=](../../../docs/fundamentals/systems/localize/overview.md)
diff --git a/packages/localize/docs/rationale.md b/packages/localize/docs/rationale.md
index 039da0554..9fb477294 100644
--- a/packages/localize/docs/rationale.md
+++ b/packages/localize/docs/rationale.md
@@ -1,3 +1,3 @@
 # Localize System Rationale
 
-[=> See Source <=](../../../docs/docs/systems/localize/rationale.md)
+[=> See Source <=](../../../docs/fundamentals/systems/localize/rationale.md)
diff --git a/packages/localize/docs/text.md b/packages/localize/docs/text.md
index 68f01fc47..16cf40b28 100644
--- a/packages/localize/docs/text.md
+++ b/packages/localize/docs/text.md
@@ -1,3 +1,3 @@
 # Localize System Text
 
-[=> See Source <=](../../../docs/docs/systems/localize/text.md)
+[=> See Source <=](../../../docs/fundamentals/systems/localize/text.md)
diff --git a/packages/localize/docs/use-cases.md b/packages/localize/docs/use-cases.md
index 84097ec11..9732a1006 100644
--- a/packages/localize/docs/use-cases.md
+++ b/packages/localize/docs/use-cases.md
@@ -1,3 +1,3 @@
 # Localize System Use Cases
 
-[=> See Source <=](../../../docs/docs/systems/localize/use-cases.md)
+[=> See Source <=](../../../docs/fundamentals/systems/localize/use-cases.md)
diff --git a/packages/localize/package.json b/packages/localize/package.json
index 5fac816b3..c12185f13 100644
--- a/packages/localize/package.json
+++ b/packages/localize/package.json
@@ -27,7 +27,7 @@
     "debug": "cd ../../ && npm run debug -- --group localize",
     "debug:firefox": "cd ../../ && npm run debug:firefox -- --group localize",
     "debug:webkit": "cd ../../ && npm run debug:webkit -- --group localize",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../ --copy-dir docs/docs/systems/localize/assets",
+    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../ --copy-dir docs/fundamentals/systems/localize/assets",
     "prepublishOnly": "npm run publish-docs",
     "test": "cd ../../ && npm run test:browser -- --group localize"
   },
diff --git a/packages/overlays/README.md b/packages/overlays/README.md
index 0dde41f2f..6f89d1a46 100644
--- a/packages/overlays/README.md
+++ b/packages/overlays/README.md
@@ -1,3 +1,3 @@
 # Lion Overlays
 
-[=> See Source <=](../../docs/docs/systems/overlays/overview.md)
+[=> See Source <=](../../docs/fundamentals/systems/overlays/overview.md)
diff --git a/packages/overlays/docs/form-integration.md b/packages/overlays/docs/form-integration.md
index 75795502e..5d5696f04 100644
--- a/packages/overlays/docs/form-integration.md
+++ b/packages/overlays/docs/form-integration.md
@@ -1,3 +1,3 @@
 # Lion Overlays Form Integration
 
-[=> See Source <=](../../../docs/docs/systems/overlays/form-integration.md)
+[=> See Source <=](../../../docs/fundamentals/systems/overlays/form-integration.md)
diff --git a/packages/overlays/docs/overview.md b/packages/overlays/docs/overview.md
index b0bc1d265..0ec794b76 100644
--- a/packages/overlays/docs/overview.md
+++ b/packages/overlays/docs/overview.md
@@ -1,3 +1,3 @@
 # Lion Overlays Overview
 
-[=> See Source <=](../../../docs/docs/systems/overlays/overview.md)
+[=> See Source <=](../../../docs/fundamentals/systems/overlays/overview.md)
diff --git a/packages/overlays/docs/rationale.md b/packages/overlays/docs/rationale.md
index 34e9d34ab..2bf906f0c 100644
--- a/packages/overlays/docs/rationale.md
+++ b/packages/overlays/docs/rationale.md
@@ -1,3 +1,3 @@
 # Lion Overlays Rationale
 
-[=> See Source <=](../../../docs/docs/systems/overlays/rationale.md)
+[=> See Source <=](../../../docs/fundamentals/systems/overlays/rationale.md)
diff --git a/packages/overlays/docs/scope.md b/packages/overlays/docs/scope.md
index 948284265..6d0b2ad4b 100644
--- a/packages/overlays/docs/scope.md
+++ b/packages/overlays/docs/scope.md
@@ -1,3 +1,3 @@
 # Lion Overlays Scope
 
-[=> See Source <=](../../../docs/docs/systems/overlays/scope.md)
+[=> See Source <=](../../../docs/fundamentals/systems/overlays/scope.md)
diff --git a/packages/overlays/docs/use-cases.md b/packages/overlays/docs/use-cases.md
index 928240571..041298eca 100644
--- a/packages/overlays/docs/use-cases.md
+++ b/packages/overlays/docs/use-cases.md
@@ -1,3 +1,3 @@
 # Lion Overlays Use Cases
 
-[=> See Source <=](../../../docs/docs/systems/overlays/use-cases.md)
+[=> See Source <=](../../../docs/fundamentals/systems/overlays/use-cases.md)
diff --git a/packages/overlays/package.json b/packages/overlays/package.json
index ab2b27ae9..e92d8190c 100644
--- a/packages/overlays/package.json
+++ b/packages/overlays/package.json
@@ -27,7 +27,7 @@
     "debug": "cd ../../ && npm run debug -- --group overlays",
     "debug:firefox": "cd ../../ && npm run debug:firefox -- --group overlays",
     "debug:webkit": "cd ../../ && npm run debug:webkit -- --group overlays",
-    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../ --copy-dir docs/docs/systems/overlays/assets",
+    "publish-docs": "node ../../packages-node/publish-docs/src/cli.js --github-url https://github.com/ing-bank/lion/ --git-root-dir ../../ --copy-dir docs/fundamentals/systems/overlays/assets",
     "prepublishOnly": "npm run publish-docs",
     "test": "cd ../../ && npm run test:browser -- --group overlays"
   },
diff --git a/packages/singleton-manager/README.md b/packages/singleton-manager/README.md
index 07b3e5cda..682e5287f 100644
--- a/packages/singleton-manager/README.md
+++ b/packages/singleton-manager/README.md
@@ -1,3 +1,3 @@
 # Singleton Manager
 
-[=> See Source <=](../../docs/docs/tools/singleton-manager/overview.md)
+[=> See Source <=](../../docs/fundamentals/tools/singleton-manager/overview.md)
diff --git a/packages/singleton-manager/docs/overview.md b/packages/singleton-manager/docs/overview.md
index 17ec3a024..7b3a01f9b 100644
--- a/packages/singleton-manager/docs/overview.md
+++ b/packages/singleton-manager/docs/overview.md
@@ -1,3 +1,3 @@
-# Select Rich
+# Singleton Manager
 
-[=> See Source <=](../../../docs/docs/tools/singleton-manager/overview.md)
+[=> See Source <=](../../../docs/fundamentals/tools/singleton-manager/overview.md)