diff --git a/NzbDrone.Core.Test/CentralDispatchFixture.cs b/NzbDrone.Core.Test/CentralDispatchFixture.cs
index d4f6bdf8a5..e89b69627b 100644
--- a/NzbDrone.Core.Test/CentralDispatchFixture.cs
+++ b/NzbDrone.Core.Test/CentralDispatchFixture.cs
@@ -7,7 +7,6 @@
 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 24e9cc275c..a61c84f735 100644
--- a/NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs
+++ b/NzbDrone.Core.Test/JobTests/AppUpdateJobFixture.cs
@@ -10,7 +10,6 @@
 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 3d47b87ecd..8b3e46b46d 100644
--- a/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs
@@ -7,7 +7,6 @@
 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 9a5b14d54c..1efa075c5b 100644
--- a/NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs
@@ -9,7 +9,6 @@
 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 3b16c2872d..0ff6e4b7a5 100644
--- a/NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs
@@ -9,7 +9,6 @@
 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 1df8f42afd..ba6446f77d 100644
--- a/NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs
@@ -9,7 +9,6 @@
 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 f1414e2bfd..e9793c0217 100644
--- a/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs
@@ -8,7 +8,6 @@
 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 9e1f3763bf..6dd2dbf883 100644
--- a/NzbDrone.Core.Test/JobTests/SearchJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/SearchJobTest.cs
@@ -4,7 +4,6 @@
 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 b82d24bc59..e1b83f75d2 100644
--- a/NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs
@@ -7,7 +7,6 @@
 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 bed82a8599..4cfa03d4bd 100644
--- a/NzbDrone.Core.Test/JobTests/SeriesSearchJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/SeriesSearchJobTest.cs
@@ -5,7 +5,6 @@
 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 5c55fc2c92..1b0d103f84 100644
--- a/NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs
@@ -8,7 +8,6 @@
 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 73c19a3819..b4f0bc7445 100644
--- a/NzbDrone.Core.Test/ProviderTests/JobProviderTests/TestJobs.cs
+++ b/NzbDrone.Core.Test/ProviderTests/JobProviderTests/TestJobs.cs
@@ -3,7 +3,6 @@
 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 cdc5eb5749..4035fb7d51 100644
--- a/NzbDrone.Core.Test/SortHelperTest.cs
+++ b/NzbDrone.Core.Test/SortHelperTest.cs
@@ -9,7 +9,6 @@
 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 5e630f9598..ffc289e01d 100644
--- a/NzbDrone.Core/CentralDispatch.cs
+++ b/NzbDrone.Core/CentralDispatch.cs
@@ -11,7 +11,6 @@
 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 201f71500d..732f358f84 100644
--- a/NzbDrone.Core/Jobs/AppUpdateJob.cs
+++ b/NzbDrone.Core/Jobs/AppUpdateJob.cs
@@ -6,7 +6,6 @@
 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 7d3bb6686c..04989c524b 100644
--- a/NzbDrone.Core/Jobs/BacklogSearchJob.cs
+++ b/NzbDrone.Core/Jobs/BacklogSearchJob.cs
@@ -3,7 +3,6 @@
 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 255ddf26e7..38edbf5bc3 100644
--- a/NzbDrone.Core/Jobs/BannerDownloadJob.cs
+++ b/NzbDrone.Core/Jobs/BannerDownloadJob.cs
@@ -7,7 +7,6 @@
 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 067b13cd5c..4fc94e0e7a 100644
--- a/NzbDrone.Core/Jobs/ConvertEpisodeJob.cs
+++ b/NzbDrone.Core/Jobs/ConvertEpisodeJob.cs
@@ -5,7 +5,6 @@
 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 aabccab8c2..eaa2915dc7 100644
--- a/NzbDrone.Core/Jobs/DeleteSeriesJob.cs
+++ b/NzbDrone.Core/Jobs/DeleteSeriesJob.cs
@@ -4,7 +4,6 @@
 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 8c7bac3132..fb1333ea51 100644
--- a/NzbDrone.Core/Jobs/DiskScanJob.cs
+++ b/NzbDrone.Core/Jobs/DiskScanJob.cs
@@ -6,7 +6,6 @@
 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 8fef479424..3e549fb630 100644
--- a/NzbDrone.Core/Jobs/EpisodeSearchJob.cs
+++ b/NzbDrone.Core/Jobs/EpisodeSearchJob.cs
@@ -3,7 +3,6 @@
 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 4e11c7da34..0a03430df8 100644
--- a/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs
+++ b/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs
@@ -6,7 +6,6 @@
 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 9239b3f02e..47144fe00b 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 6c62040593..0a4bfd91ad 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 26459fa930..6664e1a02d 100644
--- a/NzbDrone.Core/WebTimer.cs
+++ b/NzbDrone.Core/WebTimer.cs
@@ -3,7 +3,6 @@
 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 6296a40f8b..220ee88afd 100644
--- a/NzbDrone.Web/Controllers/AddSeriesController.cs
+++ b/NzbDrone.Web/Controllers/AddSeriesController.cs
@@ -8,7 +8,6 @@
 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 f65ff07450..5abff28c8c 100644
--- a/NzbDrone.Web/Controllers/CommandController.cs
+++ b/NzbDrone.Web/Controllers/CommandController.cs
@@ -7,7 +7,6 @@
 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 5e3d7bdd84..06038f3507 100644
--- a/NzbDrone.Web/Controllers/EpisodeController.cs
+++ b/NzbDrone.Web/Controllers/EpisodeController.cs
@@ -5,7 +5,6 @@
 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 5422fdabba..1c430a1caf 100644
--- a/NzbDrone.Web/Controllers/HistoryController.cs
+++ b/NzbDrone.Web/Controllers/HistoryController.cs
@@ -5,7 +5,6 @@
 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 fa7c1f49fa..4a461565aa 100644
--- a/NzbDrone.Web/Controllers/SeriesController.cs
+++ b/NzbDrone.Web/Controllers/SeriesController.cs
@@ -8,7 +8,6 @@
 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 8d00b11b2f..3b0c339f49 100644
--- a/NzbDrone.Web/Controllers/SharedController.cs
+++ b/NzbDrone.Web/Controllers/SharedController.cs
@@ -3,7 +3,6 @@
 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 4a1aeba0a8..99f2599031 100644
--- a/NzbDrone.Web/Controllers/SystemController.cs
+++ b/NzbDrone.Web/Controllers/SystemController.cs
@@ -8,7 +8,6 @@
 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 8644e185ef..b1c5bc2a19 100644
--- a/NzbDrone.Web/Controllers/UpdateController.cs
+++ b/NzbDrone.Web/Controllers/UpdateController.cs
@@ -5,7 +5,6 @@
 using NzbDrone.Common;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Jobs;
 using NzbDrone.Web.Models;
 
 namespace NzbDrone.Web.Controllers