diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs
index 4f0eb91abd8ec6f67d12e25210e45769580e06bc..cb5c4c6b189cc41e4ec6acee7ce74925019b3a7c 100644
--- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs
+++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs
@@ -22,6 +22,7 @@
 using Microsoft.VisualStudio.Feedback.Interop;
 using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem.Extensions;
 using Microsoft.VisualStudio.LanguageServices.Packaging;
+using Microsoft.VisualStudio.LanguageServices.SymbolSearch;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Text;
diff --git a/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj b/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj
index 04c4113f713a68ca1ff822b4ba8a76a0190acd71..0703045cab5427960a2205d65bb081ffddaf1b7b 100644
--- a/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj
+++ b/src/VisualStudio/Core/Def/ServicesVisualStudio.csproj
@@ -168,7 +168,7 @@
     <Compile Include="SymbolSearch\SymbolSearchService.LogService.cs" />
     <Compile Include="SymbolSearch\SymbolSearchService.RemoteControlService.cs" />
     <Compile Include="SymbolSearch\SymbolSearchServiceFactory.cs" />
-    <Compile Include="Packaging\Patching\Delta.cs" />
+    <Compile Include="SymbolSearch\Patching\Delta.cs" />
     <Compile Include="RoslynPackage.cs" />
     <Compile Include="ServicesVSResources.Designer.cs">
       <AutoGen>True</AutoGen>
diff --git a/src/VisualStudio/Core/Def/SymbolSearch/IDatabaseFactoryService.cs b/src/VisualStudio/Core/Def/SymbolSearch/IDatabaseFactoryService.cs
index 611fb46b2deb7245165c122340c2b7a9013ef9a1..6f91494de4eaea3d66aa9366d9d94c48675d869f 100644
--- a/src/VisualStudio/Core/Def/SymbolSearch/IDatabaseFactoryService.cs
+++ b/src/VisualStudio/Core/Def/SymbolSearch/IDatabaseFactoryService.cs
@@ -2,7 +2,7 @@
 
 using Microsoft.CodeAnalysis.Elfie.Model;
 
