diff --git a/src/vs/workbench/parts/debug/browser/debug.contribution.ts b/src/vs/workbench/parts/debug/browser/debug.contribution.ts
index 243e77722bc6e66179bb0001954df76a9cce4deb..20a47112aaf9d97127ed3a373af53e6b8b9ec287 100644
--- a/src/vs/workbench/parts/debug/browser/debug.contribution.ts
+++ b/src/vs/workbench/parts/debug/browser/debug.contribution.ts
@@ -20,7 +20,7 @@ import wbext = require('vs/workbench/common/contributions');
 import baseeditor = require('vs/workbench/browser/parts/editor/baseEditor');
 import * as debug from 'vs/workbench/parts/debug/common/debug';
 import { DebugEditorModelManager } from 'vs/workbench/parts/debug/browser/debugEditorModelManager'
-import dbgactions = require('vs/workbench/parts/debug/browser/debugActions');
+import dbgactions = require('vs/workbench/parts/debug/electron-browser/debugActions');
 import editorinputs = require('vs/workbench/parts/debug/browser/debugEditorInputs');
 import repleditor = require('vs/workbench/parts/debug/browser/replEditor');
 import debugwidget = require('vs/workbench/parts/debug/browser/debugActionsWidget');
diff --git a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
index 6454e9482db663feb5585b186db255e3668331b5..006ce0bd1260fbf2ebc033eab71bbc2b1d232789 100644
--- a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
+++ b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
@@ -13,7 +13,7 @@ import actionbar = require('vs/base/browser/ui/actionbar/actionbar');
 import constants = require('vs/workbench/common/constants');
 import wbext = require('vs/workbench/common/contributions');
 import debug = require('vs/workbench/parts/debug/common/debug');
-import dbgactions = require('vs/workbench/parts/debug/browser/debugActions');
+import dbgactions = require('vs/workbench/parts/debug/electron-browser/debugActions');
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IMessageService } from 'vs/platform/message/common/message';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
diff --git a/src/vs/workbench/parts/debug/browser/debugEditorContribution.ts b/src/vs/workbench/parts/debug/browser/debugEditorContribution.ts
index 1f9d9a0af64af7f44ef09f4f7b2c53f9cea501cf..30bc5c89f4aad433efb279fa217575e97940ed1f 100644
--- a/src/vs/workbench/parts/debug/browser/debugEditorContribution.ts
+++ b/src/vs/workbench/parts/debug/browser/debugEditorContribution.ts
@@ -14,7 +14,7 @@ import keyboard = require('vs/base/browser/keyboardEvent');
 import editorbrowser = require('vs/editor/browser/editorBrowser');
 import editorcommon = require('vs/editor/common/editorCommon');
 import { DebugHoverWidget } from 'vs/workbench/parts/debug/browser/debugHoverWidget';
-import debugactions = require('vs/workbench/parts/debug/browser/debugActions');
+import debugactions = require('vs/workbench/parts/debug/electron-browser/debugActions');
 import debug = require('vs/workbench/parts/debug/common/debug');
 import { IWorkspaceContextService } from 'vs/workbench/services/workspace/common/contextService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
diff --git a/src/vs/workbench/parts/debug/browser/debugViewer.ts b/src/vs/workbench/parts/debug/browser/debugViewer.ts
index 5c8c8292796f4bdf822c798ddcb1cce962153f4d..71296a7569e30216baf472e7946a77579ef370dd 100644
--- a/src/vs/workbench/parts/debug/browser/debugViewer.ts
+++ b/src/vs/workbench/parts/debug/browser/debugViewer.ts
@@ -25,7 +25,7 @@ import renderer = require('vs/base/parts/tree/browser/actionsRenderer');
 import debug = require('vs/workbench/parts/debug/common/debug');
 import model = require('vs/workbench/parts/debug/common/debugModel');
 import viewmodel = require('vs/workbench/parts/debug/common/debugViewModel');
