diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index be207f9b001..3fc06c6e874 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -44,11 +44,13 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { getCodeEditor as getEditorWidget } from 'vs/editor/common/services/codeEditorService';
-// tslint:disable-next-line:import-patterns TODO@Ben TODO@Sandeep layer breaker
-import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
 import { ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
 import { IConfigurationChangedEvent } from "vs/editor/common/config/editorOptions";
 
+// TODO@Sandeep layer breaker
+// tslint:disable-next-line:import-patterns
+import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
+
 function toEditorWithEncodingSupport(input: IEditorInput): IEncodingSupport {
 	if (input instanceof SideBySideEditorInput) {
 		input = input.master;
diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts
index db54dbd70ce..4178ab8fde6 100644
--- a/src/vs/workbench/electron-browser/shell.ts
+++ b/src/vs/workbench/electron-browser/shell.ts
@@ -88,8 +88,6 @@ import { IURLService } from 'vs/platform/url/common/url';
 import { ExtensionHostProcessWorker } from 'vs/workbench/electron-browser/extensionHost';
 import { ITimerService } from 'vs/workbench/services/timer/common/timerService';
 import { remote, ipcRenderer as ipc } from 'electron';
-import { ITextMateService } from 'vs/workbench/parts/codeEditor/electron-browser/textMate/textMateService';
-import { MainProcessTextMateSyntax } from 'vs/workbench/parts/codeEditor/electron-browser/textMate/TMSyntax';
 import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
 import { restoreFontInfo, readFontInfo, saveFontInfo } from 'vs/editor/browser/config/configuration';
 import * as browser from 'vs/base/browser/browser';
@@ -101,6 +99,10 @@ import { TextResourceConfigurationService } from 'vs/editor/common/services/reso
 import { registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
 import { foreground, selectionBackground, focusBorder, scrollbarShadow, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, listHighlightForeground, inputPlaceholderForeground } from 'vs/platform/theme/common/colorRegistry';
 
+// TODO@Alex layer breaker
+// tslint:disable-next-line:import-patterns
+import { ITextMateService } from 'vs/workbench/parts/codeEditor/electron-browser/textMate/textMateService';
+import { MainProcessTextMateSyntax } from 'vs/workbench/parts/codeEditor/electron-browser/textMate/TMSyntax';
 /**
  * Services that we require for the Shell
  */
diff --git a/src/vs/workbench/services/progress/browser/progressService2.ts b/src/vs/workbench/services/progress/browser/progressService2.ts
index 788f813cee8..05ca282c1bf 100644
--- a/src/vs/workbench/services/progress/browser/progressService2.ts
+++ b/src/vs/workbench/services/progress/browser/progressService2.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import 'vs/css!vs/workbench/services/progress/browser/media/progressService2';
+import 'vs/css!./media/progressService2';
 import * as dom from 'vs/base/browser/dom';
 import { localize } from 'vs/nls';
 import { IActivityBarService, ProgressBadge } from 'vs/workbench/services/activity/common/activityBarService';
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
index ff8c803d85f..58d5d720e61 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -36,8 +36,11 @@ import { RunOnceScheduler } from 'vs/base/common/async';
 import { IRawTextSource } from 'vs/editor/common/model/textSource';
 import { StorageScope, IStorageService } from 'vs/platform/storage/common/storage';
 import { localize } from 'vs/nls';
-import { ShowTasksAction, ShowTasksDocumentationAction } from 'vs/workbench/parts/quickopen/common/quickopenActions';
 import { Action } from 'vs/base/common/actions';
+
+// TODO@Rob layer breaker
+// tslint:disable-next-line:import-patterns
+import { ShowTasksAction, ShowTasksDocumentationAction } from 'vs/workbench/parts/quickopen/common/quickopenActions';
 /**
  * The text file editor model listens to changes to its underlying code editor model and saves these changes through the file service back to the disk.
  */
diff --git a/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts b/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts
index 519c2797b97..cd591bccb20 100644
--- a/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts
+++ b/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts
@@ -9,9 +9,12 @@ import * as colorRegistry from 'vs/platform/theme/common/colorRegistry';
 
 import * as editorColorRegistry from 'vs/editor/common/view/editorColorRegistry';
 import * as wordHighlighter from 'vs/editor/contrib/wordHighlighter/common/wordHighlighter';
-import { ansiColorIdentifiers } from 'vs/workbench/parts/terminal/electron-browser/terminalColorRegistry';
 import { peekViewEditorMatchHighlight, peekViewResultsMatchHighlight } from 'vs/editor/contrib/referenceSearch/browser/referencesWidget';
 
+// TODO@Martin layer breaker
+// tslint:disable-next-line:import-patterns
+import { ansiColorIdentifiers } from 'vs/workbench/parts/terminal/electron-browser/terminalColorRegistry';
+
 const settingToColorIdMapping: { [settingId: string]: string[] } = {};
 function addSettingMapping(settingId: string, colorId: string) {
 	let colorIds = settingToColorIdMapping[settingId];
diff --git a/tslint.json b/tslint.json
index 77753a2102c..69f1523e234 100644
--- a/tslint.json
+++ b/tslint.json
@@ -233,6 +233,71 @@
 					"assert"
 				]
 			},
+			{
+				"target": "**/vs/workbench/electron-browser/workbench.main.ts",
+				"restrictions": [
+					"**"
+				]
+			},
+			{
+				"target": "**/vs/workbench/electron-browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/{common,browser,node,electron-browser}/**",
+					"**/vs/base/parts/*/{common,browser,node,electron-browser}/**",
+					"**/vs/platform/node/**",
+					"**/vs/platform/*/{common,browser,node,electron-browser}/**",
+					"**/vs/editor/{common,browser,node,electron-browser}/**",
+					"**/vs/editor/contrib/*/{common,browser,node,electron-browser}/**",
+					"**/vs/workbench/{common,browser,node,electron-browser,api}/**",
+					"**/vs/workbench/services/*/{common,browser,node,electron-browser}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/workbench/node/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/{common,node}/**",
+					"**/vs/base/parts/*/{common,node}/**",
+					"**/vs/platform/node/**",
+					"**/vs/platform/*/{common,node}/**",
+					"**/vs/editor/{common,node}/**",
+					"**/vs/editor/contrib/*/{common,node}/**",
+					"**/vs/workbench/{common,node,api}/**",
+					"**/vs/workbench/services/*/{common,node}/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/workbench/services/**/test/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/**",
+					"**/vs/platform/**",
+					"**/vs/editor/**",
+					"**/vs/workbench/{common,browser,node,api,electron-browser}/**",
+					"**/vs/workbench/services/**",
+					"**/vs/workbench/test/**",
+					"*" // node modules
+				]
+			},
+			{
+				"target": "**/vs/workbench/services/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/**",
+					"**/vs/platform/**",
+					"**/vs/editor/**",
+					"**/vs/workbench/{common,browser,node,api,electron-browser}/**",
+					"**/vs/workbench/services/**",
+					"*" // node modules
+				]
+			},
 			{
 				"target": "**/{node,electron-browser,electron-main,extensions}/**",
 				"restrictions": "**/*"