diff --git a/.eslintignore b/.eslintignore
index 90648aa3963..e3aedfea0d6 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -28,4 +28,3 @@
 **/src/vs/loader.js
 **/test/unit/assert.js
 **/typings/**
-**/src/cli/**
diff --git a/build/filters.js b/build/filters.js
index 8fd72e05471..ff8e4ef81b3 100644
--- a/build/filters.js
+++ b/build/filters.js
@@ -22,7 +22,7 @@ module.exports.all = [
 	'scripts/**/*',
 	'src/**/*',
 	'test/**/*',
-	'!src/cli/**/*',
+	'!cli/**/*',
 	'!out*/**',
 	'!test/**/out/**',
 	'!**/node_modules/**',
diff --git a/src/cli/CONTRIBUTING.md b/cli/CONTRIBUTING.md
similarity index 100%
rename from src/cli/CONTRIBUTING.md
rename to cli/CONTRIBUTING.md
diff --git a/src/cli/Cargo.lock b/cli/Cargo.lock
similarity index 100%
rename from src/cli/Cargo.lock
rename to cli/Cargo.lock
diff --git a/src/cli/Cargo.toml b/cli/Cargo.toml
similarity index 100%
rename from src/cli/Cargo.toml
rename to cli/Cargo.toml
diff --git a/src/cli/Cross.toml b/cli/Cross.toml
similarity index 100%
rename from src/cli/Cross.toml
rename to cli/Cross.toml
diff --git a/src/cli/build.rs b/cli/build.rs
similarity index 100%
rename from src/cli/build.rs
rename to cli/build.rs
diff --git a/src/cli/src/auth.rs b/cli/src/auth.rs
similarity index 100%
rename from src/cli/src/auth.rs
rename to cli/src/auth.rs
diff --git a/src/cli/src/bin/code-tunnel/main.rs b/cli/src/bin/code-tunnel/main.rs
similarity index 100%
rename from src/cli/src/bin/code-tunnel/main.rs
rename to cli/src/bin/code-tunnel/main.rs
diff --git a/src/cli/src/bin/code/legacy_args.rs b/cli/src/bin/code/legacy_args.rs
similarity index 100%
rename from src/cli/src/bin/code/legacy_args.rs
rename to cli/src/bin/code/legacy_args.rs
diff --git a/src/cli/src/bin/code/main.rs b/cli/src/bin/code/main.rs
similarity index 100%
rename from src/cli/src/bin/code/main.rs
rename to cli/src/bin/code/main.rs
diff --git a/src/cli/src/commands.rs b/cli/src/commands.rs
similarity index 100%
rename from src/cli/src/commands.rs
rename to cli/src/commands.rs
diff --git a/src/cli/src/commands/args.rs b/cli/src/commands/args.rs
similarity index 100%
rename from src/cli/src/commands/args.rs
rename to cli/src/commands/args.rs
diff --git a/src/cli/src/commands/context.rs b/cli/src/commands/context.rs
similarity index 100%
rename from src/cli/src/commands/context.rs
rename to cli/src/commands/context.rs
diff --git a/src/cli/src/commands/output.rs b/cli/src/commands/output.rs
similarity index 100%
rename from src/cli/src/commands/output.rs
rename to cli/src/commands/output.rs
diff --git a/src/cli/src/commands/tunnels.rs b/cli/src/commands/tunnels.rs
similarity index 100%
rename from src/cli/src/commands/tunnels.rs
rename to cli/src/commands/tunnels.rs
diff --git a/src/cli/src/commands/version.rs b/cli/src/commands/version.rs
similarity index 100%
rename from src/cli/src/commands/version.rs
rename to cli/src/commands/version.rs
diff --git a/src/cli/src/constants.rs b/cli/src/constants.rs
similarity index 100%
rename from src/cli/src/constants.rs
rename to cli/src/constants.rs
diff --git a/src/cli/src/desktop.rs b/cli/src/desktop.rs
similarity index 100%
rename from src/cli/src/desktop.rs
rename to cli/src/desktop.rs
diff --git a/src/cli/src/desktop/version_manager.rs b/cli/src/desktop/version_manager.rs
similarity index 100%
rename from src/cli/src/desktop/version_manager.rs
rename to cli/src/desktop/version_manager.rs
diff --git a/src/cli/src/lib.rs b/cli/src/lib.rs
similarity index 100%
rename from src/cli/src/lib.rs
rename to cli/src/lib.rs
diff --git a/src/cli/src/log.rs b/cli/src/log.rs
similarity index 100%
rename from src/cli/src/log.rs
rename to cli/src/log.rs
diff --git a/src/cli/src/options.rs b/cli/src/options.rs
similarity index 100%
rename from src/cli/src/options.rs
rename to cli/src/options.rs
diff --git a/src/cli/src/state.rs b/cli/src/state.rs
similarity index 100%
rename from src/cli/src/state.rs
rename to cli/src/state.rs
diff --git a/src/cli/src/tunnels.rs b/cli/src/tunnels.rs
similarity index 100%
rename from src/cli/src/tunnels.rs
rename to cli/src/tunnels.rs
diff --git a/src/cli/src/tunnels/code_server.rs b/cli/src/tunnels/code_server.rs
similarity index 100%
rename from src/cli/src/tunnels/code_server.rs
rename to cli/src/tunnels/code_server.rs
diff --git a/src/cli/src/tunnels/control_server.rs b/cli/src/tunnels/control_server.rs
similarity index 100%
rename from src/cli/src/tunnels/control_server.rs
rename to cli/src/tunnels/control_server.rs
diff --git a/src/cli/src/tunnels/dev_tunnels.rs b/cli/src/tunnels/dev_tunnels.rs
similarity index 100%
rename from src/cli/src/tunnels/dev_tunnels.rs
rename to cli/src/tunnels/dev_tunnels.rs
diff --git a/src/cli/src/tunnels/legal.rs b/cli/src/tunnels/legal.rs
similarity index 100%
rename from src/cli/src/tunnels/legal.rs
rename to cli/src/tunnels/legal.rs
diff --git a/src/cli/src/tunnels/name_generator.rs b/cli/src/tunnels/name_generator.rs
similarity index 100%
rename from src/cli/src/tunnels/name_generator.rs
rename to cli/src/tunnels/name_generator.rs
diff --git a/src/cli/src/tunnels/paths.rs b/cli/src/tunnels/paths.rs
similarity index 100%
rename from src/cli/src/tunnels/paths.rs
rename to cli/src/tunnels/paths.rs
diff --git a/src/cli/src/tunnels/port_forwarder.rs b/cli/src/tunnels/port_forwarder.rs
similarity index 100%
rename from src/cli/src/tunnels/port_forwarder.rs
rename to cli/src/tunnels/port_forwarder.rs
diff --git a/src/cli/src/tunnels/protocol.rs b/cli/src/tunnels/protocol.rs
similarity index 100%
rename from src/cli/src/tunnels/protocol.rs
rename to cli/src/tunnels/protocol.rs
diff --git a/src/cli/src/tunnels/server_bridge_unix.rs b/cli/src/tunnels/server_bridge_unix.rs
similarity index 100%
rename from src/cli/src/tunnels/server_bridge_unix.rs
rename to cli/src/tunnels/server_bridge_unix.rs
diff --git a/src/cli/src/tunnels/server_bridge_windows.rs b/cli/src/tunnels/server_bridge_windows.rs
similarity index 100%
rename from src/cli/src/tunnels/server_bridge_windows.rs
rename to cli/src/tunnels/server_bridge_windows.rs
diff --git a/src/cli/src/tunnels/service.rs b/cli/src/tunnels/service.rs
similarity index 100%
rename from src/cli/src/tunnels/service.rs
rename to cli/src/tunnels/service.rs
diff --git a/src/cli/src/tunnels/service_windows.rs b/cli/src/tunnels/service_windows.rs
similarity index 100%
rename from src/cli/src/tunnels/service_windows.rs
rename to cli/src/tunnels/service_windows.rs
diff --git a/src/cli/src/update.rs b/cli/src/update.rs
similarity index 100%
rename from src/cli/src/update.rs
rename to cli/src/update.rs
diff --git a/src/cli/src/update_service.rs b/cli/src/update_service.rs
similarity index 100%
rename from src/cli/src/update_service.rs
rename to cli/src/update_service.rs
diff --git a/src/cli/src/util.rs b/cli/src/util.rs
similarity index 100%
rename from src/cli/src/util.rs
rename to cli/src/util.rs
diff --git a/src/cli/src/util/command.rs b/cli/src/util/command.rs
similarity index 100%
rename from src/cli/src/util/command.rs
rename to cli/src/util/command.rs
diff --git a/src/cli/src/util/errors.rs b/cli/src/util/errors.rs
similarity index 100%
rename from src/cli/src/util/errors.rs
rename to cli/src/util/errors.rs
diff --git a/src/cli/src/util/http.rs b/cli/src/util/http.rs
similarity index 100%
rename from src/cli/src/util/http.rs
rename to cli/src/util/http.rs
diff --git a/src/cli/src/util/input.rs b/cli/src/util/input.rs
similarity index 100%
rename from src/cli/src/util/input.rs
rename to cli/src/util/input.rs
diff --git a/src/cli/src/util/io.rs b/cli/src/util/io.rs
similarity index 100%
rename from src/cli/src/util/io.rs
rename to cli/src/util/io.rs
diff --git a/src/cli/src/util/machine.rs b/cli/src/util/machine.rs
similarity index 100%
rename from src/cli/src/util/machine.rs
rename to cli/src/util/machine.rs
diff --git a/src/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs
similarity index 100%
rename from src/cli/src/util/prereqs.rs
rename to cli/src/util/prereqs.rs
diff --git a/src/cli/src/util/sync.rs b/cli/src/util/sync.rs
similarity index 100%
rename from src/cli/src/util/sync.rs
rename to cli/src/util/sync.rs
diff --git a/src/cli/src/util/tar.rs b/cli/src/util/tar.rs
similarity index 100%
rename from src/cli/src/util/tar.rs
rename to cli/src/util/tar.rs
diff --git a/src/cli/src/util/zipper.rs b/cli/src/util/zipper.rs
similarity index 100%
rename from src/cli/src/util/zipper.rs
rename to cli/src/util/zipper.rs