diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json
index a5806e5d433..ce78e3080bb 100644
--- a/src/tsconfig.strictNullChecks.json
+++ b/src/tsconfig.strictNullChecks.json
@@ -54,11 +54,10 @@
 		"./vs/nls.mock.ts",
 		"./vs/vscode.d.ts",
 		"./vs/vscode.proposed.d.ts",
-		"./vs/workbench/api/browser/viewsExtensionPoint.ts",
-		"./vs/workbench/api/browser/mainThreadDebugService.ts",
+		"./vs/workbench/api/browser/mainThreadClipboard.ts",
 		"./vs/workbench/api/browser/mainThreadCommands.ts",
 		"./vs/workbench/api/browser/mainThreadConfiguration.ts",
-		"./vs/workbench/api/browser/mainThreadClipboard.ts",
+		"./vs/workbench/api/browser/mainThreadDebugService.ts",
 		"./vs/workbench/api/browser/mainThreadDecorations.ts",
 		"./vs/workbench/api/browser/mainThreadDiagnostics.ts",
 		"./vs/workbench/api/browser/mainThreadDialogs.ts",
@@ -66,18 +65,25 @@
 		"./vs/workbench/api/browser/mainThreadErrors.ts",
 		"./vs/workbench/api/browser/mainThreadFileSystem.ts",
 		"./vs/workbench/api/browser/mainThreadFileSystemEventService.ts",
-		"./vs/workbench/api/common/extHostCustomers.ts",
+		"./vs/workbench/api/browser/mainThreadSaveParticipant.ts",
+		"./vs/workbench/api/browser/mainThreadSCM.ts",
+		"./vs/workbench/api/browser/mainThreadSearch.ts",
+		"./vs/workbench/api/browser/mainThreadStatusBar.ts",
+		"./vs/workbench/api/browser/mainThreadStorage.ts",
+		"./vs/workbench/api/browser/viewsExtensionPoint.ts",
 		"./vs/workbench/api/common/configurationExtensionPoint.ts",
+		"./vs/workbench/api/common/extHost.protocol.ts",
+		"./vs/workbench/api/common/extHostCustomers.ts",
 		"./vs/workbench/api/common/jsonValidationExtensionPoint.ts",
 		"./vs/workbench/api/common/menusExtensionPoint.ts",
-		"./vs/workbench/api/electron-browser/mainThreadDocuments.ts",
-		"./vs/workbench/api/electron-browser/mainThreadExtensionService.ts",
-		"./vs/workbench/api/electron-browser/mainThreadHeapService.ts",
 		"./vs/workbench/api/electron-browser/mainThreadConsole.ts",
 		"./vs/workbench/api/electron-browser/mainThreadDocuments.ts",
+		"./vs/workbench/api/electron-browser/mainThreadDocuments.ts",
 		"./vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts",
 		"./vs/workbench/api/electron-browser/mainThreadEditor.ts",
 		"./vs/workbench/api/electron-browser/mainThreadEditors.ts",
+		"./vs/workbench/api/electron-browser/mainThreadExtensionService.ts",
+		"./vs/workbench/api/electron-browser/mainThreadHeapService.ts",
 		"./vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts",
 		"./vs/workbench/api/electron-browser/mainThreadLanguages.ts",
 		"./vs/workbench/api/electron-browser/mainThreadLogService.ts",
@@ -85,11 +91,6 @@
 		"./vs/workbench/api/electron-browser/mainThreadOutputService.ts",
 		"./vs/workbench/api/electron-browser/mainThreadProgress.ts",
 		"./vs/workbench/api/electron-browser/mainThreadQuickOpen.ts",
-		"./vs/workbench/api/electron-browser/mainThreadSCM.ts",
-		"./vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts",
-		"./vs/workbench/api/electron-browser/mainThreadSearch.ts",
-		"./vs/workbench/api/electron-browser/mainThreadStatusBar.ts",
-		"./vs/workbench/api/electron-browser/mainThreadStorage.ts",
 		"./vs/workbench/api/electron-browser/mainThreadTask.ts",
 		"./vs/workbench/api/electron-browser/mainThreadTelemetry.ts",
 		"./vs/workbench/api/electron-browser/mainThreadTerminalService.ts",
