diff --git a/extensions/markdown/src/commands.ts b/extensions/markdown/src/commands.ts
index 77c7df8a5c4..303692888ca 100644
--- a/extensions/markdown/src/commands.ts
+++ b/extensions/markdown/src/commands.ts
@@ -11,7 +11,7 @@ import * as path from 'path';
 
 import { Command } from './commandManager';
 import { ExtensionContentSecurityPolicyArbiter, PreviewSecuritySelector } from './security';
-import { getMarkdownUri, MDDocumentContentProvider, isMarkdownFile } from './previewContentProvider';
+import { getMarkdownUri, MDDocumentContentProvider, isMarkdownFile } from './features/previewContentProvider';
 import { Logger } from './logger';
 import { TableOfContentsProvider } from './tableOfContentsProvider';
 import { MarkdownEngine } from './markdownEngine';
diff --git a/extensions/markdown/src/extension.ts b/extensions/markdown/src/extension.ts
index af8e02291ec..77487fbec18 100644
--- a/extensions/markdown/src/extension.ts
+++ b/extensions/markdown/src/extension.ts
@@ -3,19 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-
 import * as vscode from 'vscode';
 
 import { MarkdownEngine } from './markdownEngine';
-import LinkProvider from './documentLinkProvider';
-import MDDocumentSymbolProvider from './documentSymbolProvider';
 import { ExtensionContentSecurityPolicyArbiter, PreviewSecuritySelector } from './security';
-import { MDDocumentContentProvider, getMarkdownUri, isMarkdownFile } from './previewContentProvider';
 import { Logger } from './logger';
 import { CommandManager } from './commandManager';
 import * as commands from './commands';
 import { loadDefaultTelemetryReporter } from './telemetryReporter';
 import { loadMarkdownExtensions } from './markdownExtensions';
+import LinkProvider from './features/documentLinkProvider';
+import MDDocumentSymbolProvider from './features/documentSymbolProvider';
+import { MDDocumentContentProvider, getMarkdownUri, isMarkdownFile } from './features/previewContentProvider';
 
 
 export function activate(context: vscode.ExtensionContext) {
diff --git a/extensions/markdown/src/documentLinkProvider.ts b/extensions/markdown/src/features/documentLinkProvider.ts
similarity index 100%
rename from extensions/markdown/src/documentLinkProvider.ts
rename to extensions/markdown/src/features/documentLinkProvider.ts
diff --git a/extensions/markdown/src/documentSymbolProvider.ts b/extensions/markdown/src/features/documentSymbolProvider.ts
similarity index 88%
rename from extensions/markdown/src/documentSymbolProvider.ts
rename to extensions/markdown/src/features/documentSymbolProvider.ts
index 77c0e0baad8..53213f0661d 100644
--- a/extensions/markdown/src/documentSymbolProvider.ts
+++ b/extensions/markdown/src/features/documentSymbolProvider.ts
@@ -7,8 +7,8 @@
 
 import * as vscode from 'vscode';
 
-import { MarkdownEngine } from './markdownEngine';
-import { TableOfContentsProvider } from './tableOfContentsProvider';
+import { MarkdownEngine } from '../markdownEngine';
+import { TableOfContentsProvider } from '../tableOfContentsProvider';
 
 export default class MDDocumentSymbolProvider implements vscode.DocumentSymbolProvider {
 
diff --git a/extensions/markdown/src/previewContentProvider.ts b/extensions/markdown/src/features/previewContentProvider.ts
similarity index 99%
rename from extensions/markdown/src/previewContentProvider.ts
rename to extensions/markdown/src/features/previewContentProvider.ts
index 41a708e44c0..39dfa953213 100644
--- a/extensions/markdown/src/previewContentProvider.ts
+++ b/extensions/markdown/src/features/previewContentProvider.ts
@@ -7,11 +7,11 @@
 
 import * as vscode from 'vscode';
 import * as path from 'path';
-import { MarkdownEngine } from './markdownEngine';
+import { MarkdownEngine } from '../markdownEngine';
 
 import * as nls from 'vscode-nls';
-import { Logger } from './logger';
-import { ContentSecurityPolicyArbiter, MarkdownPreviewSecurityLevel } from './security';
+import { Logger } from '../logger';
+import { ContentSecurityPolicyArbiter, MarkdownPreviewSecurityLevel } from '../security';
 const localize = nls.loadMessageBundle();
 
 const previewStrings = {
diff --git a/extensions/markdown/src/markdownExtensions.ts b/extensions/markdown/src/markdownExtensions.ts
index 018af727397..b01a14b994b 100644
--- a/extensions/markdown/src/markdownExtensions.ts
+++ b/extensions/markdown/src/markdownExtensions.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import * as path from 'path';
 
-import { MDDocumentContentProvider } from './previewContentProvider';
+import { MDDocumentContentProvider } from './features/previewContentProvider';
 import { MarkdownEngine } from './markdownEngine';
 
 const resolveExtensionResources = (extension: vscode.Extension<any>, stylePath: string): vscode.Uri => {
diff --git a/extensions/markdown/src/security.ts b/extensions/markdown/src/security.ts
index fe2bd4c8be3..5f0898e4972 100644
--- a/extensions/markdown/src/security.ts
+++ b/extensions/markdown/src/security.ts
@@ -6,7 +6,7 @@
 
 import * as vscode from 'vscode';
 
-import { getMarkdownUri, MDDocumentContentProvider } from './previewContentProvider';
+import { getMarkdownUri, MDDocumentContentProvider } from './features/previewContentProvider';
 
 import * as nls from 'vscode-nls';