diff --git a/docs/packwiz/packwiz_completion_bash.md b/docs/packwiz/completion/bash.md
similarity index 100%
rename from docs/packwiz/packwiz_completion_bash.md
rename to docs/packwiz/completion/bash.md
diff --git a/docs/packwiz/packwiz_completion_fish.md b/docs/packwiz/completion/fish.md
similarity index 100%
rename from docs/packwiz/packwiz_completion_fish.md
rename to docs/packwiz/completion/fish.md
diff --git a/docs/packwiz/packwiz_completion.md b/docs/packwiz/completion/index.md
similarity index 100%
rename from docs/packwiz/packwiz_completion.md
rename to docs/packwiz/completion/index.md
diff --git a/docs/packwiz/packwiz_completion_powershell.md b/docs/packwiz/completion/powershell.md
similarity index 100%
rename from docs/packwiz/packwiz_completion_powershell.md
rename to docs/packwiz/completion/powershell.md
diff --git a/docs/packwiz/packwiz_completion_zsh.md b/docs/packwiz/completion/zsh.md
similarity index 100%
rename from docs/packwiz/packwiz_completion_zsh.md
rename to docs/packwiz/completion/zsh.md
diff --git a/docs/packwiz/packwiz_curseforge_add.md b/docs/packwiz/curseforge/add.md
similarity index 100%
rename from docs/packwiz/packwiz_curseforge_add.md
rename to docs/packwiz/curseforge/add.md
diff --git a/docs/packwiz/packwiz_curseforge_detect.md b/docs/packwiz/curseforge/detect.md
similarity index 100%
rename from docs/packwiz/packwiz_curseforge_detect.md
rename to docs/packwiz/curseforge/detect.md
diff --git a/docs/packwiz/packwiz_curseforge_export.md b/docs/packwiz/curseforge/export.md
similarity index 100%
rename from docs/packwiz/packwiz_curseforge_export.md
rename to docs/packwiz/curseforge/export.md
diff --git a/docs/packwiz/packwiz_curseforge_import.md b/docs/packwiz/curseforge/import.md
similarity index 100%
rename from docs/packwiz/packwiz_curseforge_import.md
rename to docs/packwiz/curseforge/import.md
diff --git a/docs/packwiz/packwiz_curseforge.md b/docs/packwiz/curseforge/index.md
similarity index 100%
rename from docs/packwiz/packwiz_curseforge.md
rename to docs/packwiz/curseforge/index.md
diff --git a/docs/packwiz/packwiz_curseforge_open.md b/docs/packwiz/curseforge/open.md
similarity index 100%
rename from docs/packwiz/packwiz_curseforge_open.md
rename to docs/packwiz/curseforge/open.md
diff --git a/docs/packwiz/packwiz.md b/docs/packwiz/index.md
similarity index 100%
rename from docs/packwiz/packwiz.md
rename to docs/packwiz/index.md
diff --git a/docs/packwiz/packwiz_init.md b/docs/packwiz/init.md
similarity index 100%
rename from docs/packwiz/packwiz_init.md
rename to docs/packwiz/init.md
diff --git a/docs/packwiz/packwiz_list.md b/docs/packwiz/list.md
similarity index 100%
rename from docs/packwiz/packwiz_list.md
rename to docs/packwiz/list.md
diff --git a/docs/packwiz/packwiz_migrate.md b/docs/packwiz/migrate/index.md
similarity index 100%
rename from docs/packwiz/packwiz_migrate.md
rename to docs/packwiz/migrate/index.md
diff --git a/docs/packwiz/packwiz_migrate_loader.md b/docs/packwiz/migrate/loader.md
similarity index 100%
rename from docs/packwiz/packwiz_migrate_loader.md
rename to docs/packwiz/migrate/loader.md
diff --git a/docs/packwiz/packwiz_migrate_minecraft.md b/docs/packwiz/migrate/minecraft.md
similarity index 100%
rename from docs/packwiz/packwiz_migrate_minecraft.md
rename to docs/packwiz/migrate/minecraft.md
diff --git a/docs/packwiz/packwiz_modrinth_add.md b/docs/packwiz/modrinth/add.md
similarity index 100%
rename from docs/packwiz/packwiz_modrinth_add.md
rename to docs/packwiz/modrinth/add.md
diff --git a/docs/packwiz/packwiz_modrinth_export.md b/docs/packwiz/modrinth/export.md
similarity index 100%
rename from docs/packwiz/packwiz_modrinth_export.md
rename to docs/packwiz/modrinth/export.md
diff --git a/docs/packwiz/packwiz_modrinth.md b/docs/packwiz/modrinth/index.md
similarity index 100%
rename from docs/packwiz/packwiz_modrinth.md
rename to docs/packwiz/modrinth/index.md
diff --git a/docs/packwiz/packwiz_pin.md b/docs/packwiz/pin.md
similarity index 100%
rename from docs/packwiz/packwiz_pin.md
rename to docs/packwiz/pin.md
diff --git a/docs/packwiz/packwiz_refresh.md b/docs/packwiz/refresh.md
similarity index 100%
rename from docs/packwiz/packwiz_refresh.md
rename to docs/packwiz/refresh.md
diff --git a/docs/packwiz/packwiz_remove.md b/docs/packwiz/remove.md
similarity index 100%
rename from docs/packwiz/packwiz_remove.md
rename to docs/packwiz/remove.md
diff --git a/docs/packwiz/packwiz_serve.md b/docs/packwiz/serve.md
similarity index 100%
rename from docs/packwiz/packwiz_serve.md
rename to docs/packwiz/serve.md
diff --git a/docs/packwiz/packwiz_settings_acceptable-versions.md b/docs/packwiz/settings/acceptable-versions.md
similarity index 100%
rename from docs/packwiz/packwiz_settings_acceptable-versions.md
rename to docs/packwiz/settings/acceptable-versions.md
diff --git a/docs/packwiz/packwiz_settings.md b/docs/packwiz/settings/index.md
similarity index 100%
rename from docs/packwiz/packwiz_settings.md
rename to docs/packwiz/settings/index.md
diff --git a/docs/packwiz/packwiz_unpin.md b/docs/packwiz/unpin.md
similarity index 100%
rename from docs/packwiz/packwiz_unpin.md
rename to docs/packwiz/unpin.md
diff --git a/docs/packwiz/packwiz_update.md b/docs/packwiz/update.md
similarity index 100%
rename from docs/packwiz/packwiz_update.md
rename to docs/packwiz/update.md
diff --git a/docs/packwiz/packwiz_url_add.md b/docs/packwiz/url/add.md
similarity index 100%
rename from docs/packwiz/packwiz_url_add.md
rename to docs/packwiz/url/add.md
diff --git a/docs/packwiz/packwiz_url.md b/docs/packwiz/url/index.md
similarity index 100%
rename from docs/packwiz/packwiz_url.md
rename to docs/packwiz/url/index.md
diff --git a/docs/packwiz/packwiz_utils.md b/docs/packwiz/utils/index.md
similarity index 100%
rename from docs/packwiz/packwiz_utils.md
rename to docs/packwiz/utils/index.md
diff --git a/docs/packwiz/packwiz_utils_markdown.md b/docs/packwiz/utils/markdown.md
similarity index 100%
rename from docs/packwiz/packwiz_utils_markdown.md
rename to docs/packwiz/utils/markdown.md
diff --git a/mkdocs.yml b/mkdocs.yml
index ab50924..c9b8910 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -25,45 +25,45 @@ nav:
   - Common Issues: common-issues.md
   - Development:
     - packwiz:
