diff --git a/src/client/common/serviceRegistry.ts b/src/client/common/serviceRegistry.ts
index 2a3507498e9a..5eabb1fbe770 100644
--- a/src/client/common/serviceRegistry.ts
+++ b/src/client/common/serviceRegistry.ts
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 import { IExtensionSingleActivationService } from '../activation/types';
 import { IFileDownloader, IHttpClient } from '../common/types';
+import { LiveShareApi } from '../datascience/liveshare/liveshare';
 import { IServiceManager } from '../ioc/types';
 import { ImportTracker } from '../telemetry/importTracker';
 import { IImportTracker } from '../telemetry/types';
@@ -47,7 +48,6 @@ import {
     IInsiderExtensionPrompt
 } from './insidersBuild/types';
 import { ProductInstaller } from './installer/productInstaller';
-import { LiveShareApi } from './liveshare/liveshare';
 import { Logger } from './logger';
 import { BrowserService } from './net/browser';
 import { FileDownloader } from './net/fileDownloader';
diff --git a/src/client/common/liveshare/liveshare.ts b/src/client/datascience/liveshare/liveshare.ts
similarity index 92%
rename from src/client/common/liveshare/liveshare.ts
rename to src/client/datascience/liveshare/liveshare.ts
index e134d0301096..e2b81023301b 100644
--- a/src/client/common/liveshare/liveshare.ts
+++ b/src/client/datascience/liveshare/liveshare.ts
@@ -4,8 +4,8 @@
 import { inject, injectable } from 'inversify';
 import * as vsls from 'vsls/vscode';
 
-import { IApplicationShell, ILiveShareApi, IWorkspaceService } from '../application/types';
-import { IConfigurationService, IDisposableRegistry } from '../types';
+import { IApplicationShell, ILiveShareApi, IWorkspaceService } from '../../common/application/types';
+import { IConfigurationService, IDisposableRegistry } from '../../common/types';
 import { LiveShareProxy } from './liveshareProxy';
 
 // tslint:disable:no-any unified-signatures
diff --git a/src/client/common/liveshare/liveshareProxy.ts b/src/client/datascience/liveshare/liveshareProxy.ts
similarity index 90%
rename from src/client/common/liveshare/liveshareProxy.ts
rename to src/client/datascience/liveshare/liveshareProxy.ts
index 9241fd5427a2..c0abe374bf26 100644
--- a/src/client/common/liveshare/liveshareProxy.ts
+++ b/src/client/datascience/liveshare/liveshareProxy.ts
@@ -4,10 +4,10 @@
 import { Disposable, Event, TreeDataProvider, Uri } from 'vscode';
 import * as vsls from 'vsls/vscode';
 
-import { LiveShare, LiveShareCommands } from '../../datascience/constants';
-import { IApplicationShell } from '../application/types';
-import { createDeferred, Deferred } from '../utils/async';
-import * as localize from '../utils/localize';
+import { IApplicationShell } from '../../common/application/types';
+import { createDeferred, Deferred } from '../../common/utils/async';
+import * as localize from '../../common/utils/localize';
+import { LiveShare, LiveShareCommands } from '../constants';
 import { ServiceProxy } from './serviceProxy';
 
 // tslint:disable:no-any unified-signatures
