diff --git a/extensions/typescript/.vscodeignore b/extensions/typescript-language-features/.vscodeignore
similarity index 100%
rename from extensions/typescript/.vscodeignore
rename to extensions/typescript-language-features/.vscodeignore
diff --git a/extensions/typescript/OSSREADME.json b/extensions/typescript-language-features/OSSREADME.json
similarity index 100%
rename from extensions/typescript/OSSREADME.json
rename to extensions/typescript-language-features/OSSREADME.json
diff --git a/extensions/typescript/icon.png b/extensions/typescript-language-features/icon.png
similarity index 100%
rename from extensions/typescript/icon.png
rename to extensions/typescript-language-features/icon.png
diff --git a/extensions/typescript/language-configuration.json b/extensions/typescript-language-features/language-configuration.json
similarity index 100%
rename from extensions/typescript/language-configuration.json
rename to extensions/typescript-language-features/language-configuration.json
diff --git a/extensions/typescript/package.json b/extensions/typescript-language-features/package.json
similarity index 100%
rename from extensions/typescript/package.json
rename to extensions/typescript-language-features/package.json
diff --git a/extensions/typescript/package.nls.json b/extensions/typescript-language-features/package.nls.json
similarity index 100%
rename from extensions/typescript/package.nls.json
rename to extensions/typescript-language-features/package.nls.json
diff --git a/extensions/typescript/src/commands.ts b/extensions/typescript-language-features/src/commands.ts
similarity index 100%
rename from extensions/typescript/src/commands.ts
rename to extensions/typescript-language-features/src/commands.ts
diff --git a/extensions/typescript/src/extension.ts b/extensions/typescript-language-features/src/extension.ts
similarity index 100%
rename from extensions/typescript/src/extension.ts
rename to extensions/typescript-language-features/src/extension.ts
diff --git a/extensions/typescript/src/features/baseCodeLensProvider.ts b/extensions/typescript-language-features/src/features/baseCodeLensProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/baseCodeLensProvider.ts
rename to extensions/typescript-language-features/src/features/baseCodeLensProvider.ts
diff --git a/extensions/typescript/src/features/bufferSyncSupport.ts b/extensions/typescript-language-features/src/features/bufferSyncSupport.ts
similarity index 100%
rename from extensions/typescript/src/features/bufferSyncSupport.ts
rename to extensions/typescript-language-features/src/features/bufferSyncSupport.ts
diff --git a/extensions/typescript/src/features/completionItemProvider.ts b/extensions/typescript-language-features/src/features/completionItemProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/completionItemProvider.ts
rename to extensions/typescript-language-features/src/features/completionItemProvider.ts
diff --git a/extensions/typescript/src/features/definitionProvider.ts b/extensions/typescript-language-features/src/features/definitionProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/definitionProvider.ts
rename to extensions/typescript-language-features/src/features/definitionProvider.ts
diff --git a/extensions/typescript/src/features/definitionProviderBase.ts b/extensions/typescript-language-features/src/features/definitionProviderBase.ts
similarity index 100%
rename from extensions/typescript/src/features/definitionProviderBase.ts
rename to extensions/typescript-language-features/src/features/definitionProviderBase.ts
diff --git a/extensions/typescript/src/features/diagnostics.ts b/extensions/typescript-language-features/src/features/diagnostics.ts
similarity index 100%
rename from extensions/typescript/src/features/diagnostics.ts
rename to extensions/typescript-language-features/src/features/diagnostics.ts
diff --git a/extensions/typescript/src/features/directiveCommentCompletionProvider.ts b/extensions/typescript-language-features/src/features/directiveCommentCompletionProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/directiveCommentCompletionProvider.ts
rename to extensions/typescript-language-features/src/features/directiveCommentCompletionProvider.ts
diff --git a/extensions/typescript/src/features/documentHighlightProvider.ts b/extensions/typescript-language-features/src/features/documentHighlightProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/documentHighlightProvider.ts
rename to extensions/typescript-language-features/src/features/documentHighlightProvider.ts
diff --git a/extensions/typescript/src/features/documentSymbolProvider.ts b/extensions/typescript-language-features/src/features/documentSymbolProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/documentSymbolProvider.ts
rename to extensions/typescript-language-features/src/features/documentSymbolProvider.ts
diff --git a/extensions/typescript/src/features/folderingProvider.ts b/extensions/typescript-language-features/src/features/folderingProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/folderingProvider.ts
rename to extensions/typescript-language-features/src/features/folderingProvider.ts
diff --git a/extensions/typescript/src/features/formattingConfigurationManager.ts b/extensions/typescript-language-features/src/features/formattingConfigurationManager.ts
similarity index 100%
rename from extensions/typescript/src/features/formattingConfigurationManager.ts
rename to extensions/typescript-language-features/src/features/formattingConfigurationManager.ts
diff --git a/extensions/typescript/src/features/formattingProvider.ts b/extensions/typescript-language-features/src/features/formattingProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/formattingProvider.ts
rename to extensions/typescript-language-features/src/features/formattingProvider.ts
diff --git a/extensions/typescript/src/features/hoverProvider.ts b/extensions/typescript-language-features/src/features/hoverProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/hoverProvider.ts
rename to extensions/typescript-language-features/src/features/hoverProvider.ts
diff --git a/extensions/typescript/src/features/implementationProvider.ts b/extensions/typescript-language-features/src/features/implementationProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/implementationProvider.ts
rename to extensions/typescript-language-features/src/features/implementationProvider.ts
diff --git a/extensions/typescript/src/features/implementationsCodeLensProvider.ts b/extensions/typescript-language-features/src/features/implementationsCodeLensProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/implementationsCodeLensProvider.ts
rename to extensions/typescript-language-features/src/features/implementationsCodeLensProvider.ts
diff --git a/extensions/typescript/src/features/jsDocCompletionProvider.ts b/extensions/typescript-language-features/src/features/jsDocCompletionProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/jsDocCompletionProvider.ts
rename to extensions/typescript-language-features/src/features/jsDocCompletionProvider.ts
diff --git a/extensions/typescript/src/features/organizeImports.ts b/extensions/typescript-language-features/src/features/organizeImports.ts
similarity index 100%
rename from extensions/typescript/src/features/organizeImports.ts
rename to extensions/typescript-language-features/src/features/organizeImports.ts
diff --git a/extensions/typescript/src/features/quickFixProvider.ts b/extensions/typescript-language-features/src/features/quickFixProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/quickFixProvider.ts
rename to extensions/typescript-language-features/src/features/quickFixProvider.ts
diff --git a/extensions/typescript/src/features/refactorProvider.ts b/extensions/typescript-language-features/src/features/refactorProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/refactorProvider.ts
rename to extensions/typescript-language-features/src/features/refactorProvider.ts
diff --git a/extensions/typescript/src/features/referenceProvider.ts b/extensions/typescript-language-features/src/features/referenceProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/referenceProvider.ts
rename to extensions/typescript-language-features/src/features/referenceProvider.ts
diff --git a/extensions/typescript/src/features/referencesCodeLensProvider.ts b/extensions/typescript-language-features/src/features/referencesCodeLensProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/referencesCodeLensProvider.ts
rename to extensions/typescript-language-features/src/features/referencesCodeLensProvider.ts
diff --git a/extensions/typescript/src/features/renameProvider.ts b/extensions/typescript-language-features/src/features/renameProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/renameProvider.ts
rename to extensions/typescript-language-features/src/features/renameProvider.ts
diff --git a/extensions/typescript/src/features/signatureHelpProvider.ts b/extensions/typescript-language-features/src/features/signatureHelpProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/signatureHelpProvider.ts
rename to extensions/typescript-language-features/src/features/signatureHelpProvider.ts
diff --git a/extensions/typescript/src/features/taskProvider.ts b/extensions/typescript-language-features/src/features/taskProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/taskProvider.ts
rename to extensions/typescript-language-features/src/features/taskProvider.ts
diff --git a/extensions/typescript/src/features/typeDefinitionProvider.ts b/extensions/typescript-language-features/src/features/typeDefinitionProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/typeDefinitionProvider.ts
rename to extensions/typescript-language-features/src/features/typeDefinitionProvider.ts
diff --git a/extensions/typescript/src/features/workspaceSymbolProvider.ts b/extensions/typescript-language-features/src/features/workspaceSymbolProvider.ts
similarity index 100%
rename from extensions/typescript/src/features/workspaceSymbolProvider.ts
rename to extensions/typescript-language-features/src/features/workspaceSymbolProvider.ts
diff --git a/extensions/typescript/src/languageProvider.ts b/extensions/typescript-language-features/src/languageProvider.ts
similarity index 100%
rename from extensions/typescript/src/languageProvider.ts
rename to extensions/typescript-language-features/src/languageProvider.ts
diff --git a/extensions/typescript/src/protocol.const.ts b/extensions/typescript-language-features/src/protocol.const.ts
similarity index 100%
rename from extensions/typescript/src/protocol.const.ts
rename to extensions/typescript-language-features/src/protocol.const.ts
diff --git a/extensions/typescript/src/protocol.d.ts b/extensions/typescript-language-features/src/protocol.d.ts
similarity index 100%
rename from extensions/typescript/src/protocol.d.ts
rename to extensions/typescript-language-features/src/protocol.d.ts
diff --git a/extensions/typescript/src/typeScriptServiceClientHost.ts b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
similarity index 100%
rename from extensions/typescript/src/typeScriptServiceClientHost.ts
rename to extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
diff --git a/extensions/typescript/src/typescriptService.ts b/extensions/typescript-language-features/src/typescriptService.ts
similarity index 100%
rename from extensions/typescript/src/typescriptService.ts
rename to extensions/typescript-language-features/src/typescriptService.ts
diff --git a/extensions/typescript/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
similarity index 100%
rename from extensions/typescript/src/typescriptServiceClient.ts
rename to extensions/typescript-language-features/src/typescriptServiceClient.ts
diff --git a/extensions/typescript/src/typings/collections.d.ts b/extensions/typescript-language-features/src/typings/collections.d.ts
similarity index 100%
rename from extensions/typescript/src/typings/collections.d.ts
rename to extensions/typescript-language-features/src/typings/collections.d.ts
diff --git a/extensions/typescript/src/typings/ref.d.ts b/extensions/typescript-language-features/src/typings/ref.d.ts
similarity index 100%
rename from extensions/typescript/src/typings/ref.d.ts
rename to extensions/typescript-language-features/src/typings/ref.d.ts
diff --git a/extensions/typescript/src/utils/api.ts b/extensions/typescript-language-features/src/utils/api.ts
similarity index 100%
rename from extensions/typescript/src/utils/api.ts
rename to extensions/typescript-language-features/src/utils/api.ts
diff --git a/extensions/typescript/src/utils/arrays.ts b/extensions/typescript-language-features/src/utils/arrays.ts
similarity index 100%
rename from extensions/typescript/src/utils/arrays.ts
rename to extensions/typescript-language-features/src/utils/arrays.ts
diff --git a/extensions/typescript/src/utils/async.ts b/extensions/typescript-language-features/src/utils/async.ts
similarity index 100%
rename from extensions/typescript/src/utils/async.ts
rename to extensions/typescript-language-features/src/utils/async.ts
diff --git a/extensions/typescript/src/utils/codeAction.ts b/extensions/typescript-language-features/src/utils/codeAction.ts
similarity index 100%
rename from extensions/typescript/src/utils/codeAction.ts
rename to extensions/typescript-language-features/src/utils/codeAction.ts
diff --git a/extensions/typescript/src/utils/commandManager.ts b/extensions/typescript-language-features/src/utils/commandManager.ts
similarity index 100%
rename from extensions/typescript/src/utils/commandManager.ts
rename to extensions/typescript-language-features/src/utils/commandManager.ts
diff --git a/extensions/typescript/src/utils/configuration.ts b/extensions/typescript-language-features/src/utils/configuration.ts
similarity index 100%
rename from extensions/typescript/src/utils/configuration.ts
rename to extensions/typescript-language-features/src/utils/configuration.ts
diff --git a/extensions/typescript/src/utils/dipose.ts b/extensions/typescript-language-features/src/utils/dipose.ts
similarity index 100%
rename from extensions/typescript/src/utils/dipose.ts
rename to extensions/typescript-language-features/src/utils/dipose.ts
diff --git a/extensions/typescript/src/utils/electron.ts b/extensions/typescript-language-features/src/utils/electron.ts
similarity index 100%
rename from extensions/typescript/src/utils/electron.ts
rename to extensions/typescript-language-features/src/utils/electron.ts
diff --git a/extensions/typescript/src/utils/electronForkStart.ts b/extensions/typescript-language-features/src/utils/electronForkStart.ts
similarity index 100%
rename from extensions/typescript/src/utils/electronForkStart.ts
rename to extensions/typescript-language-features/src/utils/electronForkStart.ts
diff --git a/extensions/typescript/src/utils/fileSchemes.ts b/extensions/typescript-language-features/src/utils/fileSchemes.ts
similarity index 100%
rename from extensions/typescript/src/utils/fileSchemes.ts
rename to extensions/typescript-language-features/src/utils/fileSchemes.ts
diff --git a/extensions/typescript/src/utils/is.ts b/extensions/typescript-language-features/src/utils/is.ts
similarity index 100%
rename from extensions/typescript/src/utils/is.ts
rename to extensions/typescript-language-features/src/utils/is.ts
diff --git a/extensions/typescript/src/utils/languageConfigurations.ts b/extensions/typescript-language-features/src/utils/languageConfigurations.ts
similarity index 100%
rename from extensions/typescript/src/utils/languageConfigurations.ts
rename to extensions/typescript-language-features/src/utils/languageConfigurations.ts
diff --git a/extensions/typescript/src/utils/languageDescription.ts b/extensions/typescript-language-features/src/utils/languageDescription.ts
similarity index 100%
rename from extensions/typescript/src/utils/languageDescription.ts
rename to extensions/typescript-language-features/src/utils/languageDescription.ts
diff --git a/extensions/typescript/src/utils/languageModeIds.ts b/extensions/typescript-language-features/src/utils/languageModeIds.ts
similarity index 100%
rename from extensions/typescript/src/utils/languageModeIds.ts
rename to extensions/typescript-language-features/src/utils/languageModeIds.ts
diff --git a/extensions/typescript/src/utils/lazy.ts b/extensions/typescript-language-features/src/utils/lazy.ts
similarity index 100%
rename from extensions/typescript/src/utils/lazy.ts
rename to extensions/typescript-language-features/src/utils/lazy.ts
diff --git a/extensions/typescript/src/utils/logDirectoryProvider.ts b/extensions/typescript-language-features/src/utils/logDirectoryProvider.ts
similarity index 100%
rename from extensions/typescript/src/utils/logDirectoryProvider.ts
rename to extensions/typescript-language-features/src/utils/logDirectoryProvider.ts
diff --git a/extensions/typescript/src/utils/logger.ts b/extensions/typescript-language-features/src/utils/logger.ts
similarity index 100%
rename from extensions/typescript/src/utils/logger.ts
rename to extensions/typescript-language-features/src/utils/logger.ts
diff --git a/extensions/typescript/src/utils/managedFileContext.ts b/extensions/typescript-language-features/src/utils/managedFileContext.ts
similarity index 100%
rename from extensions/typescript/src/utils/managedFileContext.ts
rename to extensions/typescript-language-features/src/utils/managedFileContext.ts
diff --git a/extensions/typescript/src/utils/memoize.ts b/extensions/typescript-language-features/src/utils/memoize.ts
similarity index 100%
rename from extensions/typescript/src/utils/memoize.ts
rename to extensions/typescript-language-features/src/utils/memoize.ts
diff --git a/extensions/typescript/src/utils/pluginPathsProvider.ts b/extensions/typescript-language-features/src/utils/pluginPathsProvider.ts
similarity index 100%
rename from extensions/typescript/src/utils/pluginPathsProvider.ts
rename to extensions/typescript-language-features/src/utils/pluginPathsProvider.ts
diff --git a/extensions/typescript/src/utils/plugins.ts b/extensions/typescript-language-features/src/utils/plugins.ts
similarity index 100%
rename from extensions/typescript/src/utils/plugins.ts
rename to extensions/typescript-language-features/src/utils/plugins.ts
diff --git a/extensions/typescript/src/utils/previewer.ts b/extensions/typescript-language-features/src/utils/previewer.ts
similarity index 100%
rename from extensions/typescript/src/utils/previewer.ts
rename to extensions/typescript-language-features/src/utils/previewer.ts
diff --git a/extensions/typescript/src/utils/projectStatus.ts b/extensions/typescript-language-features/src/utils/projectStatus.ts
similarity index 100%
rename from extensions/typescript/src/utils/projectStatus.ts
rename to extensions/typescript-language-features/src/utils/projectStatus.ts
diff --git a/extensions/typescript/src/utils/regexp.ts b/extensions/typescript-language-features/src/utils/regexp.ts
similarity index 100%
rename from extensions/typescript/src/utils/regexp.ts
rename to extensions/typescript-language-features/src/utils/regexp.ts
diff --git a/extensions/typescript/src/utils/relativePathResolver.ts b/extensions/typescript-language-features/src/utils/relativePathResolver.ts
similarity index 100%
rename from extensions/typescript/src/utils/relativePathResolver.ts
rename to extensions/typescript-language-features/src/utils/relativePathResolver.ts
diff --git a/extensions/typescript/src/utils/telemetry.ts b/extensions/typescript-language-features/src/utils/telemetry.ts
similarity index 100%
rename from extensions/typescript/src/utils/telemetry.ts
rename to extensions/typescript-language-features/src/utils/telemetry.ts
diff --git a/extensions/typescript/src/utils/tracer.ts b/extensions/typescript-language-features/src/utils/tracer.ts
similarity index 100%
rename from extensions/typescript/src/utils/tracer.ts
rename to extensions/typescript-language-features/src/utils/tracer.ts
diff --git a/extensions/typescript/src/utils/tsconfig.ts b/extensions/typescript-language-features/src/utils/tsconfig.ts
similarity index 100%
rename from extensions/typescript/src/utils/tsconfig.ts
rename to extensions/typescript-language-features/src/utils/tsconfig.ts
diff --git a/extensions/typescript/src/utils/tsconfigProvider.ts b/extensions/typescript-language-features/src/utils/tsconfigProvider.ts
similarity index 100%
rename from extensions/typescript/src/utils/tsconfigProvider.ts
rename to extensions/typescript-language-features/src/utils/tsconfigProvider.ts
diff --git a/extensions/typescript/src/utils/typeConverters.ts b/extensions/typescript-language-features/src/utils/typeConverters.ts
similarity index 100%
rename from extensions/typescript/src/utils/typeConverters.ts
rename to extensions/typescript-language-features/src/utils/typeConverters.ts
diff --git a/extensions/typescript/src/utils/typingsStatus.ts b/extensions/typescript-language-features/src/utils/typingsStatus.ts
similarity index 100%
rename from extensions/typescript/src/utils/typingsStatus.ts
rename to extensions/typescript-language-features/src/utils/typingsStatus.ts
diff --git a/extensions/typescript/src/utils/versionPicker.ts b/extensions/typescript-language-features/src/utils/versionPicker.ts
similarity index 100%
rename from extensions/typescript/src/utils/versionPicker.ts
rename to extensions/typescript-language-features/src/utils/versionPicker.ts
diff --git a/extensions/typescript/src/utils/versionProvider.ts b/extensions/typescript-language-features/src/utils/versionProvider.ts
similarity index 100%
rename from extensions/typescript/src/utils/versionProvider.ts
rename to extensions/typescript-language-features/src/utils/versionProvider.ts
diff --git a/extensions/typescript/src/utils/versionStatus.ts b/extensions/typescript-language-features/src/utils/versionStatus.ts
similarity index 100%
rename from extensions/typescript/src/utils/versionStatus.ts
rename to extensions/typescript-language-features/src/utils/versionStatus.ts
diff --git a/extensions/typescript/src/utils/wireProtocol.ts b/extensions/typescript-language-features/src/utils/wireProtocol.ts
similarity index 100%
rename from extensions/typescript/src/utils/wireProtocol.ts
rename to extensions/typescript-language-features/src/utils/wireProtocol.ts
diff --git a/extensions/typescript/tsconfig.json b/extensions/typescript-language-features/tsconfig.json
similarity index 100%
rename from extensions/typescript/tsconfig.json
rename to extensions/typescript-language-features/tsconfig.json
diff --git a/extensions/typescript/yarn.lock b/extensions/typescript-language-features/yarn.lock
similarity index 100%
rename from extensions/typescript/yarn.lock
rename to extensions/typescript-language-features/yarn.lock