diff --git a/news/3 Code Health/2756.md b/news/3 Code Health/2756.md
new file mode 100644
index 000000000000..2fdb62ffbf9d
--- /dev/null
+++ b/news/3 Code Health/2756.md	
@@ -0,0 +1 @@
+Moved languageServer-related files to a languageServer folder.
diff --git a/src/client/activation/languageServer.ts b/src/client/activation/languageServer/languageServer.ts
similarity index 94%
rename from src/client/activation/languageServer.ts
rename to src/client/activation/languageServer/languageServer.ts
index 9624994ffc5c..9e003eff25ad 100644
--- a/src/client/activation/languageServer.ts
+++ b/src/client/activation/languageServer/languageServer.ts
@@ -13,34 +13,34 @@ import {
     Disposable, LanguageClient, LanguageClientOptions,
     ProvideCompletionItemsSignature, ServerOptions
 } from 'vscode-languageclient';
-import { createDeferred, Deferred } from '../../utils/async';
-import { StopWatch } from '../../utils/stopWatch';
+import { createDeferred, Deferred } from '../../../utils/async';
+import { StopWatch } from '../../../utils/stopWatch';
 import {
     IApplicationShell, ICommandManager, IWorkspaceService
-} from '../common/application/types';
-import { PythonSettings } from '../common/configSettings';
+} from '../../common/application/types';
+import { PythonSettings } from '../../common/configSettings';
 // tslint:disable-next-line:ordered-imports
-import { isTestExecution, STANDARD_OUTPUT_CHANNEL } from '../common/constants';
-import { IFileSystem, IPlatformService } from '../common/platform/types';
+import { isTestExecution, STANDARD_OUTPUT_CHANNEL } from '../../common/constants';
+import { IFileSystem, IPlatformService } from '../../common/platform/types';
 import {
     BANNER_NAME_LS_SURVEY, DeprecatedFeatureInfo, IConfigurationService,
     IDisposableRegistry, IExtensionContext, IFeatureDeprecationManager, ILogger,
     IOutputChannel, IPathUtils, IPythonExtensionBanner, IPythonSettings
-} from '../common/types';
-import { IEnvironmentVariablesProvider } from '../common/variables/types';
-import { IServiceContainer } from '../ioc/types';
-import { LanguageServerSymbolProvider } from '../providers/symbolProvider';
+} from '../../common/types';
+import { IEnvironmentVariablesProvider } from '../../common/variables/types';
+import { IServiceContainer } from '../../ioc/types';
+import { LanguageServerSymbolProvider } from '../../providers/symbolProvider';
 import {
     PYTHON_LANGUAGE_SERVER_ENABLED,
     PYTHON_LANGUAGE_SERVER_ERROR
-} from '../telemetry/constants';
-import { getTelemetryReporter } from '../telemetry/telemetry';
-import { IUnitTestManagementService } from '../unittests/types';
-import { LanguageServerDownloader } from './downloader';
-import { InterpreterData, InterpreterDataService } from './interpreterDataService';
-import { PlatformData } from './platformData';
-import { ProgressReporting } from './progress';
-import { IExtensionActivator, ILanguageServerFolderService } from './types';
+} from '../../telemetry/constants';
+import { getTelemetryReporter } from '../../telemetry/telemetry';
+import { IUnitTestManagementService } from '../../unittests/types';
+import { LanguageServerDownloader } from '../downloader';
+import { InterpreterData, InterpreterDataService } from '../interpreterDataService';
+import { PlatformData } from '../platformData';
+import { ProgressReporting } from '../progress';
+import { IExtensionActivator, ILanguageServerFolderService } from '../types';
 
 const PYTHON = 'python';
 const dotNetCommand = 'dotnet';
diff --git a/src/client/activation/languageServerFolderService.ts b/src/client/activation/languageServer/languageServerFolderService.ts
similarity index 90%
rename from src/client/activation/languageServerFolderService.ts
rename to src/client/activation/languageServer/languageServerFolderService.ts
index 655aac510162..e4e47d7ce0b1 100644
--- a/src/client/activation/languageServerFolderService.ts
+++ b/src/client/activation/languageServer/languageServerFolderService.ts
@@ -6,13 +6,13 @@
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
 import * as semver from 'semver';
