diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json
index 9e6dfecd6a4ca0a0fe1717264d939226e5809094..a5806e5d43370c6427c94e6e749bc49d6e8271c5 100644
--- a/src/tsconfig.strictNullChecks.json
+++ b/src/tsconfig.strictNullChecks.json
@@ -56,27 +56,28 @@
 		"./vs/vscode.proposed.d.ts",
 		"./vs/workbench/api/browser/viewsExtensionPoint.ts",
 		"./vs/workbench/api/browser/mainThreadDebugService.ts",
+		"./vs/workbench/api/browser/mainThreadCommands.ts",
+		"./vs/workbench/api/browser/mainThreadConfiguration.ts",
+		"./vs/workbench/api/browser/mainThreadClipboard.ts",
+		"./vs/workbench/api/browser/mainThreadDecorations.ts",
+		"./vs/workbench/api/browser/mainThreadDiagnostics.ts",
+		"./vs/workbench/api/browser/mainThreadDialogs.ts",
+		"./vs/workbench/api/browser/mainThreadDocumentContentProviders.ts",
+		"./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/common/configurationExtensionPoint.ts",
 		"./vs/workbench/api/common/jsonValidationExtensionPoint.ts",
 		"./vs/workbench/api/common/menusExtensionPoint.ts",
-		"./vs/workbench/api/electron-browser/mainThreadClipboard.ts",
-		"./vs/workbench/api/electron-browser/mainThreadCommands.ts",
-		"./vs/workbench/api/electron-browser/mainThreadConfiguration.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/mainThreadDecorations.ts",
-		"./vs/workbench/api/electron-browser/mainThreadDiagnostics.ts",
-		"./vs/workbench/api/electron-browser/mainThreadDialogs.ts",
-		"./vs/workbench/api/electron-browser/mainThreadDocumentContentProviders.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/mainThreadErrors.ts",
-		"./vs/workbench/api/electron-browser/mainThreadExtensionService.ts",
-		"./vs/workbench/api/electron-browser/mainThreadFileSystem.ts",
-		"./vs/workbench/api/electron-browser/mainThreadFileSystemEventService.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",
diff --git a/src/vs/workbench/api/electron-browser/mainThreadClipboard.ts b/src/vs/workbench/api/browser/mainThreadClipboard.ts
similarity index 72%
rename from src/vs/workbench/api/electron-browser/mainThreadClipboard.ts
rename to src/vs/workbench/api/browser/mainThreadClipboard.ts
index b7f4883b41d1408d8a6b9c31ba2f70d95122f71b..b86706b5695e2c4d2c102a0bcba67c5805bbd556 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadClipboard.ts
+++ b/src/vs/workbench/api/browser/mainThreadClipboard.ts
@@ -3,23 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { clipboard } from 'electron';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { MainContext, MainThreadClipboardShape } from '../common/extHost.protocol';
+import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 
 @extHostNamedCustomer(MainContext.MainThreadClipboard)
 export class MainThreadCommands implements MainThreadClipboardShape {
 
+	constructor(
+		_context: any,
+		@IClipboardService private readonly _clipboardService: IClipboardService,
+	) { }
+
 	dispose(): void {
 		// nothing
 	}
 
 	$readText(): Promise<string> {
-		return Promise.resolve(clipboard.readText());
+		return Promise.resolve(this._clipboardService.readText());
 	}
 
 	$writeText(value: string): Promise<void> {
-		clipboard.writeText(value);
+		this._clipboardService.writeText(value);
 		return Promise.resolve();
 	}
 }