-namespace Microsoft.VisualStudio.LanguageServices.Packaging
+namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch
 {
     internal interface IDatabaseFactoryService
     {
diff --git a/src/VisualStudio/Core/Def/SymbolSearch/IDelayService.cs b/src/VisualStudio/Core/Def/SymbolSearch/IDelayService.cs
index cc66af2e07342f8fb152af975913b84647c4521e..59952ddf12e035a97e891168ad04ca14fc216498 100644
--- a/src/VisualStudio/Core/Def/SymbolSearch/IDelayService.cs
+++ b/src/VisualStudio/Core/Def/SymbolSearch/IDelayService.cs
@@ -1,12 +1,8 @@
 // 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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Microsoft.VisualStudio.LanguageServices.Packaging
+namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch
 {
     /// <summary>
     /// Used so we can mock out how the search service delays work for testing purposes.
diff --git a/src/VisualStudio/Core/Def/SymbolSearch/IIOService.cs b/src/VisualStudio/Core/Def/SymbolSearch/IIOService.cs
index 2ad69774b42cc3edc0af4ac71308c7da8f18d233..2488ba9bd4d6c0aae928cdecfe6d92199530708b 100644
--- a/src/VisualStudio/Core/Def/SymbolSearch/IIOService.cs
+++ b/src/VisualStudio/Core/Def/SymbolSearch/IIOService.cs
@@ -1,13 +1,8 @@
 // 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;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Microsoft.VisualStudio.LanguageServices.Packaging
+namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch
 {
     /// <summary>
     /// Used so we can mock out how the search service does IO for testing purposes.
diff --git a/src/VisualStudio/Core/Def/SymbolSearch/ILogService.cs b/src/VisualStudio/Core/Def/SymbolSearch/ILogService.cs
index d28e3111d7141396eafce0f3156b022eb079fe53..d528d52042b063a11c429d9c4e2ff36ccc4cf0d4 100644
--- a/src/VisualStudio/Core/Def/SymbolSearch/ILogService.cs
+++ b/src/VisualStudio/Core/Def/SymbolSearch/ILogService.cs
@@ -1,12 +1,8 @@
 // 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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Microsoft.VisualStudio.LanguageServices.Packaging
+namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch
 {
     /// <summary>
     /// Used so we can mock out logging in unit tests.
diff --git a/src/VisualStudio/Core/Def/SymbolSearch/IPatchService.cs b/src/VisualStudio/Core/Def/SymbolSearch/IPatchService.cs
index 563224cd40aabace1e2a04c64571b97e6320b95e..867cc9baf7468b9af83a947cd333220a4f5e79d9 100644
--- a/src/VisualStudio/Core/Def/SymbolSearch/IPatchService.cs
+++ b/src/VisualStudio/Core/Def/SymbolSearch/IPatchService.cs
@@ -1,12 +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.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Microsoft.VisualStudio.LanguageServices.Packaging
+namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch
 {
     /// <summary>
     /// Used so we can mock out patching in unit tests.
diff --git a/src/VisualStudio/Core/Def/SymbolSearch/IRemoteControlService.cs b/src/VisualStudio/Core/Def/SymbolSearch/IRemoteControlService.cs
index e7266ce8e583d67cc4624606621a636c9f2924d3..02cc22fbbaeaa92a5c98ee26c97e4003b601cb77 100644
--- a/src/VisualStudio/Core/Def/SymbolSearch/IRemoteControlService.cs
+++ b/src/VisualStudio/Core/Def/SymbolSearch/IRemoteControlService.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.Internal.VisualStudio.Shell.Interop;
 
-namespace Microsoft.VisualStudio.LanguageServices.Packaging
+namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch
 {
     /// <summary>
     /// Used so we can mock out the remote control service in unit tests.
diff --git a/src/VisualStudio/Core/Def/Packaging/Patching/Delta.cs b/src/VisualStudio/Core/Def/SymbolSearch/Patching/Delta.cs
similarity index 97%
rename from src/VisualStudio/Core/Def/Packaging/Patching/Delta.cs
rename to src/VisualStudio/Core/Def/SymbolSearch/Patching/Delta.cs
index 6705c804a1ef3a495b1251597f4191789ef28108..2e14fe31718c2eb4948928e2cdb3e460981a82cd 100644
--- a/src/VisualStudio/Core/Def/Packaging/Patching/Delta.cs
+++ b/src/VisualStudio/Core/Def/SymbolSearch/Patching/Delta.cs
@@ -8,7 +8,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Microsoft.VisualStudio.LanguageServices.Packaging.Patching
+namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch.Patching
 {
     /// <summary>
     /// Wrapper around the msdelta api so we can consume patches produced by the Elfie service.
diff --git a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.DatabaseFactoryService.cs b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.DatabaseFactoryService.cs
index 4f522d45f7d5f1abee6a13bbe2ea38f9cf98ca94..005985f81e333fbad804516effc323e605910589 100644
--- a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.DatabaseFactoryService.cs
+++ b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.DatabaseFactoryService.cs
@@ -3,7 +3,7 @@
 using System.IO;
 using Microsoft.CodeAnalysis.Elfie.Model;
 
-namespace Microsoft.VisualStudio.LanguageServices.Packaging
+namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch
 {
     internal partial class SymbolSearchService
     {
diff --git a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.DelayService.cs b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.DelayService.cs
index 7099237f0276a234b108306db5e59e175a6cc981..50480d70db71f5cd039624a31002e39aee2ee6df 100644
--- a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.DelayService.cs
+++ b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.DelayService.cs
@@ -2,7 +2,7 @@
 
 using System;
 
-namespace Microsoft.VisualStudio.LanguageServices.Packaging
+namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch
 {
     internal partial class SymbolSearchService
     {
diff --git a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.IOService.cs b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.IOService.cs
index a3abb40b322ecbb526192e3ddc3d0ee3710d776c..57c160145dea60ba70f08cdecfec2a225e8ff6a2 100644
--- a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.IOService.cs
+++ b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.IOService.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Microsoft.VisualStudio.LanguageServices.Packaging
+namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch
 {
     internal partial class SymbolSearchService
     {
diff --git a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.LogService.cs b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.LogService.cs
index d3ca7b25e38f07e8a8e717a5caa62fc0660815ff..5cb2f7486e5fa5460b426ded474eed0031e4f08a 100644
--- a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.LogService.cs
+++ b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.LogService.cs
@@ -4,7 +4,7 @@
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.VisualStudio.Shell.Interop;
 
-namespace Microsoft.VisualStudio.LanguageServices.Packaging
+namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch
 {
     internal partial class SymbolSearchService
     {
diff --git a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.PatchService.cs b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.PatchService.cs
index 86f33a5f0a16767a8f6ac449ddb5fbed51e44f66..3e57e52c7f57440d8c316cdd7b7885503c5dd491 100644
--- a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.PatchService.cs
+++ b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.PatchService.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.Packaging
+namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch
 {
     internal partial class SymbolSearchService
     {
diff --git a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.RemoteControlService.cs b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.RemoteControlService.cs
index 7d4c7e574ceaab93e659bc9de6d82bdc84f6a412..625c973758d20e9890468e1adaeaa1504a8b0b1d 100644
--- a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.RemoteControlService.cs
+++ b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.RemoteControlService.cs
@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using Microsoft.Internal.VisualStudio.Shell.Interop;
 
-namespace Microsoft.VisualStudio.LanguageServices.Packaging
+namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch
 {
     internal partial class SymbolSearchService
     {
diff --git a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.Update.cs b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.Update.cs
index 142646c21e8a76faaa3f15d8912da28b5690c15b..e588990c77485d87fc624a80eb9ba3a87c03b80b 100644
--- a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.Update.cs
+++ b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.Update.cs
@@ -22,7 +22,7 @@
 using System.Linq;
 using System.Collections.Immutable;
 
-namespace Microsoft.VisualStudio.LanguageServices.Packaging
+namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch
 {
     /// <summary>
     /// A service which enables searching for packages matching certain criteria.
diff --git a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.cs b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.cs
index 58e47ec2d73245a2b020dfb7ab00304b909e1ce7..b0043a3f13cf0a09887276e44359e52d2936d169 100644
--- a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.cs
+++ b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchService.cs
@@ -23,7 +23,7 @@
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.SymbolSearch;
 
-namespace Microsoft.VisualStudio.LanguageServices.Packaging
+namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch
 {
     /// <summary>
     /// A service which enables searching for packages matching certain criteria.
diff --git a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchServiceFactory.cs b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchServiceFactory.cs
index 15b05d76d771c958a7fc44bddc278a89beda6620..dce114cc9e39c6fb8d1d521583488889059cec31 100644
--- a/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchServiceFactory.cs
+++ b/src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchServiceFactory.cs
@@ -12,7 +12,7 @@
 using Roslyn.Utilities;
 using VSShell = Microsoft.VisualStudio.Shell;
 
-namespace Microsoft.VisualStudio.LanguageServices.Packaging
+namespace Microsoft.VisualStudio.LanguageServices.SymbolSearch
 {
     [ExportWorkspaceServiceFactory(typeof(ISymbolSearchService), WorkspaceKind.Host), Shared]
     internal class SymbolSearchServiceFactory : IWorkspaceServiceFactory
diff --git a/src/VisualStudio/Core/Test/Packaging/PackageSearchServiceTests.vb b/src/VisualStudio/Core/Test/Packaging/PackageSearchServiceTests.vb
index 218bc20f41fc2714e3778f1073d31fe949c53593..d6edb5e21157c58c95c7b1076c8a2fba7b7bb673 100644
--- a/src/VisualStudio/Core/Test/Packaging/PackageSearchServiceTests.vb
+++ b/src/VisualStudio/Core/Test/Packaging/PackageSearchServiceTests.vb
@@ -11,6 +11,7 @@ Imports Microsoft.CodeAnalysis.Elfie.Model
 Imports Microsoft.CodeAnalysis.Packaging
 Imports Microsoft.Internal.VisualStudio.Shell.Interop
 Imports Microsoft.VisualStudio.LanguageServices.Packaging
+Imports Microsoft.VisualStudio.LanguageServices.SymbolSearch
 Imports Moq
 Imports Roslyn.Test.Utilities