diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index d44a834..fd3f098 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -29,12 +29,12 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Projects/Test-ok/T4997C_update.md",
+                "file": "Projects/PRJ-0002_m4939-nieuwe-firmware.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "T4997C_update"
+              "title": "PRJ-0002_m4939-nieuwe-firmware"
             }
           },
           {
@@ -43,16 +43,16 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "08_DOMAINS/Test-OK.md",
+                "file": "Systems/test-ok.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "Test-OK"
+              "title": "test-ok"
             }
           }
         ],
-        "currentTab": 2
+        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -119,13 +119,13 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "08_DOMAINS/Test-OK.md",
+                "file": "Projects/PRJ-0002_m4939-nieuwe-firmware.md",
                 "followCursor": false,
                 "showSearch": false,
                 "searchQuery": ""
               },
               "icon": "lucide-list",
-              "title": "Outline of Test-OK"
+              "title": "Outline of PRJ-0002_m4939-nieuwe-firmware"
             }
           }
         ]
@@ -195,13 +195,13 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "08_DOMAINS/Test-OK.md",
+                "file": "Projects/PRJ-0002_m4939-nieuwe-firmware.md",
                 "followCursor": false,
                 "showSearch": false,
                 "searchQuery": ""
               },
               "icon": "lucide-list",
