diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts
index 5b1639ab9a7..f3c86fe313a 100644
--- a/extensions/emmet/src/abbreviationActions.ts
+++ b/extensions/emmet/src/abbreviationActions.ts
@@ -9,8 +9,8 @@ import parseStylesheet from '@emmetio/css-parser';
 import parse from '@emmetio/html-matcher';
 import Node from '@emmetio/node';
 import { getSyntax } from './util';
-import { getExpandOptions, extractAbbreviation, isStyleSheet, getNode, getInnerRange } from './emmetForVSCode/emmetUtils';
-import { DocumentStreamReader } from './emmetForVSCode/bufferStream';
+import { getExpandOptions, extractAbbreviation, isStyleSheet, getNode, getInnerRange } from './vscode-emmet-helper/abbreviationUtil';
+import { DocumentStreamReader } from './bufferStream';
 
 export function wrapWithAbbreviation() {
 	let editor = vscode.window.activeTextEditor;
diff --git a/extensions/emmet/src/balance.ts b/extensions/emmet/src/balance.ts
index 3dbb566c638..abe7cbd6b73 100644
--- a/extensions/emmet/src/balance.ts
+++ b/extensions/emmet/src/balance.ts
@@ -6,8 +6,8 @@
 import * as vscode from 'vscode';
 import parse from '@emmetio/html-matcher';
 import Node from '@emmetio/node';
-import { DocumentStreamReader } from './emmetForVSCode/bufferStream';
-import { getNode, isStyleSheet } from './emmetForVSCode/emmetUtils';
+import { DocumentStreamReader } from './bufferStream';
+import { getNode, isStyleSheet } from './vscode-emmet-helper/abbreviationUtil';
 
 export function balanceOut() {
 	balance(true);
diff --git a/extensions/emmet/src/emmetForVSCode/bufferStream.ts b/extensions/emmet/src/bufferStream.ts
similarity index 100%
rename from extensions/emmet/src/emmetForVSCode/bufferStream.ts
rename to extensions/emmet/src/bufferStream.ts
diff --git a/extensions/emmet/src/defaultCompletionProvider.ts b/extensions/emmet/src/defaultCompletionProvider.ts
index ac7b756a8f6..e5cacf88000 100644
--- a/extensions/emmet/src/defaultCompletionProvider.ts
+++ b/extensions/emmet/src/defaultCompletionProvider.ts
@@ -7,9 +7,9 @@ import * as vscode from 'vscode';
 import parseStylesheet from '@emmetio/css-parser';
 import parse from '@emmetio/html-matcher';
 import Node from '@emmetio/node';
-import { DocumentStreamReader } from './emmetForVSCode/bufferStream';
-import { isStyleSheet, getNode, getInnerRange } from './emmetForVSCode/emmetUtils';
-import { EmmetCompletionItemProvider } from './emmetForVSCode/emmetCompletionProvider';
+import { DocumentStreamReader } from './bufferStream';
+import { isStyleSheet, getNode, getInnerRange } from './vscode-emmet-helper/abbreviationUtil';
+import { EmmetCompletionItemProvider } from './vscode-emmet-helper/emmetCompletionProvider';
 import { isValidLocationForEmmetAbbreviation } from './abbreviationActions';
 import { getSyntax } from './util';
 
diff --git a/extensions/emmet/src/extension.ts b/extensions/emmet/src/extension.ts
index 2533e5c969a..e300f7264e8 100644
--- a/extensions/emmet/src/extension.ts
+++ b/extensions/emmet/src/extension.ts
@@ -16,7 +16,7 @@ import { toggleComment } from './toggleComment';
 import { fetchEditPoint } from './editPoint';
 import { fetchSelectItem } from './selectItem';
 import { LANGUAGE_MODES, getMappedModes } from './util';
-import { updateExtensionsPath } from './emmetForVSCode/emmetUtils';
+import { updateExtensionsPath } from './vscode-emmet-helper/abbreviationUtil';
 
 export function activate(context: vscode.ExtensionContext) {
 	let completionProvider = new DefaultCompletionItemProvider();
diff --git a/extensions/emmet/src/matchTag.ts b/extensions/emmet/src/matchTag.ts
index 0d0a3174c1d..146fd41410d 100644
--- a/extensions/emmet/src/matchTag.ts
+++ b/extensions/emmet/src/matchTag.ts
@@ -6,8 +6,8 @@
 import * as vscode from 'vscode';
 import parse from '@emmetio/html-matcher';
 import Node from '@emmetio/node';
-import { DocumentStreamReader } from './emmetForVSCode/bufferStream';
-import { getNode } from './emmetForVSCode/emmetUtils';
+import { DocumentStreamReader } from './bufferStream';
+import { getNode } from './vscode-emmet-helper/abbreviationUtil';
 
 export function matchTag() {
 	let editor = vscode.window.activeTextEditor;
diff --git a/extensions/emmet/src/mergeLines.ts b/extensions/emmet/src/mergeLines.ts
index aa75ead0c5d..45f65fa5ebb 100644
--- a/extensions/emmet/src/mergeLines.ts
+++ b/extensions/emmet/src/mergeLines.ts
@@ -6,8 +6,8 @@
 import * as vscode from 'vscode';
 import parse from '@emmetio/html-matcher';
 import Node from '@emmetio/node';
-import { DocumentStreamReader } from './emmetForVSCode/bufferStream';
-import { getNode, isStyleSheet } from './emmetForVSCode/emmetUtils';
+import { DocumentStreamReader } from './bufferStream';
+import { getNode, isStyleSheet } from './vscode-emmet-helper/abbreviationUtil';
 
 export function mergeLines() {
 	let editor = vscode.window.activeTextEditor;
diff --git a/extensions/emmet/src/selectItem.ts b/extensions/emmet/src/selectItem.ts
index 90eac9f3a96..5b1b80e045e 100644
--- a/extensions/emmet/src/selectItem.ts
+++ b/extensions/emmet/src/selectItem.ts
@@ -10,8 +10,8 @@ import { nextItemStylesheet, prevItemStylesheet } from './selectItemStylesheet';
 import parseStylesheet from '@emmetio/css-parser';
 import parse from '@emmetio/html-matcher';
 import Node from '@emmetio/node';
-import { DocumentStreamReader } from './emmetForVSCode/bufferStream';
-import { isStyleSheet } from './emmetForVSCode/emmetUtils';
+import { DocumentStreamReader } from './bufferStream';
+import { isStyleSheet } from './vscode-emmet-helper/abbreviationUtil';
 
 
 export function fetchSelectItem(direction: string): void {
diff --git a/extensions/emmet/src/selectItemHTML.ts b/extensions/emmet/src/selectItemHTML.ts
index 9fe247bf0c4..e5d4504bb97 100644
--- a/extensions/emmet/src/selectItemHTML.ts
+++ b/extensions/emmet/src/selectItemHTML.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import { getDeepestNode, findNextWord, findPrevWord } from './util';
 import Node from '@emmetio/node';
-import { getNode } from './emmetForVSCode/emmetUtils';
+import { getNode } from './vscode-emmet-helper/abbreviationUtil';
 
 
 export function nextItemHTML(selectionStart: vscode.Position, selectionEnd: vscode.Position, editor: vscode.TextEditor, rootNode: Node): vscode.Selection {
diff --git a/extensions/emmet/src/selectItemStylesheet.ts b/extensions/emmet/src/selectItemStylesheet.ts
index 6a5e768263e..671a6a06a55 100644
--- a/extensions/emmet/src/selectItemStylesheet.ts
+++ b/extensions/emmet/src/selectItemStylesheet.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import { getDeepestNode, findNextWord, findPrevWord } from './util';
 import Node from '@emmetio/node';
-import { getNode } from './emmetForVSCode/emmetUtils';
+import { getNode } from './vscode-emmet-helper/abbreviationUtil';
 
 
 export function nextItemStylesheet(startOffset: vscode.Position, endOffset: vscode.Position, editor: vscode.TextEditor, rootNode: Node): vscode.Selection {
diff --git a/extensions/emmet/src/splitJoinTag.ts b/extensions/emmet/src/splitJoinTag.ts
index fc7ebd1ad5b..a25f0725045 100644
--- a/extensions/emmet/src/splitJoinTag.ts
+++ b/extensions/emmet/src/splitJoinTag.ts
@@ -6,8 +6,8 @@
 import * as vscode from 'vscode';
 import parse from '@emmetio/html-matcher';
 import Node from '@emmetio/node';
-import { DocumentStreamReader } from './emmetForVSCode/bufferStream';
-import { getNode, isStyleSheet } from './emmetForVSCode/emmetUtils';
+import { DocumentStreamReader } from './bufferStream';
+import { getNode, isStyleSheet } from './vscode-emmet-helper/abbreviationUtil';
 
 export function splitJoinTag() {
 	let editor = vscode.window.activeTextEditor;
diff --git a/extensions/emmet/src/toggleComment.ts b/extensions/emmet/src/toggleComment.ts
index cf2b270ae0b..628556d9ec4 100644
--- a/extensions/emmet/src/toggleComment.ts
+++ b/extensions/emmet/src/toggleComment.ts
@@ -8,8 +8,8 @@ import { getNodesInBetween } from './util';
 import parse from '@emmetio/html-matcher';
 import parseStylesheet from '@emmetio/css-parser';
 import Node from '@emmetio/node';
-import { DocumentStreamReader } from './emmetForVSCode/bufferStream';
-import { getNode, isStyleSheet } from './emmetForVSCode/emmetUtils';
+import { DocumentStreamReader } from './bufferStream';
+import { getNode, isStyleSheet } from './vscode-emmet-helper/abbreviationUtil';
 
 const startCommentStylesheet = '/*';
 const endCommentStylesheet = '*/';
diff --git a/extensions/emmet/src/updateTag.ts b/extensions/emmet/src/updateTag.ts
index a796e99baa9..dc7f98343eb 100644
--- a/extensions/emmet/src/updateTag.ts
+++ b/extensions/emmet/src/updateTag.ts
@@ -6,8 +6,8 @@
 import * as vscode from 'vscode';
 import parse from '@emmetio/html-matcher';
 import Node from '@emmetio/node';
-import { DocumentStreamReader } from './emmetForVSCode/bufferStream';
-import { getNode } from './emmetForVSCode/emmetUtils';
+import { DocumentStreamReader } from './bufferStream';
+import { getNode } from './vscode-emmet-helper/abbreviationUtil';
 
 export function updateTag(tagName: string) {
 	let editor = vscode.window.activeTextEditor;
diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
index 8cb5101dc31..ed1a5768660 100644
--- a/extensions/emmet/src/util.ts
+++ b/extensions/emmet/src/util.ts
@@ -6,8 +6,8 @@
 import * as vscode from 'vscode';
 import parse from '@emmetio/html-matcher';
 import Node from '@emmetio/node';
-import { DocumentStreamReader } from './emmetForVSCode/bufferStream';
-import { isStyleSheet, getNode } from './emmetForVSCode/emmetUtils';
+import { DocumentStreamReader } from './bufferStream';
+import { isStyleSheet, getNode } from './vscode-emmet-helper/abbreviationUtil';
 
 export const LANGUAGE_MODES: Object = {
 	'html': ['!', '.', '}'],
diff --git a/extensions/emmet/src/emmetForVSCode/emmetUtils.ts b/extensions/emmet/src/vscode-emmet-helper/abbreviationUtil.ts
similarity index 100%
rename from extensions/emmet/src/emmetForVSCode/emmetUtils.ts
rename to extensions/emmet/src/vscode-emmet-helper/abbreviationUtil.ts
diff --git a/extensions/emmet/src/emmetForVSCode/emmetCompletionProvider.ts b/extensions/emmet/src/vscode-emmet-helper/emmetCompletionProvider.ts
similarity index 99%
rename from extensions/emmet/src/emmetForVSCode/emmetCompletionProvider.ts
rename to extensions/emmet/src/vscode-emmet-helper/emmetCompletionProvider.ts
index c42adfbd7b6..03a5999ef5f 100644
--- a/extensions/emmet/src/emmetForVSCode/emmetCompletionProvider.ts
+++ b/extensions/emmet/src/vscode-emmet-helper/emmetCompletionProvider.ts
@@ -6,7 +6,7 @@
 
 import * as vscode from 'vscode';
 import { expand, createSnippetsRegistry } from '@emmetio/expand-abbreviation';
-import { isStyleSheet, extractAbbreviation, getExpandOptions } from './emmetUtils';
+import { isStyleSheet, extractAbbreviation, getExpandOptions } from './abbreviationUtil';
 
 const snippetKeyCache = new Map<string, string[]>();