@@ -99,10 +100,9 @@
 		"./vs/workbench/api/electron-browser/mainThreadWindow.ts",
 		"./vs/workbench/api/electron-browser/mainThreadWorkspace.ts",
 		"./vs/workbench/api/node/apiCommands.ts",
-		"./vs/workbench/api/common/extHost.protocol.ts",
 		"./vs/workbench/api/node/extHostApiCommands.ts",
-		"./vs/workbench/api/node/extHostCLIServer.ts",
 		"./vs/workbench/api/node/extHostClipboard.ts",
+		"./vs/workbench/api/node/extHostCLIServer.ts",
 		"./vs/workbench/api/node/extHostCommands.ts",
 		"./vs/workbench/api/node/extHostComments.ts",
 		"./vs/workbench/api/node/extHostConfiguration.ts",
diff --git a/src/vs/workbench/api/electron-browser/mainThreadSCM.ts b/src/vs/workbench/api/browser/mainThreadSCM.ts
similarity index 100%
rename from src/vs/workbench/api/electron-browser/mainThreadSCM.ts
rename to src/vs/workbench/api/browser/mainThreadSCM.ts
diff --git a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/browser/mainThreadSaveParticipant.ts
similarity index 100%
rename from src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
rename to src/vs/workbench/api/browser/mainThreadSaveParticipant.ts
diff --git a/src/vs/workbench/api/electron-browser/mainThreadSearch.ts b/src/vs/workbench/api/browser/mainThreadSearch.ts
similarity index 100%
rename from src/vs/workbench/api/electron-browser/mainThreadSearch.ts
rename to src/vs/workbench/api/browser/mainThreadSearch.ts
diff --git a/src/vs/workbench/api/electron-browser/mainThreadStatusBar.ts b/src/vs/workbench/api/browser/mainThreadStatusBar.ts
similarity index 100%
rename from src/vs/workbench/api/electron-browser/mainThreadStatusBar.ts
rename to src/vs/workbench/api/browser/mainThreadStatusBar.ts
diff --git a/src/vs/workbench/api/electron-browser/mainThreadStorage.ts b/src/vs/workbench/api/browser/mainThreadStorage.ts
similarity index 100%
rename from src/vs/workbench/api/electron-browser/mainThreadStorage.ts
rename to src/vs/workbench/api/browser/mainThreadStorage.ts
diff --git a/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts b/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts
index bf872fcf801..ebc4b35923c 100644
--- a/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts
+++ b/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts
@@ -39,11 +39,11 @@ import './mainThreadMessageService';
 import './mainThreadOutputService';
 import './mainThreadProgress';
 import './mainThreadQuickOpen';
-import './mainThreadSCM';
-import './mainThreadSearch';
-import './mainThreadSaveParticipant';
-import './mainThreadStatusBar';
-import './mainThreadStorage';
+import '../browser/mainThreadSCM';
+import '../browser/mainThreadSearch';
+import '../browser/mainThreadSaveParticipant';
+import '../browser/mainThreadStatusBar';
+import '../browser/mainThreadStorage';
 import './mainThreadTask';
 import './mainThreadTelemetry';
 import './mainThreadTerminalService';
diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadSaveParticipant.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadSaveParticipant.test.ts
index eb437ee4f29..881df02a1f5 100644
--- a/src/vs/workbench/test/electron-browser/api/mainThreadSaveParticipant.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/mainThreadSaveParticipant.test.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { FinalNewLineParticipant, TrimFinalNewLinesParticipant } from 'vs/workbench/api/electron-browser/mainThreadSaveParticipant';
+import { FinalNewLineParticipant, TrimFinalNewLinesParticipant } from 'vs/workbench/api/browser/mainThreadSaveParticipant';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { workbenchInstantiationService, TestTextFileService } from 'vs/workbench/test/workbenchTestServices';
 import { toResource } from 'vs/base/test/common/utils';