diff --git a/src/Tools/ExternalAccess/LiveShare/Classification/RoslynClassificationService.Exports.cs b/src/Tools/ExternalAccess/LiveShare/Classification/RoslynClassificationService.Exports.cs
index e22b208d60e805149aa976293eb27e117d229b29..27d09ca218763a6703a523449ecb20878792f8b3 100644
--- a/src/Tools/ExternalAccess/LiveShare/Classification/RoslynClassificationService.Exports.cs
+++ b/src/Tools/ExternalAccess/LiveShare/Classification/RoslynClassificationService.Exports.cs
@@ -7,7 +7,7 @@
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Classification
 {
     [ExportLanguageServiceFactory(typeof(IClassificationService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspClassificationServiceFactory : ILanguageServiceFactory
diff --git a/src/Tools/ExternalAccess/LiveShare/Classification/RoslynClassificationService.cs b/src/Tools/ExternalAccess/LiveShare/Classification/RoslynClassificationService.cs
index 4adaec8c0a632748216435aa1244783d282b5876..93307beca0a08a0166c601d01efb1fb71e9b4409 100644
--- a/src/Tools/ExternalAccess/LiveShare/Classification/RoslynClassificationService.cs
+++ b/src/Tools/ExternalAccess/LiveShare/Classification/RoslynClassificationService.cs
@@ -3,7 +3,6 @@
 using System;
 using System.Collections.Immutable;
 using System.Threading;
-using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Classification;
 using Microsoft.CodeAnalysis.Classification.Classifiers;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
@@ -14,7 +13,7 @@
 using Microsoft.VisualStudio.LanguageServices.LiveShare.CustomProtocol;
 using Task = System.Threading.Tasks.Task;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Classification
 {
     internal class RoslynClassificationService : ISyntaxClassificationService
     {
diff --git a/src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynCodeActionProvider.Exports.cs b/src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynCodeActionProvider.Exports.cs
index 171f9110738a1ce6d4b753798e3f81dc8894a3c5..c003e63ebc129dbd260d2c27f27652e702df59f9 100644
--- a/src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynCodeActionProvider.Exports.cs
+++ b/src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynCodeActionProvider.Exports.cs
@@ -4,7 +4,7 @@
 using Microsoft.CodeAnalysis.CodeRefactorings;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.CodeActions
 {
     [Shared]
     [ExportCodeRefactoringProvider(StringConstants.CSharpLspLanguageName)]
diff --git a/src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynCodeActionProvider.cs b/src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynCodeActionProvider.cs
index c922c17099bafcb462d7751eb31a1985e15f2b12..c4edcd973b8ced4cedfe9ac809d2fed4ba65e92e 100644
--- a/src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynCodeActionProvider.cs
+++ b/src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynCodeActionProvider.cs
@@ -9,7 +9,7 @@
 using Microsoft.CodeAnalysis.LanguageServer;
 using LSP = Microsoft.VisualStudio.LanguageServer.Protocol;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.CodeActions
 {
     internal class RoslynCodeActionProvider : CodeRefactoringProvider
     {
@@ -66,8 +66,8 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
                 // If a Command, leave it unchanged; we want to dispatch it to the host to execute.
                 // If a CodeAction, unwrap the CodeAction so the guest can run it locally.
                 var commandArguments = command.Arguments.Single();
-                var codeAction = (commandArguments is LSP.CodeAction) ? (LSP.CodeAction)commandArguments : null;
-                context.RegisterRefactoring(new RoslynRemoteCodeAction(context.Document, (codeAction == null) ? command : null, codeAction, lspClient));
+                var codeAction = commandArguments is LSP.CodeAction ? (LSP.CodeAction)commandArguments : null;
+                context.RegisterRefactoring(new RoslynRemoteCodeAction(context.Document, codeAction == null ? command : null, codeAction, lspClient));
             }
         }
     }
diff --git a/src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynRemoteCodeAction.cs b/src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynRemoteCodeAction.cs
index c55469df6a1e7a2b30cca13d05c1370418d30fcb..1fad7cea9bc3b1d87f6a293e372cbb0d732e7feb 100644
--- a/src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynRemoteCodeAction.cs
+++ b/src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynRemoteCodeAction.cs
@@ -7,7 +7,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.LiveShare.LanguageServices;
-using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.LanguageServer.CustomProtocol;
 using Microsoft.CodeAnalysis.LanguageServer;
@@ -16,14 +15,14 @@
 using Newtonsoft.Json.Linq;
 using LSP = Microsoft.VisualStudio.LanguageServer.Protocol;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.CodeActions
 {
     /// <summary>
     /// A codeaction that takes either a LSP command or a LSP codeaction.
     /// If a command is provided, then that is executed on the host side. If a codeaction is
     /// provided then the edits are applied locally on the guest side.
     /// </summary>
-    internal class RoslynRemoteCodeAction : CodeAnalysis.CodeActions.CodeAction
+    internal class RoslynRemoteCodeAction : CodeAction
     {
         private readonly Document _document;
         private readonly LSP.Command _command;
diff --git a/src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynRemoteCodeActionOperation.cs b/src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynRemoteCodeActionOperation.cs
index c32684e87a1eae3e566813d59018f524c0f4dd92..4d5207cfe0ae25074623d726c76952f2ab71dc2f 100644
--- a/src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynRemoteCodeActionOperation.cs
+++ b/src/Tools/ExternalAccess/LiveShare/CodeActions/RoslynRemoteCodeActionOperation.cs
@@ -3,12 +3,11 @@
 using System;
 using System.Threading;
 using Microsoft.VisualStudio.LiveShare.LanguageServices;
-using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 using Task = System.Threading.Tasks.Task;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.CodeActions
 {
     internal class RoslynRemoteCodeActionOperation : CodeActionOperation
     {
diff --git a/src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionProvider.Exports.cs b/src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionProvider.Exports.cs
index 3504d738ca7e7304431752ce7ff318a9c173ea91..940f3cc2c533f03f5d3b513c3d532fa7bc6d8dee 100644
--- a/src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionProvider.Exports.cs
+++ b/src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionProvider.Exports.cs
@@ -3,7 +3,7 @@
 using System.Composition;
 using Microsoft.CodeAnalysis.Completion;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Completion
 {
     [ExportCompletionProvider("CSharpLspCompletionProvider", StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspCompletionProvider : RoslynCompletionProvider
diff --git a/src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionProvider.cs b/src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionProvider.cs
index f2cab73c2e8e0df93d6077bc939b76e3b4672051..f867b35c636fb69376ac6c52ea897dc909954448 100644
--- a/src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionProvider.cs
+++ b/src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionProvider.cs
@@ -5,7 +5,6 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Completion;
 using Microsoft.CodeAnalysis.LanguageServer;
 using Microsoft.CodeAnalysis.LanguageServer.CustomProtocol;
@@ -13,7 +12,7 @@
 using Newtonsoft.Json.Linq;
 using LSP = Microsoft.VisualStudio.LanguageServer.Protocol;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Completion
 {
     internal class RoslynCompletionProvider : CommonCompletionProvider
     {
@@ -24,7 +23,7 @@ public RoslynCompletionProvider(RoslynLSPClientServiceFactory roslynLSPClientSer
             _roslynLSPClientServiceFactory = roslynLSPClientServiceFactory ?? throw new ArgumentNullException(nameof(roslynLSPClientServiceFactory));
         }
 
-        public override async Task ProvideCompletionsAsync(CodeAnalysis.Completion.CompletionContext context)
+        public override async Task ProvideCompletionsAsync(CompletionContext context)
         {
             // This provider is exported for all workspaces - so limit it to just our workspace & the debugger's intellisense workspace
             if (context.Document.Project.Solution.Workspace.Kind != WorkspaceKind.AnyCodeRoslynWorkspace &&
@@ -78,12 +77,12 @@ public override async Task ProvideCompletionsAsync(CodeAnalysis.Completion.Compl
 
                 properties.Add("InsertionText", item.InsertText);
                 properties.Add("ResolveData", JToken.FromObject(item).ToString());
-                var completionItem = CodeAnalysis.Completion.CompletionItem.Create(item.Label, item.FilterText, item.SortText, properties: properties.ToImmutable(), tags: tags);
+                var completionItem = CompletionItem.Create(item.Label, item.FilterText, item.SortText, properties: properties.ToImmutable(), tags: tags);
                 context.AddItem(completionItem);
             }
         }
 
-        protected override async Task<CompletionDescription> GetDescriptionWorkerAsync(Document document, CodeAnalysis.Completion.CompletionItem item, CancellationToken cancellationToken)
+        protected override async Task<CompletionDescription> GetDescriptionWorkerAsync(Document document, CompletionItem item, CancellationToken cancellationToken)
         {
             var lspClient = _roslynLSPClientServiceFactory.ActiveLanguageServerClient;
             if (lspClient == null)
@@ -91,7 +90,7 @@ protected override async Task<CompletionDescription> GetDescriptionWorkerAsync(D
                 return await base.GetDescriptionWorkerAsync(document, item, cancellationToken).ConfigureAwait(false);
             }
 
-            if (!item.Properties.TryGetValue("ResolveData", out string serializedItem))
+            if (!item.Properties.TryGetValue("ResolveData", out var serializedItem))
             {
                 return await base.GetDescriptionWorkerAsync(document, item, cancellationToken).ConfigureAwait(false);
             }
@@ -110,7 +109,7 @@ protected override async Task<CompletionDescription> GetDescriptionWorkerAsync(D
 
         private LSP.CompletionTriggerKind GetTriggerKind(CompletionTrigger trigger)
         {
-            if (trigger.Kind == CodeAnalysis.Completion.CompletionTriggerKind.Insertion || trigger.Kind == CodeAnalysis.Completion.CompletionTriggerKind.Deletion)
+            if (trigger.Kind == CompletionTriggerKind.Insertion || trigger.Kind == CompletionTriggerKind.Deletion)
             {
                 return LSP.CompletionTriggerKind.TriggerCharacter;
             }
@@ -118,7 +117,7 @@ private LSP.CompletionTriggerKind GetTriggerKind(CompletionTrigger trigger)
             return LSP.CompletionTriggerKind.Invoked;
         }
 
-        public override Task<TextChange?> GetTextChangeAsync(Document document, CodeAnalysis.Completion.CompletionItem selectedItem, char? ch, CancellationToken cancellationToken)
+        public override Task<TextChange?> GetTextChangeAsync(Document document, CompletionItem selectedItem, char? ch, CancellationToken cancellationToken)
         {
             selectedItem.Properties.TryGetValue("InsertionText", out var text);
             if (text != null)
diff --git a/src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionService.Exports.cs b/src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionService.Exports.cs
index cc66ff8609ecfc824cc45f2e2536fa991ac0978b..8a3350065a116e6c44f8ee4554b3a79213bfaa9f 100644
--- a/src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionService.Exports.cs
+++ b/src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionService.Exports.cs
@@ -2,12 +2,12 @@
 
 using System;
 using System.Composition;
-using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Completion;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.VisualStudio.LanguageServices;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Completion
 {
     [ExportLanguageServiceFactory(typeof(CompletionService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspCompletionServiceFactory : ILanguageServiceFactory
diff --git a/src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionService.cs b/src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionService.cs
index cd26e3a8f547dea2d1322b221b2b7f75c342a544..721fb9dca7c05b715159e15cc5f8f6e225e9b051 100644
--- a/src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionService.cs
+++ b/src/Tools/ExternalAccess/LiveShare/Completion/RoslynCompletionService.cs
@@ -2,12 +2,11 @@
 
 using System;
 using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Completion;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Completion
 {
     internal class RoslynCompletionService : CompletionServiceWithProviders
     {
diff --git a/src/Tools/ExternalAccess/LiveShare/Diagnostics/IRemoteDiagnosticsService.cs b/src/Tools/ExternalAccess/LiveShare/Diagnostics/IRemoteDiagnosticsService.cs
index a060e1ebbfce1e40eb23c95e1e58642702e6b496..637aa4285e7bb13df68b5092ce8bb7b3ed4d6b4c 100644
--- a/src/Tools/ExternalAccess/LiveShare/Diagnostics/IRemoteDiagnosticsService.cs
+++ b/src/Tools/ExternalAccess/LiveShare/Diagnostics/IRemoteDiagnosticsService.cs
@@ -6,7 +6,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Host;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Diagnostics
 {
     /// <summary>
     /// A service to get diagnostics for a given document from the remote machine.
diff --git a/src/Tools/ExternalAccess/LiveShare/Diagnostics/RoslynDocumentDiagnosticAnalyzer.cs b/src/Tools/ExternalAccess/LiveShare/Diagnostics/RoslynDocumentDiagnosticAnalyzer.cs
index 5076c2d4fc23ea6ce575f001542f8c68d6f17473..4cd27bbc3b8ca7b2321a832b0a69933f559cdad3 100644
--- a/src/Tools/ExternalAccess/LiveShare/Diagnostics/RoslynDocumentDiagnosticAnalyzer.cs
+++ b/src/Tools/ExternalAccess/LiveShare/Diagnostics/RoslynDocumentDiagnosticAnalyzer.cs
@@ -3,10 +3,9 @@
 using System.Collections.Immutable;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Diagnostics
 {
     /// <summary>
     /// A diagnostic analyzer that fetches diagnostics from the remote side.
diff --git a/src/Tools/ExternalAccess/LiveShare/Diagnostics/RoslynRemoteDiagnosticsService.Exports.cs b/src/Tools/ExternalAccess/LiveShare/Diagnostics/RoslynRemoteDiagnosticsService.Exports.cs
index bbbaceea322ba31b09327812551c7c525b508786..2b4bc70702785934458d01f2bf0db0c1d8d96791 100644
--- a/src/Tools/ExternalAccess/LiveShare/Diagnostics/RoslynRemoteDiagnosticsService.Exports.cs
+++ b/src/Tools/ExternalAccess/LiveShare/Diagnostics/RoslynRemoteDiagnosticsService.Exports.cs
@@ -3,7 +3,7 @@
 using System.Composition;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Diagnostics
 {
     [ExportLanguageService(typeof(IRemoteDiagnosticsService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspRemoteDiagnosticsService : RoslynRemoteDiagnosticsService
diff --git a/src/Tools/ExternalAccess/LiveShare/Diagnostics/RoslynRemoteDiagnosticsService.cs b/src/Tools/ExternalAccess/LiveShare/Diagnostics/RoslynRemoteDiagnosticsService.cs
index 979b0c189962f2052a595707be85de9b74c40c72..02229a095afe1671ff77130b39e7b8a680362c93 100644
--- a/src/Tools/ExternalAccess/LiveShare/Diagnostics/RoslynRemoteDiagnosticsService.cs
+++ b/src/Tools/ExternalAccess/LiveShare/Diagnostics/RoslynRemoteDiagnosticsService.cs
@@ -4,13 +4,12 @@
 using System.Collections.Immutable;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.LanguageServer;
 using Microsoft.VisualStudio.LanguageServices.LiveShare.CustomProtocol;
 using Microsoft.VisualStudio.LiveShare.LanguageServices.Protocol;
 using LSP = Microsoft.VisualStudio.LanguageServer.Protocol;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Diagnostics
 {
     internal class RoslynRemoteDiagnosticsService : IRemoteDiagnosticsService
     {
diff --git a/src/Tools/ExternalAccess/LiveShare/GotoDefinition/RoslynGotoDefinitionService.Exports.cs b/src/Tools/ExternalAccess/LiveShare/GotoDefinition/RoslynGotoDefinitionService.Exports.cs
index 9235fcc7a1a5f9a86b22c690257acd35d3e96357..faddc8d76dcfb32f87dc70ad1da65cb188198789 100644
--- a/src/Tools/ExternalAccess/LiveShare/GotoDefinition/RoslynGotoDefinitionService.Exports.cs
+++ b/src/Tools/ExternalAccess/LiveShare/GotoDefinition/RoslynGotoDefinitionService.Exports.cs
@@ -6,7 +6,7 @@
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.GotoDefinition
 {
 
     [ExportLanguageService(typeof(IGoToDefinitionService), StringConstants.CSharpLspLanguageName), Shared]
diff --git a/src/Tools/ExternalAccess/LiveShare/GotoDefinition/RoslynGotoDefinitionService.cs b/src/Tools/ExternalAccess/LiveShare/GotoDefinition/RoslynGotoDefinitionService.cs
index 00fefe5ba179ce6f7c36f64c26df4cbc5dbb232b..bb123588aa3f00991f0cfd3615dea3a0e052726f 100644
--- a/src/Tools/ExternalAccess/LiveShare/GotoDefinition/RoslynGotoDefinitionService.cs
+++ b/src/Tools/ExternalAccess/LiveShare/GotoDefinition/RoslynGotoDefinitionService.cs
@@ -18,7 +18,7 @@
 using LSP = Microsoft.VisualStudio.LanguageServer.Protocol;
 using TPL = System.Threading.Tasks;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.GotoDefinition
 {
     internal class RoslynGotoDefinitionService : IGoToDefinitionService
     {
diff --git a/src/Tools/ExternalAccess/LiveShare/Highlights/RoslynDocumentHighlightsService.Exports.cs b/src/Tools/ExternalAccess/LiveShare/Highlights/RoslynDocumentHighlightsService.Exports.cs
index c6367b5fff1d73b75a50491a60f5afbd50b0c945..50c4d873730ace1b12526e9b68c237365f279114 100644
--- a/src/Tools/ExternalAccess/LiveShare/Highlights/RoslynDocumentHighlightsService.Exports.cs
+++ b/src/Tools/ExternalAccess/LiveShare/Highlights/RoslynDocumentHighlightsService.Exports.cs
@@ -4,7 +4,7 @@
 using Microsoft.CodeAnalysis.DocumentHighlighting;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Highlights
 {
     [ExportLanguageService(typeof(IDocumentHighlightsService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspDocumentHighlightsService : RoslynDocumentHighlightsService
diff --git a/src/Tools/ExternalAccess/LiveShare/Highlights/RoslynDocumentHighlightsService.cs b/src/Tools/ExternalAccess/LiveShare/Highlights/RoslynDocumentHighlightsService.cs
index ca2f626f2742ad3d0ea9cec47fa08f4503387c41..5945f411ce6e5a6340abf6e9fe9f227c4f40b726 100644
--- a/src/Tools/ExternalAccess/LiveShare/Highlights/RoslynDocumentHighlightsService.cs
+++ b/src/Tools/ExternalAccess/LiveShare/Highlights/RoslynDocumentHighlightsService.cs
@@ -5,12 +5,11 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.DocumentHighlighting;
 using Microsoft.CodeAnalysis.LanguageServer;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Highlights
 {
     internal class RoslynDocumentHighlightsService : IDocumentHighlightsService
     {
diff --git a/src/Tools/ExternalAccess/LiveShare/HostLanguageServicesExtensions.cs b/src/Tools/ExternalAccess/LiveShare/HostLanguageServicesExtensions.cs
index 8a4fb2dd1a24c97e133ec9051407a5937fb8c84a..d107101900556876560b5878adff96dabe8fa9f8 100644
--- a/src/Tools/ExternalAccess/LiveShare/HostLanguageServicesExtensions.cs
+++ b/src/Tools/ExternalAccess/LiveShare/HostLanguageServicesExtensions.cs
@@ -3,7 +3,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Host;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
 {
     internal static class HostLanguageServicesExtensions
     {
diff --git a/src/Tools/ExternalAccess/LiveShare/LanguageServiceUtils.cs b/src/Tools/ExternalAccess/LiveShare/LanguageServiceUtils.cs
index 34d2d873b097220395b7cceddbb528a251e65a3d..a88bb35912eb3ec4f2787d48911146de396f8d40 100644
--- a/src/Tools/ExternalAccess/LiveShare/LanguageServiceUtils.cs
+++ b/src/Tools/ExternalAccess/LiveShare/LanguageServiceUtils.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
 {
     internal static class LanguageServicesUtils
     {
diff --git a/src/Tools/ExternalAccess/LiveShare/Navigation/RoslynNavigationBarItemService.Exports.cs b/src/Tools/ExternalAccess/LiveShare/Navigation/RoslynNavigationBarItemService.Exports.cs
index 78a5519476a5fcdaa2f9e7621e24c9ad3522a350..e5e6c5abda6558f50cb3253405460680bf9f9108 100644
--- a/src/Tools/ExternalAccess/LiveShare/Navigation/RoslynNavigationBarItemService.Exports.cs
+++ b/src/Tools/ExternalAccess/LiveShare/Navigation/RoslynNavigationBarItemService.Exports.cs
@@ -1,11 +1,10 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System.Composition;
-using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Navigation
 {
     [ExportLanguageService(typeof(INavigationBarItemService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspNavigationBarItemService : RoslynNavigationBarItemService
diff --git a/src/Tools/ExternalAccess/LiveShare/Navigation/RoslynNavigationBarItemService.cs b/src/Tools/ExternalAccess/LiveShare/Navigation/RoslynNavigationBarItemService.cs
index 1d8f41beb8fa42a1639a4052f8c405f75511ea7f..90c74dacc6bdaf02174dc9514674094a8957afd0 100644
--- a/src/Tools/ExternalAccess/LiveShare/Navigation/RoslynNavigationBarItemService.cs
+++ b/src/Tools/ExternalAccess/LiveShare/Navigation/RoslynNavigationBarItemService.cs
@@ -6,7 +6,6 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.Editor.Extensibility.NavigationBar;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
@@ -17,7 +16,7 @@
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 using Microsoft.VisualStudio.Text.Editor;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Navigation
 {
     internal class RoslynNavigationBarItemService : AbstractNavigationBarItemService
     {
diff --git a/src/Tools/ExternalAccess/LiveShare/Projects/IRemoteProjectInfoProvider.cs b/src/Tools/ExternalAccess/LiveShare/Projects/IRemoteProjectInfoProvider.cs
index eed646b419c5cdc2ec1f67bb3a60604861e99831..684aad2d7e7b4ce9794dffb162eb9126d4b72b1c 100644
--- a/src/Tools/ExternalAccess/LiveShare/Projects/IRemoteProjectInfoProvider.cs
+++ b/src/Tools/ExternalAccess/LiveShare/Projects/IRemoteProjectInfoProvider.cs
@@ -3,9 +3,8 @@
 using System.Collections.Immutable;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
 
-namespace Microsoft.VisualStudio.LanguageServices.Remote
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Projects
 {
     interface IRemoteProjectInfoProvider
     {
diff --git a/src/Tools/ExternalAccess/LiveShare/Projects/RoslynRemoteProjectInfoProvider.cs b/src/Tools/ExternalAccess/LiveShare/Projects/RoslynRemoteProjectInfoProvider.cs
index 272239a4923e119adcd9185aaddb0aa9309009dc..5ef71d3ab43d6881898959ba0bbcc0efdbb03599 100644
--- a/src/Tools/ExternalAccess/LiveShare/Projects/RoslynRemoteProjectInfoProvider.cs
+++ b/src/Tools/ExternalAccess/LiveShare/Projects/RoslynRemoteProjectInfoProvider.cs
@@ -7,13 +7,10 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Projects;
-using Microsoft.VisualStudio.LanguageServices.LiveShare.Client;
-using Microsoft.VisualStudio.LanguageServices.Remote;
+using CustomProtocol = Microsoft.VisualStudio.LanguageServices.LiveShare.CustomProtocol;
 using LSP = Microsoft.VisualStudio.LanguageServer.Protocol;
 
-namespace Microsoft.VisualStudio.LanguageServices.Remote.Guest
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Projects
 {
     //[Export(typeof(IRemoteProjectInfoProvider))]
     internal class RoslynRemoteProjectInfoProvider : IRemoteProjectInfoProvider
@@ -43,10 +40,10 @@ public async Task<ImmutableArray<ProjectInfo>> GetRemoteProjectInfosAsync(Cancel
                 return ImmutableArray<ProjectInfo>.Empty;
             }
 
-            LiveShare.CustomProtocol.Project[] projects;
+            CustomProtocol.Project[] projects;
             try
             {
-                var request = new LSP.LspRequest<object, LiveShare.CustomProtocol.Project[]>(LiveShare.CustomProtocol.RoslynMethods.ProjectsName);
+                var request = new LSP.LspRequest<object, CustomProtocol.Project[]>(CustomProtocol.RoslynMethods.ProjectsName);
                 projects = await lspClient.RequestAsync(request, new object(), cancellationToken).ConfigureAwait(false);
             }
             catch (Exception)
@@ -95,7 +92,7 @@ private static ProjectInfo CreateProjectInfo(string projectName, string language
             var projectId = ProjectId.CreateNewId();
             var docInfos = ImmutableArray.CreateBuilder<DocumentInfo>();
 
-            foreach (string file in files)
+            foreach (var file in files)
             {
                 var fileName = Path.GetFileNameWithoutExtension(file);
                 var docInfo = DocumentInfo.Create(DocumentId.CreateNewId(projectId),
diff --git a/src/Tools/ExternalAccess/LiveShare/References/RoslynFindUsagesService.Exports..cs b/src/Tools/ExternalAccess/LiveShare/References/RoslynFindUsagesService.Exports..cs
index 8c616a39dc6500354c1421c1cc6e79394c609b87..5f6caad302fd22724988d8ef18fbfdd6c09740d5 100644
--- a/src/Tools/ExternalAccess/LiveShare/References/RoslynFindUsagesService.Exports..cs
+++ b/src/Tools/ExternalAccess/LiveShare/References/RoslynFindUsagesService.Exports..cs
@@ -4,7 +4,7 @@
 using Microsoft.CodeAnalysis.Editor.FindUsages;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.References
 {
     [ExportLanguageService(typeof(IFindUsagesService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspFindUsagesService : RoslynFindUsagesService
diff --git a/src/Tools/ExternalAccess/LiveShare/References/RoslynFindUsagesService.cs b/src/Tools/ExternalAccess/LiveShare/References/RoslynFindUsagesService.cs
index f28349f464711313634ed3f5d84d7e2a42a0f60b..efea0fa7203e996e51ef228b50f81a0205ac7bf1 100644
--- a/src/Tools/ExternalAccess/LiveShare/References/RoslynFindUsagesService.cs
+++ b/src/Tools/ExternalAccess/LiveShare/References/RoslynFindUsagesService.cs
@@ -11,7 +11,7 @@
 using LSP = Microsoft.VisualStudio.LanguageServer.Protocol;
 using LiveShareProtocol = Microsoft.VisualStudio.LiveShare.LanguageServices.Protocol;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.References
 {
     internal class RoslynFindUsagesService : IFindUsagesService
     {
diff --git a/src/Tools/ExternalAccess/LiveShare/Rename/RoslynRenameService.Exports.cs b/src/Tools/ExternalAccess/LiveShare/Rename/RoslynRenameService.Exports.cs
index cf2726becde5c9bba28aad212930fe48d1fe1f72..fb355375ae25e9b1832d51efb5df11b7a27a522e 100644
--- a/src/Tools/ExternalAccess/LiveShare/Rename/RoslynRenameService.Exports.cs
+++ b/src/Tools/ExternalAccess/LiveShare/Rename/RoslynRenameService.Exports.cs
@@ -4,7 +4,7 @@
 using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.Host.Mef;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Rename
 {
     [ExportLanguageService(typeof(IEditorInlineRenameService), StringConstants.CSharpLspLanguageName), Shared]
     internal class CSharpLspRenameService : RoslynRenameService
diff --git a/src/Tools/ExternalAccess/LiveShare/Rename/RoslynRenameService.FailureRenameInfo.cs b/src/Tools/ExternalAccess/LiveShare/Rename/RoslynRenameService.FailureRenameInfo.cs
index e417c3bd0a73d1d2f3eb7572e5a3b1c9bd4f1b0f..3d8df2636f1b58205d2cc1009819dcc174ac7d24 100644
--- a/src/Tools/ExternalAccess/LiveShare/Rename/RoslynRenameService.FailureRenameInfo.cs
+++ b/src/Tools/ExternalAccess/LiveShare/Rename/RoslynRenameService.FailureRenameInfo.cs
@@ -3,12 +3,11 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Rename
 {
     internal partial class RoslynRenameService
     {
diff --git a/src/Tools/ExternalAccess/LiveShare/Rename/RoslynRenameService.cs b/src/Tools/ExternalAccess/LiveShare/Rename/RoslynRenameService.cs
index d4e7564ebfeb690edc260fbe1105999cd98c7141..63ad8e1b279b5bb0227c2b43868d8ef98275e7a3 100644
--- a/src/Tools/ExternalAccess/LiveShare/Rename/RoslynRenameService.cs
+++ b/src/Tools/ExternalAccess/LiveShare/Rename/RoslynRenameService.cs
@@ -2,10 +2,9 @@
 
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare.Rename
 {
     internal partial class RoslynRenameService : IEditorInlineRenameService
     {
diff --git a/src/Tools/ExternalAccess/LiveShare/RoslynLSPClientService.cs b/src/Tools/ExternalAccess/LiveShare/RoslynLSPClientService.cs
index 6531ab92844363d00b49fdb6dabb360f76211c76..6b3b0e0c31ce94c863abee668bde8013e0336812 100644
--- a/src/Tools/ExternalAccess/LiveShare/RoslynLSPClientService.cs
+++ b/src/Tools/ExternalAccess/LiveShare/RoslynLSPClientService.cs
@@ -9,7 +9,7 @@
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 using Microsoft.VisualStudio.LiveShare;
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
 {
     [Export]
     [ExportCollaborationService(typeof(RoslynLSPClientLifeTimeService),
@@ -28,7 +28,7 @@ public Task<ICollaborationService> CreateServiceAsync(CollaborationSession colla
         {
             var languageServerGuestService = (ILanguageServerGuestService)collaborationSession.GetService(typeof(ILanguageServerGuestService));
 
-            collaborationSession.RemoteServicesChanged += (object sender, RemoteServicesChangedEventArgs e) =>
+            collaborationSession.RemoteServicesChanged += (sender, e) =>
             {
                 // VS will expose a roslyn LSP server and VSCode will expose a "any" LSP provider and both support roslyn languages.
                 var roslynLspServerProviderName = LanguageServicesUtils.GetLanguageServerProviderServiceName(RoslynProviderName);
diff --git a/src/Tools/ExternalAccess/LiveShare/SignatureHelp/RoslynSignatureHelpProvider.Exports.cs b/src/Tools/ExternalAccess/LiveShare/SignatureHelp/RoslynSignatureHelpProvider.Exports.cs
index 3c0063803e28e291774abdef051c0fa13c827862..860046e4c0baea0218f28aaca6ceb6f9b364e76d 100644
--- a/src/Tools/ExternalAccess/LiveShare/SignatureHelp/RoslynSignatureHelpProvider.Exports.cs
+++ b/src/Tools/ExternalAccess/LiveShare/SignatureHelp/RoslynSignatureHelpProvider.Exports.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System.Composition;
+using Microsoft.CodeAnalysis.ExternalAccess.LiveShare;
 using Microsoft.CodeAnalysis.SignatureHelp;
 
 namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
diff --git a/src/Tools/ExternalAccess/LiveShare/SignatureHelp/RoslynSignatureHelpProvider.cs b/src/Tools/ExternalAccess/LiveShare/SignatureHelp/RoslynSignatureHelpProvider.cs
index 42d6ffa3aa9a8db9727056752acfcaeb8f3352db..0fbd434fef7187fcc166618f53f590208211b462 100644
--- a/src/Tools/ExternalAccess/LiveShare/SignatureHelp/RoslynSignatureHelpProvider.cs
+++ b/src/Tools/ExternalAccess/LiveShare/SignatureHelp/RoslynSignatureHelpProvider.cs
@@ -7,6 +7,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.ExternalAccess.LiveShare;
 using Microsoft.CodeAnalysis.LanguageServer;
 using Microsoft.CodeAnalysis.SignatureHelp;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
diff --git a/src/Tools/ExternalAccess/LiveShare/StringConstants.cs b/src/Tools/ExternalAccess/LiveShare/StringConstants.cs
index 87840a24ff40ea2d1d369706eb83b1165e7439d4..3cb21a90866faf867d38b6f474da4a0b7e694661 100644
--- a/src/Tools/ExternalAccess/LiveShare/StringConstants.cs
+++ b/src/Tools/ExternalAccess/LiveShare/StringConstants.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client
+namespace Microsoft.CodeAnalysis.ExternalAccess.LiveShare
 {
     internal class StringConstants
     {