diff --git a/architecture-docs/Fediversity-architecture-notes.md b/architecture-docs/Fediversity-architecture-notes.md
index 7ec8f7d..4ee9636 100644
--- a/architecture-docs/Fediversity-architecture-notes.md
+++ b/architecture-docs/Fediversity-architecture-notes.md
@@ -5,38 +5,34 @@ graph TB
 
 Core[<b>Core-services</b><br/><small>DNS<br/>Email<br/>identity_management<br/>secret_management<br/>authentication<br/>SASL</small>]
 
-Services[<b>Services</b><br/><small>NextCloud<br/>secure_document_collaboration<br/>Forgejo<br/>webmail<br/>HedgeDoc<br/>project_planning</small>]
-
-FediServices[<b>FediServices</b><br/><small>Matrix<br/>Pixelfed<br/>Peertube<br/>Mastadon<br/>GotoSocial<br/>activityPub</small>]
 
 subgraph Management
     Administration[<b>Administration</b><br/><small>monitoring<br/>alerting<br/>graphing<br/>restore_backups</small>]
-
     Management_UI[<b>Management_UI</b><br/><small>human-oriented<br/>administration<br/>replication<br/>migration</small>]
-
     NixOps[<b>NixOps</b><br/><small>orchestration</small>]
 end
 
-Storage[<b>Storage</b><br/><small>exclusive_filesystem<br/>shared_blob<br/>zfs</small>]
 
-Hardware[<b>Hardware</b><br/><small>Storage<br/>Networking<br/>Operating-system<br/>Virtualization</small>]
+subgraph Hardware
+    Systems[<b>Systems</b><br/><small>Storage<br/>Networking<br/>Operating-system<br/>Virtualization</small>]
+    Storage[<b>Storage</b><br/><small>exclusive_filesystem<br/>shared_blob<br/>zfs</small>]
+end
 
-Virtualization[<b>Virtualization</b><br/><small>Proxmox</small>]
+subgraph Virtualization
+    Nixos[<b>Nixos</b><br/><small>Application</small>]
+    LinuxOS[<b>LinuxOS</b><br/><small>Application</small>]
 
-Nixos[<b>Nixos</b><br/><small>Application</small>]
-
-LinuxOS[<b>LinuxOS</b><br/><small>Application</small>]
+    Services[<b>Services</b><br/><small>NextCloud<br/>secure_document_collaboration<br/>Forgejo<br/>webmail<br/>HedgeDoc<br/>project_planning</small>]
+    FediServices[<b>FediServices</b><br/><small>Matrix<br/>Pixelfed<br/>Peertube<br/>Mastadon<br/>GotoSocial<br/>activityPub</small>]
+end
 
 
-Hardware --> Storage
+Systems --> Storage
 Hardware --> Virtualization
-Virtualization --> Nixos
-Virtualization --> LinuxOS
+Virtualization --> Hardware 
 Services --> Core
 FediServices --> Core
-Services --> Storage
-FediServices --> Storage
-Core --> Storage
+Core --> Hardware
 Nixos --> Services
 Nixos --> FediServices
 Management_UI --> NixOps