diff --git a/SystemDoc.md b/SystemDoc.md
index f53d91ad..e88da404 100644
--- a/SystemDoc.md
+++ b/SystemDoc.md
@@ -7,30 +7,38 @@ permalink: /wiki/SystemDoc/
 System Documentation for Developers
 ===================================
 
--   Qubes OS Architecture v0.3 [​(pdf)](http://files.qubes-os.org/files/doc/arch-spec-0.3.pdf) (A bit outdated, but it was the original document that started this all...)
--   [Security-critical elements of Qubes OS](/wiki/SecurityCriticalCode)
--   [Qubes GUI virtualization protocol](/wiki/GUIdocs)
--   [Networking in Qubes](/wiki/QubesNet)
--   [Inter-domain file copying](/wiki/Qfilecopy)
--   Qubes RPC framework (qrexec): [In Qubes R1 and R2](/wiki/Qrexec) and [In Qubes R3/Odyssey](/wiki/Qrexec3)
-    -   [Qrexec v3 protocol details (R3/Odyssey)?](/wiki/QrexecProtocol)
--   [Dynamic memory management in Qubes](/wiki/Qmemman)
--   [Implementation of DisposableVMs](/wiki/DVMimpl)
--   [​Article about disposable VMs](http://theinvisiblethings.blogspot.com/2010/06/disposable-vms.html)
--   [Implementation of template sharing and updating](/wiki/TemplateImplementation)
--   [Dom0 secure update mechanism](/wiki/Dom0SecureUpdates)
--   [Debugging Windows VMs](/wiki/WindowsDebugging)
--   [Profiling python code](/wiki/Profiling)
--   [VM secure update mechanism?](/wiki/VMSecureUpdates)
--   [VM-dom0 internal configuration interface](/wiki/SystemDoc/VMInterface)
+1.  Fundamentals:
+    1.  Qubes OS Architecture v0.3 [​(pdf)](http://files.qubes-os.org/files/doc/arch-spec-0.3.pdf) (The original 2009 document that started this all...)
+    2.  [Security-critical elements of Qubes OS](/wiki/SecurityCriticalCode)
+    3.  Qubes RPC framework (qrexec):
+        1.  [In Qubes R1 and R2](/wiki/Qrexec)
+        2.  [In Qubes R3/Odyssey](/wiki/Qrexec3)
+        3.  [Qrexec v3 protocol details (R3/Odyssey)?](/wiki/QrexecProtocol)
 
-Build instructions:
+    4.  [Qubes GUI virtualization protocol](/wiki/GUIdocs)
+    5.  [Networking in Qubes](/wiki/QubesNet)
+    6.  [Implementation of template sharing and updating](/wiki/TemplateImplementation)
+
+2.  Services:
+    1.  [Inter-domain file copying](/wiki/Qfilecopy)
+    2.  [Dynamic memory management in Qubes](/wiki/Qmemman)
+    3.  [Implementation of DisposableVMs](/wiki/DVMimpl)
+    4.  [​Article about disposable VMs](http://theinvisiblethings.blogspot.com/2010/06/disposable-vms.html)
+    5.  [Dom0 secure update mechanism](/wiki/Dom0SecureUpdates)
+    6.  [VM secure update mechanism?](/wiki/VMSecureUpdates)
+
+3.  Debugging:
+    1.  [Debugging Windows VMs](/wiki/WindowsDebugging)
+    2.  [Profiling python code](/wiki/Profiling)
+    3.  [VM-dom0 internal configuration interface](/wiki/SystemDoc/VMInterface)
+
+4.  Building:
+    1.  [Building Qubes](/wiki/QubesBuilder)
+    2.  [Development Workflow](/wiki/DevelopmentWorkflow)
+    3.  [KDE Dom0 packages for Qubes](/wiki/KdeDom0)
+    4.  [How to build Qubes installation ISO](/wiki/InstallationIsoBuilding)
+    5.  [Building USB passthrough support (experimental)](/wiki/USBVM)
+    6.  [Building a TemplateVM based on a new OS (ArchLinux example)](/wiki/BuildingNonFedoraTemplate)
+    7.  [Building the Archlinux Template](/wiki/BuildingArchlinuxTemplate)
 
--   [Building Qubes](/wiki/QubesBuilder)
--   [Development Workflow](/wiki/DevelopmentWorkflow)
--   [KDE Dom0 packages for Qubes](/wiki/KdeDom0)
--   [How to build Qubes installation ISO](/wiki/InstallationIsoBuilding)
--   [Building USB passthrough support (experimental)](/wiki/USBVM)
--   [Building a TemplateVM based on a new OS (ArchLinux example)](/wiki/BuildingNonFedoraTemplate)
--   [Building the Archlinux Template](/wiki/BuildingArchlinuxTemplate)