diff --git a/src/buildfile.js b/src/buildfile.js
index d64321e3ffd..9e9f2121191 100644
--- a/src/buildfile.js
+++ b/src/buildfile.js
@@ -73,8 +73,8 @@ exports.keyboardMaps = [
 
 exports.code = [
 	createModuleDescription('vs/code/electron-main/main'),
-	createModuleDescription('vs/code/node/cli/main'),
-	createModuleDescription('vs/code/node/cli/cliProcessMain', ['vs/code/node/cli/main']),
+	createModuleDescription('vs/code/node/cli'),
+	createModuleDescription('vs/code/node/cliProcessMain', ['vs/code/node/cli']),
 	createModuleDescription('vs/code/electron-sandbox/issue/issueReporterMain'),
 	createModuleDescription('vs/code/node/sharedProcess/sharedProcessMain'),
 	createModuleDescription('vs/code/electron-sandbox/processExplorer/processExplorerMain')
diff --git a/src/cli.js b/src/cli.js
index 2166ce262d5..dd5ea5351ec 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -28,4 +28,4 @@ bootstrap.enableASARSupport();
 process.env['VSCODE_CLI'] = '1';
 
 // Load CLI through AMD loader
-require('./bootstrap-amd').load('vs/code/node/cli/main');
+require('./bootstrap-amd').load('vs/code/node/cli');
diff --git a/src/vs/code/node/cli/main.ts b/src/vs/code/node/cli.ts
similarity index 100%
rename from src/vs/code/node/cli/main.ts
rename to src/vs/code/node/cli.ts
diff --git a/src/vs/code/node/cli/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
similarity index 100%
rename from src/vs/code/node/cli/cliProcessMain.ts
rename to src/vs/code/node/cliProcessMain.ts