diff --git a/docs/command-reference/_index.md b/docs/command-reference/_index.md
deleted file mode 100644
index 373d4fce..00000000
--- a/docs/command-reference/_index.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Command Reference
-type: docs
-weight: 6
----
\ No newline at end of file
diff --git a/docs/command-reference/uds.md b/docs/reference/CLI/commands/uds.md
similarity index 97%
rename from docs/command-reference/uds.md
rename to docs/reference/CLI/commands/uds.md
index b62305ae..22021e66 100644
--- a/docs/command-reference/uds.md
+++ b/docs/reference/CLI/commands/uds.md
@@ -1,7 +1,5 @@
---
title: uds
-description: UDS CLI command reference for uds
.
-type: docs
---
## uds
@@ -41,4 +39,3 @@ uds COMMAND [flags]
* [uds run](/cli/command-reference/uds_run/) - Run a task using maru-runner
* [uds ui](/cli/command-reference/uds_ui/) - [beta] Launch UDS Runtime and view UI
* [uds version](/cli/command-reference/uds_version/) - Shows the version of the running UDS-CLI binary
-
diff --git a/docs/command-reference/uds_completion.md b/docs/reference/CLI/commands/uds_completion.md
similarity index 95%
rename from docs/command-reference/uds_completion.md
rename to docs/reference/CLI/commands/uds_completion.md
index bcf5a109..2364798f 100644
--- a/docs/command-reference/uds_completion.md
+++ b/docs/reference/CLI/commands/uds_completion.md
@@ -1,7 +1,5 @@
---
title: uds completion
-description: UDS CLI command reference for uds completion
.
-type: docs
---
## uds completion
@@ -39,4 +37,3 @@ See each sub-command's help for details on how to use the generated script.
* [uds completion bash](/cli/command-reference/uds_completion_bash/) - Generate the autocompletion script for bash
* [uds completion fish](/cli/command-reference/uds_completion_fish/) - Generate the autocompletion script for fish
* [uds completion zsh](/cli/command-reference/uds_completion_zsh/) - Generate the autocompletion script for zsh
-
diff --git a/docs/command-reference/uds_completion_bash.md b/docs/reference/CLI/commands/uds_completion_bash.md
similarity index 95%
rename from docs/command-reference/uds_completion_bash.md
rename to docs/reference/CLI/commands/uds_completion_bash.md
index 68cee5db..48ed3957 100644
--- a/docs/command-reference/uds_completion_bash.md
+++ b/docs/reference/CLI/commands/uds_completion_bash.md
@@ -1,7 +1,5 @@
---
title: uds completion bash
-description: UDS CLI command reference for uds completion bash
.
-type: docs
---
## uds completion bash
@@ -59,4 +57,3 @@ uds completion bash
### SEE ALSO
* [uds completion](/cli/command-reference/uds_completion/) - Generate the autocompletion script for the specified shell
-
diff --git a/docs/command-reference/uds_completion_fish.md b/docs/reference/CLI/commands/uds_completion_fish.md
similarity index 95%
rename from docs/command-reference/uds_completion_fish.md
rename to docs/reference/CLI/commands/uds_completion_fish.md
index 2ae287be..ffd9ec03 100644
--- a/docs/command-reference/uds_completion_fish.md
+++ b/docs/reference/CLI/commands/uds_completion_fish.md
@@ -1,7 +1,5 @@
---
title: uds completion fish
-description: UDS CLI command reference for uds completion fish
.
-type: docs
---
## uds completion fish
@@ -50,4 +48,3 @@ uds completion fish [flags]
### SEE ALSO
* [uds completion](/cli/command-reference/uds_completion/) - Generate the autocompletion script for the specified shell
-
diff --git a/docs/command-reference/uds_completion_zsh.md b/docs/reference/CLI/commands/uds_completion_zsh.md
similarity index 95%
rename from docs/command-reference/uds_completion_zsh.md
rename to docs/reference/CLI/commands/uds_completion_zsh.md
index 8ba431f6..879365f3 100644
--- a/docs/command-reference/uds_completion_zsh.md
+++ b/docs/reference/CLI/commands/uds_completion_zsh.md
@@ -1,7 +1,5 @@
---
title: uds completion zsh
-description: UDS CLI command reference for uds completion zsh
.
-type: docs
---
## uds completion zsh
@@ -61,4 +59,3 @@ uds completion zsh [flags]
### SEE ALSO
* [uds completion](/cli/command-reference/uds_completion/) - Generate the autocompletion script for the specified shell
-
diff --git a/docs/command-reference/uds_create.md b/docs/reference/CLI/commands/uds_create.md
similarity index 95%
rename from docs/command-reference/uds_create.md
rename to docs/reference/CLI/commands/uds_create.md
index aeb9511d..fc9e4676 100644
--- a/docs/command-reference/uds_create.md
+++ b/docs/reference/CLI/commands/uds_create.md
@@ -1,7 +1,5 @@
---
title: uds create
-description: UDS CLI command reference for uds create
.
-type: docs
---
## uds create
@@ -40,4 +38,3 @@ uds create [DIRECTORY] [flags]
### SEE ALSO
* [uds](/cli/command-reference/uds/) - CLI for UDS Bundles
-
diff --git a/docs/command-reference/uds_deploy.md b/docs/reference/CLI/commands/uds_deploy.md
similarity index 96%
rename from docs/command-reference/uds_deploy.md
rename to docs/reference/CLI/commands/uds_deploy.md
index 1c786231..4a8cbe68 100644
--- a/docs/command-reference/uds_deploy.md
+++ b/docs/reference/CLI/commands/uds_deploy.md
@@ -1,7 +1,5 @@
---
title: uds deploy
-description: UDS CLI command reference for uds deploy
.
-type: docs
---
## uds deploy
@@ -39,4 +37,3 @@ uds deploy [BUNDLE_TARBALL|OCI_REF] [flags]
### SEE ALSO
* [uds](/cli/command-reference/uds/) - CLI for UDS Bundles
-
diff --git a/docs/command-reference/uds_dev.md b/docs/reference/CLI/commands/uds_dev.md
similarity index 94%
rename from docs/command-reference/uds_dev.md
rename to docs/reference/CLI/commands/uds_dev.md
index 57111327..8a7c5f12 100644
--- a/docs/command-reference/uds_dev.md
+++ b/docs/reference/CLI/commands/uds_dev.md
@@ -1,7 +1,5 @@
---
title: uds dev
-description: UDS CLI command reference for uds dev
.
-type: docs
---
## uds dev
@@ -31,4 +29,3 @@ type: docs
* [uds](/cli/command-reference/uds/) - CLI for UDS Bundles
* [uds dev deploy](/cli/command-reference/uds_dev_deploy/) - [beta] Creates and deploys a UDS bundle in dev mode
-
diff --git a/docs/command-reference/uds_dev_deploy.md b/docs/reference/CLI/commands/uds_dev_deploy.md
similarity index 96%
rename from docs/command-reference/uds_dev_deploy.md
rename to docs/reference/CLI/commands/uds_dev_deploy.md
index c5a7defe..b89b1e78 100644
--- a/docs/command-reference/uds_dev_deploy.md
+++ b/docs/reference/CLI/commands/uds_dev_deploy.md
@@ -1,7 +1,5 @@
---
title: uds dev deploy
-description: UDS CLI command reference for uds dev deploy
.
-type: docs
---
## uds dev deploy
@@ -43,4 +41,3 @@ uds dev deploy [BUNDLE_DIR|OCI_REF] [flags]
### SEE ALSO
* [uds dev](/cli/command-reference/uds_dev/) - [beta] Commands useful for developing bundles
-
diff --git a/docs/command-reference/uds_inspect.md b/docs/reference/CLI/commands/uds_inspect.md
similarity index 95%
rename from docs/command-reference/uds_inspect.md
rename to docs/reference/CLI/commands/uds_inspect.md
index 0236c650..28c62ac1 100644
--- a/docs/command-reference/uds_inspect.md
+++ b/docs/reference/CLI/commands/uds_inspect.md
@@ -1,7 +1,5 @@
---
title: uds inspect
-description: UDS CLI command reference for uds inspect
.
-type: docs
---
## uds inspect
@@ -39,4 +37,3 @@ uds inspect [BUNDLE_TARBALL|OCI_REF|BUNDLE_YAML_FILE] [flags]
### SEE ALSO
* [uds](/cli/command-reference/uds/) - CLI for UDS Bundles
-
diff --git a/docs/command-reference/uds_logs.md b/docs/reference/CLI/commands/uds_logs.md
similarity index 94%
rename from docs/command-reference/uds_logs.md
rename to docs/reference/CLI/commands/uds_logs.md
index 856b610e..ee816c91 100644
--- a/docs/command-reference/uds_logs.md
+++ b/docs/reference/CLI/commands/uds_logs.md
@@ -1,7 +1,5 @@
---
title: uds logs
-description: UDS CLI command reference for uds logs
.
-type: docs
---
## uds logs
@@ -34,4 +32,3 @@ uds logs [flags]
### SEE ALSO
* [uds](/cli/command-reference/uds/) - CLI for UDS Bundles
-
diff --git a/docs/command-reference/uds_monitor.md b/docs/reference/CLI/commands/uds_monitor.md
similarity index 94%
rename from docs/command-reference/uds_monitor.md
rename to docs/reference/CLI/commands/uds_monitor.md
index 532b9382..c7e7804a 100644
--- a/docs/command-reference/uds_monitor.md
+++ b/docs/reference/CLI/commands/uds_monitor.md
@@ -1,7 +1,5 @@
---
title: uds monitor
-description: UDS CLI command reference for uds monitor
.
-type: docs
---
## uds monitor
@@ -36,4 +34,3 @@ Tools for monitoring a UDS Cluster and connecting to the UDS Engine for advanced
* [uds](/cli/command-reference/uds/) - CLI for UDS Bundles
* [uds monitor pepr](/cli/command-reference/uds_monitor_pepr/) - Observe Pepr operations in a UDS Cluster
-
diff --git a/docs/command-reference/uds_monitor_pepr.md b/docs/reference/CLI/commands/uds_monitor_pepr.md
similarity index 96%
rename from docs/command-reference/uds_monitor_pepr.md
rename to docs/reference/CLI/commands/uds_monitor_pepr.md
index b2fab08a..e7b356ac 100644
--- a/docs/command-reference/uds_monitor_pepr.md
+++ b/docs/reference/CLI/commands/uds_monitor_pepr.md
@@ -1,7 +1,5 @@
---
title: uds monitor pepr
-description: UDS CLI command reference for uds monitor pepr
.
-type: docs
---
## uds monitor pepr
@@ -69,4 +67,3 @@ uds monitor pepr [policies | operator | allowed | denied | failed | mutated] [fl
### SEE ALSO
* [uds monitor](/cli/command-reference/uds_monitor/) - Monitor a UDS Cluster
-
diff --git a/docs/command-reference/uds_publish.md b/docs/reference/CLI/commands/uds_publish.md
similarity index 94%
rename from docs/command-reference/uds_publish.md
rename to docs/reference/CLI/commands/uds_publish.md
index 5cdb3944..903ed749 100644
--- a/docs/command-reference/uds_publish.md
+++ b/docs/reference/CLI/commands/uds_publish.md
@@ -1,7 +1,5 @@
---
title: uds publish
-description: UDS CLI command reference for uds publish
.
-type: docs
---
## uds publish
@@ -35,4 +33,3 @@ uds publish [BUNDLE_TARBALL] [OCI_REF] [flags]
### SEE ALSO
* [uds](/cli/command-reference/uds/) - CLI for UDS Bundles
-
diff --git a/docs/command-reference/uds_pull.md b/docs/reference/CLI/commands/uds_pull.md
similarity index 95%
rename from docs/command-reference/uds_pull.md
rename to docs/reference/CLI/commands/uds_pull.md
index dec25b21..1a9c23a2 100644
--- a/docs/command-reference/uds_pull.md
+++ b/docs/reference/CLI/commands/uds_pull.md
@@ -1,7 +1,5 @@
---
title: uds pull
-description: UDS CLI command reference for uds pull
.
-type: docs
---
## uds pull
@@ -36,4 +34,3 @@ uds pull [OCI_REF] [flags]
### SEE ALSO
* [uds](/cli/command-reference/uds/) - CLI for UDS Bundles
-
diff --git a/docs/command-reference/uds_remove.md b/docs/reference/CLI/commands/uds_remove.md
similarity index 95%
rename from docs/command-reference/uds_remove.md
rename to docs/reference/CLI/commands/uds_remove.md
index c804fe32..514f8bb5 100644
--- a/docs/command-reference/uds_remove.md
+++ b/docs/reference/CLI/commands/uds_remove.md
@@ -1,7 +1,5 @@
---
title: uds remove
-description: UDS CLI command reference for uds remove
.
-type: docs
---
## uds remove
@@ -36,4 +34,3 @@ uds remove [BUNDLE_TARBALL|OCI_REF] [flags]
### SEE ALSO
* [uds](/cli/command-reference/uds/) - CLI for UDS Bundles
-
diff --git a/docs/command-reference/uds_run.md b/docs/reference/CLI/commands/uds_run.md
similarity index 94%
rename from docs/command-reference/uds_run.md
rename to docs/reference/CLI/commands/uds_run.md
index e587e65d..8585b40e 100644
--- a/docs/command-reference/uds_run.md
+++ b/docs/reference/CLI/commands/uds_run.md
@@ -1,7 +1,5 @@
---
title: uds run
-description: UDS CLI command reference for uds run
.
-type: docs
---
## uds run
@@ -34,4 +32,3 @@ uds run [flags]
### SEE ALSO
* [uds](/cli/command-reference/uds/) - CLI for UDS Bundles
-
diff --git a/docs/command-reference/uds_ui.md b/docs/reference/CLI/commands/uds_ui.md
similarity index 94%
rename from docs/command-reference/uds_ui.md
rename to docs/reference/CLI/commands/uds_ui.md
index 6e1b8662..3168f8a2 100644
--- a/docs/command-reference/uds_ui.md
+++ b/docs/reference/CLI/commands/uds_ui.md
@@ -1,7 +1,5 @@
---
title: uds ui
-description: UDS CLI command reference for uds ui
.
-type: docs
---
## uds ui
@@ -34,4 +32,3 @@ uds ui [flags]
### SEE ALSO
* [uds](/cli/command-reference/uds/) - CLI for UDS Bundles
-
diff --git a/docs/command-reference/uds_version.md b/docs/reference/CLI/commands/uds_version.md
similarity index 94%
rename from docs/command-reference/uds_version.md
rename to docs/reference/CLI/commands/uds_version.md
index 0fb67bd0..1d5a7817 100644
--- a/docs/command-reference/uds_version.md
+++ b/docs/reference/CLI/commands/uds_version.md
@@ -1,7 +1,5 @@
---
title: uds version
-description: UDS CLI command reference for uds version
.
-type: docs
---
## uds version
@@ -38,4 +36,3 @@ uds version [flags]
### SEE ALSO
* [uds](/cli/command-reference/uds/) - CLI for UDS Bundles
-
diff --git a/docs/_index.md b/docs/reference/CLI/overview.md
similarity index 93%
rename from docs/_index.md
rename to docs/reference/CLI/overview.md
index 634261dc..762db28e 100644
--- a/docs/_index.md
+++ b/docs/reference/CLI/overview.md
@@ -1,10 +1,5 @@
---
title: Overview
-linkTitle: UDS CLI
-type: docs
-menu:
- main:
- weight: 30
---
The [UDS CLI](https://github.com/defenseunicorns/uds-cli) is the primary interface for users to interact with various components within the UDS landscape. It streamlines the deployment process of mission applications and secure infrastructure, simplifying tasks involved in running mission applications while maintaining regulatory compliance in a unified and efficient manner.
diff --git a/docs/quickstart-and-usage.md b/docs/reference/CLI/quickstart-and-usage.md
similarity index 98%
rename from docs/quickstart-and-usage.md
rename to docs/reference/CLI/quickstart-and-usage.md
index ef5b6b07..b21abaa6 100644
--- a/docs/quickstart-and-usage.md
+++ b/docs/reference/CLI/quickstart-and-usage.md
@@ -1,7 +1,5 @@
---
title: Quickstart and Usage
-type: docs
-weight: 1
---
## Install
@@ -72,9 +70,9 @@ There are 2 ways to create Bundles:
1. Inside an OCI registry: `uds create