diff --git a/Cargo.toml b/Cargo.toml
index 1092e5c5a85..e555af2c8c5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,7 +75,7 @@ test = false # no unit tests
 
 [[bin]]
 name = "rustup-init"
-path = "src/rustup-cli/main.rs"
+path = "src/cli/main.rs"
 test = false # no unit tests
 
 [profile.release]
diff --git a/src/rustup-cli/common.rs b/src/cli/common.rs
similarity index 100%
rename from src/rustup-cli/common.rs
rename to src/cli/common.rs
diff --git a/src/rustup-cli/download_tracker.rs b/src/cli/download_tracker.rs
similarity index 100%
rename from src/rustup-cli/download_tracker.rs
rename to src/cli/download_tracker.rs
diff --git a/src/rustup-cli/errors.rs b/src/cli/errors.rs
similarity index 100%
rename from src/rustup-cli/errors.rs
rename to src/cli/errors.rs
diff --git a/src/rustup-cli/help.rs b/src/cli/help.rs
similarity index 100%
rename from src/rustup-cli/help.rs
rename to src/cli/help.rs
diff --git a/src/rustup-cli/job.rs b/src/cli/job.rs
similarity index 100%
rename from src/rustup-cli/job.rs
rename to src/cli/job.rs
diff --git a/src/rustup-cli/log.rs b/src/cli/log.rs
similarity index 100%
rename from src/rustup-cli/log.rs
rename to src/cli/log.rs
diff --git a/src/rustup-cli/main.rs b/src/cli/main.rs
similarity index 100%
rename from src/rustup-cli/main.rs
rename to src/cli/main.rs
diff --git a/src/rustup-cli/proxy_mode.rs b/src/cli/proxy_mode.rs
similarity index 100%
rename from src/rustup-cli/proxy_mode.rs
rename to src/cli/proxy_mode.rs
diff --git a/src/rustup-cli/rustup_mode.rs b/src/cli/rustup_mode.rs
similarity index 100%
rename from src/rustup-cli/rustup_mode.rs
rename to src/cli/rustup_mode.rs
diff --git a/src/rustup-cli/self_update.rs b/src/cli/self_update.rs
similarity index 100%
rename from src/rustup-cli/self_update.rs
rename to src/cli/self_update.rs
diff --git a/src/rustup-cli/setup_mode.rs b/src/cli/setup_mode.rs
similarity index 100%
rename from src/rustup-cli/setup_mode.rs
rename to src/cli/setup_mode.rs
diff --git a/src/rustup-cli/term2.rs b/src/cli/term2.rs
similarity index 100%
rename from src/rustup-cli/term2.rs
rename to src/cli/term2.rs