diff --git a/website/content/docs/commands/operator/autopilot-get-config.mdx b/website/content/docs/commands/operator/autopilot/get-config.mdx
similarity index 100%
rename from website/content/docs/commands/operator/autopilot-get-config.mdx
rename to website/content/docs/commands/operator/autopilot/get-config.mdx
diff --git a/website/content/docs/commands/operator/autopilot-set-config.mdx b/website/content/docs/commands/operator/autopilot/set-config.mdx
similarity index 100%
rename from website/content/docs/commands/operator/autopilot-set-config.mdx
rename to website/content/docs/commands/operator/autopilot/set-config.mdx
diff --git a/website/content/docs/commands/operator/raft-info.mdx b/website/content/docs/commands/operator/raft/info.mdx
similarity index 100%
rename from website/content/docs/commands/operator/raft-info.mdx
rename to website/content/docs/commands/operator/raft/info.mdx
diff --git a/website/content/docs/commands/operator/raft-list-peers.mdx b/website/content/docs/commands/operator/raft/list-peers.mdx
similarity index 100%
rename from website/content/docs/commands/operator/raft-list-peers.mdx
rename to website/content/docs/commands/operator/raft/list-peers.mdx
diff --git a/website/content/docs/commands/operator/raft-logs.mdx b/website/content/docs/commands/operator/raft/logs.mdx
similarity index 100%
rename from website/content/docs/commands/operator/raft-logs.mdx
rename to website/content/docs/commands/operator/raft/logs.mdx
diff --git a/website/content/docs/commands/operator/raft-remove-peer.mdx b/website/content/docs/commands/operator/raft/remove-peer.mdx
similarity index 100%
rename from website/content/docs/commands/operator/raft-remove-peer.mdx
rename to website/content/docs/commands/operator/raft/remove-peer.mdx
diff --git a/website/content/docs/commands/operator/raft-state.mdx b/website/content/docs/commands/operator/raft/state.mdx
similarity index 100%
rename from website/content/docs/commands/operator/raft-state.mdx
rename to website/content/docs/commands/operator/raft/state.mdx
diff --git a/website/content/docs/commands/operator/scheduler-get-config.mdx b/website/content/docs/commands/operator/scheduler/get-config.mdx
similarity index 100%
rename from website/content/docs/commands/operator/scheduler-get-config.mdx
rename to website/content/docs/commands/operator/scheduler/get-config.mdx
diff --git a/website/content/docs/commands/operator/scheduler-set-config.mdx b/website/content/docs/commands/operator/scheduler/set-config.mdx
similarity index 100%
rename from website/content/docs/commands/operator/scheduler-set-config.mdx
rename to website/content/docs/commands/operator/scheduler/set-config.mdx
diff --git a/website/content/docs/commands/operator/snapshot-agent.mdx b/website/content/docs/commands/operator/snapshot/agent.mdx
similarity index 100%
rename from website/content/docs/commands/operator/snapshot-agent.mdx
rename to website/content/docs/commands/operator/snapshot/agent.mdx
diff --git a/website/content/docs/commands/operator/snapshot-inspect.mdx b/website/content/docs/commands/operator/snapshot/inspect.mdx
similarity index 100%
rename from website/content/docs/commands/operator/snapshot-inspect.mdx
rename to website/content/docs/commands/operator/snapshot/inspect.mdx
diff --git a/website/content/docs/commands/operator/snapshot-restore.mdx b/website/content/docs/commands/operator/snapshot/restore.mdx
similarity index 100%
rename from website/content/docs/commands/operator/snapshot-restore.mdx
rename to website/content/docs/commands/operator/snapshot/restore.mdx
diff --git a/website/content/docs/commands/operator/snapshot-save.mdx b/website/content/docs/commands/operator/snapshot/save.mdx
similarity index 100%
rename from website/content/docs/commands/operator/snapshot-save.mdx
rename to website/content/docs/commands/operator/snapshot/save.mdx
diff --git a/website/content/docs/commands/operator/snapshot-state.mdx b/website/content/docs/commands/operator/snapshot/state.mdx
similarity index 100%
rename from website/content/docs/commands/operator/snapshot-state.mdx
rename to website/content/docs/commands/operator/snapshot/state.mdx
diff --git a/website/data/docs-nav-data.json b/website/data/docs-nav-data.json
index bd1166746..337190973 100644
--- a/website/data/docs-nav-data.json
+++ b/website/data/docs-nav-data.json
@@ -546,12 +546,17 @@
             "path": "commands/operator/api"
           },
           {
-            "title": "autopilot get-config",
-            "path": "commands/operator/autopilot-get-config"
-          },
-          {
-            "title": "autopilot set-config",
-            "path": "commands/operator/autopilot-set-config"
+            "title": "autopilot",
+            "routes": [
+              {
+                "title": "get-config",
+                "path": "commands/operator/autopilot/get-config"
+              },
+              {
+                "title": "set-config",
+                "path": "commands/operator/autopilot/set-config"
+              }
+            ]
           },
           {
             "title": "debug",
@@ -570,52 +575,67 @@
             "path": "commands/operator/metrics"
           },
           {
-            "title": "raft info",
-            "path": "commands/operator/raft-info"
+            "title": "raft",
+            "routes": [
+              {
+                "title": "info",
+                "path": "commands/operator/raft/info"
+              },
+              {
+                "title": "list-peers",
+                "path": "commands/operator/raft/list-peers"
+              },
+              {
+                "title": "logs",
+                "path": "commands/operator/raft/logs"
+              },
+              {
+                "title": "remove-peer",
+                "path": "commands/operator/raft/remove-peer"
+              },
+              {
+                "title": "state",
+                "path": "commands/operator/raft/state"
+              }
+            ]
           },
           {
-            "title": "raft list-peers",
-            "path": "commands/operator/raft-list-peers"
+            "title": "scheduler",
+            "routes": [
+              {
+                "title": "get-config",
+                "path": "commands/operator/scheduler/get-config"
+              },
+              {
+                "title": "set-config",
+                "path": "commands/operator/scheduler/set-config"
+              }
+            ]
           },
           {
-            "title": "raft logs",
-            "path": "commands/operator/raft-logs"
-          },
-          {
-            "title": "raft remove-peer",
-            "path": "commands/operator/raft-remove-peer"
-          },
-          {
-            "title": "raft state",
-            "path": "commands/operator/raft-state"
-          },
-          {
-            "title": "scheduler get-config",
-            "path": "commands/operator/scheduler-get-config"
-          },
-          {
-            "title": "scheduler set-config",
-            "path": "commands/operator/scheduler-set-config"
-          },
-          {
-            "title": "snapshot agent",
-            "path": "commands/operator/snapshot-agent"
-          },
-          {
-            "title": "snapshot inspect",
-            "path": "commands/operator/snapshot-inspect"
-          },
-          {
-            "title": "snapshot restore",
-            "path": "commands/operator/snapshot-restore"
-          },
-          {
-            "title": "snapshot save",
-            "path": "commands/operator/snapshot-save"
-          },
-          {
-            "title": "snapshot state",
-            "path": "commands/operator/snapshot-state"
+            "title": "snapshot",
+            "routes": [
+              {
+                "title": "agent",
+                "path": "commands/operator/snapshot/agent"
+              },
+              {
+                "title": "inspect",
+                "path": "commands/operator/snapshot/inspect"
+              },
+              {
+                "title": "restore",
+                "path": "commands/operator/snapshot/restore"
+              },
+              {
+                "title": "save",
+                "path": "commands/operator/snapshot/save"
+              },
+              {
+                "title": "state",
+                "path": "commands/operator/snapshot/state"
+              }
+            ]
           }
         ]
       },