diff --git a/Roslyn.sln b/Roslyn.sln
index 0d508cfec2548..8a5696b47f998 100644
--- a/Roslyn.sln
+++ b/Roslyn.sln
@@ -577,9 +577,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.CodeAnalysis.Cont
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Contracts.Package", "src\Dependencies\Contracts\Microsoft.CodeAnalysis.Contracts.Package.csproj", "{A8D5CFFA-7F9E-C35B-4F19-D63F6EC1D5CA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.Razor", "src\Tools\ExternalAccess\Razor\EditorFeatures\Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj", "{068CD9AA-CEC3-CA68-1BAB-2B1B9FD711D3}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared", "src\Tools\ExternalAccess\Razor\Shared\Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared.shproj", "{4853A78A-4EC4-4D86-9F02-D0DDEAE85520}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures", "src\Tools\ExternalAccess\Razor\EditorFeatures\Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures.csproj", "{068CD9AA-CEC3-CA68-1BAB-2B1B9FD711D3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.Razor.Features", "src\Tools\ExternalAccess\Razor\Features\Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.csproj", "{D5A8E20C-E8D2-4A57-906A-263994D8731D}"
 EndProject
@@ -2068,7 +2066,6 @@ Global
 		{BD974609-C68B-4BE6-9682-EB132462B50D} = {C2D1346B-9665-4150-B644-075CF1636BAA}
 		{A8D5CFFA-7F9E-C35B-4F19-D63F6EC1D5CA} = {C2D1346B-9665-4150-B644-075CF1636BAA}
 		{068CD9AA-CEC3-CA68-1BAB-2B1B9FD711D3} = {8977A560-45C2-4EC2-A849-97335B382C74}
-		{4853A78A-4EC4-4D86-9F02-D0DDEAE85520} = {8977A560-45C2-4EC2-A849-97335B382C74}
 		{D5A8E20C-E8D2-4A57-906A-263994D8731D} = {8977A560-45C2-4EC2-A849-97335B382C74}
 		{9EB058F3-10C9-8F3F-AD9E-72CB362A0928} = {5880FECB-91F1-4AB8-8726-75EAFA8A918E}
 		{8087BDE4-6707-05A5-5F84-DFE6628E8EC8} = {6FE0875A-E178-4766-BCC6-87D37F273102}
@@ -2151,7 +2148,6 @@ Global
 		src\Analyzers\VisualBasic\CodeFixes\VisualBasicCodeFixes.projitems*{0141285d-8f6c-42c7-baf3-3c0ccd61c716}*SharedItemsImports = 5
 		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\VisualBasic\VisualBasicWorkspaceExtensions.projitems*{0141285d-8f6c-42c7-baf3-3c0ccd61c716}*SharedItemsImports = 5
 		src\Compilers\CSharp\csc\CscCommandLine.projitems*{0161e25c-918a-4dc8-9648-30fdcc8e31e9}*SharedItemsImports = 5
-		src\Tools\ExternalAccess\Razor\Shared\Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared.projitems*{068cd9aa-cec3-ca68-1bab-2b1b9fd711d3}*SharedItemsImports = 5
 		src\RoslynAnalyzers\Utilities\Compiler\Analyzer.Utilities.projitems*{08735294-3e6b-4420-9916-e7b8c4eb874d}*SharedItemsImports = 13
 		src\RoslynAnalyzers\Utilities\Compiler\Analyzer.Utilities.projitems*{0a1267e9-52ff-b8de-8522-802be55f41da}*SharedItemsImports = 5
 		src\RoslynAnalyzers\Utilities\FlowAnalysis\FlowAnalysis.Utilities.projitems*{0a1267e9-52ff-b8de-8522-802be55f41da}*SharedItemsImports = 5
@@ -2188,7 +2184,6 @@ Global
 		src\RoslynAnalyzers\Utilities\Workspaces\Workspaces.Utilities.projitems*{3f65d29d-ed95-2d6f-b927-47c5cf070aa5}*SharedItemsImports = 5
 		src\Dependencies\Contracts\Microsoft.CodeAnalysis.Contracts.projitems*{41ed1bfa-fdad-4fe4-8118-db23fb49b0b0}*SharedItemsImports = 5
 		src\Workspaces\SharedUtilitiesAndExtensions\Workspace\CSharp\CSharpWorkspaceExtensions.projitems*{438db8af-f3f0-4ed9-80b5-13fddd5b8787}*SharedItemsImports = 13
-		src\Tools\ExternalAccess\Razor\Shared\Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared.projitems*{4853a78a-4ec4-4d86-9f02-d0ddeae85520}*SharedItemsImports = 13
 		src\Compilers\CSharp\csc\CscCommandLine.projitems*{4b45ca0c-03a0-400f-b454-3d4bcb16af38}*SharedItemsImports = 5
 		src\RoslynAnalyzers\Utilities\Refactoring.VisualBasic\Refactoring.VisualBasic.Utilities.projitems*{4c362c30-c4b1-4c4b-a545-dbf67c7e9153}*SharedItemsImports = 13
 		src\Analyzers\CSharp\Tests\CSharpAnalyzers.UnitTests.projitems*{5018d049-5870-465a-889b-c742ce1e31cb}*SharedItemsImports = 5
@@ -2265,7 +2260,6 @@ Global
 		src\Workspaces\SharedUtilitiesAndExtensions\Compiler\VisualBasic\VisualBasicCompilerExtensions.projitems*{cec0dce7-8d52-45c3-9295-fc7b16bd2451}*SharedItemsImports = 13
 		src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34}*SharedItemsImports = 13
 		src\Dependencies\Contracts\Microsoft.CodeAnalysis.Contracts.projitems*{d2589bce-4f2e-4113-b7e7-37392c0c5492}*SharedItemsImports = 5
-		src\Tools\ExternalAccess\Razor\Shared\Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared.projitems*{d5a8e20c-e8d2-4a57-906a-263994d8731d}*SharedItemsImports = 5
 		src\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.projitems*{d73adf7d-2c1c-42ae-b2ab-edc9497e4b71}*SharedItemsImports = 13
 		src\Compilers\Server\VBCSCompiler\VBCSCompilerCommandLine.projitems*{d8ef0777-9d65-4849-a7d6-ac81e58e2317}*SharedItemsImports = 13
 		src\Analyzers\CSharp\CodeFixes\CSharpCodeFixes.projitems*{da973826-c985-4128-9948-0b445e638bdb}*SharedItemsImports = 13
diff --git a/eng/config/PublishData.json b/eng/config/PublishData.json
index 5edefaf671f4b..b6ab9ae09b4a7 100644
--- a/eng/config/PublishData.json
+++ b/eng/config/PublishData.json
@@ -78,7 +78,7 @@
       "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp": "arcade",
       "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp": "arcade",
       "Microsoft.CodeAnalysis.ExternalAccess.AspNetCore": "vs-impl",
-      "Microsoft.CodeAnalysis.ExternalAccess.Razor": "vs-impl",
+      "Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures": "vs-impl",
       "Microsoft.CodeAnalysis.ExternalAccess.Razor.Features": "vs-impl",
       "Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler": "vs-impl",
       "Microsoft.CodeAnalysis.ExternalAccess.TypeScript": "vs-impl",
diff --git a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
index e92b4dd72771f..afdb3c89aa430 100644
--- a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
+++ b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
@@ -55,7 +55,7 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Debugger" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp.UnitTests" />
-    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.LanguageServer.Protocol" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.LanguageServer.Protocol.UnitTests" />
diff --git a/src/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj b/src/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj
index c23a60c32dc63..cd1328b0bab7f 100644
--- a/src/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj
+++ b/src/LanguageServer/Protocol/Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj
@@ -35,7 +35,7 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
     <!-- Full IVT is through ExternalAccess for functionality -->
-    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" />
     <!-- Restricted IVT is direct for protocol types only -->
     <RestrictedInternalsVisibleTo Include="Microsoft.AspNetCore.Razor.LanguageServer" Namespace="Roslyn.LanguageServer.Protocol" Partner="Razor" Key="$(RazorKey)" />
diff --git a/src/NuGet/VS.ExternalAPIs.Roslyn.Package/VS.ExternalAPIs.Roslyn.Package.csproj b/src/NuGet/VS.ExternalAPIs.Roslyn.Package/VS.ExternalAPIs.Roslyn.Package.csproj
index 6d9141ef72539..0519d33452360 100644
--- a/src/NuGet/VS.ExternalAPIs.Roslyn.Package/VS.ExternalAPIs.Roslyn.Package.csproj
+++ b/src/NuGet/VS.ExternalAPIs.Roslyn.Package/VS.ExternalAPIs.Roslyn.Package.csproj
@@ -49,7 +49,8 @@
     <ProjectReference Include="..\..\Scripting\Core\Microsoft.CodeAnalysis.Scripting.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\Scripting\CSharp\Microsoft.CodeAnalysis.CSharp.Scripting.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\Tools\ExternalAccess\Extensions\Microsoft.CodeAnalysis.ExternalAccess.Extensions.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\..\Tools\ExternalAccess\Razor\EditorFeatures\Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\..\Tools\ExternalAccess\Razor\EditorFeatures\Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\..\Tools\ExternalAccess\Razor\Features\Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\VisualStudio\Core\Def\Microsoft.VisualStudio.LanguageServices.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\VisualStudio\Core\Impl\Microsoft.VisualStudio.LanguageServices.Implementation.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\..\VisualStudio\CSharp\Impl\Microsoft.VisualStudio.LanguageServices.CSharp.csproj" PrivateAssets="all" />
@@ -86,7 +87,8 @@
       <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.EditorConfigGenerator\$(Configuration)\net472\Microsoft.CodeAnalysis.ExternalAccess.EditorConfigGenerator.dll" TargetDir="" />
       <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Extensions\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.Extensions.dll" TargetDir="" />
       <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.FSharp\$(Configuration)\net472\Microsoft.CodeAnalysis.ExternalAccess.FSharp.dll" TargetDir="" />
-      <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Razor\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.Razor.dll" TargetDir="" />
+      <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures.dll" TargetDir="" />
+      <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Razor.Features\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.dll" TargetDir="" />
       <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.Features\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.Features.dll" TargetDir="" />
       <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.InteractiveHost\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.InteractiveHost.dll" TargetDir="" />
       <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.LanguageServer.Protocol\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.LanguageServer.Protocol.dll" TargetDir="" />
diff --git a/src/Tools/ExternalAccess/Razor/EditorFeatures/Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj b/src/Tools/ExternalAccess/Razor/EditorFeatures/Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures.csproj
similarity index 94%
rename from src/Tools/ExternalAccess/Razor/EditorFeatures/Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj
rename to src/Tools/ExternalAccess/Razor/EditorFeatures/Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures.csproj
index 68ae9daf38674..95c43479506e9 100644
--- a/src/Tools/ExternalAccess/Razor/EditorFeatures/Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj
+++ b/src/Tools/ExternalAccess/Razor/EditorFeatures/Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures.csproj
@@ -7,7 +7,7 @@
 
     <!-- NuGet -->
     <IsPackable>true</IsPackable>
-    <PackageId>Microsoft.CodeAnalysis.ExternalAccess.Razor</PackageId>
+    <PackageId>Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures</PackageId>
     <PackageDescription>
       A supporting package for Razor:
       https://github.com/dotnet/razor
@@ -46,6 +46,7 @@
     <ProjectReference Include="..\..\..\..\LanguageServer\Protocol\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj" />
     <ProjectReference Include="..\..\..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
     <ProjectReference Include="..\..\..\..\Workspaces\Remote\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" />
+    <ProjectReference Include="..\Features\Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -59,6 +60,4 @@
     <PublicAPI Include="InternalAPI.Unshipped.txt" />
   </ItemGroup>
 
-  <Import Project="..\Shared\Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared.projitems" Label="Shared" />
-
 </Project>
diff --git a/src/Tools/ExternalAccess/Razor/Shared/ChecksumWrapper.cs b/src/Tools/ExternalAccess/Razor/Features/ChecksumWrapper.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/ChecksumWrapper.cs
rename to src/Tools/ExternalAccess/Razor/Features/ChecksumWrapper.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/AbstractRazorCohostDocumentRequestHandler.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/AbstractRazorCohostDocumentRequestHandler.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/AbstractRazorCohostDocumentRequestHandler.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/AbstractRazorCohostDocumentRequestHandler.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/AbstractRazorLspService.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/AbstractRazorLspService.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/AbstractRazorLspService.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/AbstractRazorLspService.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/AbstractRazorRequestHandler.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/AbstractRazorRequestHandler.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/AbstractRazorRequestHandler.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/AbstractRazorRequestHandler.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/Constants.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/Constants.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/Constants.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/Constants.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/ExportCohostLspServiceFactoryAttribute.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/ExportCohostLspServiceFactoryAttribute.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/ExportCohostLspServiceFactoryAttribute.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/ExportCohostLspServiceFactoryAttribute.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/ExportCohostStatelessLspServiceAttribute.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/ExportCohostStatelessLspServiceAttribute.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/ExportCohostStatelessLspServiceAttribute.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/ExportCohostStatelessLspServiceAttribute.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/CodeActions.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/CodeActions.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/CodeActions.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/CodeActions.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/Completion.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/Completion.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/Completion.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/Completion.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/Diagnostics.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/Diagnostics.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/Diagnostics.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/Diagnostics.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/DocumentHighlights.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/DocumentHighlights.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/DocumentHighlights.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/DocumentHighlights.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/DocumentSpellCheck.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/DocumentSpellCheck.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/DocumentSpellCheck.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/DocumentSpellCheck.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/DocumentSymbols.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/DocumentSymbols.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/DocumentSymbols.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/DocumentSymbols.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/FindAllReferences.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/FindAllReferences.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/FindAllReferences.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/FindAllReferences.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/FoldingRanges.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/FoldingRanges.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/FoldingRanges.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/FoldingRanges.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/GoToDefinition.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/GoToDefinition.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/GoToDefinition.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/GoToDefinition.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/GoToImplementation.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/GoToImplementation.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/GoToImplementation.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/GoToImplementation.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/Hover.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/Hover.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/Hover.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/Hover.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/InlayHints.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/InlayHints.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/InlayHints.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/InlayHints.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/OnAutoInsert.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/OnAutoInsert.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/OnAutoInsert.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/OnAutoInsert.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/Rename.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/Rename.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/Rename.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/Rename.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/SemanticTokensRange.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/SemanticTokensRange.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/SemanticTokensRange.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/SemanticTokensRange.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/SignatureHelp.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/SignatureHelp.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/SignatureHelp.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/SignatureHelp.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/ValidateBreakableRange.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/ValidateBreakableRange.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/Handlers/ValidateBreakableRange.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/Handlers/ValidateBreakableRange.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/IRazorCohostDynamicRegistrationService.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/IRazorCohostDynamicRegistrationService.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/IRazorCohostDynamicRegistrationService.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/IRazorCohostDynamicRegistrationService.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/IRazorCustomMessageTarget.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/IRazorCustomMessageTarget.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/IRazorCustomMessageTarget.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/IRazorCustomMessageTarget.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/IRazorSemanticTokensRefreshQueue.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/IRazorSemanticTokensRefreshQueue.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/IRazorSemanticTokensRefreshQueue.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/IRazorSemanticTokensRefreshQueue.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/RazorClientLanguageServerManagerFactory.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/RazorClientLanguageServerManagerFactory.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/RazorClientLanguageServerManagerFactory.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/RazorClientLanguageServerManagerFactory.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/RazorCohostClientLanguageServerManagerFactory.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/RazorCohostClientLanguageServerManagerFactory.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/RazorCohostClientLanguageServerManagerFactory.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/RazorCohostClientLanguageServerManagerFactory.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/RazorCohostRequestContext.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/RazorCohostRequestContext.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/RazorCohostRequestContext.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/RazorCohostRequestContext.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/RazorMethodAttribute.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/RazorMethodAttribute.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/RazorMethodAttribute.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/RazorMethodAttribute.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Cohost/RazorSemanticTokensRefreshQueueWrapper.cs b/src/Tools/ExternalAccess/Razor/Features/Cohost/RazorSemanticTokensRefreshQueueWrapper.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Cohost/RazorSemanticTokensRefreshQueueWrapper.cs
rename to src/Tools/ExternalAccess/Razor/Features/Cohost/RazorSemanticTokensRefreshQueueWrapper.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Constants.cs b/src/Tools/ExternalAccess/Razor/Features/Constants.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Constants.cs
rename to src/Tools/ExternalAccess/Razor/Features/Constants.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/IMefHostServicesExtensions.cs b/src/Tools/ExternalAccess/Razor/Features/IMefHostServicesExtensions.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/IMefHostServicesExtensions.cs
rename to src/Tools/ExternalAccess/Razor/Features/IMefHostServicesExtensions.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/IRazorAsynchronousOperationListenerProviderAccessor.cs b/src/Tools/ExternalAccess/Razor/Features/IRazorAsynchronousOperationListenerProviderAccessor.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/IRazorAsynchronousOperationListenerProviderAccessor.cs
rename to src/Tools/ExternalAccess/Razor/Features/IRazorAsynchronousOperationListenerProviderAccessor.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/IRazorClientLanguageServerManager.cs b/src/Tools/ExternalAccess/Razor/Features/IRazorClientLanguageServerManager.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/IRazorClientLanguageServerManager.cs
rename to src/Tools/ExternalAccess/Razor/Features/IRazorClientLanguageServerManager.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/IRazorDocumentExcerptService.cs b/src/Tools/ExternalAccess/Razor/Features/IRazorDocumentExcerptService.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/IRazorDocumentExcerptService.cs
rename to src/Tools/ExternalAccess/Razor/Features/IRazorDocumentExcerptService.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/IRazorDocumentOperationService.cs b/src/Tools/ExternalAccess/Razor/Features/IRazorDocumentOperationService.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/IRazorDocumentOperationService.cs
rename to src/Tools/ExternalAccess/Razor/Features/IRazorDocumentOperationService.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/IRazorDocumentPropertiesService.cs b/src/Tools/ExternalAccess/Razor/Features/IRazorDocumentPropertiesService.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/IRazorDocumentPropertiesService.cs
rename to src/Tools/ExternalAccess/Razor/Features/IRazorDocumentPropertiesService.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/IRazorDocumentServiceProvider.cs b/src/Tools/ExternalAccess/Razor/Features/IRazorDocumentServiceProvider.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/IRazorDocumentServiceProvider.cs
rename to src/Tools/ExternalAccess/Razor/Features/IRazorDocumentServiceProvider.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/IRazorDynamicFileInfoProvider.cs b/src/Tools/ExternalAccess/Razor/Features/IRazorDynamicFileInfoProvider.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/IRazorDynamicFileInfoProvider.cs
rename to src/Tools/ExternalAccess/Razor/Features/IRazorDynamicFileInfoProvider.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/IRazorLanguageServerTarget.cs b/src/Tools/ExternalAccess/Razor/Features/IRazorLanguageServerTarget.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/IRazorLanguageServerTarget.cs
rename to src/Tools/ExternalAccess/Razor/Features/IRazorLanguageServerTarget.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/IRazorMappingService.cs b/src/Tools/ExternalAccess/Razor/Features/IRazorMappingService.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/IRazorMappingService.cs
rename to src/Tools/ExternalAccess/Razor/Features/IRazorMappingService.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/IRazorSpanMappingService.cs b/src/Tools/ExternalAccess/Razor/Features/IRazorSpanMappingService.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/IRazorSpanMappingService.cs
rename to src/Tools/ExternalAccess/Razor/Features/IRazorSpanMappingService.cs
diff --git a/src/Tools/ExternalAccess/Razor/Features/Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.csproj b/src/Tools/ExternalAccess/Razor/Features/Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.csproj
index 9e77a3c455585..d8d5fd6f11d7d 100644
--- a/src/Tools/ExternalAccess/Razor/Features/Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.csproj
+++ b/src/Tools/ExternalAccess/Razor/Features/Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.csproj
@@ -46,6 +46,7 @@
     <InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Razor.Test" Key="$(RazorKey)" />
     <InternalsVisibleTo Include="Microsoft.VisualStudioCode.RazorExtension" Key="$(RazorKey)" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.UnitTests" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" />
   </ItemGroup>
 
   <ItemGroup>
@@ -55,6 +56,4 @@
     <ProjectReference Include="..\..\..\..\Workspaces\Remote\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" />
   </ItemGroup>
 
-  <Import Project="..\Shared\Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared.projitems" Label="Shared" />
-
 </Project>
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorAnalyzerAssemblyResolver.cs b/src/Tools/ExternalAccess/Razor/Features/RazorAnalyzerAssemblyResolver.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorAnalyzerAssemblyResolver.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorAnalyzerAssemblyResolver.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorAsynchronousOperationListenerProviderAccessor.cs b/src/Tools/ExternalAccess/Razor/Features/RazorAsynchronousOperationListenerProviderAccessor.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorAsynchronousOperationListenerProviderAccessor.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorAsynchronousOperationListenerProviderAccessor.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorAsynchronousOperationListenerWrapper.cs b/src/Tools/ExternalAccess/Razor/Features/RazorAsynchronousOperationListenerWrapper.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorAsynchronousOperationListenerWrapper.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorAsynchronousOperationListenerWrapper.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorAutoFormattingOptions.cs b/src/Tools/ExternalAccess/Razor/Features/RazorAutoFormattingOptions.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorAutoFormattingOptions.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorAutoFormattingOptions.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorBreakpointSpans.cs b/src/Tools/ExternalAccess/Razor/Features/RazorBreakpointSpans.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorBreakpointSpans.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorBreakpointSpans.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorCSharpFormattingInteractionService.cs b/src/Tools/ExternalAccess/Razor/Features/RazorCSharpFormattingInteractionService.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorCSharpFormattingInteractionService.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorCSharpFormattingInteractionService.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorCSharpProximityExpressionResolverService.cs b/src/Tools/ExternalAccess/Razor/Features/RazorCSharpProximityExpressionResolverService.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorCSharpProximityExpressionResolverService.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorCSharpProximityExpressionResolverService.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorClassificationOptionsWrapper.cs b/src/Tools/ExternalAccess/Razor/Features/RazorClassificationOptionsWrapper.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorClassificationOptionsWrapper.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorClassificationOptionsWrapper.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorClassifierAccessor.cs b/src/Tools/ExternalAccess/Razor/Features/RazorClassifierAccessor.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorClassifierAccessor.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorClassifierAccessor.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorClientLanguageServerManager.cs b/src/Tools/ExternalAccess/Razor/Features/RazorClientLanguageServerManager.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorClientLanguageServerManager.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorClientLanguageServerManager.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorDocumentExcerptServiceWrapper.cs b/src/Tools/ExternalAccess/Razor/Features/RazorDocumentExcerptServiceWrapper.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorDocumentExcerptServiceWrapper.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorDocumentExcerptServiceWrapper.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorDocumentPropertiesServiceWrapper.cs b/src/Tools/ExternalAccess/Razor/Features/RazorDocumentPropertiesServiceWrapper.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorDocumentPropertiesServiceWrapper.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorDocumentPropertiesServiceWrapper.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorDocumentServiceProviderWrapper.cs b/src/Tools/ExternalAccess/Razor/Features/RazorDocumentServiceProviderWrapper.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorDocumentServiceProviderWrapper.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorDocumentServiceProviderWrapper.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorDynamicFileInfo.cs b/src/Tools/ExternalAccess/Razor/Features/RazorDynamicFileInfo.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorDynamicFileInfo.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorDynamicFileInfo.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorExcerptMode.cs b/src/Tools/ExternalAccess/Razor/Features/RazorExcerptMode.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorExcerptMode.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorExcerptMode.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorExcerptResult.cs b/src/Tools/ExternalAccess/Razor/Features/RazorExcerptResult.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorExcerptResult.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorExcerptResult.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorGlobalOptions.cs b/src/Tools/ExternalAccess/Razor/Features/RazorGlobalOptions.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorGlobalOptions.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorGlobalOptions.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorIndentationOptions.cs b/src/Tools/ExternalAccess/Razor/Features/RazorIndentationOptions.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorIndentationOptions.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorIndentationOptions.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorLanguageServerTargetWrapper.cs b/src/Tools/ExternalAccess/Razor/Features/RazorLanguageServerTargetWrapper.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorLanguageServerTargetWrapper.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorLanguageServerTargetWrapper.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorMappedSpanResult.cs b/src/Tools/ExternalAccess/Razor/Features/RazorMappedSpanResult.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorMappedSpanResult.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorMappedSpanResult.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorMappingServiceWrapper.cs b/src/Tools/ExternalAccess/Razor/Features/RazorMappingServiceWrapper.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorMappingServiceWrapper.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorMappingServiceWrapper.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorPredefinedCodeFixProviderNames.cs b/src/Tools/ExternalAccess/Razor/Features/RazorPredefinedCodeFixProviderNames.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorPredefinedCodeFixProviderNames.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorPredefinedCodeFixProviderNames.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorPredefinedCodeRefactoringProviderNames.cs b/src/Tools/ExternalAccess/Razor/Features/RazorPredefinedCodeRefactoringProviderNames.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorPredefinedCodeRefactoringProviderNames.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorPredefinedCodeRefactoringProviderNames.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorProjectExtensions.cs b/src/Tools/ExternalAccess/Razor/Features/RazorProjectExtensions.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorProjectExtensions.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorProjectExtensions.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorSemanticTokensAccessor.cs b/src/Tools/ExternalAccess/Razor/Features/RazorSemanticTokensAccessor.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorSemanticTokensAccessor.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorSemanticTokensAccessor.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/RazorUri.cs b/src/Tools/ExternalAccess/Razor/Features/RazorUri.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/RazorUri.cs
rename to src/Tools/ExternalAccess/Razor/Features/RazorUri.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Remote/JsonSerializableDocumentId.cs b/src/Tools/ExternalAccess/Razor/Features/Remote/JsonSerializableDocumentId.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Remote/JsonSerializableDocumentId.cs
rename to src/Tools/ExternalAccess/Razor/Features/Remote/JsonSerializableDocumentId.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Remote/JsonSerializableRazorPinnedSolutionInfoWrapper.cs b/src/Tools/ExternalAccess/Razor/Features/Remote/JsonSerializableRazorPinnedSolutionInfoWrapper.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Remote/JsonSerializableRazorPinnedSolutionInfoWrapper.cs
rename to src/Tools/ExternalAccess/Razor/Features/Remote/JsonSerializableRazorPinnedSolutionInfoWrapper.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Remote/RazorPinnedSolutionInfoWrapper.cs b/src/Tools/ExternalAccess/Razor/Features/Remote/RazorPinnedSolutionInfoWrapper.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Remote/RazorPinnedSolutionInfoWrapper.cs
rename to src/Tools/ExternalAccess/Razor/Features/Remote/RazorPinnedSolutionInfoWrapper.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Remote/RazorRemoteCallbackWrapper.cs b/src/Tools/ExternalAccess/Razor/Features/Remote/RazorRemoteCallbackWrapper.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Remote/RazorRemoteCallbackWrapper.cs
rename to src/Tools/ExternalAccess/Razor/Features/Remote/RazorRemoteCallbackWrapper.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Remote/RazorRemoteHostClient.cs b/src/Tools/ExternalAccess/Razor/Features/Remote/RazorRemoteHostClient.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Remote/RazorRemoteHostClient.cs
rename to src/Tools/ExternalAccess/Razor/Features/Remote/RazorRemoteHostClient.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Remote/RazorRemoteServiceCallbackDispatcher.cs b/src/Tools/ExternalAccess/Razor/Features/Remote/RazorRemoteServiceCallbackDispatcher.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Remote/RazorRemoteServiceCallbackDispatcher.cs
rename to src/Tools/ExternalAccess/Razor/Features/Remote/RazorRemoteServiceCallbackDispatcher.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Remote/RazorRemoteServiceCallbackDispatcherRegistry.cs b/src/Tools/ExternalAccess/Razor/Features/Remote/RazorRemoteServiceCallbackDispatcherRegistry.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Remote/RazorRemoteServiceCallbackDispatcherRegistry.cs
rename to src/Tools/ExternalAccess/Razor/Features/Remote/RazorRemoteServiceCallbackDispatcherRegistry.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Remote/RazorRemoteServiceCallbackIdWrapper.cs b/src/Tools/ExternalAccess/Razor/Features/Remote/RazorRemoteServiceCallbackIdWrapper.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Remote/RazorRemoteServiceCallbackIdWrapper.cs
rename to src/Tools/ExternalAccess/Razor/Features/Remote/RazorRemoteServiceCallbackIdWrapper.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Remote/RazorRemoteServiceConnectionWrapper.cs b/src/Tools/ExternalAccess/Razor/Features/Remote/RazorRemoteServiceConnectionWrapper.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Remote/RazorRemoteServiceConnectionWrapper.cs
rename to src/Tools/ExternalAccess/Razor/Features/Remote/RazorRemoteServiceConnectionWrapper.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Remote/RazorServiceDescriptorsWrapper.cs b/src/Tools/ExternalAccess/Razor/Features/Remote/RazorServiceDescriptorsWrapper.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Remote/RazorServiceDescriptorsWrapper.cs
rename to src/Tools/ExternalAccess/Razor/Features/Remote/RazorServiceDescriptorsWrapper.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/SolutionExtensions.cs b/src/Tools/ExternalAccess/Razor/Features/SolutionExtensions.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/SolutionExtensions.cs
rename to src/Tools/ExternalAccess/Razor/Features/SolutionExtensions.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Testing/AbstractRazorLanguageServerFactoryWrapper.cs b/src/Tools/ExternalAccess/Razor/Features/Testing/AbstractRazorLanguageServerFactoryWrapper.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Testing/AbstractRazorLanguageServerFactoryWrapper.cs
rename to src/Tools/ExternalAccess/Razor/Features/Testing/AbstractRazorLanguageServerFactoryWrapper.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Testing/IRazorTestCapabilitiesProvider.cs b/src/Tools/ExternalAccess/Razor/Features/Testing/IRazorTestCapabilitiesProvider.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Testing/IRazorTestCapabilitiesProvider.cs
rename to src/Tools/ExternalAccess/Razor/Features/Testing/IRazorTestCapabilitiesProvider.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Testing/RazorTestAnalyzerLoader.cs b/src/Tools/ExternalAccess/Razor/Features/Testing/RazorTestAnalyzerLoader.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Testing/RazorTestAnalyzerLoader.cs
rename to src/Tools/ExternalAccess/Razor/Features/Testing/RazorTestAnalyzerLoader.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Testing/RazorTestLanguageServerFactory.cs b/src/Tools/ExternalAccess/Razor/Features/Testing/RazorTestLanguageServerFactory.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Testing/RazorTestLanguageServerFactory.cs
rename to src/Tools/ExternalAccess/Razor/Features/Testing/RazorTestLanguageServerFactory.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Testing/RazorTestWorkspaceRegistrationService.cs b/src/Tools/ExternalAccess/Razor/Features/Testing/RazorTestWorkspaceRegistrationService.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Testing/RazorTestWorkspaceRegistrationService.cs
rename to src/Tools/ExternalAccess/Razor/Features/Testing/RazorTestWorkspaceRegistrationService.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Testing/TestSolutionStore.cs b/src/Tools/ExternalAccess/Razor/Features/Testing/TestSolutionStore.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/Testing/TestSolutionStore.cs
rename to src/Tools/ExternalAccess/Razor/Features/Testing/TestSolutionStore.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/TextDocumentExtensions.cs b/src/Tools/ExternalAccess/Razor/Features/TextDocumentExtensions.cs
similarity index 100%
rename from src/Tools/ExternalAccess/Razor/Shared/TextDocumentExtensions.cs
rename to src/Tools/ExternalAccess/Razor/Features/TextDocumentExtensions.cs
diff --git a/src/Tools/ExternalAccess/Razor/Shared/Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared.projitems b/src/Tools/ExternalAccess/Razor/Shared/Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared.projitems
deleted file mode 100644
index 6f06c17cd8a7f..0000000000000
--- a/src/Tools/ExternalAccess/Razor/Shared/Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared.projitems
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>4853a78a-4ec4-4d86-9f02-d0ddeae85520</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>Microsoft.CodeAnalysis.ExternalAccess.Razor.Shared</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)ChecksumWrapper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\AbstractRazorCohostDocumentRequestHandler.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\AbstractRazorLspService.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\AbstractRazorRequestHandler.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\Constants.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\ExportCohostLspServiceFactoryAttribute.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\ExportCohostStatelessLspServiceAttribute.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\CodeActions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\Completion.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\Diagnostics.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\DocumentHighlights.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\DocumentSpellCheck.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\DocumentSymbols.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\FindAllReferences.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\FoldingRanges.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\GoToDefinition.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\GoToImplementation.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\Hover.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\InlayHints.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\OnAutoInsert.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\Rename.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\SemanticTokensRange.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\SignatureHelp.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\Handlers\ValidateBreakableRange.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\IRazorCohostDynamicRegistrationService.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\IRazorCustomMessageTarget.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\IRazorSemanticTokensRefreshQueue.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\RazorClientLanguageServerManagerFactory.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\RazorCohostClientLanguageServerManagerFactory.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\RazorCohostRequestContext.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\RazorMethodAttribute.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Cohost\RazorSemanticTokensRefreshQueueWrapper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Constants.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)IMefHostServicesExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)IRazorAsynchronousOperationListenerProviderAccessor.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)IRazorClientLanguageServerManager.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)IRazorDocumentExcerptService.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)IRazorDocumentOperationService.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)IRazorDocumentPropertiesService.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)IRazorDocumentServiceProvider.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)IRazorDynamicFileInfoProvider.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)IRazorLanguageServerTarget.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)IRazorMappingService.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)IRazorSpanMappingService.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorAnalyzerAssemblyResolver.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorAsynchronousOperationListenerProviderAccessor.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorAsynchronousOperationListenerWrapper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorAutoFormattingOptions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorBreakpointSpans.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorClassificationOptionsWrapper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorClassifierAccessor.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorClientLanguageServerManager.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorCSharpFormattingInteractionService.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorCSharpProximityExpressionResolverService.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorDocumentExcerptServiceWrapper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorDocumentPropertiesServiceWrapper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorDocumentServiceProviderWrapper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorDynamicFileInfo.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorExcerptMode.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorExcerptResult.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorGlobalOptions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorIndentationOptions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorLanguageServerTargetWrapper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorMappedSpanResult.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorMappingServiceWrapper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorPredefinedCodeFixProviderNames.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorPredefinedCodeRefactoringProviderNames.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorProjectExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorSemanticTokensAccessor.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RazorUri.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Remote\JsonSerializableDocumentId.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Remote\JsonSerializableRazorPinnedSolutionInfoWrapper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Remote\RazorPinnedSolutionInfoWrapper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Remote\RazorRemoteCallbackWrapper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Remote\RazorRemoteHostClient.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Remote\RazorRemoteServiceCallbackDispatcher.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Remote\RazorRemoteServiceCallbackDispatcherRegistry.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Remote\RazorRemoteServiceCallbackIdWrapper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Remote\RazorRemoteServiceConnectionWrapper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Remote\RazorServiceDescriptorsWrapper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)SolutionExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Testing\AbstractRazorLanguageServerFactoryWrapper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Testing\IRazorTestCapabilitiesProvider.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Testing\RazorTestAnalyzerLoader.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Testing\RazorTestLanguageServerFactory.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Testing\RazorTestWorkspaceRegistrationService.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Testing\TestSolutionStore.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)TextDocumentExtensions.cs" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Tools/ExternalAccess/RazorTest/Microsoft.CodeAnalysis.ExternalAccess.Razor.UnitTests.csproj b/src/Tools/ExternalAccess/RazorTest/Microsoft.CodeAnalysis.ExternalAccess.Razor.UnitTests.csproj
index be2b10c7fc1ab..5f4948ccd652a 100644
--- a/src/Tools/ExternalAccess/RazorTest/Microsoft.CodeAnalysis.ExternalAccess.Razor.UnitTests.csproj
+++ b/src/Tools/ExternalAccess/RazorTest/Microsoft.CodeAnalysis.ExternalAccess.Razor.UnitTests.csproj
@@ -10,7 +10,7 @@
     <ProjectReference Include="..\..\..\Compilers\Test\Core\Microsoft.CodeAnalysis.Test.Utilities.csproj" />
     <ProjectReference Include="..\..\..\EditorFeatures\TestUtilities\Microsoft.CodeAnalysis.EditorFeatures.Test.Utilities.csproj" Condition="'$(TargetFramework)' == 'net472'" />
     <ProjectReference Include="..\..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />
