diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 1eaf03b6ec4e9a97a896a58a958f0b205cd6ab6d..51b2286ed0fed6f217364804cf5a81f4b9257e42 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -55,7 +55,7 @@ const excludedExtensions = [
 ];
 
 const vscodeEntryPoints = _.flatten([
-	buildfile.entrypoint('vs/workbench/electron-browser/workbench.main'),
+	buildfile.entrypoint('vs/workbench/workbench.main'),
 	buildfile.base,
 	buildfile.workbench,
 	buildfile.code
@@ -219,8 +219,8 @@ function packageTask(platform, arch, opts) {
 		const out = opts.minified ? 'out-vscode-min' : 'out-vscode';
 
 		const checksums = computeChecksums(out, [
-			'vs/workbench/electron-browser/workbench.main.js',
-			'vs/workbench/electron-browser/workbench.main.css',
+			'vs/workbench/workbench.main.js',
+			'vs/workbench/workbench.main.css',
 			'vs/workbench/electron-browser/bootstrap/index.html',
 			'vs/workbench/electron-browser/bootstrap/index.js',
 			'vs/workbench/electron-browser/bootstrap/preload.js'
diff --git a/src/buildfile.js b/src/buildfile.js
index 99813dab58d2ce3c7417473f0efa2ae08b219a2b..58a2532f458a66899bc287b46e21b7b898e0ce1d 100644
--- a/src/buildfile.js
+++ b/src/buildfile.js
@@ -10,7 +10,7 @@ exports.base = [{
 	append: [ 'vs/base/worker/workerMain' ],
 	dest: 'vs/base/worker/workerMain.js'
 }];
-exports.workbench = require('./vs/workbench/buildfile').collectModules(['vs/workbench/electron-browser/workbench.main']);
+exports.workbench = require('./vs/workbench/buildfile').collectModules(['vs/workbench/workbench.main']);
 exports.code = require('./vs/code/buildfile').collectModules();
 
 exports.entrypoint = function (name) {
diff --git a/src/vs/workbench/electron-browser/bootstrap/index.js b/src/vs/workbench/electron-browser/bootstrap/index.js
index d79e86de78518379f3809e753eabf3705176b5f3..565b1e48c63d3e2c06e791e50f4d26be7ac69af8 100644
--- a/src/vs/workbench/electron-browser/bootstrap/index.js
+++ b/src/vs/workbench/electron-browser/bootstrap/index.js
@@ -191,9 +191,9 @@ function main() {
 
 		const workbenchMainTimer = startTimer('load:workbench.main');
 		require([
-			'vs/workbench/electron-browser/workbench.main',
-			'vs/nls!vs/workbench/electron-browser/workbench.main',
-			'vs/css!vs/workbench/electron-browser/workbench.main'
+			'vs/workbench/workbench.main',
+			'vs/nls!vs/workbench/workbench.main',
+			'vs/css!vs/workbench/workbench.main'
 		], function () {
 			workbenchMainTimer.stop();
 			timers.afterLoadWorkbenchMain = Date.now();
diff --git a/src/vs/workbench/parts/performance/electron-browser/performance.contribution.ts b/src/vs/workbench/parts/performance/electron-browser/performance.contribution.ts
index e88b9d0abc0e44f85158933658246407229a376b..5ac35b0980eb7ea5cecc8a2a2aff003ad13bc49e 100644
--- a/src/vs/workbench/parts/performance/electron-browser/performance.contribution.ts
+++ b/src/vs/workbench/parts/performance/electron-browser/performance.contribution.ts
@@ -247,7 +247,7 @@ class PerformanceTelemetry implements IWorkbenchContribution {
 	}
 
 	private _sendWorkbenchMainSizeTelemetry(): void {
-		const { fsPath } = URI.parse(require.toUrl('vs/workbench/electron-browser/workbench.main.js'));
+		const { fsPath } = URI.parse(require.toUrl('vs/workbench/workbench.main.js'));
 		stat(fsPath).then(stats => {
 			this._telemetryService.publicLog('perf:jsFileSize', { workbenchMain: stats.size });
 		});
diff --git a/src/vs/workbench/electron-browser/workbench.main.css b/src/vs/workbench/workbench.main.css
similarity index 100%
rename from src/vs/workbench/electron-browser/workbench.main.css
rename to src/vs/workbench/workbench.main.css
diff --git a/src/vs/workbench/electron-browser/workbench.main.nls.js b/src/vs/workbench/workbench.main.nls.js
similarity index 100%
rename from src/vs/workbench/electron-browser/workbench.main.nls.js
rename to src/vs/workbench/workbench.main.nls.js
diff --git a/src/vs/workbench/electron-browser/workbench.main.ts b/src/vs/workbench/workbench.main.ts
similarity index 100%
rename from src/vs/workbench/electron-browser/workbench.main.ts
rename to src/vs/workbench/workbench.main.ts
diff --git a/tslint.json b/tslint.json
index b67a115e78f0587195b1cd27c86e9c0803286d83..8d7fd3ba5043a42ff97a4b755ca07d554f5afe51 100644
--- a/tslint.json
+++ b/tslint.json
@@ -295,7 +295,7 @@
 				]
 			},
 			{
-				"target": "**/vs/workbench/electron-browser/workbench.main.ts",
+				"target": "**/vs/workbench/workbench.main.ts",
 				"restrictions": [
 					"**"
 				]