diff --git a/NzbDrone.Api/NancyBootstrapper.cs b/NzbDrone.Api/NancyBootstrapper.cs
index 81a1e400a..5e44ee2ac 100644
--- a/NzbDrone.Api/NancyBootstrapper.cs
+++ b/NzbDrone.Api/NancyBootstrapper.cs
@@ -13,7 +13,6 @@ using NzbDrone.Common;
 using NzbDrone.Core;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Lifecycle;
-using NzbDrone.Core.Providers.Core;
 using SignalR;
 
 namespace NzbDrone.Api
diff --git a/NzbDrone.Core/Providers/Core/ArchiveProvider.cs b/NzbDrone.Common/ArchiveProvider.cs
similarity index 72%
rename from NzbDrone.Core/Providers/Core/ArchiveProvider.cs
rename to NzbDrone.Common/ArchiveProvider.cs
index c8bb3fd1d..3cac6f464 100644
--- a/NzbDrone.Core/Providers/Core/ArchiveProvider.cs
+++ b/NzbDrone.Common/ArchiveProvider.cs
@@ -1,11 +1,8 @@
-using System;
-using System.IO;
-using System.Linq;
+using System.Linq;
 using Ionic.Zip;
 using NLog;
-using NzbDrone.Common;
 
-namespace NzbDrone.Core.Providers.Core
+namespace NzbDrone.Common
 {
     public class ArchiveProvider
     {
@@ -15,7 +12,7 @@ namespace NzbDrone.Core.Providers.Core
         {
             logger.Trace("Extracting archive [{0}] to [{1}]", compressedFile, destination);
 
-            using (ZipFile zipFile = ZipFile.Read(compressedFile))
+            using (var zipFile = ZipFile.Read(compressedFile))
             {
                 zipFile.ExtractAll(destination);
             }
diff --git a/NzbDrone.Common/NzbDrone.Common.csproj b/NzbDrone.Common/NzbDrone.Common.csproj
index f8d4ded91..b82a5ab4f 100644
--- a/NzbDrone.Common/NzbDrone.Common.csproj
+++ b/NzbDrone.Common/NzbDrone.Common.csproj
@@ -61,6 +61,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.Configuration.dll</HintPath>
     </Reference>
+    <Reference Include="Ionic.Zip">
+      <HintPath>..\packages\DotNetZip.1.9.1.8\lib\net20\Ionic.Zip.dll</HintPath>
+    </Reference>
     <Reference Include="Nancy">
       <HintPath>..\packages\Nancy.0.16.1\lib\net40\Nancy.dll</HintPath>
     </Reference>
@@ -85,6 +88,7 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ArchiveProvider.cs" />
     <Compile Include="CommonContainerExtentions.cs" />
     <Compile Include="EnsureThat\Ensure.cs" />
     <Compile Include="EnsureThat\EnsureBoolExtensions.cs" />
@@ -135,6 +139,7 @@
     </Compile>
     <Compile Include="SysTray\SysTrayProvider.cs" />
     <Compile Include="TryParseExtension.cs" />
+    <Compile Include="UdpProvider.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="EnsureThat\ve-3BAF.tmp" />
diff --git a/NzbDrone.Core/Providers/Core/UdpProvider.cs b/NzbDrone.Common/UdpProvider.cs
similarity index 98%
rename from NzbDrone.Core/Providers/Core/UdpProvider.cs
rename to NzbDrone.Common/UdpProvider.cs
index ed0de0b2d..2f5727dc7 100644
--- a/NzbDrone.Core/Providers/Core/UdpProvider.cs
+++ b/NzbDrone.Common/UdpProvider.cs
@@ -1,11 +1,10 @@
-using System;
-using System.Collections.Generic;
+using System.Linq;
+using System;
 using System.Net;
 using System.Net.Sockets;
-using System.Text;
 using NLog;
 
-namespace NzbDrone.Core.Providers.Core
+namespace NzbDrone.Common
 {
     public class UdpProvider
     {
diff --git a/NzbDrone.Common/packages.config b/NzbDrone.Common/packages.config
index 4013a3317..969cf4904 100644
--- a/NzbDrone.Common/packages.config
+++ b/NzbDrone.Common/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Autofac" version="3.0.1" targetFramework="net40" />
+  <package id="DotNetZip" version="1.9.1.8" targetFramework="net40" />
   <package id="Nancy" version="0.16.1" targetFramework="net40" />
   <package id="Nancy.Hosting.Self" version="0.16.1" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
diff --git a/NzbDrone.Core.Test/DecisionEngineTests/AllowedReleaseGroupSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/AllowedReleaseGroupSpecificationFixture.cs
index b2468ccc7..03d8105fc 100644
--- a/NzbDrone.Core.Test/DecisionEngineTests/AllowedReleaseGroupSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/DecisionEngineTests/AllowedReleaseGroupSpecificationFixture.cs
@@ -12,7 +12,6 @@ using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/DecisionEngineTests/LanguageSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/LanguageSpecificationFixture.cs
index 22d45779d..d72d25038 100644
--- a/NzbDrone.Core.Test/DecisionEngineTests/LanguageSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/DecisionEngineTests/LanguageSpecificationFixture.cs
@@ -9,7 +9,6 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/DecisionEngineTests/RetentionSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/RetentionSpecificationFixture.cs
index f30b36f6b..2cd2c11eb 100644
--- a/NzbDrone.Core.Test/DecisionEngineTests/RetentionSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/DecisionEngineTests/RetentionSpecificationFixture.cs
@@ -10,7 +10,6 @@ using NUnit.Framework;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/Framework/TestDbHelper.cs b/NzbDrone.Core.Test/Framework/TestDbHelper.cs
index 8d87c13e9..ff96696ff 100644
--- a/NzbDrone.Core.Test/Framework/TestDbHelper.cs
+++ b/NzbDrone.Core.Test/Framework/TestDbHelper.cs
@@ -7,7 +7,6 @@ using FluentAssertions;
 using Moq;
 using NzbDrone.Common;
 using NzbDrone.Core.Datastore;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 
 
diff --git a/NzbDrone.Core.Test/IndexerTests/IndexerFixture.cs b/NzbDrone.Core.Test/IndexerTests/IndexerFixture.cs
index d7ddab46f..d66db7263 100644
--- a/NzbDrone.Core.Test/IndexerTests/IndexerFixture.cs
+++ b/NzbDrone.Core.Test/IndexerTests/IndexerFixture.cs
@@ -14,7 +14,6 @@ using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/IndexerTests/NzbxFixture.cs b/NzbDrone.Core.Test/IndexerTests/NzbxFixture.cs
index 9f7d74174..f62b9c282 100644
--- a/NzbDrone.Core.Test/IndexerTests/NzbxFixture.cs
+++ b/NzbDrone.Core.Test/IndexerTests/NzbxFixture.cs
@@ -13,7 +13,6 @@ using NzbDrone.Common;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Test.ProviderTests;
diff --git a/NzbDrone.Core.Test/Indexers/IndexerServiceTest.cs b/NzbDrone.Core.Test/Indexers/IndexerServiceTest.cs
index 16c59a4f4..5e062f11f 100644
--- a/NzbDrone.Core.Test/Indexers/IndexerServiceTest.cs
+++ b/NzbDrone.Core.Test/Indexers/IndexerServiceTest.cs
@@ -12,7 +12,6 @@ using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common.AutoMoq;
 
diff --git a/NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs b/NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs
index 884e73ebf..efc2a30c0 100644
--- a/NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs
+++ b/NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs
@@ -11,7 +11,6 @@ using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Lifecycle;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
 
diff --git a/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs b/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs
index 70f43af98..ddbf582de 100644
--- a/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs
@@ -10,7 +10,6 @@ using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
diff --git a/NzbDrone.Core.Test/JobTests/PostDownloadScanJobFixture.cs b/NzbDrone.Core.Test/JobTests/PostDownloadScanJobFixture.cs
index db0eb5e87..986d8cf22 100644
--- a/NzbDrone.Core.Test/JobTests/PostDownloadScanJobFixture.cs
+++ b/NzbDrone.Core.Test/JobTests/PostDownloadScanJobFixture.cs
@@ -11,7 +11,6 @@ using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
 
diff --git a/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs b/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs
index 3c6bc7077..60eaeae10 100644
--- a/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs
@@ -12,7 +12,6 @@ using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
diff --git a/NzbDrone.Core.Test/JobTests/RssSyncJobTest.cs b/NzbDrone.Core.Test/JobTests/RssSyncJobTest.cs
index eee4fc2e3..b065efd73 100644
--- a/NzbDrone.Core.Test/JobTests/RssSyncJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/RssSyncJobTest.cs
@@ -7,7 +7,6 @@ using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common.AutoMoq;
 
diff --git a/NzbDrone.Core.Test/ProviderTests/DiskProviderTests/ExtractArchiveFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskProviderTests/ExtractArchiveFixture.cs
index 0cb4071e6..e6c5e43f4 100644
--- a/NzbDrone.Core.Test/ProviderTests/DiskProviderTests/ExtractArchiveFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DiskProviderTests/ExtractArchiveFixture.cs
@@ -1,6 +1,6 @@
 using FluentAssertions;
 using NUnit.Framework;
-using NzbDrone.Core.Providers.Core;
+using NzbDrone.Common;
 using NzbDrone.Core.Test.Framework;
 using System.IO;
 
diff --git a/NzbDrone.Core.Test/ProviderTests/DiskProviderTests/FreeDiskSpaceTest.cs b/NzbDrone.Core.Test/ProviderTests/DiskProviderTests/FreeDiskSpaceTest.cs
index 1ff440b4a..387dc6d24 100644
--- a/NzbDrone.Core.Test/ProviderTests/DiskProviderTests/FreeDiskSpaceTest.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DiskProviderTests/FreeDiskSpaceTest.cs
@@ -8,7 +8,6 @@ using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common.AutoMoq;
 
diff --git a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpDropFolderFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpDropFolderFixture.cs
index aea3f01be..65455ccb0 100644
--- a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpDropFolderFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpDropFolderFixture.cs
@@ -13,7 +13,6 @@ using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
diff --git a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpFixture.cs
index d01847267..fc344e9c0 100644
--- a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpFixture.cs
@@ -13,7 +13,6 @@ using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
diff --git a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/GetVideoFilesFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/GetVideoFilesFixture.cs
index 5d965c3a0..746078ab5 100644
--- a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/GetVideoFilesFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/GetVideoFilesFixture.cs
@@ -10,7 +10,6 @@ using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
diff --git a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs
index 4281c1a70..499797271 100644
--- a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs
@@ -11,7 +11,6 @@ using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
diff --git a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/MoveEpisodeFileFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/MoveEpisodeFileFixture.cs
index 98f7363ca..0c8169e21 100644
--- a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/MoveEpisodeFileFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/MoveEpisodeFileFixture.cs
@@ -15,7 +15,6 @@ using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
diff --git a/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/BlackholeProviderFixture.cs b/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/BlackholeProviderFixture.cs
index bf0022573..302513e8f 100644
--- a/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/BlackholeProviderFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/BlackholeProviderFixture.cs
@@ -9,8 +9,7 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Providers.DownloadClients;
+using NzbDrone.Core.Download.Clients;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
 
diff --git a/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/NzbgetProviderTests/DownloadNzbFixture.cs b/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/NzbgetProviderTests/DownloadNzbFixture.cs
index 630ba347c..dee7374fc 100644
--- a/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/NzbgetProviderTests/DownloadNzbFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/NzbgetProviderTests/DownloadNzbFixture.cs
@@ -8,9 +8,8 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Model.Nzbget;
-using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Providers.DownloadClients;
+using NzbDrone.Core.Download.Clients;
+using NzbDrone.Core.Download.Clients.Nzbget;
 using NzbDrone.Test.Common;
 
 namespace NzbDrone.Core.Test.ProviderTests.DownloadClientTests.NzbgetProviderTests
diff --git a/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/NzbgetProviderTests/QueueFixture.cs b/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/NzbgetProviderTests/QueueFixture.cs
index c8f0d5d5a..cd1af39ee 100644
--- a/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/NzbgetProviderTests/QueueFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/NzbgetProviderTests/QueueFixture.cs
@@ -8,9 +8,8 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Model.Nzbget;
-using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Providers.DownloadClients;
+using NzbDrone.Core.Download.Clients;
+using NzbDrone.Core.Download.Clients.Nzbget;
 using NzbDrone.Test.Common;
 
 namespace NzbDrone.Core.Test.ProviderTests.DownloadClientTests.NzbgetProviderTests
diff --git a/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/PneumaticProviderFixture.cs b/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/PneumaticProviderFixture.cs
index 80d746d0e..9655a4f7f 100644
--- a/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/PneumaticProviderFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/PneumaticProviderFixture.cs
@@ -9,8 +9,7 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Providers.DownloadClients;
+using NzbDrone.Core.Download.Clients;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
 
diff --git a/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/SabProviderTests/QueueFixture.cs b/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/SabProviderTests/QueueFixture.cs
index fb9f27b3b..d38ae0bf0 100644
--- a/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/SabProviderTests/QueueFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/SabProviderTests/QueueFixture.cs
@@ -9,12 +9,11 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Download.Clients;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Model.Sabnzbd;
-using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Providers.DownloadClients;
+using NzbDrone.Core.Download.Clients.Sabnzbd;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
diff --git a/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/SabProviderTests/SabProviderFixture.cs b/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/SabProviderTests/SabProviderFixture.cs
index 30922d3bc..cb7762a97 100644
--- a/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/SabProviderTests/SabProviderFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/SabProviderTests/SabProviderFixture.cs
@@ -11,10 +11,9 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Download.Clients;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Model.Sabnzbd;
-using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Providers.DownloadClients;
+using NzbDrone.Core.Download.Clients.Sabnzbd;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
diff --git a/NzbDrone.Core.Test/ProviderTests/DownloadProviderTests/DownloadProviderFixture.cs b/NzbDrone.Core.Test/ProviderTests/DownloadProviderTests/DownloadProviderFixture.cs
index 9e7c75f4b..d5e6fd7bd 100644
--- a/NzbDrone.Core.Test/ProviderTests/DownloadProviderTests/DownloadProviderFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DownloadProviderTests/DownloadProviderFixture.cs
@@ -7,10 +7,11 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Download;
+using NzbDrone.Core.Download.Clients;
+using NzbDrone.Core.Download.Clients.Sabnzbd;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.DownloadClients;
 using NzbDrone.Core.Test.Framework;
 
 // ReSharper disable InconsistentNaming
diff --git a/NzbDrone.Core.Test/ProviderTests/EventClientProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/EventClientProviderTest.cs
index c61f54024..f3302767a 100644
--- a/NzbDrone.Core.Test/ProviderTests/EventClientProviderTest.cs
+++ b/NzbDrone.Core.Test/ProviderTests/EventClientProviderTest.cs
@@ -3,8 +3,8 @@
 using System;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Common;
 using NzbDrone.Core.Model.Xbmc;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Providers.Xbmc;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common.AutoMoq;
diff --git a/NzbDrone.Core.Test/ProviderTests/PlexProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/PlexProviderTest.cs
index 4b942134f..b1ab91a1b 100644
--- a/NzbDrone.Core.Test/ProviderTests/PlexProviderTest.cs
+++ b/NzbDrone.Core.Test/ProviderTests/PlexProviderTest.cs
@@ -14,7 +14,6 @@ using NzbDrone.Core.Configuration;
 using NzbDrone.Core.ExternalNotification;
 using NzbDrone.Core.Model.Xbmc;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Providers.Xbmc;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/CleanupFixture.cs b/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/CleanupFixture.cs
index 8fa9f67db..e48f6b215 100644
--- a/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/CleanupFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/CleanupFixture.cs
@@ -13,7 +13,6 @@ using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common.AutoMoq;
diff --git a/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteDirectoryFixture.cs b/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteDirectoryFixture.cs
index 741f0fae8..d7ec5de82 100644
--- a/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteDirectoryFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteDirectoryFixture.cs
@@ -13,7 +13,6 @@ using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common.AutoMoq;
diff --git a/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteFileFixture.cs b/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteFileFixture.cs
index 10a426618..0be28f3fb 100644
--- a/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteFileFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteFileFixture.cs
@@ -13,7 +13,6 @@ using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common.AutoMoq;
diff --git a/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/EmptyFixture.cs b/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/EmptyFixture.cs
index ad7874f98..624517b4c 100644
--- a/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/EmptyFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/EmptyFixture.cs
@@ -13,7 +13,6 @@ using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common.AutoMoq;
diff --git a/NzbDrone.Core.Test/ProviderTests/UpdateProviderTests/GetAvilableUpdateFixture.cs b/NzbDrone.Core.Test/ProviderTests/UpdateProviderTests/GetAvilableUpdateFixture.cs
index d345c11b3..e6cf07fb9 100644
--- a/NzbDrone.Core.Test/ProviderTests/UpdateProviderTests/GetAvilableUpdateFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/UpdateProviderTests/GetAvilableUpdateFixture.cs
@@ -6,7 +6,6 @@ using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common.AutoMoq;
 
diff --git a/NzbDrone.Core.Test/ProviderTests/XbmcProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/XbmcProviderTest.cs
index cafe32f94..22f45a1ee 100644
--- a/NzbDrone.Core.Test/ProviderTests/XbmcProviderTest.cs
+++ b/NzbDrone.Core.Test/ProviderTests/XbmcProviderTest.cs
@@ -11,7 +11,6 @@ using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Xbmc;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Providers.Xbmc;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/TvTests/SeriesProviderTest.cs b/NzbDrone.Core.Test/TvTests/SeriesProviderTest.cs
index 8ea0bca44..a5c595882 100644
Binary files a/NzbDrone.Core.Test/TvTests/SeriesProviderTest.cs and b/NzbDrone.Core.Test/TvTests/SeriesProviderTest.cs differ
diff --git a/NzbDrone.Core/Configuration/ConfigService.cs b/NzbDrone.Core/Configuration/ConfigService.cs
index 9473c84f6..6eeb0be5c 100644
--- a/NzbDrone.Core/Configuration/ConfigService.cs
+++ b/NzbDrone.Core/Configuration/ConfigService.cs
@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using NLog;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Model.Nzbget;
-using NzbDrone.Core.Model.Sabnzbd;
+using NzbDrone.Core.Download.Clients.Nzbget;
+using NzbDrone.Core.Download.Clients.Sabnzbd;
 using NzbDrone.Core.Providers;
 
 namespace NzbDrone.Core.Configuration
diff --git a/NzbDrone.Core/Configuration/IConfigService.cs b/NzbDrone.Core/Configuration/IConfigService.cs
index b4b7fa469..43588fb49 100644
--- a/NzbDrone.Core/Configuration/IConfigService.cs
+++ b/NzbDrone.Core/Configuration/IConfigService.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Model.Nzbget;
-using NzbDrone.Core.Model.Sabnzbd;
+using NzbDrone.Core.Download.Clients.Nzbget;
+using NzbDrone.Core.Download.Clients.Sabnzbd;
 
 namespace NzbDrone.Core.Configuration
 {
diff --git a/NzbDrone.Core/DecisionEngine/AllowedReleaseGroupSpecification.cs b/NzbDrone.Core/DecisionEngine/AllowedReleaseGroupSpecification.cs
index 4540ec870..1a98776ee 100644
--- a/NzbDrone.Core/DecisionEngine/AllowedReleaseGroupSpecification.cs
+++ b/NzbDrone.Core/DecisionEngine/AllowedReleaseGroupSpecification.cs
@@ -3,7 +3,6 @@ using System.Linq;
 using NLog;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.DecisionEngine
 {
diff --git a/NzbDrone.Core/DecisionEngine/LanguageSpecification.cs b/NzbDrone.Core/DecisionEngine/LanguageSpecification.cs
index 4a4c5105b..5e2950a41 100644
--- a/NzbDrone.Core/DecisionEngine/LanguageSpecification.cs
+++ b/NzbDrone.Core/DecisionEngine/LanguageSpecification.cs
@@ -2,7 +2,6 @@
 using NLog;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.DecisionEngine
 {
diff --git a/NzbDrone.Core/DecisionEngine/RetentionSpecification.cs b/NzbDrone.Core/DecisionEngine/RetentionSpecification.cs
index 8780101d4..654e996bc 100644
--- a/NzbDrone.Core/DecisionEngine/RetentionSpecification.cs
+++ b/NzbDrone.Core/DecisionEngine/RetentionSpecification.cs
@@ -2,7 +2,6 @@
 using NLog;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.DecisionEngine
 {
diff --git a/NzbDrone.Core/Providers/DownloadClients/BlackholeProvider.cs b/NzbDrone.Core/Download/Clients/BlackholeProvider.cs
similarity index 94%
rename from NzbDrone.Core/Providers/DownloadClients/BlackholeProvider.cs
rename to NzbDrone.Core/Download/Clients/BlackholeProvider.cs
index 72d9d99bb..4bae2b3a0 100644
--- a/NzbDrone.Core/Providers/DownloadClients/BlackholeProvider.cs
+++ b/NzbDrone.Core/Download/Clients/BlackholeProvider.cs
@@ -7,10 +7,9 @@ using NzbDrone.Core.Configuration;
 using NzbDrone.Core.History;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.DecisionEngine;
 
-namespace NzbDrone.Core.Providers.DownloadClients
+namespace NzbDrone.Core.Download.Clients
 {
     public class BlackholeProvider : IDownloadClient
     {
@@ -18,7 +17,6 @@ namespace NzbDrone.Core.Providers.DownloadClients
         private readonly HttpProvider _httpProvider;
         private readonly DiskProvider _diskProvider;
         private readonly UpgradeHistorySpecification _upgradeHistorySpecification;
-        private readonly HistoryService _historyService;
 
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
 
diff --git a/NzbDrone.Core/Model/Nzbget/EnqueueResponse.cs b/NzbDrone.Core/Download/Clients/Nzbget/EnqueueResponse.cs
similarity index 82%
rename from NzbDrone.Core/Model/Nzbget/EnqueueResponse.cs
rename to NzbDrone.Core/Download/Clients/Nzbget/EnqueueResponse.cs
index c4aa4b4d6..b2c7f0fbb 100644
--- a/NzbDrone.Core/Model/Nzbget/EnqueueResponse.cs
+++ b/NzbDrone.Core/Download/Clients/Nzbget/EnqueueResponse.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace NzbDrone.Core.Model.Nzbget
+namespace NzbDrone.Core.Download.Clients.Nzbget
 {
     public class EnqueueResponse
     {
diff --git a/NzbDrone.Core/Model/Nzbget/ErrorModel.cs b/NzbDrone.Core/Download/Clients/Nzbget/ErrorModel.cs
similarity index 89%
rename from NzbDrone.Core/Model/Nzbget/ErrorModel.cs
rename to NzbDrone.Core/Download/Clients/Nzbget/ErrorModel.cs
index 592b8abab..d7293163b 100644
--- a/NzbDrone.Core/Model/Nzbget/ErrorModel.cs
+++ b/NzbDrone.Core/Download/Clients/Nzbget/ErrorModel.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace NzbDrone.Core.Model.Nzbget
+namespace NzbDrone.Core.Download.Clients.Nzbget
 {
     public class ErrorModel
     {
diff --git a/NzbDrone.Core/Model/Nzbget/JsonError.cs b/NzbDrone.Core/Download/Clients/Nzbget/JsonError.cs
similarity index 82%
rename from NzbDrone.Core/Model/Nzbget/JsonError.cs
rename to NzbDrone.Core/Download/Clients/Nzbget/JsonError.cs
index 7389efece..a09b2a717 100644
--- a/NzbDrone.Core/Model/Nzbget/JsonError.cs
+++ b/NzbDrone.Core/Download/Clients/Nzbget/JsonError.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace NzbDrone.Core.Model.Nzbget
+namespace NzbDrone.Core.Download.Clients.Nzbget
 {
     public class JsonError
     {
diff --git a/NzbDrone.Core/Model/Nzbget/JsonRequest.cs b/NzbDrone.Core/Download/Clients/Nzbget/JsonRequest.cs
similarity index 87%
rename from NzbDrone.Core/Model/Nzbget/JsonRequest.cs
rename to NzbDrone.Core/Download/Clients/Nzbget/JsonRequest.cs
index 3d3f812b1..57712d33b 100644
--- a/NzbDrone.Core/Model/Nzbget/JsonRequest.cs
+++ b/NzbDrone.Core/Download/Clients/Nzbget/JsonRequest.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using Newtonsoft.Json;
 
-namespace NzbDrone.Core.Model.Nzbget
+namespace NzbDrone.Core.Download.Clients.Nzbget
 {
     public class JsonRequest
     {
diff --git a/NzbDrone.Core/Providers/DownloadClients/NzbgetProvider.cs b/NzbDrone.Core/Download/Clients/Nzbget/NzbgetProvider.cs
similarity index 96%
rename from NzbDrone.Core/Providers/DownloadClients/NzbgetProvider.cs
rename to NzbDrone.Core/Download/Clients/Nzbget/NzbgetProvider.cs
index b2afb9828..4a7e2f3e3 100644
--- a/NzbDrone.Core/Providers/DownloadClients/NzbgetProvider.cs
+++ b/NzbDrone.Core/Download/Clients/Nzbget/NzbgetProvider.cs
@@ -2,19 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using System.Text.RegularExpressions;
-using System.Web;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using NLog;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Model.Nzbget;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Tv;
 
-namespace NzbDrone.Core.Providers.DownloadClients
+namespace NzbDrone.Core.Download.Clients.Nzbget
 {
     public class NzbgetProvider : IDownloadClient
     {
diff --git a/NzbDrone.Core/Model/Nzbget/PriorityType.cs b/NzbDrone.Core/Download/Clients/Nzbget/PriorityType.cs
similarity index 74%
rename from NzbDrone.Core/Model/Nzbget/PriorityType.cs
rename to NzbDrone.Core/Download/Clients/Nzbget/PriorityType.cs
index 43be8b196..7235f375a 100644
--- a/NzbDrone.Core/Model/Nzbget/PriorityType.cs
+++ b/NzbDrone.Core/Download/Clients/Nzbget/PriorityType.cs
@@ -1,4 +1,4 @@
-namespace NzbDrone.Core.Model.Nzbget
+namespace NzbDrone.Core.Download.Clients.Nzbget
 {
     public enum PriorityType
     {
diff --git a/NzbDrone.Core/Model/Nzbget/Queue.cs b/NzbDrone.Core/Download/Clients/Nzbget/Queue.cs
similarity index 86%
rename from NzbDrone.Core/Model/Nzbget/Queue.cs
rename to NzbDrone.Core/Download/Clients/Nzbget/Queue.cs
index 831608f60..e9f647442 100644
--- a/NzbDrone.Core/Model/Nzbget/Queue.cs
+++ b/NzbDrone.Core/Download/Clients/Nzbget/Queue.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using Newtonsoft.Json;
 
-namespace NzbDrone.Core.Model.Nzbget
+namespace NzbDrone.Core.Download.Clients.Nzbget
 {
     public class Queue
     {
diff --git a/NzbDrone.Core/Model/Nzbget/QueueItem.cs b/NzbDrone.Core/Download/Clients/Nzbget/QueueItem.cs
similarity index 88%
rename from NzbDrone.Core/Model/Nzbget/QueueItem.cs
rename to NzbDrone.Core/Download/Clients/Nzbget/QueueItem.cs
index 82257a213..d7d0a896d 100644
--- a/NzbDrone.Core/Model/Nzbget/QueueItem.cs
+++ b/NzbDrone.Core/Download/Clients/Nzbget/QueueItem.cs
@@ -1,10 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
+using NzbDrone.Core.Model;
 
-namespace NzbDrone.Core.Model.Nzbget
+namespace NzbDrone.Core.Download.Clients.Nzbget
 {
     public class QueueItem
     {
diff --git a/NzbDrone.Core/Model/Nzbget/VersionModel.cs b/NzbDrone.Core/Download/Clients/Nzbget/VersionModel.cs
similarity index 82%
rename from NzbDrone.Core/Model/Nzbget/VersionModel.cs
rename to NzbDrone.Core/Download/Clients/Nzbget/VersionModel.cs
index fdbbec462..6f234306e 100644
--- a/NzbDrone.Core/Model/Nzbget/VersionModel.cs
+++ b/NzbDrone.Core/Download/Clients/Nzbget/VersionModel.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace NzbDrone.Core.Model.Nzbget
+namespace NzbDrone.Core.Download.Clients.Nzbget
 {
     public class VersionModel
     {
diff --git a/NzbDrone.Core/Providers/DownloadClients/PneumaticProvider.cs b/NzbDrone.Core/Download/Clients/PneumaticProvider.cs
similarity index 97%
rename from NzbDrone.Core/Providers/DownloadClients/PneumaticProvider.cs
rename to NzbDrone.Core/Download/Clients/PneumaticProvider.cs
index 1191c429d..1b9314f89 100644
--- a/NzbDrone.Core/Providers/DownloadClients/PneumaticProvider.cs
+++ b/NzbDrone.Core/Download/Clients/PneumaticProvider.cs
@@ -6,10 +6,9 @@ using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.DecisionEngine;
 
-namespace NzbDrone.Core.Providers.DownloadClients
+namespace NzbDrone.Core.Download.Clients
 {
     public class PneumaticProvider : IDownloadClient
     {
diff --git a/NzbDrone.Core/Model/Sabnzbd/SabAddResponse.cs b/NzbDrone.Core/Download/Clients/Sabnzbd/SabAddResponse.cs
similarity index 85%
rename from NzbDrone.Core/Model/Sabnzbd/SabAddResponse.cs
rename to NzbDrone.Core/Download/Clients/Sabnzbd/SabAddResponse.cs
index 43e0a89a1..244156805 100644
--- a/NzbDrone.Core/Model/Sabnzbd/SabAddResponse.cs
+++ b/NzbDrone.Core/Download/Clients/Sabnzbd/SabAddResponse.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using Newtonsoft.Json;
 
-namespace NzbDrone.Core.Model.Sabnzbd
+namespace NzbDrone.Core.Download.Clients.Sabnzbd
 {
     public class SabAddResponse
     {
diff --git a/NzbDrone.Core/Model/Sabnzbd/SabCategoryModel.cs b/NzbDrone.Core/Download/Clients/Sabnzbd/SabCategoryModel.cs
similarity index 74%
rename from NzbDrone.Core/Model/Sabnzbd/SabCategoryModel.cs
rename to NzbDrone.Core/Download/Clients/Sabnzbd/SabCategoryModel.cs
index 0b8bd1cbc..83d7b3e03 100644
--- a/NzbDrone.Core/Model/Sabnzbd/SabCategoryModel.cs
+++ b/NzbDrone.Core/Download/Clients/Sabnzbd/SabCategoryModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NzbDrone.Core.Model.Sabnzbd
+namespace NzbDrone.Core.Download.Clients.Sabnzbd
 {
     public class SabCategoryModel
     {
diff --git a/NzbDrone.Core/Model/Sabnzbd/SabHistory.cs b/NzbDrone.Core/Download/Clients/Sabnzbd/SabHistory.cs
similarity index 86%
rename from NzbDrone.Core/Model/Sabnzbd/SabHistory.cs
rename to NzbDrone.Core/Download/Clients/Sabnzbd/SabHistory.cs
index 578ca6bcd..6182a417a 100644
--- a/NzbDrone.Core/Model/Sabnzbd/SabHistory.cs
+++ b/NzbDrone.Core/Download/Clients/Sabnzbd/SabHistory.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using Newtonsoft.Json;
 
-namespace NzbDrone.Core.Model.Sabnzbd
+namespace NzbDrone.Core.Download.Clients.Sabnzbd
 {
     public class SabHistory
     {
diff --git a/NzbDrone.Core/Model/Sabnzbd/SabHistoryItem.cs b/NzbDrone.Core/Download/Clients/Sabnzbd/SabHistoryItem.cs
similarity index 93%
rename from NzbDrone.Core/Model/Sabnzbd/SabHistoryItem.cs
rename to NzbDrone.Core/Download/Clients/Sabnzbd/SabHistoryItem.cs
index 87f8f1eda..4aa330a93 100644
--- a/NzbDrone.Core/Model/Sabnzbd/SabHistoryItem.cs
+++ b/NzbDrone.Core/Download/Clients/Sabnzbd/SabHistoryItem.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using Newtonsoft.Json;
 
-namespace NzbDrone.Core.Model.Sabnzbd
+namespace NzbDrone.Core.Download.Clients.Sabnzbd
 {
     public class SabHistoryItem
     {
diff --git a/NzbDrone.Core/Model/Sabnzbd/SabJsonError.cs b/NzbDrone.Core/Download/Clients/Sabnzbd/SabJsonError.cs
similarity index 83%
rename from NzbDrone.Core/Model/Sabnzbd/SabJsonError.cs
rename to NzbDrone.Core/Download/Clients/Sabnzbd/SabJsonError.cs
index 5badfb0f1..2d2ce28f7 100644
--- a/NzbDrone.Core/Model/Sabnzbd/SabJsonError.cs
+++ b/NzbDrone.Core/Download/Clients/Sabnzbd/SabJsonError.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using Newtonsoft.Json;
 
-namespace NzbDrone.Core.Model.Sabnzbd
+namespace NzbDrone.Core.Download.Clients.Sabnzbd
 {
     public class SabJsonError
     {
diff --git a/NzbDrone.Core/Model/Sabnzbd/SabModel.cs b/NzbDrone.Core/Download/Clients/Sabnzbd/SabModel.cs
similarity index 75%
rename from NzbDrone.Core/Model/Sabnzbd/SabModel.cs
rename to NzbDrone.Core/Download/Clients/Sabnzbd/SabModel.cs
index 2e4bec620..158535065 100644
--- a/NzbDrone.Core/Model/Sabnzbd/SabModel.cs
+++ b/NzbDrone.Core/Download/Clients/Sabnzbd/SabModel.cs
@@ -1,4 +1,4 @@
-namespace NzbDrone.Core.Model.Sabnzbd
+namespace NzbDrone.Core.Download.Clients.Sabnzbd
 {
     public class SabModel
     {
diff --git a/NzbDrone.Core/Model/Sabnzbd/SabPriorityType.cs b/NzbDrone.Core/Download/Clients/Sabnzbd/SabPriorityType.cs
similarity index 75%
rename from NzbDrone.Core/Model/Sabnzbd/SabPriorityType.cs
rename to NzbDrone.Core/Download/Clients/Sabnzbd/SabPriorityType.cs
index 23a94cf24..d16be5f2f 100644
--- a/NzbDrone.Core/Model/Sabnzbd/SabPriorityType.cs
+++ b/NzbDrone.Core/Download/Clients/Sabnzbd/SabPriorityType.cs
@@ -1,4 +1,4 @@
-namespace NzbDrone.Core.Model.Sabnzbd
+namespace NzbDrone.Core.Download.Clients.Sabnzbd
 {
     public enum SabPriorityType
     {
diff --git a/NzbDrone.Core/Providers/DownloadClients/SabProvider.cs b/NzbDrone.Core/Download/Clients/Sabnzbd/SabProvider.cs
similarity index 98%
rename from NzbDrone.Core/Providers/DownloadClients/SabProvider.cs
rename to NzbDrone.Core/Download/Clients/Sabnzbd/SabProvider.cs
index 02c251d97..6cc95c3f5 100644
--- a/NzbDrone.Core/Providers/DownloadClients/SabProvider.cs
+++ b/NzbDrone.Core/Download/Clients/Sabnzbd/SabProvider.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using System.Text.RegularExpressions;
 using System.Web;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -10,11 +9,9 @@ using NLog;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Model.Sabnzbd;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Tv;
 
-namespace NzbDrone.Core.Providers.DownloadClients
+namespace NzbDrone.Core.Download.Clients.Sabnzbd
 {
     public class SabProvider : IDownloadClient
     {
diff --git a/NzbDrone.Core/Model/Sabnzbd/SabQueue.cs b/NzbDrone.Core/Download/Clients/Sabnzbd/SabQueue.cs
similarity index 85%
rename from NzbDrone.Core/Model/Sabnzbd/SabQueue.cs
rename to NzbDrone.Core/Download/Clients/Sabnzbd/SabQueue.cs
index b4cc7873d..6b91bb4cc 100644
--- a/NzbDrone.Core/Model/Sabnzbd/SabQueue.cs
+++ b/NzbDrone.Core/Download/Clients/Sabnzbd/SabQueue.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using Newtonsoft.Json;
 
-namespace NzbDrone.Core.Model.Sabnzbd
+namespace NzbDrone.Core.Download.Clients.Sabnzbd
 {
     public class SabQueue
     {
diff --git a/NzbDrone.Core/Model/Sabnzbd/SabQueueItem.cs b/NzbDrone.Core/Download/Clients/Sabnzbd/SabQueueItem.cs
similarity index 93%
rename from NzbDrone.Core/Model/Sabnzbd/SabQueueItem.cs
rename to NzbDrone.Core/Download/Clients/Sabnzbd/SabQueueItem.cs
index fb895acb4..45b7e1914 100644
--- a/NzbDrone.Core/Model/Sabnzbd/SabQueueItem.cs
+++ b/NzbDrone.Core/Download/Clients/Sabnzbd/SabQueueItem.cs
@@ -1,11 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Newtonsoft.Json;
 using NzbDrone.Core.Helpers;
+using NzbDrone.Core.Model;
 
-namespace NzbDrone.Core.Model.Sabnzbd
+namespace NzbDrone.Core.Download.Clients.Sabnzbd
 {
     public class SabQueueItem
     {
diff --git a/NzbDrone.Core/Model/Sabnzbd/SabVersionModel.cs b/NzbDrone.Core/Download/Clients/Sabnzbd/SabVersionModel.cs
similarity index 78%
rename from NzbDrone.Core/Model/Sabnzbd/SabVersionModel.cs
rename to NzbDrone.Core/Download/Clients/Sabnzbd/SabVersionModel.cs
index 2e326a7c9..19fdc7b69 100644
--- a/NzbDrone.Core/Model/Sabnzbd/SabVersionModel.cs
+++ b/NzbDrone.Core/Download/Clients/Sabnzbd/SabVersionModel.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace NzbDrone.Core.Model.Sabnzbd
+namespace NzbDrone.Core.Download.Clients.Sabnzbd
 {
     public class SabVersionModel
     {
diff --git a/NzbDrone.Core/Download/DownloadProvider.cs b/NzbDrone.Core/Download/DownloadProvider.cs
index 58f3c457f..2370b6644 100644
--- a/NzbDrone.Core/Download/DownloadProvider.cs
+++ b/NzbDrone.Core/Download/DownloadProvider.cs
@@ -3,8 +3,10 @@ using System.Linq;
 using NLog;
 using NzbDrone.Common.Eventing;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Download.Clients;
+using NzbDrone.Core.Download.Clients.Nzbget;
+using NzbDrone.Core.Download.Clients.Sabnzbd;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.DownloadClients;
 
 namespace NzbDrone.Core.Download
 {
diff --git a/NzbDrone.Core/Providers/DownloadClients/IDownloadClient.cs b/NzbDrone.Core/Download/IDownloadClient.cs
similarity index 82%
rename from NzbDrone.Core/Providers/DownloadClients/IDownloadClient.cs
rename to NzbDrone.Core/Download/IDownloadClient.cs
index 1cdc2988b..b7092e950 100644
--- a/NzbDrone.Core/Providers/DownloadClients/IDownloadClient.cs
+++ b/NzbDrone.Core/Download/IDownloadClient.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using NzbDrone.Core.Model;
 
-namespace NzbDrone.Core.Providers.DownloadClients
+namespace NzbDrone.Core.Download
 {
     public interface IDownloadClient
     {
diff --git a/NzbDrone.Core/Helpers/SabnzbdPriorityTypeConverter.cs b/NzbDrone.Core/Helpers/SabnzbdPriorityTypeConverter.cs
index 9281fc09c..e5c0b5b0f 100644
--- a/NzbDrone.Core/Helpers/SabnzbdPriorityTypeConverter.cs
+++ b/NzbDrone.Core/Helpers/SabnzbdPriorityTypeConverter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using Newtonsoft.Json;
-using NzbDrone.Core.Model.Sabnzbd;
+using NzbDrone.Core.Download.Clients.Sabnzbd;
 
 namespace NzbDrone.Core.Helpers
 {
diff --git a/NzbDrone.Core/Indexers/FileSharingTalk.cs b/NzbDrone.Core/Indexers/FileSharingTalk.cs
index 3cc9ed574..65bba7b83 100644
--- a/NzbDrone.Core/Indexers/FileSharingTalk.cs
+++ b/NzbDrone.Core/Indexers/FileSharingTalk.cs
@@ -5,7 +5,6 @@ using System.ServiceModel.Syndication;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Indexers
 {
diff --git a/NzbDrone.Core/Indexers/IndexerBase.cs b/NzbDrone.Core/Indexers/IndexerBase.cs
index 0777bedb7..136be9790 100644
--- a/NzbDrone.Core/Indexers/IndexerBase.cs
+++ b/NzbDrone.Core/Indexers/IndexerBase.cs
@@ -8,7 +8,6 @@ using NLog;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Indexers
 {
diff --git a/NzbDrone.Core/Indexers/Newznab.cs b/NzbDrone.Core/Indexers/Newznab.cs
index 9485899ae..f6d20421e 100644
--- a/NzbDrone.Core/Indexers/Newznab.cs
+++ b/NzbDrone.Core/Indexers/Newznab.cs
@@ -7,7 +7,6 @@ using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Indexers
 {
diff --git a/NzbDrone.Core/Indexers/NzbClub.cs b/NzbDrone.Core/Indexers/NzbClub.cs
index 1c22fc132..a1d982286 100644
--- a/NzbDrone.Core/Indexers/NzbClub.cs
+++ b/NzbDrone.Core/Indexers/NzbClub.cs
@@ -6,7 +6,6 @@ using System.Text.RegularExpressions;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Indexers
 {
diff --git a/NzbDrone.Core/Indexers/NzbIndex.cs b/NzbDrone.Core/Indexers/NzbIndex.cs
index 027cc8205..d31a2fb19 100644
--- a/NzbDrone.Core/Indexers/NzbIndex.cs
+++ b/NzbDrone.Core/Indexers/NzbIndex.cs
@@ -6,7 +6,6 @@ using System.Text.RegularExpressions;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Indexers
 {
diff --git a/NzbDrone.Core/Indexers/NzbsRUs.cs b/NzbDrone.Core/Indexers/NzbsRUs.cs
index 80b89bb2c..28abd6bfc 100644
--- a/NzbDrone.Core/Indexers/NzbsRUs.cs
+++ b/NzbDrone.Core/Indexers/NzbsRUs.cs
@@ -6,7 +6,6 @@ using System.Text.RegularExpressions;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Indexers
 {
diff --git a/NzbDrone.Core/Indexers/Nzbx.cs b/NzbDrone.Core/Indexers/Nzbx.cs
index 72fb59a32..66594de23 100644
--- a/NzbDrone.Core/Indexers/Nzbx.cs
+++ b/NzbDrone.Core/Indexers/Nzbx.cs
@@ -8,7 +8,6 @@ using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Nzbx;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Indexers
 {
diff --git a/NzbDrone.Core/Indexers/Omgwtfnzbs.cs b/NzbDrone.Core/Indexers/Omgwtfnzbs.cs
index ad66101a6..7a47a6d98 100644
--- a/NzbDrone.Core/Indexers/Omgwtfnzbs.cs
+++ b/NzbDrone.Core/Indexers/Omgwtfnzbs.cs
@@ -6,7 +6,6 @@ using System.Text.RegularExpressions;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Indexers
 {
diff --git a/NzbDrone.Core/Indexers/Wombles.cs b/NzbDrone.Core/Indexers/Wombles.cs
index 9e29fb05e..f361df242 100644
--- a/NzbDrone.Core/Indexers/Wombles.cs
+++ b/NzbDrone.Core/Indexers/Wombles.cs
@@ -5,7 +5,6 @@ using System.ServiceModel.Syndication;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Indexers
 {
diff --git a/NzbDrone.Core/Jobs/DiskScanJob.cs b/NzbDrone.Core/Jobs/DiskScanJob.cs
index e2cdaf6cf..2ae5b5b98 100644
--- a/NzbDrone.Core/Jobs/DiskScanJob.cs
+++ b/NzbDrone.Core/Jobs/DiskScanJob.cs
@@ -8,7 +8,6 @@ using NzbDrone.Core.Tv;
 using NzbDrone.Core.Helpers;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 
 namespace NzbDrone.Core.Jobs
diff --git a/NzbDrone.Core/Jobs/PastWeekBacklogSearchJob.cs b/NzbDrone.Core/Jobs/PastWeekBacklogSearchJob.cs
index 29a1aeb33..af7ae5e50 100644
--- a/NzbDrone.Core/Jobs/PastWeekBacklogSearchJob.cs
+++ b/NzbDrone.Core/Jobs/PastWeekBacklogSearchJob.cs
@@ -8,7 +8,6 @@ using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 
 namespace NzbDrone.Core.Jobs
diff --git a/NzbDrone.Core/Jobs/PostDownloadScanJob.cs b/NzbDrone.Core/Jobs/PostDownloadScanJob.cs
index 04d409110..a8315c134 100644
--- a/NzbDrone.Core/Jobs/PostDownloadScanJob.cs
+++ b/NzbDrone.Core/Jobs/PostDownloadScanJob.cs
@@ -6,7 +6,6 @@ using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Jobs.Framework;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Jobs
 {
diff --git a/NzbDrone.Core/Jobs/RecentBacklogSearchJob.cs b/NzbDrone.Core/Jobs/RecentBacklogSearchJob.cs
index 0863f23e0..2cc4a2434 100644
--- a/NzbDrone.Core/Jobs/RecentBacklogSearchJob.cs
+++ b/NzbDrone.Core/Jobs/RecentBacklogSearchJob.cs
@@ -8,7 +8,6 @@ using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 
 namespace NzbDrone.Core.Jobs
diff --git a/NzbDrone.Core/Jobs/RssSyncJob.cs b/NzbDrone.Core/Jobs/RssSyncJob.cs
index 1b48b37b6..ec790686b 100644
--- a/NzbDrone.Core/Jobs/RssSyncJob.cs
+++ b/NzbDrone.Core/Jobs/RssSyncJob.cs
@@ -10,7 +10,6 @@ using NzbDrone.Core.Jobs.Framework;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.DecisionEngine;
 
 namespace NzbDrone.Core.Jobs
diff --git a/NzbDrone.Core/Jobs/UpdateInfoJob.cs b/NzbDrone.Core/Jobs/UpdateInfoJob.cs
index f26fedc2f..a567da08f 100644
--- a/NzbDrone.Core/Jobs/UpdateInfoJob.cs
+++ b/NzbDrone.Core/Jobs/UpdateInfoJob.cs
@@ -10,7 +10,6 @@ using NzbDrone.Core.Tv;
 using NzbDrone.Core.Helpers;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 
 namespace NzbDrone.Core.Jobs
diff --git a/NzbDrone.Core/Lifecycle/AppUpdateJob.cs b/NzbDrone.Core/Lifecycle/AppUpdateJob.cs
index c775958cc..5def00cca 100644
--- a/NzbDrone.Core/Lifecycle/AppUpdateJob.cs
+++ b/NzbDrone.Core/Lifecycle/AppUpdateJob.cs
@@ -8,7 +8,6 @@ using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Jobs.Framework;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Lifecycle
 {
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index 880b1cce6..236d8a5aa 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -222,14 +222,14 @@
     <Compile Include="Model\ConnectionInfoModel.cs" />
     <Compile Include="Model\BacklogSettingType.cs" />
     <Compile Include="Model\MediaInfoModel.cs" />
-    <Compile Include="Model\Nzbget\EnqueueResponse.cs" />
-    <Compile Include="Model\Nzbget\ErrorModel.cs" />
-    <Compile Include="Model\Nzbget\JsonError.cs" />
-    <Compile Include="Model\Nzbget\JsonRequest.cs" />
-    <Compile Include="Model\Nzbget\Queue.cs" />
-    <Compile Include="Model\Nzbget\QueueItem.cs" />
-    <Compile Include="Model\Nzbget\PriorityType.cs" />
-    <Compile Include="Model\Nzbget\VersionModel.cs" />
+    <Compile Include="Download\Clients\Nzbget\EnqueueResponse.cs" />
+    <Compile Include="Download\Clients\Nzbget\ErrorModel.cs" />
+    <Compile Include="Download\Clients\Nzbget\JsonError.cs" />
+    <Compile Include="Download\Clients\Nzbget\JsonRequest.cs" />
+    <Compile Include="Download\Clients\Nzbget\Queue.cs" />
+    <Compile Include="Download\Clients\Nzbget\QueueItem.cs" />
+    <Compile Include="Download\Clients\Nzbget\PriorityType.cs" />
+    <Compile Include="Download\Clients\Nzbget\VersionModel.cs" />
     <Compile Include="Model\Nzbx\NzbxSearchItem.cs" />
     <Compile Include="Model\Nzbx\NzbxRecentItem.cs" />
     <Compile Include="Model\Nzbx\NzbxVotesModel.cs" />
@@ -250,15 +250,15 @@
     <Compile Include="Tv\SeasonRepository.cs" />
     <Compile Include="Tv\SeriesRepository.cs" />
     <Compile Include="Tv\QualityModel.cs" />
-    <Compile Include="Model\Sabnzbd\SabAddResponse.cs" />
-    <Compile Include="Model\Sabnzbd\SabHistoryItem.cs" />
-    <Compile Include="Model\Sabnzbd\SabHistory.cs" />
-    <Compile Include="Model\Sabnzbd\SabJsonError.cs" />
-    <Compile Include="Model\Sabnzbd\SabQueue.cs" />
-    <Compile Include="Model\Sabnzbd\SabCategoryModel.cs" />
-    <Compile Include="Model\Sabnzbd\SabModel.cs" />
-    <Compile Include="Model\Sabnzbd\SabQueueItem.cs" />
-    <Compile Include="Model\Sabnzbd\SabVersionModel.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabAddResponse.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabHistoryItem.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabHistory.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabJsonError.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabQueue.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabCategoryModel.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabModel.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabQueueItem.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabVersionModel.cs" />
     <Compile Include="Model\StatsModel.cs" />
     <Compile Include="Model\TvRage\TvRageEpisode.cs" />
     <Compile Include="Model\TvRage\TvRageSearchResult.cs" />
@@ -279,13 +279,12 @@
     <Compile Include="AutofacSignalrDependencyResolver.cs" />
     <Compile Include="MediaCover\MediaCoverService.cs" />
     <Compile Include="DecisionEngine\LanguageSpecification.cs" />
-    <Compile Include="Providers\DownloadClients\NzbgetProvider.cs" />
+    <Compile Include="Download\Clients\Nzbget\NzbgetProvider.cs" />
     <Compile Include="Providers\MediaInfoProvider.cs" />
     <Compile Include="DecisionEngine\AllowedReleaseGroupSpecification.cs" />
     <Compile Include="DecisionEngine\CustomStartDateSpecification.cs" />
-    <Compile Include="Providers\DownloadClients\PneumaticProvider.cs" />
+    <Compile Include="Download\Clients\PneumaticProvider.cs" />
     <Compile Include="Indexers\Nzbx.cs" />
-    <Compile Include="Providers\Hubs\EpisodeHub.cs" />
     <Compile Include="Indexers\NzbClub.cs" />
     <Compile Include="Indexers\NzbIndex.cs" />
     <Compile Include="Indexers\FileSharingTalk.cs" />
@@ -340,15 +339,9 @@
     <Compile Include="Providers\Converting\HandbrakeProvider.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Providers\Core\ArchiveProvider.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Configuration\ConfigService.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Providers\Core\UdpProvider.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="DecisionEngine\AcceptableSizeSpecification.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -382,13 +375,13 @@
     <Compile Include="Providers\DiskScanProvider.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Providers\DownloadClients\BlackholeProvider.cs">
+    <Compile Include="Download\Clients\BlackholeProvider.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Providers\DownloadClients\IDownloadClient.cs">
+    <Compile Include="Download\IDownloadClient.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Providers\DownloadClients\SabProvider.cs">
+    <Compile Include="Download\Clients\Sabnzbd\SabProvider.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Download\DownloadProvider.cs">
@@ -480,9 +473,6 @@
     <Compile Include="Tv\SeriesService.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Providers\SignalRProvider.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Providers\SmtpProvider.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -511,7 +501,7 @@
     <Compile Include="Model\EpisodeParseResult.cs" />
     <Compile Include="Model\EpisodeSortingType.cs" />
     <Compile Include="Model\EpisodeStatusType.cs" />
-    <Compile Include="Model\Sabnzbd\SabPriorityType.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabPriorityType.cs" />
     <Compile Include="Model\SeasonParseResult.cs" />
     <Compile Include="MediaFiles\EpisodeFile.cs" />
     <Compile Include="Model\Notification\ProgressNotificationStatus.cs" />
diff --git a/NzbDrone.Core/Providers/AutoConfigureProvider.cs b/NzbDrone.Core/Providers/AutoConfigureProvider.cs
index 000360a0b..e431f6fa3 100644
--- a/NzbDrone.Core/Providers/AutoConfigureProvider.cs
+++ b/NzbDrone.Core/Providers/AutoConfigureProvider.cs
@@ -7,7 +7,7 @@ using System.Net.NetworkInformation;
 using System.Text.RegularExpressions;
 using NLog;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Model.Sabnzbd;
+using NzbDrone.Core.Download.Clients.Sabnzbd;
 
 namespace NzbDrone.Core.Providers
 {
diff --git a/NzbDrone.Core/Providers/Converting/AtomicParsleyProvider.cs b/NzbDrone.Core/Providers/Converting/AtomicParsleyProvider.cs
index 44f51c974..5da57687d 100644
--- a/NzbDrone.Core/Providers/Converting/AtomicParsleyProvider.cs
+++ b/NzbDrone.Core/Providers/Converting/AtomicParsleyProvider.cs
@@ -5,7 +5,6 @@ using NLog;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 
 namespace NzbDrone.Core.Providers.Converting
diff --git a/NzbDrone.Core/Providers/Converting/HandbrakeProvider.cs b/NzbDrone.Core/Providers/Converting/HandbrakeProvider.cs
index 1a70628b5..50278e521 100644
--- a/NzbDrone.Core/Providers/Converting/HandbrakeProvider.cs
+++ b/NzbDrone.Core/Providers/Converting/HandbrakeProvider.cs
@@ -5,7 +5,6 @@ using NLog;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Notification;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 
 namespace NzbDrone.Core.Providers.Converting
diff --git a/NzbDrone.Core/Providers/DiskScanProvider.cs b/NzbDrone.Core/Providers/DiskScanProvider.cs
index aba46e20a..5508e56b7 100644
--- a/NzbDrone.Core/Providers/DiskScanProvider.cs
+++ b/NzbDrone.Core/Providers/DiskScanProvider.cs
@@ -21,21 +21,18 @@ namespace NzbDrone.Core.Providers
         private readonly DiskProvider _diskProvider;
         private readonly IEpisodeService _episodeService;
         private readonly IMediaFileService _mediaFileService;
-        private readonly SignalRProvider _signalRProvider;
         private readonly IConfigService _configService;
         private readonly RecycleBinProvider _recycleBinProvider;
         private readonly MediaInfoProvider _mediaInfoProvider;
         private readonly ISeriesRepository _seriesRepository;
         private readonly IEventAggregator _eventAggregator;
 
-        public DiskScanProvider(DiskProvider diskProvider, IEpisodeService episodeService, IMediaFileService mediaFileService,
-                                SignalRProvider signalRProvider, IConfigService configService,
+        public DiskScanProvider(DiskProvider diskProvider, IEpisodeService episodeService, IMediaFileService mediaFileService, IConfigService configService,
                                 RecycleBinProvider recycleBinProvider, MediaInfoProvider mediaInfoProvider, ISeriesRepository seriesRepository, IEventAggregator eventAggregator)
         {
             _diskProvider = diskProvider;
             _episodeService = episodeService;
             _mediaFileService = mediaFileService;
-            _signalRProvider = signalRProvider;
             _configService = configService;
             _recycleBinProvider = recycleBinProvider;
             _mediaInfoProvider = mediaInfoProvider;
@@ -168,7 +165,7 @@ namespace NzbDrone.Core.Providers
 
             //Todo: We shouldn't actually import the file until we confirm its the only one we want.
             //Todo: Separate episodeFile creation from importing (pass file to import to import)
-             _mediaFileService.Add(episodeFile);
+            _mediaFileService.Add(episodeFile);
 
             //Link file to all episodes
             foreach (var ep in episodes)
@@ -233,9 +230,6 @@ namespace NzbDrone.Core.Providers
             if (newDownload)
             {
                 _eventAggregator.Publish(new EpisodeDownloadedEvent(parseResult));
-
-                foreach (var episode in episodes)
-                    _signalRProvider.UpdateEpisodeStatus(episode.Id, EpisodeStatusType.Ready, parseResult.Quality);
             }
 
             return episodeFile;
diff --git a/NzbDrone.Core/Providers/Hubs/EpisodeHub.cs b/NzbDrone.Core/Providers/Hubs/EpisodeHub.cs
deleted file mode 100644
index 7777d53c5..000000000
--- a/NzbDrone.Core/Providers/Hubs/EpisodeHub.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using SignalR.Hubs;
-
-namespace NzbDrone.Core.Providers.Hubs
-{
-    public class EpisodeHub : Hub
-    {
-    }
-}
diff --git a/NzbDrone.Core/Providers/RecycleBinProvider.cs b/NzbDrone.Core/Providers/RecycleBinProvider.cs
index 2798365b0..854e493c2 100644
--- a/NzbDrone.Core/Providers/RecycleBinProvider.cs
+++ b/NzbDrone.Core/Providers/RecycleBinProvider.cs
@@ -6,7 +6,6 @@ using System.Text;
 using NLog;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Providers
 {
diff --git a/NzbDrone.Core/Providers/SignalRProvider.cs b/NzbDrone.Core/Providers/SignalRProvider.cs
deleted file mode 100644
index bc2ae2d1f..000000000
--- a/NzbDrone.Core/Providers/SignalRProvider.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Linq;
-using NLog;
-using NzbDrone.Common.Eventing;
-using NzbDrone.Core.Download;
-using NzbDrone.Core.Tv;
-using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Hubs;
-using SignalR;
-
-namespace NzbDrone.Core.Providers
-{
-    public class SignalRProvider : IHandle<EpisodeGrabbedEvent>
-    {
-        private static readonly Logger logger = LogManager.GetCurrentClassLogger();
-
-        public virtual void UpdateEpisodeStatus(int episodeId, EpisodeStatusType episodeStatus, QualityModel quality)
-        {
-            try
-            {
-                logger.Trace("Sending Status update to client. EpisodeId: {0}, Status: {1}", episodeId, episodeStatus);
-
-                var context = GlobalHost.ConnectionManager.GetHubContext<EpisodeHub>();
-                context.Clients.updatedStatus(new
-                                               {
-                                                   EpisodeId = episodeId,
-                                                   EpisodeStatus = episodeStatus.ToString(),
-                                                   Quality = (quality == null ? String.Empty : quality.Quality.ToString())
-                                               });
-            }
-            catch (Exception ex)
-            {
-                logger.TraceException("Error", ex);
-                throw;
-            }
-        }
-
-        public void Handle(EpisodeGrabbedEvent message)
-        {
-            foreach (var episode in message.ParseResult.Episodes)
-            {
-                UpdateEpisodeStatus(episode.Id, EpisodeStatusType.Downloading, message.ParseResult.Quality);
-            }
-        }
-    }
-}
diff --git a/NzbDrone.Core/Providers/TwitterProvider.cs b/NzbDrone.Core/Providers/TwitterProvider.cs
index 81c920e34..7a8b2eb48 100644
--- a/NzbDrone.Core/Providers/TwitterProvider.cs
+++ b/NzbDrone.Core/Providers/TwitterProvider.cs
@@ -6,7 +6,6 @@ using NLog;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Twitter;
-using NzbDrone.Core.Providers.Core;
 using Twitterizer;
 
 namespace NzbDrone.Core.Providers
diff --git a/NzbDrone.Core/Providers/UpdateProvider.cs b/NzbDrone.Core/Providers/UpdateProvider.cs
index 3996c2ede..bf820937c 100644
--- a/NzbDrone.Core/Providers/UpdateProvider.cs
+++ b/NzbDrone.Core/Providers/UpdateProvider.cs
@@ -9,7 +9,6 @@ using NLog;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 
 namespace NzbDrone.Core.Providers
diff --git a/NzbDrone.Core/Providers/Xbmc/EventClientProvider.cs b/NzbDrone.Core/Providers/Xbmc/EventClientProvider.cs
index b32f22563..0e64424cd 100644
--- a/NzbDrone.Core/Providers/Xbmc/EventClientProvider.cs
+++ b/NzbDrone.Core/Providers/Xbmc/EventClientProvider.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using NzbDrone.Core.Providers.Core;
+using NzbDrone.Common;
 using NzbDrone.Core.Model.Xbmc;
 
 namespace NzbDrone.Core.Providers.Xbmc
diff --git a/NzbDrone.Core/Providers/XbmcProvider.cs b/NzbDrone.Core/Providers/XbmcProvider.cs
index bb624ffc5..b1c1b7648 100644
--- a/NzbDrone.Core/Providers/XbmcProvider.cs
+++ b/NzbDrone.Core/Providers/XbmcProvider.cs
@@ -11,7 +11,6 @@ using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Xbmc;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Providers.Xbmc;
 using NzbDrone.Core.Repository;