diff --git a/extensions/typescript-language-features/src/server.ts b/extensions/typescript-language-features/src/tsServer/server.ts
similarity index 95%
rename from extensions/typescript-language-features/src/server.ts
rename to extensions/typescript-language-features/src/tsServer/server.ts
index 38325a8d090..3caa36d8cfe 100644
--- a/extensions/typescript-language-features/src/server.ts
+++ b/extensions/typescript-language-features/src/tsServer/server.ts
@@ -7,20 +7,20 @@ import * as cp from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as vscode from 'vscode';
-import * as Proto from './protocol';
-import { CancelledResponse, NoContentResponse, ServerResponse } from './typescriptService';
-import API from './utils/api';
-import { TsServerLogLevel, TypeScriptServiceConfiguration } from './utils/configuration';
-import { Disposable } from './utils/dispose';
-import * as electron from './utils/electron';
-import LogDirectoryProvider from './utils/logDirectoryProvider';
-import Logger from './utils/logger';
-import { TypeScriptPluginPathsProvider } from './utils/pluginPathsProvider';
-import { TypeScriptServerPlugin } from './utils/plugins';
-import TelemetryReporter from './utils/telemetry';
-import Tracer from './utils/tracer';
-import { TypeScriptVersion, TypeScriptVersionProvider } from './utils/versionProvider';
-import { Reader } from './utils/wireProtocol';
+import * as Proto from '../protocol';
+import { CancelledResponse, NoContentResponse, ServerResponse } from '../typescriptService';
+import API from '../utils/api';
+import { TsServerLogLevel, TypeScriptServiceConfiguration } from '../utils/configuration';
+import { Disposable } from '../utils/dispose';
+import * as electron from '../utils/electron';
+import LogDirectoryProvider from '../utils/logDirectoryProvider';
+import Logger from '../utils/logger';
+import { TypeScriptPluginPathsProvider } from '../utils/pluginPathsProvider';
+import { TypeScriptServerPlugin } from '../utils/plugins';
+import TelemetryReporter from '../utils/telemetry';
+import Tracer from '../utils/tracer';
+import { TypeScriptVersion, TypeScriptVersionProvider } from '../utils/versionProvider';
+import { Reader } from '../utils/wireProtocol';
 
 interface CallbackItem<R> {
 	readonly onSuccess: (value: R) => void;
diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
index 233f0112d57..6a7be7ca03c 100644
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -10,7 +10,7 @@ import * as nls from 'vscode-nls';
 import BufferSyncSupport from './features/bufferSyncSupport';
 import { DiagnosticKind, DiagnosticsManager } from './features/diagnostics';
 import * as Proto from './protocol';
-import { TypeScriptServer, TypeScriptServerSpawner } from './server';
+import { TypeScriptServer, TypeScriptServerSpawner } from './tsServer/server';
 import { ITypeScriptServiceClient } from './typescriptService';
 import API from './utils/api';
 import { TsServerLogLevel, TypeScriptServiceConfiguration } from './utils/configuration';