13 files changed, 30 insertions, 33 deletions
diff --git a/.cargo/registry.toml b/.cargo/registry.toml
index 3ebfa17..c1a712d 100644
--- a/.cargo/registry.toml
+++ b/.cargo/registry.toml
@@ -24,30 +24,30 @@ type = "Renderer"
 # Json Renderer
 [renderer.json]
 name = "json"
-type = "crate::renderers::json::JVResultJsonRenderer"
+type = "crate::cmds::renderer::json::JVResultJsonRenderer"
 
 [renderer.json_pretty]
 name = "json-pretty"
-type = "crate::renderers::json_pretty::JVResultPrettyJsonRenderer"
+type = "crate::cmds::renderer::json_pretty::JVResultPrettyJsonRenderer"
 
 ####################
 ### Auto-Collect ###
 ####################
 
 [collect.args]
-path = "src/args.rs"
+path = "src/cmds/arg.rs"
 
 [collect.cmds]
-path = "src/cmds.rs"
+path = "src/cmds/cmd.rs"
 
 [collect.collects]
-path = "src/collects.rs"
+path = "src/cmds/collect.rs"
 
 [collect.inputs]
-path = "src/inputs.rs"
+path = "src/cmds/in.rs"
 
 [collect.outputs]
-path = "src/outputs.rs"
+path = "src/cmds/out.rs"
 
 [collect.renderers]
-path = "src/renderers.rs"
+path = "src/cmds/renderer.rs"
diff --git a/.gitignore b/.gitignore
index cf2b5b0..4e45244 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,12 +26,12 @@
 _*.rs
 
 # Generated by the build system
-/src/args.rs
-/src/cmds.rs
-/src/collects.rs
-/src/inputs.rs
-/src/outputs.rs
-/src/renderers.rs
+/src/cmds/arg.rs
+/src/cmds/cmd.rs
+/src/cmds/collect.rs
+/src/cmds/in.rs
+/src/cmds/out.rs
+/src/cmds/renderer.rs
 
 # Symbolic links and shortcuts created by scripts
 /deploy.lnk
diff --git a/build.rs b/build.rs
index 22842ed..07b5c10 100644
--- a/build.rs
+++ b/build.rs
@@ -4,7 +4,7 @@ use std::process::Command;
 
 use string_proc::pascal_case;
 
-const COMMANDS_PATH: &str = "./src/cmds/";
+const COMMANDS_PATH: &str = "./src/cmds/cmd/";
 
 const COMPILE_INFO_RS_TEMPLATE: &str = "./templates/compile_info.rs.template";
 const COMPILE_INFO_RS: &str = "./src/data/compile_info.rs";
@@ -312,7 +312,7 @@ fn generate_cmd_registry_file(repo_root: &PathBuf) -> Result<(), Box<dyn std::er
 
             let key = file_name.to_string();
             let node = file_name.replace(".", " ").replace("_", " ");
-            let cmd_type = format!("cmds::{}::JV{}Command", file_name, pascal_name);
+            let cmd_type = format!("cmds::cmd::{}::JV{}Command", file_name, pascal_name);
 
             nodes.push(node.clone());
             commands.push((key, node, cmd_type));
diff --git a/src/cmds.rs b/src/cmds.rs
new file mode 100644
index 0000000..46057c8
--- /dev/null
+++ b/src/cmds.rs
@@ -0,0 +1,6 @@
+pub mod arg;
+pub mod cmd;
+pub mod collect;
+pub mod r#in;
+pub mod out;
+pub mod renderer;
diff --git a/src/args/status.rs b/src/cmds/arg/status.rs
index c713227..c713227 100644
--- a/src/args/status.rs
+++ b/src/cmds/arg/status.rs
diff --git a/src/cmds/status.rs b/src/cmds/cmd/status.rs
index 6f04408..f34dbb8 100644
--- a/src/cmds/status.rs
+++ b/src/cmds/cmd/status.rs
@@ -5,11 +5,13 @@ use just_enough_vcs::vcs::{
 };
 
 use crate::{
-    args::status::JVStatusArgument,
-    collects::status::JVStatusCollect,
-    inputs::status::JVStatusInput,
-    outputs::status::{JVStatusOutput, JVStatusWrongModifyReason},
-    renderers::status::JVStatusRenderer,
+    cmds::{
+        arg::status::JVStatusArgument,
+        collect::status::JVStatusCollect,
+        r#in::status::JVStatusInput,
+        out::status::{JVStatusOutput, JVStatusWrongModifyReason},
+        renderer::status::JVStatusRenderer,
+    },
     systems::cmd::{
         cmd_system::{JVCommand, JVCommandContext},
         errors::{CmdExecuteError, CmdPrepareError},
diff --git a/src/collects/status.rs b/src/cmds/collect/status.rs
index b0e8fcd..b0e8fcd 100644
--- a/src/collects/status.rs
+++ b/src/cmds/collect/status.rs
diff --git a/src/inputs/status.rs b/src/cmds/in/status.rs
index 859ccd2..859ccd2 100644
--- a/src/inputs/status.rs
+++ b/src/cmds/in/status.rs
diff --git a/src/outputs/status.rs b/src/cmds/out/status.rs
index 2b8d9c6..2b8d9c6 100644
--- a/src/outputs/status.rs
+++ b/src/cmds/out/status.rs
diff --git a/src/renderers/json.rs b/src/cmds/renderer/json.rs
index 9a3105d..9a3105d 100644
--- a/src/renderers/json.rs
+++ b/src/cmds/renderer/json.rs
diff --git a/src/renderers/json_pretty.rs b/src/cmds/renderer/json_pretty.rs
index a4a3ba5..a4a3ba5 100644
--- a/src/renderers/json_pretty.rs
+++ b/src/cmds/renderer/json_pretty.rs
diff --git a/src/renderers/status.rs b/src/cmds/renderer/status.rs
index 549211e..965ff87 100644
--- a/src/renderers/status.rs
+++ b/src/cmds/renderer/status.rs
@@ -5,7 +5,7 @@ use cli_utils::{
 use rust_i18n::t;
 
 use crate::{
-    outputs::status::{JVStatusOutput, JVStatusWrongModifyReason},
+    cmds::out::status::{JVStatusOutput, JVStatusWrongModifyReason},
     r_println,
     systems::cmd::{
         errors::CmdRenderError,
diff --git a/src/lib.rs b/src/lib.rs
index d4832f5..74b68f1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,16 +11,5 @@ pub mod legacy_json_output;
 /// Systems
 pub mod systems;
 
-// --- ASSETS ---
-
 /// Commands
 pub mod cmds;
-
-/// Command Data
-pub mod args;
-pub mod collects;
-pub mod inputs;
-pub mod outputs;
-
-/// Result Renderers
-pub mod renderers;