more project clean up.

NzbDrone.Api/NancyBootstrapper.cs

@@ -13,7 +13,6 @@
 using NzbDrone.Core;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Lifecycle;
-using NzbDrone.Core.Providers.Core;
 using SignalR;
 
 namespace NzbDrone.Api

NzbDrone.Common/ArchiveProvider.cs

@@ -1,11 +1,8 @@
-using System;
+using System.Linq;
-using System.IO;
-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 @@ public virtual void ExtractArchive(string compressedFile, string destination)
         {
             logger.Trace("Extracting archive [{0}] to [{1}]", compressedFile, destination);
 
-            using (ZipFile zipFile = ZipFile.Read(compressedFile))
+            using (var zipFile = ZipFile.Read(compressedFile))
             {
                 zipFile.ExtractAll(destination);
             }

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" />

NzbDrone.Common/UdpProvider.cs

@@ -1,11 +1,10 @@
-using System;
+using System.Linq;
-using System.Collections.Generic;
+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
     {

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" />

NzbDrone.Core.Test/DecisionEngineTests/AllowedReleaseGroupSpecificationFixture.cs

@@ -12,7 +12,6 @@
 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;

NzbDrone.Core.Test/DecisionEngineTests/LanguageSpecificationFixture.cs

@@ -9,7 +9,6 @@
 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;

NzbDrone.Core.Test/DecisionEngineTests/RetentionSpecificationFixture.cs

@@ -10,7 +10,6 @@
 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;

NzbDrone.Core.Test/Framework/TestDbHelper.cs

@@ -7,7 +7,6 @@
 using Moq;
 using NzbDrone.Common;
 using NzbDrone.Core.Datastore;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 
 

NzbDrone.Core.Test/IndexerTests/IndexerFixture.cs

@@ -14,7 +14,6 @@
 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;

NzbDrone.Core.Test/IndexerTests/NzbxFixture.cs

@@ -13,7 +13,6 @@
 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;

NzbDrone.Core.Test/Indexers/IndexerServiceTest.cs

@@ -12,7 +12,6 @@
 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;
 

NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs

@@ -11,7 +11,6 @@
 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;
 

NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs

@@ -10,7 +10,6 @@
 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;

NzbDrone.Core.Test/JobTests/PostDownloadScanJobFixture.cs

@@ -11,7 +11,6 @@
 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;
 

NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs

@@ -12,7 +12,6 @@
 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;

NzbDrone.Core.Test/JobTests/RssSyncJobTest.cs

@@ -7,7 +7,6 @@
 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;
 

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;
 

NzbDrone.Core.Test/ProviderTests/DiskProviderTests/FreeDiskSpaceTest.cs

@@ -8,7 +8,6 @@
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common.AutoMoq;
 

NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpDropFolderFixture.cs

@@ -13,7 +13,6 @@
 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;

NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpFixture.cs

@@ -13,7 +13,6 @@
 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;

NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/GetVideoFilesFixture.cs

@@ -10,7 +10,6 @@
 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;

NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs

@@ -11,7 +11,6 @@
 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;

NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/MoveEpisodeFileFixture.cs

@@ -15,7 +15,6 @@
 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;

NzbDrone.Core.Test/ProviderTests/DownloadClientTests/BlackholeProviderFixture.cs

@@ -9,8 +9,7 @@
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Providers.Core;
+using NzbDrone.Core.Download.Clients;
-using NzbDrone.Core.Providers.DownloadClients;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
 

NzbDrone.Core.Test/ProviderTests/DownloadClientTests/NzbgetProviderTests/DownloadNzbFixture.cs

@@ -8,9 +8,8 @@
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Model.Nzbget;
+using NzbDrone.Core.Download.Clients;
-using NzbDrone.Core.Providers.Core;
+using NzbDrone.Core.Download.Clients.Nzbget;
-using NzbDrone.Core.Providers.DownloadClients;
 using NzbDrone.Test.Common;
 
 namespace NzbDrone.Core.Test.ProviderTests.DownloadClientTests.NzbgetProviderTests

NzbDrone.Core.Test/ProviderTests/DownloadClientTests/NzbgetProviderTests/QueueFixture.cs

@@ -8,9 +8,8 @@
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Model.Nzbget;
+using NzbDrone.Core.Download.Clients;
-using NzbDrone.Core.Providers.Core;
+using NzbDrone.Core.Download.Clients.Nzbget;
-using NzbDrone.Core.Providers.DownloadClients;
 using NzbDrone.Test.Common;
 
 namespace NzbDrone.Core.Test.ProviderTests.DownloadClientTests.NzbgetProviderTests

NzbDrone.Core.Test/ProviderTests/DownloadClientTests/PneumaticProviderFixture.cs

@@ -9,8 +9,7 @@
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Providers.Core;
+using NzbDrone.Core.Download.Clients;
-using NzbDrone.Core.Providers.DownloadClients;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
 

NzbDrone.Core.Test/ProviderTests/DownloadClientTests/SabProviderTests/QueueFixture.cs

@@ -9,12 +9,11 @@
 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.Download.Clients.Sabnzbd;
-using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Providers.DownloadClients;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;

NzbDrone.Core.Test/ProviderTests/DownloadClientTests/SabProviderTests/SabProviderFixture.cs

@@ -11,10 +11,9 @@
 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.Download.Clients.Sabnzbd;
-using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Providers.DownloadClients;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;

NzbDrone.Core.Test/ProviderTests/DownloadProviderTests/DownloadProviderFixture.cs

@@ -7,10 +7,11 @@
 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

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;

NzbDrone.Core.Test/ProviderTests/PlexProviderTest.cs

@@ -14,7 +14,6 @@
 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;

NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/CleanupFixture.cs

@@ -13,7 +13,6 @@
 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;

NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteDirectoryFixture.cs

@@ -13,7 +13,6 @@
 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;

NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteFileFixture.cs

@@ -13,7 +13,6 @@
 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;

NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/EmptyFixture.cs

@@ -13,7 +13,6 @@
 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;

NzbDrone.Core.Test/ProviderTests/UpdateProviderTests/GetAvilableUpdateFixture.cs

@@ -6,7 +6,6 @@
 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;
 

NzbDrone.Core.Test/ProviderTests/XbmcProviderTest.cs

@@ -11,7 +11,6 @@
 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;

NzbDrone.Core/Configuration/ConfigService.cs

@@ -3,8 +3,8 @@
 using System.Linq;
 using NLog;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Model.Nzbget;
+using NzbDrone.Core.Download.Clients.Nzbget;
-using NzbDrone.Core.Model.Sabnzbd;
+using NzbDrone.Core.Download.Clients.Sabnzbd;
 using NzbDrone.Core.Providers;
 
 namespace NzbDrone.Core.Configuration

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.Download.Clients.Nzbget;
-using NzbDrone.Core.Model.Sabnzbd;
+using NzbDrone.Core.Download.Clients.Sabnzbd;
 
 namespace NzbDrone.Core.Configuration
 {

NzbDrone.Core/DecisionEngine/AllowedReleaseGroupSpecification.cs

@@ -3,7 +3,6 @@
 using NLog;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.DecisionEngine
 {

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
 {

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
 {

NzbDrone.Core/Download/Clients/BlackholeProvider.cs

@@ -7,10 +7,9 @@
 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 @@ public class BlackholeProvider : IDownloadClient
         private readonly HttpProvider _httpProvider;
         private readonly DiskProvider _diskProvider;
         private readonly UpgradeHistorySpecification _upgradeHistorySpecification;
-        private readonly HistoryService _historyService;
 
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
 

NzbDrone.Core/Download/Clients/Nzbget/EnqueueResponse.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace NzbDrone.Core.Model.Nzbget
+namespace NzbDrone.Core.Download.Clients.Nzbget
 {
     public class EnqueueResponse
     {

NzbDrone.Core/Download/Clients/Nzbget/ErrorModel.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace NzbDrone.Core.Model.Nzbget
+namespace NzbDrone.Core.Download.Clients.Nzbget
 {
     public class ErrorModel
     {

NzbDrone.Core/Download/Clients/Nzbget/JsonError.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace NzbDrone.Core.Model.Nzbget
+namespace NzbDrone.Core.Download.Clients.Nzbget
 {
     public class JsonError
     {

NzbDrone.Core/Download/Clients/Nzbget/JsonRequest.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using Newtonsoft.Json;
 
-namespace NzbDrone.Core.Model.Nzbget
+namespace NzbDrone.Core.Download.Clients.Nzbget
 {
     public class JsonRequest
     {

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
     {

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
     {

NzbDrone.Core/Download/Clients/Nzbget/Queue.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using Newtonsoft.Json;
 
-namespace NzbDrone.Core.Model.Nzbget
+namespace NzbDrone.Core.Download.Clients.Nzbget
 {
     public class Queue
     {

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
     {

NzbDrone.Core/Download/Clients/Nzbget/VersionModel.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace NzbDrone.Core.Model.Nzbget
+namespace NzbDrone.Core.Download.Clients.Nzbget
 {
     public class VersionModel
     {

NzbDrone.Core/Download/Clients/PneumaticProvider.cs

@@ -6,10 +6,9 @@
 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
     {

NzbDrone.Core/Download/Clients/Sabnzbd/SabAddResponse.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using Newtonsoft.Json;
 
-namespace NzbDrone.Core.Model.Sabnzbd
+namespace NzbDrone.Core.Download.Clients.Sabnzbd
 {
     public class SabAddResponse
     {

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
     {

NzbDrone.Core/Download/Clients/Sabnzbd/SabHistory.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using Newtonsoft.Json;
 
-namespace NzbDrone.Core.Model.Sabnzbd
+namespace NzbDrone.Core.Download.Clients.Sabnzbd
 {
     public class SabHistory
     {

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
     {

NzbDrone.Core/Download/Clients/Sabnzbd/SabJsonError.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using Newtonsoft.Json;
 
-namespace NzbDrone.Core.Model.Sabnzbd
+namespace NzbDrone.Core.Download.Clients.Sabnzbd
 {
     public class SabJsonError
     {

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
     {

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
     {

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 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
     {

NzbDrone.Core/Download/Clients/Sabnzbd/SabQueue.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using Newtonsoft.Json;
 
-namespace NzbDrone.Core.Model.Sabnzbd
+namespace NzbDrone.Core.Download.Clients.Sabnzbd
 {
     public class SabQueue
     {

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
     {

NzbDrone.Core/Download/Clients/Sabnzbd/SabVersionModel.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace NzbDrone.Core.Model.Sabnzbd
+namespace NzbDrone.Core.Download.Clients.Sabnzbd
 {
     public class SabVersionModel
     {

NzbDrone.Core/Download/DownloadProvider.cs

@@ -3,8 +3,10 @@
 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
 {

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
     {

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
 {

NzbDrone.Core/Indexers/FileSharingTalk.cs

@@ -5,7 +5,6 @@
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Indexers
 {

NzbDrone.Core/Indexers/IndexerBase.cs

@@ -8,7 +8,6 @@
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Indexers
 {

NzbDrone.Core/Indexers/Newznab.cs

@@ -7,7 +7,6 @@
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Indexers
 {

NzbDrone.Core/Indexers/NzbClub.cs

@@ -6,7 +6,6 @@
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Indexers
 {

NzbDrone.Core/Indexers/NzbIndex.cs

@@ -6,7 +6,6 @@
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Indexers
 {

NzbDrone.Core/Indexers/NzbsRUs.cs

@@ -6,7 +6,6 @@
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Indexers
 {

NzbDrone.Core/Indexers/Nzbx.cs

@@ -8,7 +8,6 @@
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Nzbx;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Indexers
 {

NzbDrone.Core/Indexers/Omgwtfnzbs.cs

@@ -6,7 +6,6 @@
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Indexers
 {

NzbDrone.Core/Indexers/Wombles.cs

@@ -5,7 +5,6 @@
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Indexers
 {

NzbDrone.Core/Jobs/DiskScanJob.cs

@@ -8,7 +8,6 @@
 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

NzbDrone.Core/Jobs/PastWeekBacklogSearchJob.cs

@@ -8,7 +8,6 @@
 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

NzbDrone.Core/Jobs/PostDownloadScanJob.cs

@@ -6,7 +6,6 @@
 using NzbDrone.Core.Jobs.Framework;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Jobs
 {

NzbDrone.Core/Jobs/RecentBacklogSearchJob.cs

@@ -8,7 +8,6 @@
 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

NzbDrone.Core/Jobs/RssSyncJob.cs

@@ -10,7 +10,6 @@
 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

NzbDrone.Core/Jobs/UpdateInfoJob.cs

@@ -10,7 +10,6 @@
 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

NzbDrone.Core/Lifecycle/AppUpdateJob.cs

@@ -8,7 +8,6 @@
 using NzbDrone.Core.Jobs.Framework;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Lifecycle
 {

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="Download\Clients\Nzbget\EnqueueResponse.cs" />
-    <Compile Include="Model\Nzbget\ErrorModel.cs" />
+    <Compile Include="Download\Clients\Nzbget\ErrorModel.cs" />
-    <Compile Include="Model\Nzbget\JsonError.cs" />
+    <Compile Include="Download\Clients\Nzbget\JsonError.cs" />
-    <Compile Include="Model\Nzbget\JsonRequest.cs" />
+    <Compile Include="Download\Clients\Nzbget\JsonRequest.cs" />
-    <Compile Include="Model\Nzbget\Queue.cs" />
+    <Compile Include="Download\Clients\Nzbget\Queue.cs" />
-    <Compile Include="Model\Nzbget\QueueItem.cs" />
+    <Compile Include="Download\Clients\Nzbget\QueueItem.cs" />
-    <Compile Include="Model\Nzbget\PriorityType.cs" />
+    <Compile Include="Download\Clients\Nzbget\PriorityType.cs" />
-    <Compile Include="Model\Nzbget\VersionModel.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="Download\Clients\Sabnzbd\SabAddResponse.cs" />
-    <Compile Include="Model\Sabnzbd\SabHistoryItem.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabHistoryItem.cs" />
-    <Compile Include="Model\Sabnzbd\SabHistory.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabHistory.cs" />
-    <Compile Include="Model\Sabnzbd\SabJsonError.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabJsonError.cs" />
-    <Compile Include="Model\Sabnzbd\SabQueue.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabQueue.cs" />
-    <Compile Include="Model\Sabnzbd\SabCategoryModel.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabCategoryModel.cs" />
-    <Compile Include="Model\Sabnzbd\SabModel.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabModel.cs" />
-    <Compile Include="Model\Sabnzbd\SabQueueItem.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabQueueItem.cs" />
-    <Compile Include="Model\Sabnzbd\SabVersionModel.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" />

NzbDrone.Core/Providers/AutoConfigureProvider.cs

@@ -7,7 +7,7 @@
 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
 {

NzbDrone.Core/Providers/Converting/AtomicParsleyProvider.cs

@@ -5,7 +5,6 @@
 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

NzbDrone.Core/Providers/Converting/HandbrakeProvider.cs

@@ -5,7 +5,6 @@
 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

NzbDrone.Core/Providers/DiskScanProvider.cs

@@ -21,21 +21,18 @@ public class DiskScanProvider
         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,
+        public DiskScanProvider(DiskProvider diskProvider, IEpisodeService episodeService, IMediaFileService mediaFileService, IConfigService configService,
-                                SignalRProvider signalRProvider, 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 @@ public virtual EpisodeFile ImportFile(Series series, string filePath)
 
             //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 @@ public virtual EpisodeFile MoveEpisodeFile(EpisodeFile episodeFile, bool newDown
             if (newDownload)
             {
                 _eventAggregator.Publish(new EpisodeDownloadedEvent(parseResult));
-
-                foreach (var episode in episodes)
-                    _signalRProvider.UpdateEpisodeStatus(episode.Id, EpisodeStatusType.Ready, parseResult.Quality);
             }
 
             return episodeFile;

NzbDrone.Core/Providers/Hubs/EpisodeHub.cs

@@ -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
-    {
-    }
-}

NzbDrone.Core/Providers/RecycleBinProvider.cs

@@ -6,7 +6,6 @@
 using NLog;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Providers.Core;
 
 namespace NzbDrone.Core.Providers
 {

NzbDrone.Core/Providers/SignalRProvider.cs

@@ -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);
-            }
-        }
-    }
-}

NzbDrone.Core/Providers/TwitterProvider.cs

@@ -6,7 +6,6 @@
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Twitter;
-using NzbDrone.Core.Providers.Core;
 using Twitterizer;
 
 namespace NzbDrone.Core.Providers

NzbDrone.Core/Providers/UpdateProvider.cs

@@ -9,7 +9,6 @@
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 
 
 namespace NzbDrone.Core.Providers

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

NzbDrone.Core/Providers/XbmcProvider.cs

@@ -11,7 +11,6 @@
 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;