-      - packwiz/packwiz.md
+      - packwiz/index.md
       - completion:
-        - packwiz/packwiz_completion.md
-        - bash: packwiz/packwiz_completion_bash.md
-        - fish: packwiz/packwiz_completion_fish.md
-        - powershell: packwiz/packwiz_completion_powershell.md
-        - zsh: packwiz/packwiz_completion_zsh.md
+        - packwiz/completion/index.md
+        - bash: packwiz/completion/bash.md
+        - fish: packwiz/completion/fish.md
+        - powershell: packwiz/completion/powershell.md
+        - zsh: packwiz/completion/zsh.md
       - curseforge:
-        - packwiz/packwiz_curseforge.md
-        - add: packwiz/packwiz_curseforge_add.md
-        - detect: packwiz/packwiz_curseforge_detect.md
-        - export: packwiz/packwiz_curseforge_export.md
-        - import: packwiz/packwiz_curseforge_import.md
-        - open: packwiz/packwiz_curseforge_open.md
-      - init: packwiz/packwiz_init.md
-      - list: packwiz/packwiz_list.md
+        - packwiz/curseforge/index.md
+        - add: packwiz/curseforge/add.md
+        - detect: packwiz/curseforge/detect.md
+        - export: packwiz/curseforge/export.md
+        - import: packwiz/curseforge/import.md
+        - open: packwiz/curseforge/open.md
+      - init: packwiz/init.md
+      - list: packwiz/list.md
       - migrate:
-        - packwiz/packwiz_migrate.md
-        - loader: packwiz/packwiz_migrate_loader.md
-        - minecraft: packwiz/packwiz_migrate_minecraft.md
+        - packwiz/migrate/index.md
+        - loader: packwiz/migrate/loader.md
+        - minecraft: packwiz/migrate/minecraft.md
       - modrinth:
-        - packwiz/packwiz_modrinth.md
-        - add: packwiz/packwiz_modrinth_add.md
-        - export: packwiz/packwiz_modrinth_export.md
-      - pin: packwiz/packwiz_pin.md
-      - refresh: packwiz/packwiz_refresh.md
-      - remove: packwiz/packwiz_remove.md
-      - serve: packwiz/packwiz_serve.md
+        - packwiz/modrinth/index.md
+        - add: packwiz/modrinth/add.md
+        - export: packwiz/modrinth/export.md
+      - pin: packwiz/pin.md
+      - refresh: packwiz/refresh.md
+      - remove: packwiz/remove.md
+      - serve: packwiz/serve.md
       - settings:
-        - packwiz/packwiz_settings.md
-        - acceptable-versions: packwiz/packwiz_settings_acceptable-versions.md
-      - unpin: packwiz/packwiz_unpin.md
-      - update: packwiz/packwiz_update.md
+        - packwiz/settings/index.md
+        - acceptable-versions: packwiz/settings/acceptable-versions.md
+      - unpin: packwiz/unpin.md
+      - update: packwiz/update.md
       - url:
-        - packwiz/packwiz_url.md
-        - add: packwiz/packwiz_url_add.md
+        - packwiz/url/index.md
+        - add: packwiz/url/add.md
       - utils:
-        - packwiz/packwiz_utils.md
-        - markdown: packwiz/packwiz_utils_markdown.md
+        - packwiz/utils/index.md
+        - markdown: packwiz/utils/markdown.md
 
 plugins:
   - git-authors