-import debugactions = require('vs/workbench/parts/debug/browser/debugActions');
+import debugactions = require('vs/workbench/parts/debug/electron-browser/debugActions');
 import { IContextViewService, IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
diff --git a/src/vs/workbench/parts/debug/browser/debugViewlet.ts b/src/vs/workbench/parts/debug/browser/debugViewlet.ts
index 52bc38d9d78a96024da81d35e9319a0c0d62fedc..950d9b22f16e28a2efd1e32e6eed2b85ed83f028 100644
--- a/src/vs/workbench/parts/debug/browser/debugViewlet.ts
+++ b/src/vs/workbench/parts/debug/browser/debugViewlet.ts
@@ -23,7 +23,7 @@ import viewlet = require('vs/workbench/browser/viewlet');
 import debug = require('vs/workbench/parts/debug/common/debug');
 import model = require('vs/workbench/parts/debug/common/debugModel');
 import viewer = require('vs/workbench/parts/debug/browser/debugViewer');
-import dbgactions = require('vs/workbench/parts/debug/browser/debugActions');
+import dbgactions = require('vs/workbench/parts/debug/electron-browser/debugActions');
 import dbgactionitems = require('vs/workbench/parts/debug/browser/debugActionItems');
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
diff --git a/src/vs/workbench/parts/debug/browser/replEditor.ts b/src/vs/workbench/parts/debug/browser/replEditor.ts
index 0c7bd7975da0cf974670c4cc7b5f761a1e2e5bc8..b98b4ecf830b1ff6223cd464651341377c08e3c9 100644
--- a/src/vs/workbench/parts/debug/browser/replEditor.ts
+++ b/src/vs/workbench/parts/debug/browser/replEditor.ts
@@ -19,7 +19,7 @@ import editorinputs = require('vs/workbench/parts/debug/browser/debugEditorInput
 import viewer = require('vs/workbench/parts/debug/browser/replViewer');
 import debug = require('vs/workbench/parts/debug/common/debug');
 import model = require('vs/workbench/parts/debug/common/debugModel');
-import debugactions = require('vs/workbench/parts/debug/browser/debugActions');
+import debugactions = require('vs/workbench/parts/debug/electron-browser/debugActions');
 import replhistory = require('vs/workbench/parts/debug/common/replHistory');
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IContextViewService, IContextMenuService } from 'vs/platform/contextview/browser/contextView';
diff --git a/src/vs/workbench/parts/debug/browser/replViewer.ts b/src/vs/workbench/parts/debug/browser/replViewer.ts
index 597cd3f459c2f4b6ca3d00c22e35b2bb33c181bd..e91cbf19d5b33a3c38cc95886269538662f8cf05 100644
--- a/src/vs/workbench/parts/debug/browser/replViewer.ts
+++ b/src/vs/workbench/parts/debug/browser/replViewer.ts
@@ -24,7 +24,7 @@ import treedefaults = require('vs/base/parts/tree/browser/treeDefaults');
 import debug = require('vs/workbench/parts/debug/common/debug');
 import model = require('vs/workbench/parts/debug/common/debugModel');
 import debugviewer = require('vs/workbench/parts/debug/browser/debugViewer');
-import dbgactions = require('vs/workbench/parts/debug/browser/debugActions');
+import dbgactions = require('vs/workbench/parts/debug/electron-browser/debugActions');
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
diff --git a/src/vs/workbench/parts/debug/browser/debugActions.ts b/src/vs/workbench/parts/debug/electron-browser/debugActions.ts
similarity index 99%
rename from src/vs/workbench/parts/debug/browser/debugActions.ts
rename to src/vs/workbench/parts/debug/electron-browser/debugActions.ts
index a61c56ea500ca3981d13dd98de04ef8532795943..6e2e780d82fa1870e8e663a9d3e45fabe1e575fa 100644
--- a/src/vs/workbench/parts/debug/browser/debugActions.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugActions.ts
@@ -21,7 +21,6 @@ import remote = require('remote');
 import IDebugService = debug.IDebugService;
 
 var clipboard = remote.require('clipboard');
-
 var registry = <wbaregistry.IWorkbenchActionRegistry> platform.Registry.as(wbaregistry.Extensions.WorkbenchActions);
 
 export class AbstractDebugAction extends actions.Action {
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index a84393bbbbe6befc3f82a76590dedf97def9af8a..5b4b2617c2a390049a76f648005f776f7a4df506 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -21,7 +21,7 @@ import session = require('vs/workbench/parts/debug/node/rawDebugSession');
 import model = require('vs/workbench/parts/debug/common/debugModel');
 import debuginputs = require('vs/workbench/parts/debug/browser/debugEditorInputs');
 import viewmodel = require('vs/workbench/parts/debug/common/debugViewModel');
-import debugactions = require('vs/workbench/parts/debug/browser/debugActions');
+import debugactions = require('vs/workbench/parts/debug/electron-browser/debugActions');
 import { ConfigurationManager } from 'vs/workbench/parts/debug/node/debugConfigurationManager';
 import { Repl } from 'vs/workbench/parts/debug/browser/replEditor';
 import { Source } from 'vs/workbench/parts/debug/common/debugSource';
diff --git a/src/vs/workbench/parts/debug/node/rawDebugSession.ts b/src/vs/workbench/parts/debug/node/rawDebugSession.ts
index 08c85334ac83607c33e95d43d17a5735278b5edc..ce4f0352095ec3de81fe0881b2b99ab6761aae67 100644
--- a/src/vs/workbench/parts/debug/node/rawDebugSession.ts
+++ b/src/vs/workbench/parts/debug/node/rawDebugSession.ts
@@ -6,7 +6,6 @@
 import cp = require('child_process');
 import fs = require('fs');
 import net = require('net');
-import remote = require('remote');
 import platform = require('vs/base/common/platform');
 import errors = require('vs/base/common/errors');
 import { Promise, TPromise} from 'vs/base/common/winjs.base';
@@ -18,8 +17,6 @@ import stdfork = require('vs/base/node/stdFork');
 import { IMessageService } from 'vs/platform/message/common/message';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 
-var shell = remote.require('shell');
-
 export class RawDebugSession extends v8.V8Protocol implements debug.IRawDebugSession {
 	private serverProcess: cp.ChildProcess;
 	private socket: net.Socket = null;