diff --git a/NzbDrone.Core.Test/CentralDispatchFixture.cs b/NzbDrone.Core.Test/CentralDispatchFixture.cs
index d4f6bdf8a..e89b69627 100644
--- a/NzbDrone.Core.Test/CentralDispatchFixture.cs
+++ b/NzbDrone.Core.Test/CentralDispatchFixture.cs
@@ -7,7 +7,6 @@ using NUnit.Framework;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Indexer;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Test.Framework;
 using Ninject;
 
diff --git a/NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs b/NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs
index 24e9cc275..a61c84f73 100644
--- a/NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs
+++ b/NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs
@@ -10,7 +10,6 @@ using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Test.Framework;
 
 namespace NzbDrone.Core.Test.JobTests
diff --git a/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs b/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs
index 3d47b87ec..8b3e46b46 100644
--- a/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs
@@ -7,7 +7,6 @@ using NUnit.Framework;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Repository;
 using NzbDrone.Test.Common.AutoMoq;
 
diff --git a/NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs b/NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs
index 9a5b14d54..1efa075c5 100644
--- a/NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs
@@ -9,7 +9,6 @@ using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 
diff --git a/NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs b/NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs
index 3b16c2872..0ff6e4b7a 100644
--- a/NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs
@@ -9,7 +9,6 @@ using NUnit.Framework;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
diff --git a/NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs b/NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs
index 1df8f42af..ba6446f77 100644
--- a/NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs
@@ -9,7 +9,6 @@ using NUnit.Framework;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Repository;
 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 f1414e2bf..e9793c021 100644
--- a/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs
@@ -8,7 +8,6 @@ using NUnit.Framework;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common.AutoMoq;
diff --git a/NzbDrone.Core.Test/JobTests/SearchJobTest.cs b/NzbDrone.Core.Test/JobTests/SearchJobTest.cs
index 9e1f3763b..6dd2dbf88 100644
--- a/NzbDrone.Core.Test/JobTests/SearchJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/SearchJobTest.cs
@@ -4,7 +4,6 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Test.Common.AutoMoq;
 
 namespace NzbDrone.Core.Test.JobTests
diff --git a/NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs b/NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs
index b82d24bc5..e1b83f75d 100644
--- a/NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs
@@ -7,7 +7,6 @@ using NUnit.Framework;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common.AutoMoq;
diff --git a/NzbDrone.Core.Test/JobTests/SeriesSearchJobTest.cs b/NzbDrone.Core.Test/JobTests/SeriesSearchJobTest.cs
index bed82a859..4cfa03d4b 100644
--- a/NzbDrone.Core.Test/JobTests/SeriesSearchJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/SeriesSearchJobTest.cs
@@ -5,7 +5,6 @@ using NUnit.Framework;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common.AutoMoq;
 
diff --git a/NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs b/NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs
index 5c55fc2c9..1b0d103f8 100644
--- a/NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs
@@ -8,7 +8,6 @@ using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
 using NzbDrone.Test.Common.AutoMoq;
diff --git a/NzbDrone.Core.Test/ProviderTests/JobProviderTests/TestJobs.cs b/NzbDrone.Core.Test/ProviderTests/JobProviderTests/TestJobs.cs
index 73c19a381..b4f0bc744 100644
--- a/NzbDrone.Core.Test/ProviderTests/JobProviderTests/TestJobs.cs
+++ b/NzbDrone.Core.Test/ProviderTests/JobProviderTests/TestJobs.cs
@@ -3,7 +3,6 @@ using System.Linq;
 using System.Threading;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
