diff --git a/docs/getting-started.md b/docs/getting-started.md
index 664ee7e..4f54eca 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -20,16 +20,16 @@ and configuration details needed to get connected!
 	* [Adding your prefix to EntityDB](registration/entitydb.md)
 4. Setting up routing
 	1. Setting up Bird
-		1. [Bird basics](bird_basics.md)
+		1. [Bird basics](routing/bird/bird_basics.md)
 		2. Bird configuration
-			1. [Bird 1.6](bird1.6.md)
-			2. [Bird 2.0](bird2.md)
+			1. [Bird 1.6](routing/bird/bird1.6.md)
+			2. [Bird 2.0](routing/bird/bird2.md)
 			3. Protocols
-				1. [Babel](bird_babel.md)
-				2. [OSPFv3](bird_ospfv3.md)
-5. [Tunneling](tunneling.md) TODO: Finish this
-	* TODO: Setup tunnel(s)
-	* TODO: Fastd config
+				1. [Babel](routing/bird/bird_babel.md)
+				2. [OSPFv3](routing/bird/bird_ospfv3.md)
+5. Tunneling
+	* [Fastd tunneling](tunneling/fastd.md)
+	* [GRE tunneling](tunneling/gre.md)
 6. Setting up your home network
 	* [Configuring your hosts]
 		1. Statically (TODO)
diff --git a/docs/bird1.6.md b/docs/routing/bird/bird1.6.md
similarity index 100%
rename from docs/bird1.6.md
rename to docs/routing/bird/bird1.6.md
diff --git a/docs/bird2.md b/docs/routing/bird/bird2.md
similarity index 100%
rename from docs/bird2.md
rename to docs/routing/bird/bird2.md
diff --git a/docs/bird_babel.md b/docs/routing/bird/bird_babel.md
similarity index 100%
rename from docs/bird_babel.md
rename to docs/routing/bird/bird_babel.md
diff --git a/docs/bird_basics.md b/docs/routing/bird/bird_basics.md
similarity index 100%
rename from docs/bird_basics.md
rename to docs/routing/bird/bird_basics.md
diff --git a/mkdocs.yml b/mkdocs.yml
index ada45e0..70c7c65 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -12,16 +12,16 @@ nav:
          - Adding your prefix to EntityDB: registration/entitydb.md
       - Routing:
          - Setting up Bird:
-            - Bird basics: bird_basics.md
+            - Bird basics: routing/bird/bird_basics.md
             - Bird configuration:
-               - Bird 1.6: bird1.6.md
-               - Bird 2: bird2.md
+               - Bird 1.6: routing/bird/bird1.6.md
+               - Bird 2: routing/bird/bird2.md
             - Protocols:
-               - Babel: bird_babel.md
-               - OSPFv3: bird_ospfv3.md
+               - Babel: routing/bird/bird_babel.md
+               - OSPFv3: routing/bird/bird_ospfv3.md
       - Tunneling:
          - Fastd: tunneling/fastd.md
-         - GRE: gre.md
+         - GRE: tunneling/gre.md
       - Setting up your home network:
          - Configuring your hosts:
             - Statically (TODO): static.md