diff --git a/NzbDrone.Core.Test/CentralDispatchFixture.cs b/NzbDrone.Core.Test/CentralDispatchFixture.cs
index 76546ff52..10c016a3c 100644
--- a/NzbDrone.Core.Test/CentralDispatchFixture.cs
+++ b/NzbDrone.Core.Test/CentralDispatchFixture.cs
@@ -8,6 +8,7 @@ using NCrunch.Framework;
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Indexers.Providers;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.ExternalNotification;
diff --git a/NzbDrone.Core.Test/IndexerTests/IndexerFixture.cs b/NzbDrone.Core.Test/IndexerTests/IndexerFixture.cs
index 63fb529ed..e4fb2ae3b 100644
--- a/NzbDrone.Core.Test/IndexerTests/IndexerFixture.cs
+++ b/NzbDrone.Core.Test/IndexerTests/IndexerFixture.cs
@@ -11,6 +11,7 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Indexers.Providers;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
diff --git a/NzbDrone.Core.Test/IndexerTests/NzbxFixture.cs b/NzbDrone.Core.Test/IndexerTests/NzbxFixture.cs
index fc2c5d83c..77c734682 100644
--- a/NzbDrone.Core.Test/IndexerTests/NzbxFixture.cs
+++ b/NzbDrone.Core.Test/IndexerTests/NzbxFixture.cs
@@ -10,7 +10,7 @@ using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
-using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Indexers.Providers;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
diff --git a/NzbDrone.Core.Test/Indexers/IndexerServiceTest.cs b/NzbDrone.Core.Test/Indexers/IndexerServiceTest.cs
index 1cb6fa3d6..da2269dd6 100644
--- a/NzbDrone.Core.Test/Indexers/IndexerServiceTest.cs
+++ b/NzbDrone.Core.Test/Indexers/IndexerServiceTest.cs
@@ -9,6 +9,7 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Indexers.Providers;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/PerformSearchTestBase.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/PerformSearchTestBase.cs
index 5446d56db..4b96e196b 100644
--- a/NzbDrone.Core.Test/ProviderTests/SearchTests/PerformSearchTestBase.cs
+++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/PerformSearchTestBase.cs
@@ -6,6 +6,7 @@ using FizzWare.NBuilder;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Indexers.Providers;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
diff --git a/NzbDrone.Core/ContainerExtentions.cs b/NzbDrone.Core/ContainerExtentions.cs
index 90adcd1ef..11faff3bb 100644
--- a/NzbDrone.Core/ContainerExtentions.cs
+++ b/NzbDrone.Core/ContainerExtentions.cs
@@ -6,7 +6,7 @@ using Autofac.Core;
 using NLog;
 using NzbDrone.Common;
 using NzbDrone.Core.Datastore;
-using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Indexers.Providers;
 using NzbDrone.Core.Instrumentation;
 using NzbDrone.Core.Providers.ExternalNotification;
 using NzbDrone.Core.Providers.Metadata;
diff --git a/NzbDrone.Core/Indexers/IndexerService.cs b/NzbDrone.Core/Indexers/IndexerService.cs
index 7200ce18d..3ad42643e 100644
--- a/NzbDrone.Core/Indexers/IndexerService.cs
+++ b/NzbDrone.Core/Indexers/IndexerService.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
+using NzbDrone.Core.Indexers.Providers;
 using NzbDrone.Core.Lifecycle;
 using PetaPoco;
 
diff --git a/NzbDrone.Core/Indexers/FileSharingTalk.cs b/NzbDrone.Core/Indexers/Providers/FileSharingTalk.cs
similarity index 98%
rename from NzbDrone.Core/Indexers/FileSharingTalk.cs
rename to NzbDrone.Core/Indexers/Providers/FileSharingTalk.cs
index 1d70dd8da..ea39aa99a 100644
--- a/NzbDrone.Core/Indexers/FileSharingTalk.cs
+++ b/NzbDrone.Core/Indexers/Providers/FileSharingTalk.cs
@@ -6,7 +6,7 @@ using NzbDrone.Common;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers.Core;
 