-using NzbDrone.Core.Providers.Jobs;
 
 namespace NzbDrone.Core.Test.ProviderTests.JobProviderTests
 {
diff --git a/NzbDrone.Core.Test/SortHelperTest.cs b/NzbDrone.Core.Test/SortHelperTest.cs
index cdc5eb574..4035fb7d5 100644
--- a/NzbDrone.Core.Test/SortHelperTest.cs
+++ b/NzbDrone.Core.Test/SortHelperTest.cs
@@ -9,7 +9,6 @@ using NUnit.Framework;
 using NzbDrone.Core.Helpers;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 
diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs
index 5e630f959..ffc289e01 100644
--- a/NzbDrone.Core/CentralDispatch.cs
+++ b/NzbDrone.Core/CentralDispatch.cs
@@ -11,7 +11,6 @@ using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.ExternalNotification;
 using NzbDrone.Core.Providers.Indexer;
-using NzbDrone.Core.Providers.Jobs;
 using PetaPoco;
 
 namespace NzbDrone.Core
diff --git a/NzbDrone.Core/Jobs/AppUpdateJob.cs b/NzbDrone.Core/Jobs/AppUpdateJob.cs
index 201f71500..732f358f8 100644
--- a/NzbDrone.Core/Jobs/AppUpdateJob.cs
+++ b/NzbDrone.Core/Jobs/AppUpdateJob.cs
@@ -6,7 +6,6 @@ using NzbDrone.Common;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Providers.Jobs;
 
 namespace NzbDrone.Core.Jobs
 {
diff --git a/NzbDrone.Core/Jobs/BacklogSearchJob.cs b/NzbDrone.Core/Jobs/BacklogSearchJob.cs
index 7d3bb6686..04989c524 100644
--- a/NzbDrone.Core/Jobs/BacklogSearchJob.cs
+++ b/NzbDrone.Core/Jobs/BacklogSearchJob.cs
@@ -3,7 +3,6 @@ using System.Linq;
 using NLog;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Repository;
 
 namespace NzbDrone.Core.Jobs
diff --git a/NzbDrone.Core/Jobs/BannerDownloadJob.cs b/NzbDrone.Core/Jobs/BannerDownloadJob.cs
index 255ddf26e..38edbf5bc 100644
--- a/NzbDrone.Core/Jobs/BannerDownloadJob.cs
+++ b/NzbDrone.Core/Jobs/BannerDownloadJob.cs
@@ -7,7 +7,6 @@ using NzbDrone.Common;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Repository;
 
 namespace NzbDrone.Core.Jobs
diff --git a/NzbDrone.Core/Jobs/ConvertEpisodeJob.cs b/NzbDrone.Core/Jobs/ConvertEpisodeJob.cs
index 067b13cd5..4fc94e0e7 100644
--- a/NzbDrone.Core/Jobs/ConvertEpisodeJob.cs
+++ b/NzbDrone.Core/Jobs/ConvertEpisodeJob.cs
@@ -5,7 +5,6 @@ using NLog;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Converting;
-using NzbDrone.Core.Providers.Jobs;
 
 namespace NzbDrone.Core.Jobs
 {
diff --git a/NzbDrone.Core/Jobs/DeleteSeriesJob.cs b/NzbDrone.Core/Jobs/DeleteSeriesJob.cs
index aabccab8c..eaa2915dc 100644
--- a/NzbDrone.Core/Jobs/DeleteSeriesJob.cs
+++ b/NzbDrone.Core/Jobs/DeleteSeriesJob.cs
@@ -4,7 +4,6 @@ using Ninject;
 using NLog;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Jobs;
 
 namespace NzbDrone.Core.Jobs
 {
diff --git a/NzbDrone.Core/Jobs/DiskScanJob.cs b/NzbDrone.Core/Jobs/DiskScanJob.cs
index 8c7bac313..fb1333ea5 100644
--- a/NzbDrone.Core/Jobs/DiskScanJob.cs
+++ b/NzbDrone.Core/Jobs/DiskScanJob.cs
@@ -6,7 +6,6 @@ using NLog;
 using NzbDrone.Core.Helpers;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Repository;
 
 namespace NzbDrone.Core.Jobs
diff --git a/NzbDrone.Core/Jobs/EpisodeSearchJob.cs b/NzbDrone.Core/Jobs/EpisodeSearchJob.cs
index 8fef47942..3e549fb63 100644
--- a/NzbDrone.Core/Jobs/EpisodeSearchJob.cs
+++ b/NzbDrone.Core/Jobs/EpisodeSearchJob.cs
@@ -3,7 +3,6 @@ using System;
 using Ninject;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Jobs;
 
 namespace NzbDrone.Core.Jobs
 {
diff --git a/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs b/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs
index 4e11c7da3..0a03430df 100644
--- a/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs
+++ b/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs
@@ -6,7 +6,6 @@ using Ninject;
 using NLog;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Jobs;
 
 namespace NzbDrone.Core.Jobs
 {
diff --git a/NzbDrone.Core/Providers/Jobs/RenameSeriesJob.cs b/NzbDrone.Core/Jobs/RenameSeriesJob.cs
similarity index 95%
rename from NzbDrone.Core/Providers/Jobs/RenameSeriesJob.cs
rename to NzbDrone.Core/Jobs/RenameSeriesJob.cs
index 9239b3f02..47144fe00 100644
--- a/NzbDrone.Core/Providers/Jobs/RenameSeriesJob.cs
+++ b/NzbDrone.Core/Jobs/RenameSeriesJob.cs
@@ -1,10 +1,11 @@
+using System.Linq;
 using System;
 using NLog;
 using Ninject;
-using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
+using NzbDrone.Core.Providers;
 
-namespace NzbDrone.Core.Providers.Jobs
+namespace NzbDrone.Core.Jobs
 {
     public class RenameSeriesJob : IJob
     {
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index 6c6204059..0a4bfd91a 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -242,7 +242,7 @@
     <Compile Include="Jobs\TrimLogsJob.cs" />
     <Compile Include="Jobs\JobProvider.cs" />
     <Compile Include="Jobs\RenameSeasonJob.cs" />
-    <Compile Include="Providers\Jobs\RenameSeriesJob.cs" />
+    <Compile Include="Jobs\RenameSeriesJob.cs" />
     <Compile Include="Providers\NewznzbProvider.cs" />
     <Compile Include="Providers\ExternalNotification\Prowl.cs" />
     <Compile Include="Jobs\AppUpdateJob.cs" />
@@ -383,7 +383,9 @@
     <Content Include="NzbDrone.ico" />
     <Content Include="license.txt" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Providers\Jobs\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
diff --git a/NzbDrone.Core/WebTimer.cs b/NzbDrone.Core/WebTimer.cs
index 26459fa93..6664e1a02 100644
--- a/NzbDrone.Core/WebTimer.cs
+++ b/NzbDrone.Core/WebTimer.cs
@@ -3,7 +3,6 @@ using System.Web;
 using System.Web.Caching;
 using NLog;
 using NzbDrone.Core.Jobs;
-using NzbDrone.Core.Providers.Jobs;
 
 namespace NzbDrone.Core
 {
diff --git a/NzbDrone.Web/Controllers/AddSeriesController.cs b/NzbDrone.Web/Controllers/AddSeriesController.cs
index 6296a40f8..220ee88af 100644
--- a/NzbDrone.Web/Controllers/AddSeriesController.cs
+++ b/NzbDrone.Web/Controllers/AddSeriesController.cs
@@ -8,7 +8,6 @@ using NzbDrone.Common;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Repository;
 using NzbDrone.Web.Models;
 
diff --git a/NzbDrone.Web/Controllers/CommandController.cs b/NzbDrone.Web/Controllers/CommandController.cs
index f65ff0745..5abff28c8 100644
--- a/NzbDrone.Web/Controllers/CommandController.cs
+++ b/NzbDrone.Web/Controllers/CommandController.cs
@@ -7,7 +7,6 @@ using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Twitter;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Web.Models;
 
 namespace NzbDrone.Web.Controllers
diff --git a/NzbDrone.Web/Controllers/EpisodeController.cs b/NzbDrone.Web/Controllers/EpisodeController.cs
index 5e3d7bdd8..06038f350 100644
--- a/NzbDrone.Web/Controllers/EpisodeController.cs
+++ b/NzbDrone.Web/Controllers/EpisodeController.cs
@@ -5,7 +5,6 @@ using System.Web.Mvc;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Web.Models;
 
 namespace NzbDrone.Web.Controllers
diff --git a/NzbDrone.Web/Controllers/HistoryController.cs b/NzbDrone.Web/Controllers/HistoryController.cs
index 5422fdabb..1c430a1ca 100644
--- a/NzbDrone.Web/Controllers/HistoryController.cs
+++ b/NzbDrone.Web/Controllers/HistoryController.cs
@@ -5,7 +5,6 @@ using System.Web.Mvc;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Web.Models;
 using Telerik.Web.Mvc;
 
diff --git a/NzbDrone.Web/Controllers/SeriesController.cs b/NzbDrone.Web/Controllers/SeriesController.cs
index fa7c1f49f..4a461565a 100644
--- a/NzbDrone.Web/Controllers/SeriesController.cs
+++ b/NzbDrone.Web/Controllers/SeriesController.cs
@@ -8,7 +8,6 @@ using NzbDrone.Core;
 using NzbDrone.Core.Helpers;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Core.Repository;
 using NzbDrone.Web.Models;
 using Telerik.Web.Mvc;
diff --git a/NzbDrone.Web/Controllers/SharedController.cs b/NzbDrone.Web/Controllers/SharedController.cs
index 8d00b11b2..3b0c339f4 100644
--- a/NzbDrone.Web/Controllers/SharedController.cs
+++ b/NzbDrone.Web/Controllers/SharedController.cs
@@ -3,7 +3,6 @@ using System.Web.Mvc;
 using NzbDrone.Common;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Web.Models;
 
 namespace NzbDrone.Web.Controllers
diff --git a/NzbDrone.Web/Controllers/SystemController.cs b/NzbDrone.Web/Controllers/SystemController.cs
index 4a1aeba0a..99f259903 100644
--- a/NzbDrone.Web/Controllers/SystemController.cs
+++ b/NzbDrone.Web/Controllers/SystemController.cs
@@ -8,7 +8,6 @@ using NzbDrone.Core.Helpers;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Web.Models;
 using Telerik.Web.Mvc;
 
diff --git a/NzbDrone.Web/Controllers/UpdateController.cs b/NzbDrone.Web/Controllers/UpdateController.cs
index 8644e185e..b1c5bc2a1 100644
--- a/NzbDrone.Web/Controllers/UpdateController.cs
+++ b/NzbDrone.Web/Controllers/UpdateController.cs
@@ -5,7 +5,6 @@ using System.Web.Mvc;
 using NzbDrone.Common;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Web.Models;
 
 namespace NzbDrone.Web.Controllers