diff --git a/src/EditorFeatures/Core/EditorFeatures.csproj b/src/EditorFeatures/Core/EditorFeatures.csproj
index f0f41b11e57cc6c80e24a339452161fc49844848..14beeda7180ad5b4c632932615af9e3bda9169d5 100644
--- a/src/EditorFeatures/Core/EditorFeatures.csproj
+++ b/src/EditorFeatures/Core/EditorFeatures.csproj
@@ -760,7 +760,7 @@
     <Compile Include="Shared\Tagging\Tags\PreviewWarningTag.cs" />
     <Compile Include="Shared\Tagging\Tags\PreviewWarningTagDefinition.cs" />
     <Compile Include="Implementation\ReferenceHighlighting\ReferenceHighlightingTagSource.cs" />
-    <Compile Include="Shared\Tagging\TagSources\SemanticBufferTagSource.cs" />
+    <Compile Include="Implementation\Classification\SemanticBufferTagSource.cs" />
     <Compile Include="Shared\Tagging\TagSources\ProducerPopulatedTagSource.cs" />
     <Compile Include="Shared\Tagging\TagSources\TagSource_ReferenceCounting.cs" />
     <Compile Include="Shared\Tagging\Utilities\BatchChangeNotifier.cs" />
diff --git a/src/EditorFeatures/Core/Shared/Tagging/TagSources/SemanticBufferTagSource.cs b/src/EditorFeatures/Core/Implementation/Classification/SemanticBufferTagSource.cs
similarity index 98%
rename from src/EditorFeatures/Core/Shared/Tagging/TagSources/SemanticBufferTagSource.cs
rename to src/EditorFeatures/Core/Implementation/Classification/SemanticBufferTagSource.cs
index 7e72d6e34c469ee35899df3e43a8102de9f8fdfd..f1a013f53acff7b988c54854f905393a050aec18 100644
--- a/src/EditorFeatures/Core/Shared/Tagging/TagSources/SemanticBufferTagSource.cs
+++ b/src/EditorFeatures/Core/Implementation/Classification/SemanticBufferTagSource.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Editor.Shared.Tagging;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Editor.Tagging;
 using Microsoft.CodeAnalysis.LanguageServices;
@@ -15,7 +16,7 @@
 using Microsoft.VisualStudio.Text.Tagging;
 using Roslyn.Utilities;
 
-namespace Microsoft.CodeAnalysis.Editor.Shared.Tagging.TagSources
+namespace Microsoft.CodeAnalysis.Editor.Implementation.Classification
 {
     internal sealed class SemanticBufferTagSource<TTag> : ProducerPopulatedTagSource<TTag> where TTag : ITag
     {
diff --git a/src/EditorFeatures/Core/Implementation/Classification/SemanticClassificationTaggerProvider.cs b/src/EditorFeatures/Core/Implementation/Classification/SemanticClassificationTaggerProvider.cs
index 418798a6722f8c5806c6b8682b6d0697b491cdca..dcbecfddc5cd76a378376f1722ebf8532388614f 100644
--- a/src/EditorFeatures/Core/Implementation/Classification/SemanticClassificationTaggerProvider.cs
+++ b/src/EditorFeatures/Core/Implementation/Classification/SemanticClassificationTaggerProvider.cs
@@ -8,7 +8,6 @@
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.Shared.Options;
 using Microsoft.CodeAnalysis.Editor.Shared.Tagging;
-using Microsoft.CodeAnalysis.Editor.Shared.Tagging.TagSources;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Editor.Tagging;
 using Microsoft.CodeAnalysis.ErrorReporting;