-    <ProjectReference Include="..\Razor\EditorFeatures\Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj" />
+    <ProjectReference Include="..\..\..\Tools\ExternalAccess\Razor\Features\Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.csproj" />
 	</ItemGroup>
 
   <ItemGroup>
diff --git a/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj b/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
index 140c30166c14e..bef9fd44f42fc 100644
--- a/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
+++ b/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
@@ -79,7 +79,7 @@
       <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
       <PkgDefEntry>BindingRedirect</PkgDefEntry>
     </ProjectReference>
-    <ProjectReference Include="..\..\Tools\ExternalAccess\Razor\EditorFeatures\Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj">
+    <ProjectReference Include="..\..\Tools\ExternalAccess\Razor\EditorFeatures\Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures.csproj">
       <Name>Microsoft.CodeAnalysis.ExternalAccess.Razor</Name>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
       <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
diff --git a/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj b/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj
index 02fadfdfe88b3..bbced73477841 100644
--- a/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj
+++ b/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj
@@ -44,7 +44,6 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.EditorFeatures.DiagnosticsTests.Utilities" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
-    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" />
     <InternalsVisibleTo Include="IdeCoreBenchmarks" />
     <InternalsVisibleTo Include="Roslyn.VisualStudio.Next.UnitTests" />
diff --git a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
index 5dc19530993a7..650e302697239 100644
--- a/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
+++ b/src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
@@ -135,7 +135,7 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
-    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Xaml" />
diff --git a/src/Workspaces/Remote/Core/Microsoft.CodeAnalysis.Remote.Workspaces.csproj b/src/Workspaces/Remote/Core/Microsoft.CodeAnalysis.Remote.Workspaces.csproj
index 27c06b86a8117..53dfd7ec0fd75 100644
--- a/src/Workspaces/Remote/Core/Microsoft.CodeAnalysis.Remote.Workspaces.csproj
+++ b/src/Workspaces/Remote/Core/Microsoft.CodeAnalysis.Remote.Workspaces.csproj
@@ -63,8 +63,6 @@
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.Workspaces.Test.Utilities" />
     <InternalsVisibleTo Include="Microsoft.VisualStudio.Completion.Tests" Key="$(IntelliCodeCSharpKey)" WorkItem="https://github.com/dotnet/roslyn/issues/35081" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
-    <!-- Razor is transitioning to using the correct EA structure. In the meantime add IVT for both until Razor moves to the correct layer -->
-    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.VisualDiagnostics" />
     <RestrictedInternalsVisibleTo Include="Microsoft.VisualStudio.IntelliCode.CSharp" Partner="Pythia" Key="$(IntelliCodeCSharpKey)" />
diff --git a/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj b/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj
index 0d6a88744d452..cbae58dfc1ade 100644
--- a/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj
+++ b/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj
@@ -16,7 +16,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />
     <ProjectReference Include="..\..\..\Tools\ExternalAccess\Extensions\Microsoft.CodeAnalysis.ExternalAccess.Extensions.csproj" />
-    <ProjectReference Include="..\..\..\Tools\ExternalAccess\Razor\EditorFeatures\Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj" />
+    <ProjectReference Include="..\..\..\Tools\ExternalAccess\Razor\Features\Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.csproj" />
     <ProjectReference Include="..\..\..\Tools\ExternalAccess\RazorCompiler\Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler.csproj" />
     <ProjectReference Include="..\..\..\Features\ExternalAccess\AspNetCore\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj" />
     <ProjectReference Include="..\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" />