diff --git a/src/vs/workbench/api/electron-browser/mainThreadCommands.ts b/src/vs/workbench/api/browser/mainThreadCommands.ts
similarity index 100%
rename from src/vs/workbench/api/electron-browser/mainThreadCommands.ts
rename to src/vs/workbench/api/browser/mainThreadCommands.ts
diff --git a/src/vs/workbench/api/electron-browser/mainThreadConfiguration.ts b/src/vs/workbench/api/browser/mainThreadConfiguration.ts
similarity index 100%
rename from src/vs/workbench/api/electron-browser/mainThreadConfiguration.ts
rename to src/vs/workbench/api/browser/mainThreadConfiguration.ts
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDecorations.ts b/src/vs/workbench/api/browser/mainThreadDecorations.ts
similarity index 100%
rename from src/vs/workbench/api/electron-browser/mainThreadDecorations.ts
rename to src/vs/workbench/api/browser/mainThreadDecorations.ts
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDiagnostics.ts b/src/vs/workbench/api/browser/mainThreadDiagnostics.ts
similarity index 100%
rename from src/vs/workbench/api/electron-browser/mainThreadDiagnostics.ts
rename to src/vs/workbench/api/browser/mainThreadDiagnostics.ts
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDialogs.ts b/src/vs/workbench/api/browser/mainThreadDialogs.ts
similarity index 100%
rename from src/vs/workbench/api/electron-browser/mainThreadDialogs.ts
rename to src/vs/workbench/api/browser/mainThreadDialogs.ts
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDocumentContentProviders.ts b/src/vs/workbench/api/browser/mainThreadDocumentContentProviders.ts
similarity index 100%
rename from src/vs/workbench/api/electron-browser/mainThreadDocumentContentProviders.ts
rename to src/vs/workbench/api/browser/mainThreadDocumentContentProviders.ts
diff --git a/src/vs/workbench/api/electron-browser/mainThreadErrors.ts b/src/vs/workbench/api/browser/mainThreadErrors.ts
similarity index 100%
rename from src/vs/workbench/api/electron-browser/mainThreadErrors.ts
rename to src/vs/workbench/api/browser/mainThreadErrors.ts
diff --git a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts b/src/vs/workbench/api/browser/mainThreadFileSystem.ts
similarity index 100%
rename from src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
rename to src/vs/workbench/api/browser/mainThreadFileSystem.ts
diff --git a/src/vs/workbench/api/electron-browser/mainThreadFileSystemEventService.ts b/src/vs/workbench/api/browser/mainThreadFileSystemEventService.ts
similarity index 100%
rename from src/vs/workbench/api/electron-browser/mainThreadFileSystemEventService.ts
rename to src/vs/workbench/api/browser/mainThreadFileSystemEventService.ts
diff --git a/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts b/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts
index ad49c1dcd659df03d94e7bd38afe15c5d714866f..bf872fcf80188bb6a50be6c18c5fd7cd9014ed02 100644
--- a/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts
+++ b/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts
@@ -15,23 +15,23 @@ import { LanguageConfigurationFileHandler } from 'vs/workbench/contrib/codeEdito
 
 // --- mainThread participants
 import 'vs/workbench/api/node/apiCommands';
-import './mainThreadClipboard';
-import './mainThreadCommands';
-import './mainThreadConfiguration';
+import '../browser/mainThreadClipboard';
+import '../browser/mainThreadCommands';
+import '../browser/mainThreadConfiguration';
 import './mainThreadConsole';
 import '../browser/mainThreadDebugService';
-import './mainThreadDecorations';
-import './mainThreadDiagnostics';
-import './mainThreadDialogs';
-import './mainThreadDocumentContentProviders';
+import '../browser/mainThreadDecorations';
+import '../browser/mainThreadDiagnostics';
+import '../browser/mainThreadDialogs';
+import '../browser/mainThreadDocumentContentProviders';
 import './mainThreadDocuments';
 import './mainThreadDocumentsAndEditors';
 import './mainThreadEditor';
 import './mainThreadEditors';
-import './mainThreadErrors';
+import '../browser/mainThreadErrors';
 import './mainThreadExtensionService';
-import './mainThreadFileSystem';
-import './mainThreadFileSystemEventService';
+import '../browser/mainThreadFileSystem';
+import '../browser/mainThreadFileSystemEventService';
 import './mainThreadHeapService';
 import './mainThreadLanguageFeatures';
 import './mainThreadLanguages';
diff --git a/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts b/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
index f00301bb9f5b1038d6ac7a9a6cb3e52facf2d386..10a79626bc9ef06ec9ef4163bda7cef531c91bf2 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
@@ -20,7 +20,7 @@ import { IHeapService } from 'vs/workbench/api/electron-browser/mainThreadHeapSe
 import { ExtHostApiCommands } from 'vs/workbench/api/node/extHostApiCommands';
 import { ExtHostCommands } from 'vs/workbench/api/node/extHostCommands';
 import { ExtHostHeapService } from 'vs/workbench/api/node/extHostHeapService';