-import { EXTENSION_ROOT_DIR } from '../common/constants';
-import { log } from '../common/logger';
-import { NugetPackage } from '../common/nuget/types';
-import { IFileSystem } from '../common/platform/types';
-import { IConfigurationService } from '../common/types';
-import { IServiceContainer } from '../ioc/types';
-import { FolderVersionPair, IDownloadChannelRule, ILanguageServerFolderService, ILanguageServerPackageService } from './types';
+import { EXTENSION_ROOT_DIR } from '../../common/constants';
+import { log } from '../../common/logger';
+import { NugetPackage } from '../../common/nuget/types';
+import { IFileSystem } from '../../common/platform/types';
+import { IConfigurationService } from '../../common/types';
+import { IServiceContainer } from '../../ioc/types';
+import { FolderVersionPair, IDownloadChannelRule, ILanguageServerFolderService, ILanguageServerPackageService } from '../types';
 
 const languageServerFolder = 'languageServer';
 
diff --git a/src/client/activation/languageServerHashes.ts b/src/client/activation/languageServer/languageServerHashes.ts
similarity index 100%
rename from src/client/activation/languageServerHashes.ts
rename to src/client/activation/languageServer/languageServerHashes.ts
diff --git a/src/client/activation/languageServerPackageRepository.ts b/src/client/activation/languageServer/languageServerPackageRepository.ts
similarity index 90%
rename from src/client/activation/languageServerPackageRepository.ts
rename to src/client/activation/languageServer/languageServerPackageRepository.ts
index 6ca91ba085f8..1bdba941dc6b 100644
--- a/src/client/activation/languageServerPackageRepository.ts
+++ b/src/client/activation/languageServer/languageServerPackageRepository.ts
@@ -4,8 +4,8 @@
 'use strict';
 
 import { inject, injectable } from 'inversify';
-import { AzureBlobStoreNugetRepository } from '../common/nuget/azureBlobStoreNugetRepository';
-import { IServiceContainer } from '../ioc/types';
+import { AzureBlobStoreNugetRepository } from '../../common/nuget/azureBlobStoreNugetRepository';
+import { IServiceContainer } from '../../ioc/types';
 
 const azureBlobStorageAccount = 'https://pvsc.blob.core.windows.net';
 
diff --git a/src/client/activation/languageServerPackageService.ts b/src/client/activation/languageServer/languageServerPackageService.ts
similarity index 88%
rename from src/client/activation/languageServerPackageService.ts
rename to src/client/activation/languageServer/languageServerPackageService.ts
index fc8849283bca..d883483e361e 100644
--- a/src/client/activation/languageServerPackageService.ts
+++ b/src/client/activation/languageServer/languageServerPackageService.ts
@@ -5,15 +5,15 @@
 
 import { inject, injectable } from 'inversify';
 import { parse } from 'semver';
-import { Architecture, OSType } from '../../utils/platform';
-import { PVSC_EXTENSION_ID } from '../common/constants';
-import { log } from '../common/logger';
-import { INugetRepository, INugetService, NugetPackage } from '../common/nuget/types';
-import { IPlatformService } from '../common/platform/types';
-import { IConfigurationService, IExtensions, LanguageServerDownloadChannels } from '../common/types';
-import { IServiceContainer } from '../ioc/types';
-import { PlatformName } from './platformData';
-import { ILanguageServerPackageService } from './types';
+import { Architecture, OSType } from '../../../utils/platform';
+import { PVSC_EXTENSION_ID } from '../../common/constants';
+import { log } from '../../common/logger';
+import { INugetRepository, INugetService, NugetPackage } from '../../common/nuget/types';
+import { IPlatformService } from '../../common/platform/types';
+import { IConfigurationService, IExtensions, LanguageServerDownloadChannels } from '../../common/types';
+import { IServiceContainer } from '../../ioc/types';
+import { PlatformName } from '../platformData';
+import { ILanguageServerPackageService } from '../types';
 
 const downloadBaseFileName = 'Python-Language-Server';
 export const maxMajorVersion = 0;