@@ -15,12 +15,12 @@ export class LiveShareProxy implements vsls.LiveShare {
     private currentRole: vsls.Role = vsls.Role.None;
     private guestChecker: vsls.SharedService | vsls.SharedServiceProxy | null = null;
     private pendingGuestCheckCount = 0;
-    private peerCheckPromise : Deferred<boolean> | undefined;
+    private peerCheckPromise: Deferred<boolean> | undefined;
     constructor(
         private applicationShell: IApplicationShell,
         private peerTimeout: number | undefined,
-        private realApi : vsls.LiveShare
-        ) {
+        private realApi: vsls.LiveShare
+    ) {
         this.realApi.onDidChangePeers(this.onPeersChanged, this);
         this.realApi.onDidChangeSession(this.onSessionChanged, this);
         this.onSessionChanged({ session: this.realApi.session }).ignoreErrors();
@@ -86,7 +86,7 @@ export class LiveShareProxy implements vsls.LiveShare {
         return this.realApi.getContacts(emails);
     }
 
-    private async onSessionChanged(ev: vsls.SessionChangeEvent) : Promise<void> {
+    private async onSessionChanged(ev: vsls.SessionChangeEvent): Promise<void> {
         const newRole = ev.session ? ev.session.role : vsls.Role.None;
         if (this.currentRole !== newRole) {
             // Setup our guest checker service.
@@ -102,7 +102,7 @@ export class LiveShareProxy implements vsls.LiveShare {
                     this.guestChecker.onNotify(LiveShareCommands.guestCheck, (_args: object) => this.onGuestResponse());
                 }
 
-            // If guest, we need to list for requests.
+                // If guest, we need to list for requests.
             } else if (this.currentRole === vsls.Role.Guest) {
                 this.guestChecker = await this.realApi.getSharedService(LiveShare.GuestCheckerService);
                 if (this.guestChecker) {
@@ -120,7 +120,7 @@ export class LiveShareProxy implements vsls.LiveShare {
         }
     }
 
-    private peersAreOkay() : Promise<boolean> {
+    private peersAreOkay(): Promise<boolean> {
         // If already asking, just use that promise
         if (this.peerCheckPromise) {
             return this.peerCheckPromise.promise;
diff --git a/src/client/common/liveshare/serviceProxy.ts b/src/client/datascience/liveshare/serviceProxy.ts
similarity index 100%
rename from src/client/common/liveshare/serviceProxy.ts
rename to src/client/datascience/liveshare/serviceProxy.ts
diff --git a/src/test/common/serviceRegistry.unit.test.ts b/src/test/common/serviceRegistry.unit.test.ts
index 6321debb1219..8d0631c96073 100644
--- a/src/test/common/serviceRegistry.unit.test.ts
+++ b/src/test/common/serviceRegistry.unit.test.ts
@@ -30,7 +30,6 @@ import { InsidersExtensionPrompt } from '../../client/common/insidersBuild/insid
 import { InsidersExtensionService } from '../../client/common/insidersBuild/insidersExtensionService';
 import { ExtensionChannel, IExtensionChannelRule, IExtensionChannelService, IInsiderExtensionPrompt } from '../../client/common/insidersBuild/types';
 import { ProductInstaller } from '../../client/common/installer/productInstaller';
-import { LiveShareApi } from '../../client/common/liveshare/liveshare';
 import { Logger } from '../../client/common/logger';
 import { BrowserService } from '../../client/common/net/browser';
 import { HttpClient } from '../../client/common/net/httpClient';
@@ -57,6 +56,7 @@ import { IShellDetector, ITerminalActivationCommandProvider, ITerminalActivation
 import { IAsyncDisposableRegistry, IBrowserService, IConfigurationService, ICryptoUtils, ICurrentProcess, IEditorUtils, IExperimentsManager, IExtensions, IFeatureDeprecationManager, IHttpClient, IInstaller, ILogger, IPathUtils, IPersistentStateFactory, IRandom } from '../../client/common/types';
 import { IMultiStepInputFactory, MultiStepInputFactory } from '../../client/common/utils/multiStepInput';
 import { Random } from '../../client/common/utils/random';
+import { LiveShareApi } from '../../client/datascience/liveshare/liveshare';
 import { IServiceManager } from '../../client/ioc/types';
 import { ImportTracker } from '../../client/telemetry/importTracker';
 import { IImportTracker } from '../../client/telemetry/types';
diff --git a/src/test/datascience/execution.unit.test.ts b/src/test/datascience/execution.unit.test.ts
index 0fcfbb2897b5..27167fa2b512 100644
--- a/src/test/datascience/execution.unit.test.ts
+++ b/src/test/datascience/execution.unit.test.ts
@@ -20,7 +20,6 @@ import { WorkspaceService } from '../../client/common/application/workspace';
 import { PythonSettings } from '../../client/common/configSettings';
 import { ConfigurationService } from '../../client/common/configuration/service';
 import { PYTHON_LANGUAGE } from '../../client/common/constants';
-import { LiveShareApi } from '../../client/common/liveshare/liveshare';
 import { Logger } from '../../client/common/logger';
 import { PersistentState, PersistentStateFactory } from '../../client/common/persistentState';
 import { FileSystem } from '../../client/common/platform/fileSystem';
@@ -48,6 +47,7 @@ import { JupyterExecutionFactory } from '../../client/datascience/jupyter/jupyte
 import { KernelSelector } from '../../client/datascience/jupyter/kernels/kernelSelector';
 import { LiveKernelModel } from '../../client/datascience/jupyter/kernels/types';
 import { NotebookStarter } from '../../client/datascience/jupyter/notebookStarter';
+import { LiveShareApi } from '../../client/datascience/liveshare/liveshare';
 import {
     ICell,
     IConnection,
diff --git a/src/test/datascience/interactive-ipynb/nativeEditor.unit.test.ts b/src/test/datascience/interactive-ipynb/nativeEditor.unit.test.ts
index a8997ac5934b..48423654336a 100644
--- a/src/test/datascience/interactive-ipynb/nativeEditor.unit.test.ts
+++ b/src/test/datascience/interactive-ipynb/nativeEditor.unit.test.ts
@@ -36,7 +36,6 @@ import { WorkspaceService } from '../../../client/common/application/workspace';
 import { PythonSettings } from '../../../client/common/configSettings';
 import { ConfigurationService } from '../../../client/common/configuration/service';
 import { CryptoUtils } from '../../../client/common/crypto';
-import { LiveShareApi } from '../../../client/common/liveshare/liveshare';
 import { IFileSystem } from '../../../client/common/platform/types';
 import { IConfigurationService, ICryptoUtils, IExtensionContext } from '../../../client/common/types';
 import { createDeferred } from '../../../client/common/utils/async';
@@ -53,6 +52,7 @@ import { JupyterExecutionFactory } from '../../../client/datascience/jupyter/jup
 import { JupyterExporter } from '../../../client/datascience/jupyter/jupyterExporter';
 import { JupyterImporter } from '../../../client/datascience/jupyter/jupyterImporter';
 import { JupyterVariables } from '../../../client/datascience/jupyter/jupyterVariables';
+import { LiveShareApi } from '../../../client/datascience/liveshare/liveshare';
 import { ThemeFinder } from '../../../client/datascience/themeFinder';
 import {
     ICodeCssGenerator,
diff --git a/src/test/datascience/mockLiveShare.ts b/src/test/datascience/mockLiveShare.ts
index 435c6e1a62e1..aa522eefa2b0 100644
--- a/src/test/datascience/mockLiveShare.ts
+++ b/src/test/datascience/mockLiveShare.ts
@@ -7,10 +7,10 @@ import { CancellationToken, CancellationTokenSource, Disposable, Event, EventEmi
 import * as vsls from 'vsls/vscode';
 
 import { IApplicationShell, ILiveShareTestingApi } from '../../client/common/application/types';
-import { LiveShareProxy } from '../../client/common/liveshare/liveshareProxy';
 import { IConfigurationService, IDisposable, IDisposableRegistry } from '../../client/common/types';
 import { noop } from '../../client/common/utils/misc';
 import { LiveShare } from '../../client/datascience/constants';
+import { LiveShareProxy } from '../../client/datascience/liveshare/liveshareProxy';
 
 // tslint:disable:no-any unified-signatures max-classes-per-file
 
@@ -355,7 +355,7 @@ class MockLiveShare implements vsls.LiveShare, vsls.Session, vsls.Peer, IDisposa
         return Promise.resolve({ dispose: noop });
     }
 
-    private generateServicePair() : MockLiveService[] {
+    private generateServicePair(): MockLiveService[] {
         const hostService = new MockLiveService();
         const guestService = new MockLiveService();
         hostService.setSibling(guestService);
@@ -375,9 +375,9 @@ export class MockLiveShareApi implements ILiveShareTestingApi {
 
     constructor(
         @inject(IDisposableRegistry) private disposables: IDisposableRegistry,
-        @inject(IApplicationShell) private appShell : IApplicationShell,
+        @inject(IApplicationShell) private appShell: IApplicationShell,
         @inject(IConfigurationService) private config: IConfigurationService
-        ) {
+    ) {
     }
 
     public getApi(): Promise<vsls.LiveShare | null> {