-import { MainThreadCommands } from 'vs/workbench/api/electron-browser/mainThreadCommands';
+import { MainThreadCommands } from 'vs/workbench/api/browser/mainThreadCommands';
 import { ExtHostDocuments } from 'vs/workbench/api/node/extHostDocuments';
 import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
 import { MainContext, ExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
diff --git a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
index b5c83b88ef1f84c70ffb0d316b066ff643b8d22f..ad7e303c6d80cf8d66369418a28dec3f1a43bf11 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
@@ -17,7 +17,7 @@ import { MarkerService } from 'vs/platform/markers/common/markerService';
 import { ExtHostLanguageFeatures } from 'vs/workbench/api/node/extHostLanguageFeatures';
 import { MainThreadLanguageFeatures } from 'vs/workbench/api/electron-browser/mainThreadLanguageFeatures';
 import { ExtHostCommands } from 'vs/workbench/api/node/extHostCommands';
-import { MainThreadCommands } from 'vs/workbench/api/electron-browser/mainThreadCommands';
+import { MainThreadCommands } from 'vs/workbench/api/browser/mainThreadCommands';
 import { IHeapService } from 'vs/workbench/api/electron-browser/mainThreadHeapService';
 import { ExtHostDocuments } from 'vs/workbench/api/node/extHostDocuments';
 import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
diff --git a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
index 7b38d2b9470c486228aa6808bd46d46a0d25d230..327cf819d32ba0dfe2f7f6927cd2ee44fef6f366 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
@@ -13,7 +13,7 @@ import { TreeDataProvider, TreeItem } from 'vscode';
 import { TestRPCProtocol } from './testRPCProtocol';
 import { ExtHostHeapService } from 'vs/workbench/api/node/extHostHeapService';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { MainThreadCommands } from 'vs/workbench/api/electron-browser/mainThreadCommands';
+import { MainThreadCommands } from 'vs/workbench/api/browser/mainThreadCommands';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { mock } from 'vs/workbench/test/electron-browser/api/mock';
 import { TreeItemCollapsibleState, ITreeItem } from 'vs/workbench/common/views';
diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadCommands.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadCommands.test.ts
index 5902e8e757bf2f4813f6210c2e7c12aa75c99181..5f820b2087a28ffd9d3a8672a3fc4714fe6546f9 100644
--- a/src/vs/workbench/test/electron-browser/api/mainThreadCommands.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/mainThreadCommands.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { MainThreadCommands } from 'vs/workbench/api/electron-browser/mainThreadCommands';
+import { MainThreadCommands } from 'vs/workbench/api/browser/mainThreadCommands';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { SingleProxyRPCProtocol } from './testRPCProtocol';
 
diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadConfiguration.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadConfiguration.test.ts
index 01d75b06fd53d761e922e33bb553954c4f75f781..8db57b2d13460c495d7f108081066c66a0628b13 100644
--- a/src/vs/workbench/test/electron-browser/api/mainThreadConfiguration.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/mainThreadConfiguration.test.ts
@@ -10,7 +10,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { Extensions, IConfigurationRegistry, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { MainThreadConfiguration } from 'vs/workbench/api/electron-browser/mainThreadConfiguration';
+import { MainThreadConfiguration } from 'vs/workbench/api/browser/mainThreadConfiguration';
 import { SingleProxyRPCProtocol } from './testRPCProtocol';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { WorkspaceService } from 'vs/workbench/services/configuration/node/configurationService';
diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadDiagnostics.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadDiagnostics.test.ts
index 8d855237d593d3ed90f34c4a87307a6227508a7f..e01923222da5e9743256c4aff9aa18cbc766bc38 100644
--- a/src/vs/workbench/test/electron-browser/api/mainThreadDiagnostics.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/mainThreadDiagnostics.test.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import { MarkerService } from 'vs/platform/markers/common/markerService';
-import { MainThreadDiagnostics } from 'vs/workbench/api/electron-browser/mainThreadDiagnostics';
+import { MainThreadDiagnostics } from 'vs/workbench/api/browser/mainThreadDiagnostics';
 import { URI } from 'vs/base/common/uri';
 
 
diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadDocumentContentProviders.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadDocumentContentProviders.test.ts
index 4fde2d476bfd70b4b432ce83409d4a181e75cc75..4830fdad63b51ceeb80c9b422c0d287afbbd4f71 100644
--- a/src/vs/workbench/test/electron-browser/api/mainThreadDocumentContentProviders.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/mainThreadDocumentContentProviders.test.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import { URI } from 'vs/base/common/uri';
-import { MainThreadDocumentContentProviders } from 'vs/workbench/api/electron-browser/mainThreadDocumentContentProviders';
+import { MainThreadDocumentContentProviders } from 'vs/workbench/api/browser/mainThreadDocumentContentProviders';
 import { TextModel } from 'vs/editor/common/model/textModel';
 import { mock } from 'vs/workbench/test/electron-browser/api/mock';
 import { IModelService } from 'vs/editor/common/services/modelService';