diff --git a/src/vs/workbench/contrib/emmet/electron-browser/actions/expandAbbreviation.ts b/src/vs/workbench/contrib/emmet/browser/actions/expandAbbreviation.ts
similarity index 94%
rename from src/vs/workbench/contrib/emmet/electron-browser/actions/expandAbbreviation.ts
rename to src/vs/workbench/contrib/emmet/browser/actions/expandAbbreviation.ts
index 72c5ed4a9c4aa..18aa8533f44c4 100644
--- a/src/vs/workbench/contrib/emmet/electron-browser/actions/expandAbbreviation.ts
+++ b/src/vs/workbench/contrib/emmet/browser/actions/expandAbbreviation.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as nls from 'vs/nls';
-import { EmmetEditorAction } from 'vs/workbench/contrib/emmet/electron-browser/emmetActions';
+import { EmmetEditorAction } from 'vs/workbench/contrib/emmet/browser/emmetActions';
 import { registerEditorAction } from 'vs/editor/browser/editorExtensions';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { KeyCode } from 'vs/base/common/keyCodes';
diff --git a/src/vs/workbench/contrib/emmet/browser/emmet.browser.contribution.ts b/src/vs/workbench/contrib/emmet/browser/emmet.browser.contribution.ts
deleted file mode 100644
index e6aa9d4055b33..0000000000000
--- a/src/vs/workbench/contrib/emmet/browser/emmet.browser.contribution.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import './actions/showEmmetCommands';
diff --git a/src/vs/workbench/contrib/emmet/electron-browser/emmet.contribution.ts b/src/vs/workbench/contrib/emmet/browser/emmet.contribution.ts
similarity index 91%
rename from src/vs/workbench/contrib/emmet/electron-browser/emmet.contribution.ts
rename to src/vs/workbench/contrib/emmet/browser/emmet.contribution.ts
index f29d6b2c02208..b603e987b2922 100644
--- a/src/vs/workbench/contrib/emmet/electron-browser/emmet.contribution.ts
+++ b/src/vs/workbench/contrib/emmet/browser/emmet.contribution.ts
@@ -3,5 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import './actions/showEmmetCommands';
 import './actions/expandAbbreviation';
 
diff --git a/src/vs/workbench/contrib/emmet/electron-browser/emmetActions.ts b/src/vs/workbench/contrib/emmet/browser/emmetActions.ts
similarity index 98%
rename from src/vs/workbench/contrib/emmet/electron-browser/emmetActions.ts
rename to src/vs/workbench/contrib/emmet/browser/emmetActions.ts
index 8c83a335415a6..607da869cc3de 100644
--- a/src/vs/workbench/contrib/emmet/electron-browser/emmetActions.ts
+++ b/src/vs/workbench/contrib/emmet/browser/emmetActions.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { EditorAction, ServicesAccessor, IActionOptions } from 'vs/editor/browser/editorExtensions';
-import { grammarsExtPoint, ITMSyntaxExtensionPoint } from 'vs/workbench/services/textMate/electron-browser/TMGrammars';
+import { grammarsExtPoint, ITMSyntaxExtensionPoint } from 'vs/workbench/services/textMate/common/TMGrammars';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IExtensionService, ExtensionPointContribution } from 'vs/workbench/services/extensions/common/extensions';
 import { ICommandService } from 'vs/platform/commands/common/commands';
diff --git a/src/vs/workbench/contrib/emmet/test/electron-browser/emmetAction.test.ts b/src/vs/workbench/contrib/emmet/test/browser/emmetAction.test.ts
similarity index 97%
rename from src/vs/workbench/contrib/emmet/test/electron-browser/emmetAction.test.ts
rename to src/vs/workbench/contrib/emmet/test/browser/emmetAction.test.ts
index 7aefb85575b6e..8e32b760063ea 100644
--- a/src/vs/workbench/contrib/emmet/test/electron-browser/emmetAction.test.ts
+++ b/src/vs/workbench/contrib/emmet/test/browser/emmetAction.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IGrammarContributions, ILanguageIdentifierResolver, EmmetEditorAction } from 'vs/workbench/contrib/emmet/electron-browser/emmetActions';
+import { IGrammarContributions, ILanguageIdentifierResolver, EmmetEditorAction } from 'vs/workbench/contrib/emmet/browser/emmetActions';
 import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import * as assert from 'assert';
 import { LanguageId, LanguageIdentifier } from 'vs/editor/common/modes';
diff --git a/src/vs/workbench/services/textMate/electron-browser/TMGrammars.ts b/src/vs/workbench/services/textMate/common/TMGrammars.ts
similarity index 100%
rename from src/vs/workbench/services/textMate/electron-browser/TMGrammars.ts
rename to src/vs/workbench/services/textMate/common/TMGrammars.ts
diff --git a/src/vs/workbench/services/textMate/electron-browser/textMateService.ts b/src/vs/workbench/services/textMate/electron-browser/textMateService.ts
index 224367b09e85e..de5333bf4a82c 100644
--- a/src/vs/workbench/services/textMate/electron-browser/textMateService.ts
+++ b/src/vs/workbench/services/textMate/electron-browser/textMateService.ts
@@ -20,7 +20,7 @@ import { IFileService } from 'vs/platform/files/common/files';
 import { ILogService } from 'vs/platform/log/common/log';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { ExtensionMessageCollector } from 'vs/workbench/services/extensions/common/extensionsRegistry';
-import { IEmbeddedLanguagesMap, ITMSyntaxExtensionPoint, TokenTypesContribution, grammarsExtPoint } from 'vs/workbench/services/textMate/electron-browser/TMGrammars';
+import { IEmbeddedLanguagesMap, ITMSyntaxExtensionPoint, TokenTypesContribution, grammarsExtPoint } from 'vs/workbench/services/textMate/common/TMGrammars';
 import { ITextMateService } from 'vs/workbench/services/textMate/common/textMateService';
 import { ITokenColorizationRule, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { IEmbeddedLanguagesMap as IEmbeddedLanguagesMap2, IGrammar, ITokenTypeMap, Registry, StackElement, StandardTokenType } from 'vscode-textmate';
diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts
index 600e12c27bcc8..00ec860a12b8a 100644
--- a/src/vs/workbench/workbench.main.ts
+++ b/src/vs/workbench/workbench.main.ts
@@ -237,8 +237,7 @@ import 'vs/workbench/contrib/relauncher/electron-browser/relauncher.contribution
 import 'vs/workbench/contrib/tasks/electron-browser/task.contribution';
 
 // Emmet
-import 'vs/workbench/contrib/emmet/browser/emmet.browser.contribution';
-import 'vs/workbench/contrib/emmet/electron-browser/emmet.contribution';
+import 'vs/workbench/contrib/emmet/browser/emmet.contribution';
 
 // CodeEditor Contributions
 import 'vs/workbench/contrib/codeEditor/browser/codeEditor.contribution';