diff --git a/binaries/cli/src/commands/build.rs b/binaries/cli/src/command/build.rs
similarity index 100%
rename from binaries/cli/src/commands/build.rs
rename to binaries/cli/src/command/build.rs
diff --git a/binaries/cli/src/commands/check.rs b/binaries/cli/src/command/check.rs
similarity index 100%
rename from binaries/cli/src/commands/check.rs
rename to binaries/cli/src/command/check.rs
diff --git a/binaries/cli/src/commands/coordinator.rs b/binaries/cli/src/command/coordinator.rs
similarity index 100%
rename from binaries/cli/src/commands/coordinator.rs
rename to binaries/cli/src/command/coordinator.rs
diff --git a/binaries/cli/src/commands/daemon.rs b/binaries/cli/src/command/daemon.rs
similarity index 100%
rename from binaries/cli/src/commands/daemon.rs
rename to binaries/cli/src/command/daemon.rs
diff --git a/binaries/cli/src/commands/destroy.rs b/binaries/cli/src/command/destroy.rs
similarity index 100%
rename from binaries/cli/src/commands/destroy.rs
rename to binaries/cli/src/command/destroy.rs
diff --git a/binaries/cli/src/commands/graph.rs b/binaries/cli/src/command/graph.rs
similarity index 100%
rename from binaries/cli/src/commands/graph.rs
rename to binaries/cli/src/command/graph.rs
diff --git a/binaries/cli/src/commands/graph/.gitignore b/binaries/cli/src/command/graph/.gitignore
similarity index 100%
rename from binaries/cli/src/commands/graph/.gitignore
rename to binaries/cli/src/command/graph/.gitignore
diff --git a/binaries/cli/src/commands/graph/mermaid-template.html b/binaries/cli/src/command/graph/mermaid-template.html
similarity index 100%
rename from binaries/cli/src/commands/graph/mermaid-template.html
rename to binaries/cli/src/command/graph/mermaid-template.html
diff --git a/binaries/cli/src/commands/list.rs b/binaries/cli/src/command/list.rs
similarity index 100%
rename from binaries/cli/src/commands/list.rs
rename to binaries/cli/src/command/list.rs
diff --git a/binaries/cli/src/commands/logs.rs b/binaries/cli/src/command/logs.rs
similarity index 100%
rename from binaries/cli/src/commands/logs.rs
rename to binaries/cli/src/command/logs.rs
diff --git a/binaries/cli/src/commands/new.rs b/binaries/cli/src/command/new.rs
similarity index 100%
rename from binaries/cli/src/commands/new.rs
rename to binaries/cli/src/command/new.rs
diff --git a/binaries/cli/src/commands/run.rs b/binaries/cli/src/command/run.rs
similarity index 100%
rename from binaries/cli/src/commands/run.rs
rename to binaries/cli/src/command/run.rs
diff --git a/binaries/cli/src/commands/runtime.rs b/binaries/cli/src/command/runtime.rs
similarity index 100%
rename from binaries/cli/src/commands/runtime.rs
rename to binaries/cli/src/command/runtime.rs
diff --git a/binaries/cli/src/commands/self_.rs b/binaries/cli/src/command/self_.rs
similarity index 100%
rename from binaries/cli/src/commands/self_.rs
rename to binaries/cli/src/command/self_.rs
diff --git a/binaries/cli/src/commands/start/attach.rs b/binaries/cli/src/command/start/attach.rs
similarity index 100%
rename from binaries/cli/src/commands/start/attach.rs
rename to binaries/cli/src/command/start/attach.rs
diff --git a/binaries/cli/src/commands/start/mod.rs b/binaries/cli/src/command/start/mod.rs
similarity index 100%
rename from binaries/cli/src/commands/start/mod.rs
rename to binaries/cli/src/command/start/mod.rs
diff --git a/binaries/cli/src/commands/stop.rs b/binaries/cli/src/command/stop.rs
similarity index 100%
rename from binaries/cli/src/commands/stop.rs
rename to binaries/cli/src/command/stop.rs
diff --git a/binaries/cli/src/commands/up.rs b/binaries/cli/src/command/up.rs
similarity index 100%
rename from binaries/cli/src/commands/up.rs
rename to binaries/cli/src/command/up.rs
diff --git a/binaries/cli/src/lib.rs b/binaries/cli/src/lib.rs
index d1e026c8..03474839 100644
--- a/binaries/cli/src/lib.rs
+++ b/binaries/cli/src/lib.rs
@@ -1,11 +1,11 @@
 use colored::Colorize;
-use commands::Executable;
+use command::Executable;
 use std::{
     net::{IpAddr, Ipv4Addr},
     path::PathBuf,
 };
 
-mod commands;
+mod command;
 mod common;
 mod formatting;
 pub mod output;
@@ -19,7 +19,7 @@ const LISTEN_WILDCARD: IpAddr = IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0));
 #[clap(version)]
 pub struct Args {
     #[clap(subcommand)]
-    command: commands::Command,
+    command: command::Command,
 }
 
 #[derive(Debug, clap::Args)]