diff --git a/src/client/activation/platformData.ts b/src/client/activation/platformData.ts
index 6a7d007b9008..fc0f01b2b2de 100644
--- a/src/client/activation/platformData.ts
+++ b/src/client/activation/platformData.ts
@@ -7,7 +7,7 @@ import {
     language_server_osx_x64_sha512,
     language_server_win_x64_sha512,
     language_server_win_x86_sha512
-} from './languageServerHashes';
+} from './languageServer/languageServerHashes';
 
 export enum PlatformName {
     Windows32Bit = 'win-x86',
diff --git a/src/client/activation/serviceRegistry.ts b/src/client/activation/serviceRegistry.ts
index f85f48083702..2ea04b4ec4ed 100644
--- a/src/client/activation/serviceRegistry.ts
+++ b/src/client/activation/serviceRegistry.ts
@@ -11,10 +11,10 @@ import { ProposeLanguageServerBanner } from '../languageServices/proposeLanguage
 import { ExtensionActivationService } from './activationService';
 import { DownloadBetaChannelRule, DownloadDailyChannelRule, DownloadStableChannelRule } from './downloadChannelRules';
 import { JediExtensionActivator } from './jedi';
-import { LanguageServerExtensionActivator } from './languageServer';
-import { LanguageServerFolderService } from './languageServerFolderService';
-import { BetaLanguageServerPackageRepository, DailyLanguageServerPackageRepository, LanguageServerDownloadChannel, StableLanguageServerPackageRepository } from './languageServerPackageRepository';
-import { LanguageServerPackageService } from './languageServerPackageService';
+import { LanguageServerExtensionActivator } from './languageServer/languageServer';
+import { LanguageServerFolderService } from './languageServer/languageServerFolderService';
+import { BetaLanguageServerPackageRepository, DailyLanguageServerPackageRepository, LanguageServerDownloadChannel, StableLanguageServerPackageRepository } from './languageServer/languageServerPackageRepository';
+import { LanguageServerPackageService } from './languageServer/languageServerPackageService';
 import { ExtensionActivators, IDownloadChannelRule, IExtensionActivationService, IExtensionActivator, ILanguageServerFolderService, ILanguageServerPackageService } from './types';
 
 export function registerTypes(serviceManager: IServiceManager) {
diff --git a/src/test/activation/languageServer.unit.test.ts b/src/test/activation/languageServer/languageServer.unit.test.ts
similarity index 90%
rename from src/test/activation/languageServer.unit.test.ts
rename to src/test/activation/languageServer/languageServer.unit.test.ts
index e0b21420e487..492ccfc9e4da 100644
--- a/src/test/activation/languageServer.unit.test.ts
+++ b/src/test/activation/languageServer/languageServer.unit.test.ts
@@ -8,12 +8,12 @@
 import { expect } from 'chai';
 import * as path from 'path';
 import * as TypeMoq from 'typemoq';
-import { LanguageServerExtensionActivator } from '../../client/activation/languageServer';
-import { IApplicationShell, ICommandManager, IWorkspaceService } from '../../client/common/application/types';
-import { IPlatformService } from '../../client/common/platform/types';
-import { IConfigurationService, IDisposableRegistry, IExtensionContext, IFeatureDeprecationManager, IOutputChannel, IPathUtils, IPythonSettings } from '../../client/common/types';
-import { IEnvironmentVariablesProvider } from '../../client/common/variables/types';
-import { IServiceContainer } from '../../client/ioc/types';
+import { LanguageServerExtensionActivator } from '../../../client/activation/languageServer/languageServer';
+import { IApplicationShell, ICommandManager, IWorkspaceService } from '../../../client/common/application/types';
+import { IPlatformService } from '../../../client/common/platform/types';
+import { IConfigurationService, IDisposableRegistry, IExtensionContext, IFeatureDeprecationManager, IOutputChannel, IPathUtils, IPythonSettings } from '../../../client/common/types';
+import { IEnvironmentVariablesProvider } from '../../../client/common/variables/types';
+import { IServiceContainer } from '../../../client/ioc/types';
 
 suite('Language Server', () => {
     let serviceContainer: TypeMoq.IMock<IServiceContainer>;
diff --git a/src/test/activation/languageServerFolderService.unit.test.ts b/src/test/activation/languageServer/languageServerFolderService.unit.test.ts
similarity index 94%
rename from src/test/activation/languageServerFolderService.unit.test.ts
rename to src/test/activation/languageServer/languageServerFolderService.unit.test.ts
index e5326c044d00..faf3a6eed2ae 100644
--- a/src/test/activation/languageServerFolderService.unit.test.ts
+++ b/src/test/activation/languageServer/languageServerFolderService.unit.test.ts
@@ -9,13 +9,13 @@ import { expect } from 'chai';
 import * as path from 'path';
 import { parse, SemVer } from 'semver';
 import * as typeMoq from 'typemoq';
-import { LanguageServerFolderService } from '../../client/activation/languageServerFolderService';
-import { IDownloadChannelRule, ILanguageServerPackageService } from '../../client/activation/types';
-import { EXTENSION_ROOT_DIR } from '../../client/common/constants';
-import { NugetPackage } from '../../client/common/nuget/types';
-import { IFileSystem, IPlatformService } from '../../client/common/platform/types';
-import { IConfigurationService, IPythonSettings } from '../../client/common/types';
-import { IServiceContainer } from '../../client/ioc/types';
+import { LanguageServerFolderService } from '../../../client/activation/languageServer/languageServerFolderService';
+import { IDownloadChannelRule, ILanguageServerPackageService } from '../../../client/activation/types';
+import { EXTENSION_ROOT_DIR } from '../../../client/common/constants';
+import { NugetPackage } from '../../../client/common/nuget/types';
+import { IFileSystem, IPlatformService } from '../../../client/common/platform/types';
+import { IConfigurationService, IPythonSettings } from '../../../client/common/types';
+import { IServiceContainer } from '../../../client/ioc/types';
 
 const languageServerFolder = 'languageServer';
 
diff --git a/src/test/activation/languageServerPackageRepository.unit.test.ts b/src/test/activation/languageServer/languageServerPackageRepository.unit.test.ts
similarity index 92%
rename from src/test/activation/languageServerPackageRepository.unit.test.ts
rename to src/test/activation/languageServer/languageServerPackageRepository.unit.test.ts
index 214b40621e37..4bfa18f1eced 100644
--- a/src/test/activation/languageServerPackageRepository.unit.test.ts
+++ b/src/test/activation/languageServer/languageServerPackageRepository.unit.test.ts
@@ -5,8 +5,8 @@
 
 import { expect } from 'chai';
 import * as typeMoq from 'typemoq';
-import { BetaLanguageServerPackageRepository, DailyLanguageServerPackageRepository, LanguageServerDownloadChannel, StableLanguageServerPackageRepository } from '../../client/activation/languageServerPackageRepository';
-import { IServiceContainer } from '../../client/ioc/types';
+import { BetaLanguageServerPackageRepository, DailyLanguageServerPackageRepository, LanguageServerDownloadChannel, StableLanguageServerPackageRepository } from '../../../client/activation/languageServer/languageServerPackageRepository';
+import { IServiceContainer } from '../../../client/ioc/types';
 
 suite('Language Server Download Channels', () => {
     let serviceContainer: typeMoq.IMock<IServiceContainer>;
diff --git a/src/test/activation/languageServerPackageService.test.ts b/src/test/activation/languageServer/languageServerPackageService.test.ts
similarity index 81%
rename from src/test/activation/languageServerPackageService.test.ts
rename to src/test/activation/languageServer/languageServerPackageService.test.ts
index d690627dd6ea..d5da51e876a3 100644
--- a/src/test/activation/languageServerPackageService.test.ts
+++ b/src/test/activation/languageServer/languageServerPackageService.test.ts
@@ -8,18 +8,18 @@
 import { expect } from 'chai';
 import * as typeMoq from 'typemoq';
 import { WorkspaceConfiguration } from 'vscode';
-import { LanguageServerPackageStorageContainers } from '../../client/activation/languageServerPackageRepository';
-import { LanguageServerPackageService } from '../../client/activation/languageServerPackageService';
-import { IHttpClient } from '../../client/activation/types';
-import { IWorkspaceService } from '../../client/common/application/types';
-import { HttpClient } from '../../client/common/net/httpClient';
-import { AzureBlobStoreNugetRepository } from '../../client/common/nuget/azureBlobStoreNugetRepository';
-import { NugetRepository } from '../../client/common/nuget/nugetRepository';
-import { NugetService } from '../../client/common/nuget/nugetService';
-import { INugetRepository, INugetService } from '../../client/common/nuget/types';
-import { PlatformService } from '../../client/common/platform/platformService';
-import { IPlatformService } from '../../client/common/platform/types';
-import { IServiceContainer } from '../../client/ioc/types';
+import { LanguageServerPackageStorageContainers } from '../../../client/activation/languageServer/languageServerPackageRepository';
+import { LanguageServerPackageService } from '../../../client/activation/languageServer/languageServerPackageService';
+import { IHttpClient } from '../../../client/activation/types';
+import { IWorkspaceService } from '../../../client/common/application/types';
+import { HttpClient } from '../../../client/common/net/httpClient';
+import { AzureBlobStoreNugetRepository } from '../../../client/common/nuget/azureBlobStoreNugetRepository';
+import { NugetRepository } from '../../../client/common/nuget/nugetRepository';
+import { NugetService } from '../../../client/common/nuget/nugetService';
+import { INugetRepository, INugetService } from '../../../client/common/nuget/types';
+import { PlatformService } from '../../../client/common/platform/platformService';
+import { IPlatformService } from '../../../client/common/platform/types';
+import { IServiceContainer } from '../../../client/ioc/types';
 
 suite('Language Server Package Service', () => {
     let serviceContainer: typeMoq.IMock<IServiceContainer>;
diff --git a/src/test/activation/languageServerPackageService.unit.test.ts b/src/test/activation/languageServer/languageServerPackageService.unit.test.ts
similarity index 91%
rename from src/test/activation/languageServerPackageService.unit.test.ts
rename to src/test/activation/languageServer/languageServerPackageService.unit.test.ts
index 0a043cb9284c..1682080d6f7a 100644
--- a/src/test/activation/languageServerPackageService.unit.test.ts
+++ b/src/test/activation/languageServer/languageServerPackageService.unit.test.ts
@@ -8,13 +8,13 @@
 import { expect } from 'chai';
 import { SemVer } from 'semver';
 import * as typeMoq from 'typemoq';
-import { LanguageServerPackageService } from '../../client/activation/languageServerPackageService';
-import { PlatformName } from '../../client/activation/platformData';
-import { NugetService } from '../../client/common/nuget/nugetService';
-import { INugetRepository, INugetService, NugetPackage } from '../../client/common/nuget/types';
-import { IPlatformService } from '../../client/common/platform/types';
-import { IServiceContainer } from '../../client/ioc/types';
-import { Architecture, OSType } from '../../utils/platform';
+import { LanguageServerPackageService } from '../../../client/activation/languageServer/languageServerPackageService';
+import { PlatformName } from '../../../client/activation/platformData';
+import { NugetService } from '../../../client/common/nuget/nugetService';
+import { INugetRepository, INugetService, NugetPackage } from '../../../client/common/nuget/types';
+import { IPlatformService } from '../../../client/common/platform/types';
+import { IServiceContainer } from '../../../client/ioc/types';
+import { Architecture, OSType } from '../../../utils/platform';
 
 const downloadBaseFileName = 'Python-Language-Server';
 
diff --git a/src/test/common/nuget/azureBobStoreRepository.test.ts b/src/test/common/nuget/azureBobStoreRepository.test.ts
index 5090ed3837fc..e1ebb9baa804 100644
--- a/src/test/common/nuget/azureBobStoreRepository.test.ts
+++ b/src/test/common/nuget/azureBobStoreRepository.test.ts
@@ -6,8 +6,8 @@
 import { expect } from 'chai';
 import { SemVer } from 'semver';
 import * as typeMoq from 'typemoq';
-import { LanguageServerPackageStorageContainers } from '../../../client/activation/languageServerPackageRepository';
-import { LanguageServerPackageService } from '../../../client/activation/languageServerPackageService';
+import { LanguageServerPackageStorageContainers } from '../../../client/activation/languageServer/languageServerPackageRepository';
+import { LanguageServerPackageService } from '../../../client/activation/languageServer/languageServerPackageService';
 import { IHttpClient } from '../../../client/activation/types';
 import { AzureBlobStoreNugetRepository } from '../../../client/common/nuget/azureBlobStoreNugetRepository';
 import { INugetService } from '../../../client/common/nuget/types';