diff --git a/src/LanguageServer/Protocol/Features/CodeFixes/CodeFixService.FixAllDiagnosticProvider.cs b/src/Features/Core/Portable/CodeFixes/Service/CodeFixService.FixAllDiagnosticProvider.cs
similarity index 100%
rename from src/LanguageServer/Protocol/Features/CodeFixes/CodeFixService.FixAllDiagnosticProvider.cs
rename to src/Features/Core/Portable/CodeFixes/Service/CodeFixService.FixAllDiagnosticProvider.cs
diff --git a/src/LanguageServer/Protocol/Features/CodeFixes/CodeFixService.FixAllPredefinedDiagnosticProvider.cs b/src/Features/Core/Portable/CodeFixes/Service/CodeFixService.FixAllPredefinedDiagnosticProvider.cs
similarity index 100%
rename from src/LanguageServer/Protocol/Features/CodeFixes/CodeFixService.FixAllPredefinedDiagnosticProvider.cs
rename to src/Features/Core/Portable/CodeFixes/Service/CodeFixService.FixAllPredefinedDiagnosticProvider.cs
diff --git a/src/LanguageServer/Protocol/Features/CodeFixes/CodeFixService.ProjectCodeFixProvider.cs b/src/Features/Core/Portable/CodeFixes/Service/CodeFixService.ProjectCodeFixProvider.cs
similarity index 100%
rename from src/LanguageServer/Protocol/Features/CodeFixes/CodeFixService.ProjectCodeFixProvider.cs
rename to src/Features/Core/Portable/CodeFixes/Service/CodeFixService.ProjectCodeFixProvider.cs
diff --git a/src/LanguageServer/Protocol/Features/CodeFixes/CodeFixService.cs b/src/Features/Core/Portable/CodeFixes/Service/CodeFixService.cs
similarity index 99%
rename from src/LanguageServer/Protocol/Features/CodeFixes/CodeFixService.cs
rename to src/Features/Core/Portable/CodeFixes/Service/CodeFixService.cs
index 7a4264e6baad2..b2d43b6471a9b 100644
--- a/src/LanguageServer/Protocol/Features/CodeFixes/CodeFixService.cs
+++ b/src/Features/Core/Portable/CodeFixes/Service/CodeFixService.cs
@@ -28,7 +28,7 @@
 using Microsoft.CodeAnalysis.Shared.Utilities;
 using Microsoft.CodeAnalysis.Telemetry;
 using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.Threading;
+using Microsoft.CodeAnalysis.Threading;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.CodeFixes;
@@ -157,7 +157,7 @@ public CodeFixService(
             CancellationToken cancellationToken)
         {
             // Ensure we yield here so the caller can continue on.
-            await TaskScheduler.Default.SwitchTo(alwaysYield: true);
+            await Task.Yield().ConfigureAwait(false);
 
             await foreach (var collection in StreamFixesAsync(
                 document, spanToDiagnostics, fixAllForInSpan: false,
diff --git a/src/LanguageServer/Protocol/Features/CodeFixes/ICodeFixService.cs b/src/Features/Core/Portable/CodeFixes/Service/ICodeFixService.cs
similarity index 100%
rename from src/LanguageServer/Protocol/Features/CodeFixes/ICodeFixService.cs
rename to src/Features/Core/Portable/CodeFixes/Service/ICodeFixService.cs