-              "title": "Outline of Test-OK"
+              "title": "Outline of PRJ-0002_m4939-nieuwe-firmware"
             }
           },
           {
@@ -257,38 +257,38 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "8bd6798528043d8f",
+  "active": "81fc2f07bac1e6ac",
   "lastOpenFiles": [
-    "Projects/Test-ok/T4997C_update.md",
-    "08_DOMAINS/Test-OK.md",
-    "Daily/2026-05-11.md",
+    "Projects/T5089A Testontwerp.md",
+    "Systems/gitlab.md",
+    "Systems/test-ok.md",
+    "Systems/testtrack.md",
+    "Projects/T4997C_update.md",
     "00 - Start/Dashboard.md",
+    "Daily/2026-05-11.md",
     "Projects/Test-ok",
-    "Projects/2026/T5089A Testontwerp.md",
-    "Projects/2026/Hittech testrapporten uploaden.md",
+    "Projects/PRJ-0001_hittech-testrapporten.md",
     "Meetings/2026/2026-05-11 Bluebird procesoptimalisatie.md",
     "Daily/2026-05-08.md",
     "Daily/2026-05-07.md",
-    "Contactpersonen/Patrick de Kroon.md",
-    "Contactpersonen/Rob Gloudemans.md",
-    "Contactpersonen/Rik Somers.md",
+    "People/Patrick de Kroon.md",
+    "People/Rob Gloudemans.md",
+    "People/Rik Somers.md",
     "Meetings/2026/2026-05-07 3T ESC-P test.md",
-    "Contactpersonen/Ties Jansen.md",
-    "Contactpersonen/Marco van Zijl.md",
-    "Contactpersonen/Tariq Dinmohamed.md",
-    "05 - Producten/M4772.md",
-    "Contactpersonen/Niels Rombouts.md",
-    "Contactpersonen/Titian Bogaerts.md",
+    "People/Ties Jansen.md",
+    "People/Marco van Zijl.md",
+    "People/Tariq Dinmohamed.md",
+    "Products/M4772.md",
+    "People/Niels Rombouts.md",
+    "People/Titian Bogaerts.md",
     "00 - Start/Views/mini-calendar-default.base",
     "Daily/2026-04-02.md",
     "Daily/2026-02-27.md",
     "Daily/2026-03-27.md",
     "Daily/2026-03-16.md",
     "Daily/2026-03-17.md",
-    "Companies/Matas.md",
-    "Companies/3T.md",
     "Companies",
-    "Contactpersonen",
+    "People",
     "00 - Start/Views/calendar-default.base",
     "00 - Start/Views/agenda-default.base",
     "00 - Start/Views/kanban-default.base",
diff --git a/06 - Testadapters/T4893B.md b/Fixtures/T4893B.md
similarity index 100%
rename from 06 - Testadapters/T4893B.md
rename to Fixtures/T4893B.md
diff --git a/06 - Testadapters/T4997A.md b/Fixtures/T4997A.md
similarity index 100%
rename from 06 - Testadapters/T4997A.md
rename to Fixtures/T4997A.md
diff --git a/06 - Testadapters/T5089A.md b/Fixtures/T5089A.md
similarity index 100%
rename from 06 - Testadapters/T5089A.md
rename to Fixtures/T5089A.md
diff --git a/Contactpersonen/Frank Hobelman.md b/People/Frank Hobelman.md
similarity index 100%
rename from Contactpersonen/Frank Hobelman.md
rename to People/Frank Hobelman.md
diff --git a/Contactpersonen/Marco van Zijl.md b/People/Marco van Zijl.md
similarity index 100%
rename from Contactpersonen/Marco van Zijl.md
rename to People/Marco van Zijl.md
diff --git a/Contactpersonen/Niels Rombouts.md b/People/Niels Rombouts.md
similarity index 100%
rename from Contactpersonen/Niels Rombouts.md
rename to People/Niels Rombouts.md
diff --git a/Contactpersonen/Patrick de Kroon.md b/People/Patrick de Kroon.md
similarity index 100%
rename from Contactpersonen/Patrick de Kroon.md
rename to People/Patrick de Kroon.md
diff --git a/Contactpersonen/Rik Somers.md b/People/Rik Somers.md
similarity index 100%
rename from Contactpersonen/Rik Somers.md
rename to People/Rik Somers.md
diff --git a/Contactpersonen/Rob Gloudemans.md b/People/Rob Gloudemans.md
similarity index 100%
rename from Contactpersonen/Rob Gloudemans.md
rename to People/Rob Gloudemans.md
diff --git a/Contactpersonen/Tariq Dinmohamed.md b/People/Tariq Dinmohamed.md
similarity index 100%
rename from Contactpersonen/Tariq Dinmohamed.md
rename to People/Tariq Dinmohamed.md
diff --git a/Contactpersonen/Ties Jansen.md b/People/Ties Jansen.md
similarity index 100%
rename from Contactpersonen/Ties Jansen.md
rename to People/Ties Jansen.md
diff --git a/Contactpersonen/Titian Bogaerts.md b/People/Titian Bogaerts.md
similarity index 100%
rename from Contactpersonen/Titian Bogaerts.md
rename to People/Titian Bogaerts.md
diff --git a/05 - Producten/M4772.md b/Products/M4772.md
similarity index 100%
rename from 05 - Producten/M4772.md
rename to Products/M4772.md
diff --git a/Projects/2026/Hittech testrapporten uploaden.md b/Projects/PRJ-0001_hittech-testrapporten.md
similarity index 100%
rename from Projects/2026/Hittech testrapporten uploaden.md
rename to Projects/PRJ-0001_hittech-testrapporten.md
diff --git a/Projects/2026/M4939 Nieuwe firmware.md b/Projects/PRJ-0002_m4939-nieuwe-firmware.md
similarity index 100%
rename from Projects/2026/M4939 Nieuwe firmware.md
rename to Projects/PRJ-0002_m4939-nieuwe-firmware.md
diff --git a/Projects/2026/RMA orders importeren in Test-OK.md b/Projects/PRJ-0003_rma-orders-importeren-testok.md
similarity index 100%
rename from Projects/2026/RMA orders importeren in Test-OK.md
rename to Projects/PRJ-0003_rma-orders-importeren-testok.md
diff --git a/Projects/2026/T4166F wijziging.md b/Projects/PRJ-0004_t4166f-wijziging.md
similarity index 100%
rename from Projects/2026/T4166F wijziging.md
rename to Projects/PRJ-0004_t4166f-wijziging.md
diff --git a/Projects/2026/T4912B Update.md b/Projects/T4912B Update.md
similarity index 100%
rename from Projects/2026/T4912B Update.md
rename to Projects/T4912B Update.md
diff --git a/Projects/Test-ok/T4997C_update.md b/Projects/T4997C_update.md
similarity index 100%
rename from Projects/Test-ok/T4997C_update.md
rename to Projects/T4997C_update.md
diff --git a/Projects/2026/T5089A Testontwerp.md b/Projects/T5089A Testontwerp.md
similarity index 100%
rename from Projects/2026/T5089A Testontwerp.md
rename to Projects/T5089A Testontwerp.md
diff --git a/Systems/gitlab.md b/Systems/gitlab.md
new file mode 100644
index 0000000..e69de29
diff --git a/08_DOMAINS/Test-OK.md b/Systems/test-ok.md
similarity index 100%
rename from 08_DOMAINS/Test-OK.md
rename to Systems/test-ok.md
diff --git a/Systems/testtrack.md b/Systems/testtrack.md
new file mode 100644
index 0000000..e69de29