-namespace NzbDrone.Core.Indexers
+namespace NzbDrone.Core.Indexers.Providers
 {
     public class FileSharingTalk : IndexerBase
     {
diff --git a/NzbDrone.Core/Indexers/IndexerBase.cs b/NzbDrone.Core/Indexers/Providers/IndexerBase.cs
similarity index 99%
rename from NzbDrone.Core/Indexers/IndexerBase.cs
rename to NzbDrone.Core/Indexers/Providers/IndexerBase.cs
index 25cd7572f..4051e1302 100644
--- a/NzbDrone.Core/Indexers/IndexerBase.cs
+++ b/NzbDrone.Core/Indexers/Providers/IndexerBase.cs
@@ -9,7 +9,7 @@ using NzbDrone.Common;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers.Core;
 
-namespace NzbDrone.Core.Indexers
+namespace NzbDrone.Core.Indexers.Providers
 {
     public abstract class IndexerBase
     {
diff --git a/NzbDrone.Core/Indexers/Newznab.cs b/NzbDrone.Core/Indexers/Providers/Newznab.cs
similarity index 99%
rename from NzbDrone.Core/Indexers/Newznab.cs
rename to NzbDrone.Core/Indexers/Providers/Newznab.cs
index fd10dc2b4..ef464c3df 100644
--- a/NzbDrone.Core/Indexers/Newznab.cs
+++ b/NzbDrone.Core/Indexers/Providers/Newznab.cs
@@ -8,7 +8,7 @@ using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
 
-namespace NzbDrone.Core.Indexers
+namespace NzbDrone.Core.Indexers.Providers
 {
     public class Newznab : IndexerBase
     {
diff --git a/NzbDrone.Core/Indexers/NzbClub.cs b/NzbDrone.Core/Indexers/Providers/NzbClub.cs
similarity index 98%
rename from NzbDrone.Core/Indexers/NzbClub.cs
rename to NzbDrone.Core/Indexers/Providers/NzbClub.cs
index 977b5898d..922903534 100644
--- a/NzbDrone.Core/Indexers/NzbClub.cs
+++ b/NzbDrone.Core/Indexers/Providers/NzbClub.cs
@@ -7,7 +7,7 @@ using NzbDrone.Common;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers.Core;
 
-namespace NzbDrone.Core.Indexers
+namespace NzbDrone.Core.Indexers.Providers
 {
     public class NzbClub : IndexerBase
     {
diff --git a/NzbDrone.Core/Indexers/NzbIndex.cs b/NzbDrone.Core/Indexers/Providers/NzbIndex.cs
similarity index 98%
rename from NzbDrone.Core/Indexers/NzbIndex.cs
rename to NzbDrone.Core/Indexers/Providers/NzbIndex.cs
index cd835ba4b..049b5ae3a 100644
--- a/NzbDrone.Core/Indexers/NzbIndex.cs
+++ b/NzbDrone.Core/Indexers/Providers/NzbIndex.cs
@@ -7,7 +7,7 @@ using NzbDrone.Common;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers.Core;
 
-namespace NzbDrone.Core.Indexers
+namespace NzbDrone.Core.Indexers.Providers
 {
     public class NzbIndex : IndexerBase
     {
diff --git a/NzbDrone.Core/Indexers/NzbsRUs.cs b/NzbDrone.Core/Indexers/Providers/NzbsRUs.cs
similarity index 98%
rename from NzbDrone.Core/Indexers/NzbsRUs.cs
rename to NzbDrone.Core/Indexers/Providers/NzbsRUs.cs
index f0054af8f..565fdeb38 100644
--- a/NzbDrone.Core/Indexers/NzbsRUs.cs
+++ b/NzbDrone.Core/Indexers/Providers/NzbsRUs.cs
@@ -7,7 +7,7 @@ using NzbDrone.Common;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers.Core;
 
-namespace NzbDrone.Core.Indexers
+namespace NzbDrone.Core.Indexers.Providers
 {
     public class NzbsRUs : IndexerBase
     {
diff --git a/NzbDrone.Core/Indexers/Nzbx.cs b/NzbDrone.Core/Indexers/Providers/Nzbx.cs
similarity index 99%
rename from NzbDrone.Core/Indexers/Nzbx.cs
rename to NzbDrone.Core/Indexers/Providers/Nzbx.cs
index eeb84fe17..1ffd9f2cd 100644
--- a/NzbDrone.Core/Indexers/Nzbx.cs
+++ b/NzbDrone.Core/Indexers/Providers/Nzbx.cs
@@ -9,7 +9,7 @@ using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Nzbx;
 using NzbDrone.Core.Providers.Core;
 
-namespace NzbDrone.Core.Indexers
+namespace NzbDrone.Core.Indexers.Providers
 {
     class Nzbx : IndexerBase
     {
diff --git a/NzbDrone.Core/Indexers/Omgwtfnzbs.cs b/NzbDrone.Core/Indexers/Providers/Omgwtfnzbs.cs
similarity index 98%
rename from NzbDrone.Core/Indexers/Omgwtfnzbs.cs
rename to NzbDrone.Core/Indexers/Providers/Omgwtfnzbs.cs
index d78548c73..73adaaf38 100644
--- a/NzbDrone.Core/Indexers/Omgwtfnzbs.cs
+++ b/NzbDrone.Core/Indexers/Providers/Omgwtfnzbs.cs
@@ -7,7 +7,7 @@ using NzbDrone.Common;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers.Core;
 
-namespace NzbDrone.Core.Indexers
+namespace NzbDrone.Core.Indexers.Providers
 {
     class Omgwtfnzbs : IndexerBase
     {
diff --git a/NzbDrone.Core/Indexers/SyndicationFeedXmlReader.cs b/NzbDrone.Core/Indexers/Providers/SyndicationFeedXmlReader.cs
similarity index 98%
rename from NzbDrone.Core/Indexers/SyndicationFeedXmlReader.cs
rename to NzbDrone.Core/Indexers/Providers/SyndicationFeedXmlReader.cs
index addbe4959..6f21848fc 100644
--- a/NzbDrone.Core/Indexers/SyndicationFeedXmlReader.cs
+++ b/NzbDrone.Core/Indexers/Providers/SyndicationFeedXmlReader.cs
@@ -11,7 +11,7 @@ using System.Threading;
 using System.Xml;
 using NLog;
 
-namespace NzbDrone.Core.Indexers
+namespace NzbDrone.Core.Indexers.Providers
 {
     public class SyndicationFeedXmlReader : XmlTextReader
     {
diff --git a/NzbDrone.Core/Indexers/Wombles.cs b/NzbDrone.Core/Indexers/Providers/Wombles.cs
similarity index 98%
rename from NzbDrone.Core/Indexers/Wombles.cs
rename to NzbDrone.Core/Indexers/Providers/Wombles.cs
index 3665c8461..1a45df14c 100644
--- a/NzbDrone.Core/Indexers/Wombles.cs
+++ b/NzbDrone.Core/Indexers/Providers/Wombles.cs
@@ -6,7 +6,7 @@ using NzbDrone.Common;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers.Core;
 
-namespace NzbDrone.Core.Indexers
+namespace NzbDrone.Core.Indexers.Providers
 {
     public class Wombles : IndexerBase
     {
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index e79b4f77e..5c7c02067 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -341,13 +341,13 @@
     <Compile Include="DecisionEngine\AllowedReleaseGroupSpecification.cs" />
     <Compile Include="DecisionEngine\CustomStartDateSpecification.cs" />
     <Compile Include="Providers\DownloadClients\PneumaticProvider.cs" />
-    <Compile Include="Indexers\Nzbx.cs" />
+    <Compile Include="Indexers\Providers\Nzbx.cs" />
     <Compile Include="Providers\Hubs\EpisodeHub.cs" />
-    <Compile Include="Indexers\NzbClub.cs" />
-    <Compile Include="Indexers\NzbIndex.cs" />
-    <Compile Include="Indexers\FileSharingTalk.cs" />
-    <Compile Include="Indexers\Omgwtfnzbs.cs" />
-    <Compile Include="Indexers\Wombles.cs" />
+    <Compile Include="Indexers\Providers\NzbClub.cs" />
+    <Compile Include="Indexers\Providers\NzbIndex.cs" />
+    <Compile Include="Indexers\Providers\FileSharingTalk.cs" />
+    <Compile Include="Indexers\Providers\Omgwtfnzbs.cs" />
+    <Compile Include="Indexers\Providers\Wombles.cs" />
     <Compile Include="Providers\MetadataProvider.cs" />
     <Compile Include="Providers\Metadata\MetadataBase.cs" />
     <Compile Include="Providers\Metadata\Xbmc.cs" />
@@ -494,16 +494,16 @@
     <Compile Include="Indexers\IndexerService.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Indexers\IndexerBase.cs">
+    <Compile Include="Indexers\Providers\IndexerBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Indexers\Newznab.cs">
+    <Compile Include="Indexers\Providers\Newznab.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Indexers\NzbsRUs.cs">
+    <Compile Include="Indexers\Providers\NzbsRUs.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Indexers\SyndicationFeedXmlReader.cs">
+    <Compile Include="Indexers\Providers\SyndicationFeedXmlReader.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Providers\MediaFileProvider.cs">