diff --git a/docs/games/ddra20/setup.md b/docs/games/ddr/a20/setup.md
similarity index 100%
rename from docs/games/ddra20/setup.md
rename to docs/games/ddr/a20/setup.md
diff --git a/docs/games/ddra20/troubleshooting.md b/docs/games/ddr/a20/troubleshooting.md
similarity index 100%
rename from docs/games/ddra20/troubleshooting.md
rename to docs/games/ddr/a20/troubleshooting.md
diff --git a/docs/games/ddra20plus/setup.md b/docs/games/ddr/a20plus/setup.md
similarity index 100%
rename from docs/games/ddra20plus/setup.md
rename to docs/games/ddr/a20plus/setup.md
diff --git a/docs/games/ddra20plus/troubleshooting.md b/docs/games/ddr/a20plus/troubleshooting.md
similarity index 100%
rename from docs/games/ddra20plus/troubleshooting.md
rename to docs/games/ddr/a20plus/troubleshooting.md
diff --git a/docs/games/ddra3/setup.md b/docs/games/ddr/a3/setup.md
similarity index 100%
rename from docs/games/ddra3/setup.md
rename to docs/games/ddr/a3/setup.md
diff --git a/docs/games/ddra3/troubleshooting.md b/docs/games/ddr/a3/troubleshooting.md
similarity index 100%
rename from docs/games/ddra3/troubleshooting.md
rename to docs/games/ddr/a3/troubleshooting.md
diff --git a/docs/games/ddr/setup.md b/docs/games/ddr/setup.md
index 2147cd56..7e76530e 100644
--- a/docs/games/ddr/setup.md
+++ b/docs/games/ddr/setup.md
@@ -143,7 +143,7 @@
 
 #### Patches
 
-!!! info "Go through the [Spice2x Patching](../../extras/patchsp2x.md) page to import patches."
+!!! info "Go through the [Spice2x Patching](../../../extras/patchsp2x.md) page to import patches."
 
 !!! danger "To prevent issues, avoid patching things you don't need or understand."
 
@@ -202,7 +202,7 @@
 
 ??? tip "Local e-amuse Emulator (Asphyxia)"
 
-	This is covered in the [Asphyxia CORE](../../extras/asphyxia.md) page.
+	This is covered in the [Asphyxia CORE](../../../extras/asphyxia.md) page.
 
 ---
 ### Pre-launch requirements
@@ -227,4 +227,4 @@
 
 !!! warning "Have any other issue?"
 
-	Check out the [Troubleshooting](troubleshooting.md) and [Error Codes](../../errorcodes/bemani.md) pages.
\ No newline at end of file
+	Check out the [Troubleshooting](troubleshooting.md) and [Error Codes](../../../errorcodes/bemani.md) pages.
\ No newline at end of file
diff --git a/docs/games/ddrworld/setup.md b/docs/games/ddr/world/setup.md
similarity index 100%
rename from docs/games/ddrworld/setup.md
rename to docs/games/ddr/world/setup.md
diff --git a/docs/games/ddrworld/troubleshooting.md b/docs/games/ddr/world/troubleshooting.md
similarity index 100%
rename from docs/games/ddrworld/troubleshooting.md
rename to docs/games/ddr/world/troubleshooting.md
diff --git a/mkdocs.yml b/mkdocs.yml
index a8cf2ecc..cf0bb6f8 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -76,17 +76,17 @@ nav:
           - "Common Problems/Tips": "games/hellopopn/problems.md"
       - "DDR":
         - "DDR A20":
-          - "Game Setup": "games/ddra20/setup.md"
-          - "Troubleshooting": "games/ddra20/troubleshooting.md"
+          - "Game Setup": "games/ddr/a20/setup.md"
+          - "Troubleshooting": "games/ddr/a20/troubleshooting.md"
         - "DDR A20 PLUS":
-          - "Game Setup": "games/ddra20plus/setup.md"
-          - "Troubleshooting": "games/ddra20plus/troubleshooting.md"
+          - "Game Setup": "games/ddr/a20plus/setup.md"
+          - "Troubleshooting": "games/ddr/a20plus/troubleshooting.md"
         - "DDR A3":
-          - "Game Setup": "games/ddra3/setup.md"
-          - "Troubleshooting": "games/ddra3/troubleshooting.md"
+          - "Game Setup": "games/ddr/a3/setup.md"
+          - "Troubleshooting": "games/ddr/a3/troubleshooting.md"
         - "DDR WORLD":
-          - "Game Setup": "games/ddrworld/setup.md"
-          - "Troubleshooting": "games/ddrworld/troubleshooting.md"
+          - "Game Setup": "games/ddr/world/setup.md"
+          - "Troubleshooting": "games/ddr/world/troubleshooting.md"
       - "Jubeat":
         - "Jubeat Clan":
           - "First Time Setup": "games/jubeatclan/setup.md"