diff --git a/NzbDrone.Api/AutomapperBootstraper.cs b/NzbDrone.Api/AutomapperBootstraper.cs
index 17bff19ad..52d5ce4f1 100644
--- a/NzbDrone.Api/AutomapperBootstraper.cs
+++ b/NzbDrone.Api/AutomapperBootstraper.cs
@@ -35,7 +35,7 @@ public static void InitializeAutomapper()
                   .ForMember(dest => dest.QualityTypeId, opt => opt.MapFrom(src => src.Id));
 
             //Series
-            Mapper.CreateMap<Core.Repository.Series, SeriesResource>()
+            Mapper.CreateMap<Core.Episodes.Series, SeriesResource>()
                   .ForMember(dest => dest.Id, opt => opt.MapFrom(src => src.SeriesId))
                   .ForMember(dest => dest.CustomStartDate, opt => opt.ResolveUsing<NullableDatetimeToString>().FromMember(src => src.CustomStartDate))
                   .ForMember(dest => dest.BacklogSetting, opt => opt.MapFrom(src => (Int32)src.BacklogSetting))
diff --git a/NzbDrone.Api/Resolvers/NextAiringResolver.cs b/NzbDrone.Api/Resolvers/NextAiringResolver.cs
index faf94bc13..4459f5b91 100644
--- a/NzbDrone.Api/Resolvers/NextAiringResolver.cs
+++ b/NzbDrone.Api/Resolvers/NextAiringResolver.cs
@@ -7,9 +7,9 @@
 
 namespace NzbDrone.Api.Resolvers
 {
-    public class NextAiringResolver : ValueResolver<Core.Repository.Series, DateTime?>
+    public class NextAiringResolver : ValueResolver<Core.Episodes.Series, DateTime?>
     {
-        protected override DateTime? ResolveCore(Core.Repository.Series source)
+        protected override DateTime? ResolveCore(Core.Episodes.Series source)
         {
             if(String.IsNullOrWhiteSpace(source.AirTime) || !source.NextAiring.HasValue)
                 return source.NextAiring;
diff --git a/NzbDrone.Api/Series/SeriesModule.cs b/NzbDrone.Api/Series/SeriesModule.cs
index 9b61b44aa..89b5da5fc 100644
--- a/NzbDrone.Api/Series/SeriesModule.cs
+++ b/NzbDrone.Api/Series/SeriesModule.cs
@@ -7,9 +7,9 @@
 using Nancy;
 using NzbDrone.Api.Extentions;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers;
 
 namespace NzbDrone.Api.Series
 {
@@ -34,7 +34,7 @@ public SeriesModule(SeriesProvider seriesProvider, JobController jobProvider)
         private Response AllSeries()
         {
             var series = _seriesProvider.GetAllSeriesWithEpisodeCount().ToList();
-            var seriesModels = Mapper.Map<List<Core.Repository.Series>, List<SeriesResource>>(series);
+            var seriesModels = Mapper.Map<List<Core.Tv.Series>, List<SeriesResource>>(series);
 
             return seriesModels.AsResponse();
         }
@@ -42,14 +42,14 @@ private Response AllSeries()
         private Response GetSeries(int id)
         {
             var series = _seriesProvider.GetSeries(id);
-            var seriesModels = Mapper.Map<Core.Repository.Series, SeriesResource>(series);
+            var seriesModels = Mapper.Map<Core.Tv.Series, SeriesResource>(series);
 
             return seriesModels.AsResponse();
         }
 
         private Response AddSeries()
         {
-            var request = Request.Body.FromJson<Core.Repository.Series>();
+            var request = Request.Body.FromJson<Core.Tv.Series>();
 
             //Todo: Alert the user if this series already exists
             //Todo: We need to create the folder if the user is adding a new series
@@ -101,7 +101,7 @@ private Response DeleteSeries(int id)
         }
     }
 
-    public class SeriesValidator : AbstractValidator<Core.Repository.Series>
+    public class SeriesValidator : AbstractValidator<Core.Tv.Series>
     {
         private readonly DiskProvider _diskProvider;
 
diff --git a/NzbDrone.Core.Test/DecisionEngineTests/AcceptableSizeSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/AcceptableSizeSpecificationFixture.cs
index e99f79e89..01bf501ab 100644
--- a/NzbDrone.Core.Test/DecisionEngineTests/AcceptableSizeSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/DecisionEngineTests/AcceptableSizeSpecificationFixture.cs
@@ -7,6 +7,7 @@
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.DecisionEngine;
diff --git a/NzbDrone.Core.Test/DecisionEngineTests/AllowedReleaseGroupSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/AllowedReleaseGroupSpecificationFixture.cs
index d7707a0c6..2ef538bd0 100644
--- a/NzbDrone.Core.Test/DecisionEngineTests/AllowedReleaseGroupSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/DecisionEngineTests/AllowedReleaseGroupSpecificationFixture.cs
@@ -7,6 +7,7 @@
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
diff --git a/NzbDrone.Core.Test/DecisionEngineTests/CustomStartDateSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/CustomStartDateSpecificationFixture.cs
index 3dee00de2..50410bbd0 100644
--- a/NzbDrone.Core.Test/DecisionEngineTests/CustomStartDateSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/DecisionEngineTests/CustomStartDateSpecificationFixture.cs
@@ -7,6 +7,7 @@
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.DecisionEngine;
diff --git a/NzbDrone.Core.Test/DecisionEngineTests/MonitoredEpisodeSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/MonitoredEpisodeSpecificationFixture.cs
index d54c2856f..f2178b001 100644
--- a/NzbDrone.Core.Test/DecisionEngineTests/MonitoredEpisodeSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/DecisionEngineTests/MonitoredEpisodeSpecificationFixture.cs
@@ -7,6 +7,7 @@
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.DecisionEngine;
diff --git a/NzbDrone.Core.Test/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs
index 7959d43fb..34573c10c 100644
--- a/NzbDrone.Core.Test/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs
@@ -5,6 +5,7 @@
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs
index fc86a99db..f4a064a1c 100644
--- a/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Repository.Quality;
diff --git a/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs
index 55f431e45..240a6c9c6 100644
--- a/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs
@@ -6,6 +6,7 @@
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.DecisionEngine;
diff --git a/NzbDrone.Core.Test/DecisionEngineTests/UpgradeHistorySpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/UpgradeHistorySpecificationFixture.cs
index 8f3dc70c8..af5d53349 100644
--- a/NzbDrone.Core.Test/DecisionEngineTests/UpgradeHistorySpecificationFixture.cs
+++ b/NzbDrone.Core.Test/DecisionEngineTests/UpgradeHistorySpecificationFixture.cs
@@ -5,6 +5,7 @@
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.DecisionEngine;
diff --git a/NzbDrone.Core.Test/DecisionEngineTests/UpgradePossibleSpecificationFixture.cs b/NzbDrone.Core.Test/DecisionEngineTests/UpgradePossibleSpecificationFixture.cs
index aa5533fe1..724e331a3 100644
--- a/NzbDrone.Core.Test/DecisionEngineTests/UpgradePossibleSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/DecisionEngineTests/UpgradePossibleSpecificationFixture.cs
@@ -5,6 +5,7 @@
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core.Test/EpisodeParseResultTest.cs b/NzbDrone.Core.Test/EpisodeParseResultTest.cs
index 3f9d2253a..919908d52 100644
--- a/NzbDrone.Core.Test/EpisodeParseResultTest.cs
+++ b/NzbDrone.Core.Test/EpisodeParseResultTest.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Repository.Quality;
 using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/EpisodeStatusTest.cs b/NzbDrone.Core.Test/EpisodeStatusTest.cs
index 5c1866954..2a815b648 100644
--- a/NzbDrone.Core.Test/EpisodeStatusTest.cs
+++ b/NzbDrone.Core.Test/EpisodeStatusTest.cs
@@ -2,6 +2,7 @@
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs b/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs
index 3613d3147..981603408 100644
--- a/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/BacklogSearchJobTest.cs
@@ -4,6 +4,7 @@
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
diff --git a/NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs b/NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs
index 768d187be..333ebfee9 100644
--- a/NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/BannerDownloadJobTest.cs
@@ -5,6 +5,7 @@
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs b/NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs
index a126348a2..eead3c6b8 100644
--- a/NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/DiskScanJobTest.cs
@@ -6,6 +6,7 @@
 using FizzWare.NBuilder;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs b/NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs
index 646a1921b..df6aea9a4 100644
--- a/NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/ImportNewSeriesJobTest.cs
@@ -6,6 +6,7 @@
 using FizzWare.NBuilder;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs b/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs
index 5a9a814bf..d6421ac02 100644
--- a/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/RecentBacklogSearchJobTest.cs
@@ -6,6 +6,7 @@
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
diff --git a/NzbDrone.Core.Test/JobTests/RenameSeasonJobFixture.cs b/NzbDrone.Core.Test/JobTests/RenameSeasonJobFixture.cs
index e7ae66846..f23dabd8d 100644
--- a/NzbDrone.Core.Test/JobTests/RenameSeasonJobFixture.cs
+++ b/NzbDrone.Core.Test/JobTests/RenameSeasonJobFixture.cs
@@ -5,6 +5,7 @@
 using FizzWare.NBuilder;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs b/NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs
index 0f1bff47e..41f0e54cb 100644
--- a/NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs
@@ -5,6 +5,7 @@
 using FizzWare.NBuilder;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
diff --git a/NzbDrone.Core.Test/JobTests/SeriesSearchJobTest.cs b/NzbDrone.Core.Test/JobTests/SeriesSearchJobTest.cs
index 8dc9069b3..d7841271a 100644
--- a/NzbDrone.Core.Test/JobTests/SeriesSearchJobTest.cs
+++ b/NzbDrone.Core.Test/JobTests/SeriesSearchJobTest.cs
@@ -2,6 +2,7 @@
 
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index f22548de5..19920a8ef 100644
--- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -181,7 +181,7 @@
     <Compile Include="ProviderTests\DiskScanProviderTests\GetVideoFilesFixture.cs" />
     <Compile Include="ProviderTests\DiskScanProviderTests\ScanFixture.cs" />
     <Compile Include="ProviderTests\DownloadClientTests\PneumaticProviderFixture.cs" />
-    <Compile Include="ProviderTests\EpisodeProviderTests\GetEpisodeBySceneNumberFixture.cs" />
+    <Compile Include="TvTests\EpisodeProviderTests\GetEpisodeBySceneNumberFixture.cs" />
     <Compile Include="ProviderTests\Metadata\Xbmc_ForEpisodeFile_Fixture.cs" />
     <Compile Include="ProviderTests\Metadata\Xbmc_ForSeries_Fixture.cs" />
     <Compile Include="ProviderTests\PostDownloadProviderTests\ProcessDropDirectoryFixture.cs" />
@@ -192,7 +192,7 @@
     <Compile Include="ProviderTests\RecycleBinProviderTests\DeleteDirectoryFixture.cs" />
     <Compile Include="ProviderTests\SearchHistoryProviderTest.cs" />
     <Compile Include="ProviderTests\PlexProviderTest.cs" />
-    <Compile Include="ProviderTests\SeasonProviderTest.cs" />
+    <Compile Include="TvTests\SeasonProviderTest.cs" />
     <Compile Include="DecisionEngineTests\RetentionSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\QualityAllowedByProfileSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\UpgradeHistorySpecificationFixture.cs" />
@@ -220,7 +220,7 @@
     <Compile Include="ProviderTests\XemCommunicationProviderTests\GetXemSeriesIdsFixture.cs" />
     <Compile Include="Services\ParseErrorServiceFixture.cs" />
     <Compile Include="HelperTests\SortHelperFixture.cs" />
-    <Compile Include="ProviderTests\EpisodeProviderTests\EpisodeProviderTest_DeleteInvalidEpisodes.cs" />
+    <Compile Include="TvTests\EpisodeProviderTests\EpisodeProviderTest_DeleteInvalidEpisodes.cs" />
     <Compile Include="DecisionEngineTests\AcceptableSizeSpecificationFixture.cs" />
     <Compile Include="ProviderTests\QualityTypeProviderTest.cs" />
     <Compile Include="ProviderTests\MisnamedProviderTest.cs" />
@@ -230,7 +230,7 @@
     <Compile Include="CentralDispatchFixture.cs" />
     <Compile Include="ProviderTests\XbmcProviderTest.cs" />
     <Compile Include="ProviderTests\DiskScanProviderTests\MoveEpisodeFileFixture.cs" />
-    <Compile Include="ProviderTests\EpisodeProviderTests\EpisodeProviderTest_GetEpisodesByParseResult.cs" />
+    <Compile Include="TvTests\EpisodeProviderTests\EpisodeProviderTest_GetEpisodesByParseResult.cs" />
     <Compile Include="ProviderTests\DiskScanProviderTests\ImportFileFixture.cs" />
     <Compile Include="FluentTest.cs" />
     <Compile Include="ProviderTests\LogProviderTests\LogProviderFixture.cs" />
@@ -252,14 +252,14 @@
     <Compile Include="ProviderTests\HistoryProviderTest.cs" />
     <Compile Include="ProviderTests\MediaFileProviderTest.cs" />
     <Compile Include="ProviderTests\ConfigProviderTests\ConfigProviderFixture.cs" />
-    <Compile Include="ProviderTests\EpisodeProviderTests\EpisodeProviderTest.cs" />
+    <Compile Include="TvTests\EpisodeProviderTests\EpisodeProviderTest.cs" />
     <Compile Include="Framework\TestDbHelper.cs" />
     <Compile Include="ParserTests\ParserFixture.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="QualityProfileTest.cs" />
     <Compile Include="ProviderTests\DownloadClientTests\SabProviderTests\SabProviderFixture.cs" />
     <Compile Include="ProviderTests\SceneMappingProviderTest.cs" />
-    <Compile Include="ProviderTests\SeriesProviderTest.cs" />
+    <Compile Include="TvTests\SeriesProviderTest.cs" />
     <Compile Include="ProviderTests\TvDbProviderTest.cs" />
     <Compile Include="XbmcVersionTests.cs" />
   </ItemGroup>
diff --git a/NzbDrone.Core.Test/ProviderTests/BannerProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/BannerProviderTest.cs
index a58d32bac..6188376bb 100644
--- a/NzbDrone.Core.Test/ProviderTests/BannerProviderTest.cs
+++ b/NzbDrone.Core.Test/ProviderTests/BannerProviderTest.cs
@@ -7,6 +7,7 @@
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpDropFolderFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpDropFolderFixture.cs
index ba803c4ed..431d1185e 100644
--- a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpDropFolderFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpDropFolderFixture.cs
@@ -8,6 +8,7 @@
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
diff --git a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpFixture.cs
index 236fda84c..2342ae46e 100644
--- a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/CleanUpFixture.cs
@@ -8,6 +8,7 @@
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
diff --git a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs
index 6b4c7338c..f4a2bb0b0 100644
--- a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs
@@ -6,6 +6,7 @@
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
diff --git a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/MoveEpisodeFileFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/MoveEpisodeFileFixture.cs
index 125312ba5..3f7ac8b6a 100644
--- a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/MoveEpisodeFileFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/MoveEpisodeFileFixture.cs
@@ -8,6 +8,7 @@
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
diff --git a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ScanFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ScanFixture.cs
index 2c1d22613..953b7e274 100644
--- a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ScanFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ScanFixture.cs
@@ -8,6 +8,7 @@
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
diff --git a/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/SabProviderTests/QueueFixture.cs b/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/SabProviderTests/QueueFixture.cs
index 56ca84c3b..da6660802 100644
--- a/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/SabProviderTests/QueueFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DownloadClientTests/SabProviderTests/QueueFixture.cs
@@ -8,6 +8,7 @@
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Sabnzbd;
 using NzbDrone.Core.Providers.Core;
diff --git a/NzbDrone.Core.Test/ProviderTests/DownloadProviderTests/ContainsRecentEpisode.cs b/NzbDrone.Core.Test/ProviderTests/DownloadProviderTests/ContainsRecentEpisode.cs
index 1a44301a8..7a9fa3f22 100644
--- a/NzbDrone.Core.Test/ProviderTests/DownloadProviderTests/ContainsRecentEpisode.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DownloadProviderTests/ContainsRecentEpisode.cs
@@ -5,6 +5,7 @@
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core.Test/ProviderTests/DownloadProviderTests/DownloadProviderFixture.cs b/NzbDrone.Core.Test/ProviderTests/DownloadProviderTests/DownloadProviderFixture.cs
index d9d54e2e8..c2da04329 100644
--- a/NzbDrone.Core.Test/ProviderTests/DownloadProviderTests/DownloadProviderFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/DownloadProviderTests/DownloadProviderFixture.cs
@@ -5,6 +5,7 @@
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
diff --git a/NzbDrone.Core.Test/ProviderTests/HistoryProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/HistoryProviderTest.cs
index d4af2e714..d011ab81b 100644
--- a/NzbDrone.Core.Test/ProviderTests/HistoryProviderTest.cs
+++ b/NzbDrone.Core.Test/ProviderTests/HistoryProviderTest.cs
@@ -3,6 +3,7 @@
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Repository.Quality;
diff --git a/NzbDrone.Core.Test/ProviderTests/LogProviderTests/LogProviderFixture.cs b/NzbDrone.Core.Test/ProviderTests/LogProviderTests/LogProviderFixture.cs
index 31a3f956f..7ef6794da 100644
--- a/NzbDrone.Core.Test/ProviderTests/LogProviderTests/LogProviderFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/LogProviderTests/LogProviderFixture.cs
@@ -7,6 +7,7 @@
 using NLog;
 using NUnit.Framework;
 using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Instrumentation;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTest.cs
index c584fe590..ef5a71367 100644
--- a/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTest.cs
+++ b/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTest.cs
@@ -8,6 +8,7 @@
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
diff --git a/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests/CleanUpDatabaseFixture.cs b/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests/CleanUpDatabaseFixture.cs
index bae1e5d16..888ea370d 100644
--- a/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests/CleanUpDatabaseFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests/CleanUpDatabaseFixture.cs
@@ -5,6 +5,7 @@
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
diff --git a/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests/GetNewFilenameFixture.cs b/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests/GetNewFilenameFixture.cs
index c765d0561..2db8ef181 100644
--- a/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests/GetNewFilenameFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests/GetNewFilenameFixture.cs
@@ -7,6 +7,7 @@
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForEpisodeFile_Fixture.cs b/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForEpisodeFile_Fixture.cs
index d579b4406..b408e3c83 100644
--- a/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForEpisodeFile_Fixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForEpisodeFile_Fixture.cs
@@ -8,6 +8,7 @@
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
diff --git a/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForSeries_Fixture.cs b/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForSeries_Fixture.cs
index ce2731037..300371b4a 100644
--- a/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForSeries_Fixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/Metadata/Xbmc_ForSeries_Fixture.cs
@@ -7,6 +7,7 @@
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
diff --git a/NzbDrone.Core.Test/ProviderTests/MisnamedProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/MisnamedProviderTest.cs
index 6f23d3eae..8227d6eed 100644
--- a/NzbDrone.Core.Test/ProviderTests/MisnamedProviderTest.cs
+++ b/NzbDrone.Core.Test/ProviderTests/MisnamedProviderTest.cs
@@ -4,6 +4,7 @@
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Repository.Quality;
diff --git a/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadFixture.cs b/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadFixture.cs
index 9b54886f5..3d38956b4 100644
--- a/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDownloadFixture.cs
@@ -8,6 +8,7 @@
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDropDirectoryFixture.cs b/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDropDirectoryFixture.cs
index 5e48d7138..7d9f90175 100644
--- a/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDropDirectoryFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessDropDirectoryFixture.cs
@@ -8,6 +8,7 @@
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessVideoFileFixture.cs b/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessVideoFileFixture.cs
index 8f2e0635c..b16199ff7 100644
--- a/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessVideoFileFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/PostDownloadProviderTests/ProcessVideoFileFixture.cs
@@ -8,6 +8,7 @@
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core.Test/ProviderTests/ReferenceDataProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/ReferenceDataProviderTest.cs
index 50fc641fc..c69362b13 100644
--- a/NzbDrone.Core.Test/ProviderTests/ReferenceDataProviderTest.cs
+++ b/NzbDrone.Core.Test/ProviderTests/ReferenceDataProviderTest.cs
@@ -6,6 +6,7 @@
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core.Test/ProviderTests/SearchHistoryProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/SearchHistoryProviderTest.cs
index af652fce5..33b4d5014 100644
--- a/NzbDrone.Core.Test/ProviderTests/SearchHistoryProviderTest.cs
+++ b/NzbDrone.Core.Test/ProviderTests/SearchHistoryProviderTest.cs
@@ -7,6 +7,7 @@
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/DailyEpisodeSearchTests/CheckReportFixture.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/DailyEpisodeSearchTests/CheckReportFixture.cs
index b94ab791b..c3c89e2cc 100644
--- a/NzbDrone.Core.Test/ProviderTests/SearchTests/DailyEpisodeSearchTests/CheckReportFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/DailyEpisodeSearchTests/CheckReportFixture.cs
@@ -5,6 +5,7 @@
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/DailyEpisodeSearchTests/PerformSearchFixture.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/DailyEpisodeSearchTests/PerformSearchFixture.cs
index 35b51b5ba..29c9a6c68 100644
--- a/NzbDrone.Core.Test/ProviderTests/SearchTests/DailyEpisodeSearchTests/PerformSearchFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/DailyEpisodeSearchTests/PerformSearchFixture.cs
@@ -5,6 +5,7 @@
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/EpisodeSearchTests/CheckReportFixture.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/EpisodeSearchTests/CheckReportFixture.cs
index c0d4f2f38..ae7eb9904 100644
--- a/NzbDrone.Core.Test/ProviderTests/SearchTests/EpisodeSearchTests/CheckReportFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/EpisodeSearchTests/CheckReportFixture.cs
@@ -5,6 +5,7 @@
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/EpisodeSearchTests/PerformSearchFixture.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/EpisodeSearchTests/PerformSearchFixture.cs
index 5fa687fab..a3ad9282c 100644
--- a/NzbDrone.Core.Test/ProviderTests/SearchTests/EpisodeSearchTests/PerformSearchFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/EpisodeSearchTests/PerformSearchFixture.cs
@@ -5,6 +5,7 @@
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/GetSearchTitleFixture.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/GetSearchTitleFixture.cs
index 02ad81710..4119d5b24 100644
--- a/NzbDrone.Core.Test/ProviderTests/SearchTests/GetSearchTitleFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/GetSearchTitleFixture.cs
@@ -5,6 +5,7 @@
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Search;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/PartialSeasonSearchTests/CheckReportFixture.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/PartialSeasonSearchTests/CheckReportFixture.cs
index fd2f3062e..6901d69d3 100644
--- a/NzbDrone.Core.Test/ProviderTests/SearchTests/PartialSeasonSearchTests/CheckReportFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/PartialSeasonSearchTests/CheckReportFixture.cs
@@ -5,6 +5,7 @@
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/PartialSeasonSearchTests/PerformSearchFixture.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/PartialSeasonSearchTests/PerformSearchFixture.cs
index 6855113d5..596321904 100644
--- a/NzbDrone.Core.Test/ProviderTests/SearchTests/PartialSeasonSearchTests/PerformSearchFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/PartialSeasonSearchTests/PerformSearchFixture.cs
@@ -5,6 +5,7 @@
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/PerformSearchTestBase.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/PerformSearchTestBase.cs
index b06a65090..43bdd0f33 100644
--- a/NzbDrone.Core.Test/ProviderTests/SearchTests/PerformSearchTestBase.cs
+++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/PerformSearchTestBase.cs
@@ -5,6 +5,7 @@
 using FizzWare.NBuilder;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/ProcessResultsFixture.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/ProcessResultsFixture.cs
index 40896c82d..3605c4851 100644
--- a/NzbDrone.Core.Test/ProviderTests/SearchTests/ProcessResultsFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/ProcessResultsFixture.cs
@@ -6,6 +6,7 @@
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core.Test/ProviderTests/SearchTests/TestSearch.cs b/NzbDrone.Core.Test/ProviderTests/SearchTests/TestSearch.cs
index d9b95e936..f71725197 100644
--- a/NzbDrone.Core.Test/ProviderTests/SearchTests/TestSearch.cs
+++ b/NzbDrone.Core.Test/ProviderTests/SearchTests/TestSearch.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.DecisionEngine;
@@ -24,7 +25,7 @@ public TestSearch(SeriesProvider seriesProvider, EpisodeProvider episodeProvider
         {
         }
 
-        public override List<EpisodeParseResult> PerformSearch(Repository.Series series, dynamic options, Model.Notification.ProgressNotification notification)
+        public override List<EpisodeParseResult> PerformSearch(Series series, dynamic options, Model.Notification.ProgressNotification notification)
         {
             if (options.Episode == null)
                 throw new ArgumentException("Episode is invalid");
@@ -54,12 +55,12 @@ public override List<EpisodeParseResult> PerformSearch(Repository.Series series,
             return reports;
         }
 
-        public override SearchHistoryItem CheckReport(Repository.Series series, dynamic options, EpisodeParseResult episodeParseResult, Repository.Search.SearchHistoryItem item)
+        public override SearchHistoryItem CheckReport(Series series, dynamic options, EpisodeParseResult episodeParseResult, Repository.Search.SearchHistoryItem item)
         {
             return item;
         }
 
-        protected override void FinalizeSearch(Repository.Series series, dynamic options, bool reportsFound, Model.Notification.ProgressNotification notification)
+        protected override void FinalizeSearch(Series series, dynamic options, bool reportsFound, Model.Notification.ProgressNotification notification)
         {
             logger.Warn("Unable to find {0} in any of indexers.", series.Title);
         }
diff --git a/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/FindMatchingTvRageSeriesFixture.cs b/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/FindMatchingTvRageSeriesFixture.cs
index 680a4f33e..5ef6e7dfd 100644
--- a/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/FindMatchingTvRageSeriesFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/FindMatchingTvRageSeriesFixture.cs
@@ -5,6 +5,7 @@
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.TvRage;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/ProcessResultsFixture.cs b/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/ProcessResultsFixture.cs
index 1684de5fe..80b04c70e 100644
--- a/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/ProcessResultsFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/ProcessResultsFixture.cs
@@ -5,6 +5,7 @@
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.TvRage;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core.Test/ProviderTests/UpcomingEpisodesProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/UpcomingEpisodesProviderTest.cs
index 297b528e5..661c3e396 100644
--- a/NzbDrone.Core.Test/ProviderTests/UpcomingEpisodesProviderTest.cs
+++ b/NzbDrone.Core.Test/ProviderTests/UpcomingEpisodesProviderTest.cs
@@ -5,6 +5,7 @@
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/ProviderTests/XbmcProviderTest.cs b/NzbDrone.Core.Test/ProviderTests/XbmcProviderTest.cs
index 9e4a7a19d..cb979f5b4 100644
--- a/NzbDrone.Core.Test/ProviderTests/XbmcProviderTest.cs
+++ b/NzbDrone.Core.Test/ProviderTests/XbmcProviderTest.cs
@@ -7,6 +7,7 @@
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Xbmc;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
diff --git a/NzbDrone.Core.Test/QualityProfileTest.cs b/NzbDrone.Core.Test/QualityProfileTest.cs
index 156e1b330..d0c97cac3 100644
--- a/NzbDrone.Core.Test/QualityProfileTest.cs
+++ b/NzbDrone.Core.Test/QualityProfileTest.cs
@@ -5,6 +5,7 @@
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Repository.Quality;
diff --git a/NzbDrone.Core.Test/QualityTest.cs b/NzbDrone.Core.Test/QualityTest.cs
index 05f2136af..59a7f5eec 100644
--- a/NzbDrone.Core.Test/QualityTest.cs
+++ b/NzbDrone.Core.Test/QualityTest.cs
@@ -1,5 +1,6 @@
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Repository.Quality;
 using NzbDrone.Core.Test.Framework;
diff --git a/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTests/EpisodeProviderTest.cs b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest.cs
similarity index 99%
rename from NzbDrone.Core.Test/ProviderTests/EpisodeProviderTests/EpisodeProviderTest.cs
rename to NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest.cs
index 923a234ad..42f18d3c7 100644
--- a/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTests/EpisodeProviderTest.cs
+++ b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest.cs
@@ -7,16 +7,16 @@
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Repository;
 using NzbDrone.Core.Repository.Quality;
 using NzbDrone.Core.Test.Framework;
 using PetaPoco;
 using TvdbLib.Data;
 
-namespace NzbDrone.Core.Test.ProviderTests.EpisodeProviderTests
+namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests
 {
     [TestFixture]
     // ReSharper disable InconsistentNaming
diff --git a/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTests/EpisodeProviderTest_DeleteInvalidEpisodes.cs b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest_DeleteInvalidEpisodes.cs
similarity index 98%
rename from NzbDrone.Core.Test/ProviderTests/EpisodeProviderTests/EpisodeProviderTest_DeleteInvalidEpisodes.cs
rename to NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest_DeleteInvalidEpisodes.cs
index 222166942..ff85387f6 100644
--- a/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTests/EpisodeProviderTest_DeleteInvalidEpisodes.cs
+++ b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest_DeleteInvalidEpisodes.cs
@@ -5,12 +5,11 @@
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
-using NzbDrone.Core.Providers;
-using NzbDrone.Core.Repository;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Test.Framework;
 using TvdbLib.Data;
 
-namespace NzbDrone.Core.Test.ProviderTests.EpisodeProviderTests
+namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests
 {
     [TestFixture]
     // ReSharper disable InconsistentNaming
diff --git a/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs
similarity index 98%
rename from NzbDrone.Core.Test/ProviderTests/EpisodeProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs
rename to NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs
index dda01dd9b..1ea65784e 100644
--- a/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs
+++ b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest_GetEpisodesByParseResult.cs
@@ -6,13 +6,12 @@
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers;
-using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
 
-namespace NzbDrone.Core.Test.ProviderTests.EpisodeProviderTests
+namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests
 {
     [TestFixture]
     // ReSharper disable InconsistentNaming
diff --git a/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTests/GetEpisodeBySceneNumberFixture.cs b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/GetEpisodeBySceneNumberFixture.cs
similarity index 94%
rename from NzbDrone.Core.Test/ProviderTests/EpisodeProviderTests/GetEpisodeBySceneNumberFixture.cs
rename to NzbDrone.Core.Test/TvTests/EpisodeProviderTests/GetEpisodeBySceneNumberFixture.cs
index 5c48a1f47..aa7cf63b6 100644
--- a/NzbDrone.Core.Test/ProviderTests/EpisodeProviderTests/GetEpisodeBySceneNumberFixture.cs
+++ b/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/GetEpisodeBySceneNumberFixture.cs
@@ -4,11 +4,10 @@
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
-using NzbDrone.Core.Providers;
-using NzbDrone.Core.Repository;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Test.Framework;
 
-namespace NzbDrone.Core.Test.ProviderTests.EpisodeProviderTests
+namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests
 {
     [TestFixture]
     // ReSharper disable InconsistentNaming
diff --git a/NzbDrone.Core.Test/ProviderTests/SeasonProviderTest.cs b/NzbDrone.Core.Test/TvTests/SeasonProviderTest.cs
similarity index 95%
rename from NzbDrone.Core.Test/ProviderTests/SeasonProviderTest.cs
rename to NzbDrone.Core.Test/TvTests/SeasonProviderTest.cs
index 3da861396..14d6b0156 100644
--- a/NzbDrone.Core.Test/ProviderTests/SeasonProviderTest.cs
+++ b/NzbDrone.Core.Test/TvTests/SeasonProviderTest.cs
@@ -1,24 +1,15 @@
 // ReSharper disable RedundantUsingDirective
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
 using FizzWare.NBuilder;
 using FluentAssertions;
-using Moq;
 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.Repository.Quality;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common.AutoMoq;
-using PetaPoco;
-using TvdbLib.Data;
 
-namespace NzbDrone.Core.Test.ProviderTests
+namespace NzbDrone.Core.Test.TvTests
 {
     [TestFixture]
     // ReSharper disable InconsistentNaming
diff --git a/NzbDrone.Core.Test/ProviderTests/SeriesProviderTest.cs b/NzbDrone.Core.Test/TvTests/SeriesProviderTest.cs
similarity index 97%
rename from NzbDrone.Core.Test/ProviderTests/SeriesProviderTest.cs
rename to NzbDrone.Core.Test/TvTests/SeriesProviderTest.cs
index 08a4f1769..f30ab50fc 100644
--- a/NzbDrone.Core.Test/ProviderTests/SeriesProviderTest.cs
+++ b/NzbDrone.Core.Test/TvTests/SeriesProviderTest.cs
@@ -1,18 +1,17 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Repository;
 using NzbDrone.Core.Repository.Quality;
 using NzbDrone.Core.Test.Framework;
 
 // ReSharper disable InconsistentNaming
-namespace NzbDrone.Core.Test.ProviderTests
+namespace NzbDrone.Core.Test.TvTests
 {
     [TestFixture]
     public class SeriesProviderTest : SqlCeTest
diff --git a/NzbDrone.Core.Test/dbBenchmark.cs b/NzbDrone.Core.Test/dbBenchmark.cs
index 4113a1bd0..b852311a0 100644
--- a/NzbDrone.Core.Test/dbBenchmark.cs
+++ b/NzbDrone.Core.Test/dbBenchmark.cs
@@ -6,6 +6,7 @@
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Repository.Quality;
diff --git a/NzbDrone.Core/Datastore/PetaPoco/EpisodeSeasonRelator.cs b/NzbDrone.Core/Datastore/PetaPoco/EpisodeSeasonRelator.cs
index 8c57c90b4..5f726cdaf 100644
--- a/NzbDrone.Core/Datastore/PetaPoco/EpisodeSeasonRelator.cs
+++ b/NzbDrone.Core/Datastore/PetaPoco/EpisodeSeasonRelator.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Repository;
 
 // ReSharper disable CheckNamespace
diff --git a/NzbDrone.Core/DecisionEngine/AcceptableSizeSpecification.cs b/NzbDrone.Core/DecisionEngine/AcceptableSizeSpecification.cs
index 0ba115e96..209ca0927 100644
--- a/NzbDrone.Core/DecisionEngine/AcceptableSizeSpecification.cs
+++ b/NzbDrone.Core/DecisionEngine/AcceptableSizeSpecification.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository.Quality;
diff --git a/NzbDrone.Core/DecisionEngine/MonitoredEpisodeSpecification.cs b/NzbDrone.Core/DecisionEngine/MonitoredEpisodeSpecification.cs
index 99f0a78d7..5c929771f 100644
--- a/NzbDrone.Core/DecisionEngine/MonitoredEpisodeSpecification.cs
+++ b/NzbDrone.Core/DecisionEngine/MonitoredEpisodeSpecification.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 
diff --git a/NzbDrone.Core/DecisionEngine/QualityUpgradeSpecification.cs b/NzbDrone.Core/DecisionEngine/QualityUpgradeSpecification.cs
index b7e53cc24..5f3cc12cd 100644
--- a/NzbDrone.Core/DecisionEngine/QualityUpgradeSpecification.cs
+++ b/NzbDrone.Core/DecisionEngine/QualityUpgradeSpecification.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Repository.Quality;
 
diff --git a/NzbDrone.Core/DecisionEngine/UpgradeDiskSpecification.cs b/NzbDrone.Core/DecisionEngine/UpgradeDiskSpecification.cs
index a532368dd..4411f13e1 100644
--- a/NzbDrone.Core/DecisionEngine/UpgradeDiskSpecification.cs
+++ b/NzbDrone.Core/DecisionEngine/UpgradeDiskSpecification.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 
 namespace NzbDrone.Core.DecisionEngine
diff --git a/NzbDrone.Core/DecisionEngine/UpgradeHistorySpecification.cs b/NzbDrone.Core/DecisionEngine/UpgradeHistorySpecification.cs
index ef1163c84..36bb1f6e6 100644
--- a/NzbDrone.Core/DecisionEngine/UpgradeHistorySpecification.cs
+++ b/NzbDrone.Core/DecisionEngine/UpgradeHistorySpecification.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
 
diff --git a/NzbDrone.Core/DecisionEngine/UpgradePossibleSpecification.cs b/NzbDrone.Core/DecisionEngine/UpgradePossibleSpecification.cs
index a17e8d144..8deb621e3 100644
--- a/NzbDrone.Core/DecisionEngine/UpgradePossibleSpecification.cs
+++ b/NzbDrone.Core/DecisionEngine/UpgradePossibleSpecification.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
 
diff --git a/NzbDrone.Core/Jobs/BacklogSearchJob.cs b/NzbDrone.Core/Jobs/BacklogSearchJob.cs
index df682f99d..3e94737de 100644
--- a/NzbDrone.Core/Jobs/BacklogSearchJob.cs
+++ b/NzbDrone.Core/Jobs/BacklogSearchJob.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core/Jobs/BannerDownloadJob.cs b/NzbDrone.Core/Jobs/BannerDownloadJob.cs
index e442c4861..be3f08213 100644
--- a/NzbDrone.Core/Jobs/BannerDownloadJob.cs
+++ b/NzbDrone.Core/Jobs/BannerDownloadJob.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using NLog;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
diff --git a/NzbDrone.Core/Jobs/ConvertEpisodeJob.cs b/NzbDrone.Core/Jobs/ConvertEpisodeJob.cs
index df450ae9d..5c6390f17 100644
--- a/NzbDrone.Core/Jobs/ConvertEpisodeJob.cs
+++ b/NzbDrone.Core/Jobs/ConvertEpisodeJob.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Converting;
diff --git a/NzbDrone.Core/Jobs/DeleteSeriesJob.cs b/NzbDrone.Core/Jobs/DeleteSeriesJob.cs
index 376670950..fa8a86282 100644
--- a/NzbDrone.Core/Jobs/DeleteSeriesJob.cs
+++ b/NzbDrone.Core/Jobs/DeleteSeriesJob.cs
@@ -2,6 +2,7 @@
 using System;
 using NLog;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 
diff --git a/NzbDrone.Core/Jobs/DiskScanJob.cs b/NzbDrone.Core/Jobs/DiskScanJob.cs
index 6429a1e2e..cefbb5af0 100644
--- a/NzbDrone.Core/Jobs/DiskScanJob.cs
+++ b/NzbDrone.Core/Jobs/DiskScanJob.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Helpers;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core/Jobs/EpisodeSearchJob.cs b/NzbDrone.Core/Jobs/EpisodeSearchJob.cs
index 2f8c9c401..590ab1d92 100644
--- a/NzbDrone.Core/Jobs/EpisodeSearchJob.cs
+++ b/NzbDrone.Core/Jobs/EpisodeSearchJob.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using System;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.DecisionEngine;
diff --git a/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs b/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs
index 314b76d5f..2aa7786fa 100644
--- a/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs
+++ b/NzbDrone.Core/Jobs/ImportNewSeriesJob.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 
diff --git a/NzbDrone.Core/Jobs/PastWeekBacklogSearchJob.cs b/NzbDrone.Core/Jobs/PastWeekBacklogSearchJob.cs
index 87d6b92e5..dcfc81836 100644
--- a/NzbDrone.Core/Jobs/PastWeekBacklogSearchJob.cs
+++ b/NzbDrone.Core/Jobs/PastWeekBacklogSearchJob.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core/Jobs/RecentBacklogSearchJob.cs b/NzbDrone.Core/Jobs/RecentBacklogSearchJob.cs
index 4e0333531..7cdf3bba5 100644
--- a/NzbDrone.Core/Jobs/RecentBacklogSearchJob.cs
+++ b/NzbDrone.Core/Jobs/RecentBacklogSearchJob.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core/Jobs/RefreshEpsiodeMetadata.cs b/NzbDrone.Core/Jobs/RefreshEpsiodeMetadata.cs
index 55a55a6c5..36836360a 100644
--- a/NzbDrone.Core/Jobs/RefreshEpsiodeMetadata.cs
+++ b/NzbDrone.Core/Jobs/RefreshEpsiodeMetadata.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core/Jobs/RenameSeasonJob.cs b/NzbDrone.Core/Jobs/RenameSeasonJob.cs
index 513b9eee2..1b0e0da71 100644
--- a/NzbDrone.Core/Jobs/RenameSeasonJob.cs
+++ b/NzbDrone.Core/Jobs/RenameSeasonJob.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core/Jobs/RenameSeriesJob.cs b/NzbDrone.Core/Jobs/RenameSeriesJob.cs
index ebb3bcbdf..d66b761bd 100644
--- a/NzbDrone.Core/Jobs/RenameSeriesJob.cs
+++ b/NzbDrone.Core/Jobs/RenameSeriesJob.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core/Jobs/SeasonSearchJob.cs b/NzbDrone.Core/Jobs/SeasonSearchJob.cs
index e93c40b03..21a4e884c 100644
--- a/NzbDrone.Core/Jobs/SeasonSearchJob.cs
+++ b/NzbDrone.Core/Jobs/SeasonSearchJob.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core/Jobs/SeriesSearchJob.cs b/NzbDrone.Core/Jobs/SeriesSearchJob.cs
index 53bd5b52e..60e232d51 100644
--- a/NzbDrone.Core/Jobs/SeriesSearchJob.cs
+++ b/NzbDrone.Core/Jobs/SeriesSearchJob.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core/Jobs/UpdateInfoJob.cs b/NzbDrone.Core/Jobs/UpdateInfoJob.cs
index 55aefd9ec..d84e7e446 100644
--- a/NzbDrone.Core/Jobs/UpdateInfoJob.cs
+++ b/NzbDrone.Core/Jobs/UpdateInfoJob.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Helpers;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
diff --git a/NzbDrone.Core/Model/EpisodeParseResult.cs b/NzbDrone.Core/Model/EpisodeParseResult.cs
index 59ab062d6..448291a07 100644
--- a/NzbDrone.Core/Model/EpisodeParseResult.cs
+++ b/NzbDrone.Core/Model/EpisodeParseResult.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Repository;
 
 namespace NzbDrone.Core.Model
diff --git a/NzbDrone.Core/Model/SeasonParseResult.cs b/NzbDrone.Core/Model/SeasonParseResult.cs
index 49ae63ba2..464a27abf 100644
--- a/NzbDrone.Core/Model/SeasonParseResult.cs
+++ b/NzbDrone.Core/Model/SeasonParseResult.cs
@@ -1,4 +1,6 @@
-namespace NzbDrone.Core.Model
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Core.Model
 {
     public class SeasonParseResult
     {
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index d9452876b..733627dc1 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -302,7 +302,7 @@
     <Compile Include="Model\JobQueueItem.cs" />
     <Compile Include="Model\LanguageType.cs" />
     <Compile Include="Model\MisnamedEpisodeModel.cs" />
-    <Compile Include="Model\QualityModel.cs" />
+    <Compile Include="Tv\QualityModel.cs" />
     <Compile Include="Model\Sabnzbd\SabAddResponse.cs" />
     <Compile Include="Model\Sabnzbd\SabHistoryItem.cs" />
     <Compile Include="Model\Sabnzbd\SabHistory.cs" />
@@ -353,7 +353,7 @@
     <Compile Include="Providers\Search\PartialSeasonSearch.cs" />
     <Compile Include="Providers\Search\EpisodeSearch.cs" />
     <Compile Include="Providers\Search\SearchBase.cs" />
-    <Compile Include="Providers\SeasonProvider.cs" />
+    <Compile Include="Tv\SeasonProvider.cs" />
     <Compile Include="Jobs\RecentBacklogSearchJob.cs" />
     <Compile Include="Instrumentation\TrimLogsJob.cs" />
     <Compile Include="Jobs\JobController.cs" />
@@ -387,7 +387,7 @@
     <Compile Include="Repository\Search\SearchHistoryItem.cs" />
     <Compile Include="Repository\Search\SearchHistory.cs" />
     <Compile Include="Model\ReportRejectionType.cs" />
-    <Compile Include="Repository\Season.cs" />
+    <Compile Include="Tv\Season.cs" />
     <Compile Include="Providers\AutoConfigureProvider.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -454,7 +454,7 @@
     <Compile Include="Providers\DownloadProvider.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Providers\EpisodeProvider.cs">
+    <Compile Include="Tv\EpisodeProvider.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Providers\ExternalNotificationProvider.cs">
@@ -540,7 +540,7 @@
     <Compile Include="Providers\SearchProvider.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Providers\SeriesProvider.cs">
+    <Compile Include="Tv\SeriesProvider.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Providers\SignalRProvider.cs">
@@ -579,11 +579,11 @@
     <Compile Include="Model\EpisodeStatusType.cs" />
     <Compile Include="Model\Sabnzbd\SabPriorityType.cs" />
     <Compile Include="Model\SeasonParseResult.cs" />
-    <Compile Include="Repository\EpisodeFile.cs" />
+    <Compile Include="Tv\EpisodeFile.cs" />
     <Compile Include="Model\Notification\ProgressNotificationStatus.cs" />
     <Compile Include="Parser.cs" />
     <Compile Include="Model\Notification\ProgressNotification.cs" />
-    <Compile Include="Repository\Episode.cs" />
+    <Compile Include="Tv\Episode.cs" />
     <Compile Include="Instrumentation\Log.cs" />
     <Compile Include="Repository\History.cs" />
     <Compile Include="Repository\Config.cs" />
@@ -591,7 +591,7 @@
     <Compile Include="Repository\Quality\QualityProfile.cs" />
     <Compile Include="RootFolders\RootFolder.cs" />
     <Compile Include="Repository\SceneMapping.cs" />
-    <Compile Include="Repository\Series.cs" />
+    <Compile Include="Tv\Series.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Tvdb\Tvdb.cs" />
     <Compile Include="Tvdb\Tvdb.Sync.cs" />
diff --git a/NzbDrone.Core/Parser.cs b/NzbDrone.Core/Parser.cs
index 12417c802..ab9a29c04 100644
--- a/NzbDrone.Core/Parser.cs
+++ b/NzbDrone.Core/Parser.cs
@@ -6,7 +6,8 @@
 using System.Text.RegularExpressions;
 using NLog;
 using NzbDrone.Common;
-using NzbDrone.Core.Model;
+    using NzbDrone.Core.Tv;
+    using NzbDrone.Core.Model;
 using NzbDrone.Core.Repository.Quality;
 
 namespace NzbDrone.Core
diff --git a/NzbDrone.Core/Providers/BannerProvider.cs b/NzbDrone.Core/Providers/BannerProvider.cs
index c9961abe0..f97119001 100644
--- a/NzbDrone.Core/Providers/BannerProvider.cs
+++ b/NzbDrone.Core/Providers/BannerProvider.cs
@@ -5,6 +5,7 @@
 using System.Text;
 using NLog;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Repository;
 
diff --git a/NzbDrone.Core/Providers/Converting/AtomicParsleyProvider.cs b/NzbDrone.Core/Providers/Converting/AtomicParsleyProvider.cs
index f5307e465..f33fd9562 100644
--- a/NzbDrone.Core/Providers/Converting/AtomicParsleyProvider.cs
+++ b/NzbDrone.Core/Providers/Converting/AtomicParsleyProvider.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.IO;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core/Providers/Converting/HandbrakeProvider.cs b/NzbDrone.Core/Providers/Converting/HandbrakeProvider.cs
index 1a34b22f4..ac3c84d2b 100644
--- a/NzbDrone.Core/Providers/Converting/HandbrakeProvider.cs
+++ b/NzbDrone.Core/Providers/Converting/HandbrakeProvider.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Text.RegularExpressions;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core/Providers/DiskScanProvider.cs b/NzbDrone.Core/Providers/DiskScanProvider.cs
index 51f3572a2..1ddbbe203 100644
--- a/NzbDrone.Core/Providers/DiskScanProvider.cs
+++ b/NzbDrone.Core/Providers/DiskScanProvider.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using NLog;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core/Providers/DownloadProvider.cs b/NzbDrone.Core/Providers/DownloadProvider.cs
index 1e92983de..a8edd1ce6 100644
--- a/NzbDrone.Core/Providers/DownloadProvider.cs
+++ b/NzbDrone.Core/Providers/DownloadProvider.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Providers.DownloadClients;
diff --git a/NzbDrone.Core/Providers/ExternalNotification/ExternalNotificationBase.cs b/NzbDrone.Core/Providers/ExternalNotification/ExternalNotificationBase.cs
index c5192ccc5..c8a1433d3 100644
--- a/NzbDrone.Core/Providers/ExternalNotification/ExternalNotificationBase.cs
+++ b/NzbDrone.Core/Providers/ExternalNotification/ExternalNotificationBase.cs
@@ -1,4 +1,5 @@
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 
diff --git a/NzbDrone.Core/Providers/ExternalNotification/Growl.cs b/NzbDrone.Core/Providers/ExternalNotification/Growl.cs
index 31d3e39b1..676565ce4 100644
--- a/NzbDrone.Core/Providers/ExternalNotification/Growl.cs
+++ b/NzbDrone.Core/Providers/ExternalNotification/Growl.cs
@@ -1,5 +1,6 @@
 using System;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 
diff --git a/NzbDrone.Core/Providers/ExternalNotification/Plex.cs b/NzbDrone.Core/Providers/ExternalNotification/Plex.cs
index 31fd9ca43..19f66cdaf 100644
--- a/NzbDrone.Core/Providers/ExternalNotification/Plex.cs
+++ b/NzbDrone.Core/Providers/ExternalNotification/Plex.cs
@@ -1,5 +1,6 @@
 using System;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 
diff --git a/NzbDrone.Core/Providers/ExternalNotification/Prowl.cs b/NzbDrone.Core/Providers/ExternalNotification/Prowl.cs
index 987d3c185..23fbac45e 100644
--- a/NzbDrone.Core/Providers/ExternalNotification/Prowl.cs
+++ b/NzbDrone.Core/Providers/ExternalNotification/Prowl.cs
@@ -1,5 +1,6 @@
 using System;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using Prowlin;
diff --git a/NzbDrone.Core/Providers/ExternalNotification/Smtp.cs b/NzbDrone.Core/Providers/ExternalNotification/Smtp.cs
index c3bda14c2..098db8695 100644
--- a/NzbDrone.Core/Providers/ExternalNotification/Smtp.cs
+++ b/NzbDrone.Core/Providers/ExternalNotification/Smtp.cs
@@ -1,4 +1,5 @@
 using System;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 
diff --git a/NzbDrone.Core/Providers/ExternalNotification/Twitter.cs b/NzbDrone.Core/Providers/ExternalNotification/Twitter.cs
index 9f5125d1a..0591fdc5c 100644
--- a/NzbDrone.Core/Providers/ExternalNotification/Twitter.cs
+++ b/NzbDrone.Core/Providers/ExternalNotification/Twitter.cs
@@ -1,4 +1,5 @@
 using System;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 
diff --git a/NzbDrone.Core/Providers/ExternalNotification/Xbmc.cs b/NzbDrone.Core/Providers/ExternalNotification/Xbmc.cs
index 013818835..f9037193c 100644
--- a/NzbDrone.Core/Providers/ExternalNotification/Xbmc.cs
+++ b/NzbDrone.Core/Providers/ExternalNotification/Xbmc.cs
@@ -1,4 +1,5 @@
 using System;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 
diff --git a/NzbDrone.Core/Providers/ExternalNotificationProvider.cs b/NzbDrone.Core/Providers/ExternalNotificationProvider.cs
index 4dcb261ca..68474c3c5 100644
--- a/NzbDrone.Core/Providers/ExternalNotificationProvider.cs
+++ b/NzbDrone.Core/Providers/ExternalNotificationProvider.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers.ExternalNotification;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core/Providers/HistoryProvider.cs b/NzbDrone.Core/Providers/HistoryProvider.cs
index 7f72d08c3..31a9d3e81 100644
--- a/NzbDrone.Core/Providers/HistoryProvider.cs
+++ b/NzbDrone.Core/Providers/HistoryProvider.cs
@@ -4,6 +4,7 @@
 using DataTables.Mvc.Core.Helpers;
 using DataTables.Mvc.Core.Models;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Repository.Quality;
diff --git a/NzbDrone.Core/Providers/MediaFileProvider.cs b/NzbDrone.Core/Providers/MediaFileProvider.cs
index c0e630dc8..5cb7b8f1b 100644
--- a/NzbDrone.Core/Providers/MediaFileProvider.cs
+++ b/NzbDrone.Core/Providers/MediaFileProvider.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Helpers;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core/Providers/Metadata/MetadataBase.cs b/NzbDrone.Core/Providers/Metadata/MetadataBase.cs
index 740785acc..1d685897a 100644
--- a/NzbDrone.Core/Providers/Metadata/MetadataBase.cs
+++ b/NzbDrone.Core/Providers/Metadata/MetadataBase.cs
@@ -1,6 +1,7 @@
 using System;
 using NLog;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core/Providers/Metadata/Xbmc.cs b/NzbDrone.Core/Providers/Metadata/Xbmc.cs
index a7563b8ce..034ac15bd 100644
--- a/NzbDrone.Core/Providers/Metadata/Xbmc.cs
+++ b/NzbDrone.Core/Providers/Metadata/Xbmc.cs
@@ -5,6 +5,7 @@
 using System.Xml;
 using System.Xml.Linq;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
diff --git a/NzbDrone.Core/Providers/MetadataProvider.cs b/NzbDrone.Core/Providers/MetadataProvider.cs
index c0ebde1ac..5fc83d022 100644
--- a/NzbDrone.Core/Providers/MetadataProvider.cs
+++ b/NzbDrone.Core/Providers/MetadataProvider.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers.ExternalNotification;
 using NzbDrone.Core.Providers.Metadata;
diff --git a/NzbDrone.Core/Providers/MisnamedProvider.cs b/NzbDrone.Core/Providers/MisnamedProvider.cs
index 6a1e98bee..4d529f430 100644
--- a/NzbDrone.Core/Providers/MisnamedProvider.cs
+++ b/NzbDrone.Core/Providers/MisnamedProvider.cs
@@ -5,6 +5,7 @@
 using System.Text;
 using System.Diagnostics;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Repository;
 
diff --git a/NzbDrone.Core/Providers/PostDownloadProvider.cs b/NzbDrone.Core/Providers/PostDownloadProvider.cs
index 0b852306e..6f8ae3cb0 100644
--- a/NzbDrone.Core/Providers/PostDownloadProvider.cs
+++ b/NzbDrone.Core/Providers/PostDownloadProvider.cs
@@ -4,6 +4,7 @@
 using System.Text.RegularExpressions;
 using NLog;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 
 namespace NzbDrone.Core.Providers
diff --git a/NzbDrone.Core/Providers/Search/DailyEpisodeSearch.cs b/NzbDrone.Core/Providers/Search/DailyEpisodeSearch.cs
index 89e3d4a28..f2c736179 100644
--- a/NzbDrone.Core/Providers/Search/DailyEpisodeSearch.cs
+++ b/NzbDrone.Core/Providers/Search/DailyEpisodeSearch.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.DecisionEngine;
diff --git a/NzbDrone.Core/Providers/Search/EpisodeSearch.cs b/NzbDrone.Core/Providers/Search/EpisodeSearch.cs
index 29287a315..3581b22f3 100644
--- a/NzbDrone.Core/Providers/Search/EpisodeSearch.cs
+++ b/NzbDrone.Core/Providers/Search/EpisodeSearch.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.DecisionEngine;
diff --git a/NzbDrone.Core/Providers/Search/PartialSeasonSearch.cs b/NzbDrone.Core/Providers/Search/PartialSeasonSearch.cs
index 4e1912496..327567fb8 100644
--- a/NzbDrone.Core/Providers/Search/PartialSeasonSearch.cs
+++ b/NzbDrone.Core/Providers/Search/PartialSeasonSearch.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.DecisionEngine;
diff --git a/NzbDrone.Core/Providers/Search/SearchBase.cs b/NzbDrone.Core/Providers/Search/SearchBase.cs
index 97fee95a5..59fc7ab33 100644
--- a/NzbDrone.Core/Providers/Search/SearchBase.cs
+++ b/NzbDrone.Core/Providers/Search/SearchBase.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.DecisionEngine;
diff --git a/NzbDrone.Core/Providers/SearchHistoryProvider.cs b/NzbDrone.Core/Providers/SearchHistoryProvider.cs
index 50231b8f2..d7fdc816b 100644
--- a/NzbDrone.Core/Providers/SearchHistoryProvider.cs
+++ b/NzbDrone.Core/Providers/SearchHistoryProvider.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Repository.Search;
 using PetaPoco;
diff --git a/NzbDrone.Core/Providers/SearchProvider.cs b/NzbDrone.Core/Providers/SearchProvider.cs
index 3c56449db..a1256db7e 100644
--- a/NzbDrone.Core/Providers/SearchProvider.cs
+++ b/NzbDrone.Core/Providers/SearchProvider.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.DecisionEngine;
diff --git a/NzbDrone.Core/Providers/SignalRProvider.cs b/NzbDrone.Core/Providers/SignalRProvider.cs
index 4bc890b76..08c829116 100644
--- a/NzbDrone.Core/Providers/SignalRProvider.cs
+++ b/NzbDrone.Core/Providers/SignalRProvider.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers.Hubs;
 using SignalR;
diff --git a/NzbDrone.Core/Providers/StatsProvider.cs b/NzbDrone.Core/Providers/StatsProvider.cs
index 21ff6f0a4..03f6262eb 100644
--- a/NzbDrone.Core/Providers/StatsProvider.cs
+++ b/NzbDrone.Core/Providers/StatsProvider.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Repository;
 using PetaPoco;
diff --git a/NzbDrone.Core/Providers/TvRageMappingProvider.cs b/NzbDrone.Core/Providers/TvRageMappingProvider.cs
index 0f0f92897..aae8fde35 100644
--- a/NzbDrone.Core/Providers/TvRageMappingProvider.cs
+++ b/NzbDrone.Core/Providers/TvRageMappingProvider.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.TvRage;
 using NzbDrone.Core.Repository;
 
diff --git a/NzbDrone.Core/Providers/UpcomingEpisodesProvider.cs b/NzbDrone.Core/Providers/UpcomingEpisodesProvider.cs
index e7ea723c4..5693fab57 100644
--- a/NzbDrone.Core/Providers/UpcomingEpisodesProvider.cs
+++ b/NzbDrone.Core/Providers/UpcomingEpisodesProvider.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Repository;
 using PetaPoco;
diff --git a/NzbDrone.Core/Providers/XbmcProvider.cs b/NzbDrone.Core/Providers/XbmcProvider.cs
index 1df4bcb9d..bee174805 100644
--- a/NzbDrone.Core/Providers/XbmcProvider.cs
+++ b/NzbDrone.Core/Providers/XbmcProvider.cs
@@ -8,6 +8,7 @@
 using Newtonsoft.Json.Linq;
 using NLog;
 using NzbDrone.Common;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Model.Xbmc;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Providers.Xbmc;
diff --git a/NzbDrone.Core/Providers/XemProvider.cs b/NzbDrone.Core/Providers/XemProvider.cs
index 70542901a..0f5489134 100644
--- a/NzbDrone.Core/Providers/XemProvider.cs
+++ b/NzbDrone.Core/Providers/XemProvider.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using NLog;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Repository;
 
 namespace NzbDrone.Core.Providers
diff --git a/NzbDrone.Core/Repository/History.cs b/NzbDrone.Core/Repository/History.cs
index 597aab3da..cf56bd283 100644
--- a/NzbDrone.Core/Repository/History.cs
+++ b/NzbDrone.Core/Repository/History.cs
@@ -1,4 +1,5 @@
 using System;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Repository.Quality;
 using PetaPoco;
 
diff --git a/NzbDrone.Core/RootFolders/RootFolderService.cs b/NzbDrone.Core/RootFolders/RootFolderService.cs
index 7dd1afb07..3fc33386d 100644
--- a/NzbDrone.Core/RootFolders/RootFolderService.cs
+++ b/NzbDrone.Core/RootFolders/RootFolderService.cs
@@ -5,6 +5,7 @@
 using NLog;
 using NzbDrone.Common;
 using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Tv;
 using NzbDrone.Core.Providers;
 
 namespace NzbDrone.Core.RootFolders
diff --git a/NzbDrone.Core/Repository/Episode.cs b/NzbDrone.Core/Tv/Episode.cs
similarity index 80%
rename from NzbDrone.Core/Repository/Episode.cs
rename to NzbDrone.Core/Tv/Episode.cs
index a6f4110d3..dd5c46436 100644
--- a/NzbDrone.Core/Repository/Episode.cs
+++ b/NzbDrone.Core/Tv/Episode.cs
@@ -1,12 +1,9 @@
-using System;
-using NzbDrone.Core.Datastore;
+using System.Linq;
+using System;
 using NzbDrone.Core.Model;
-using PetaPoco;
 
-namespace NzbDrone.Core.Repository
+namespace NzbDrone.Core.Tv
 {
-    [TableName("Episodes")]
-    [PrimaryKey("EpisodeId", autoIncrement = true)]
     public class Episode
     {
         public int EpisodeId { get; set; }
@@ -23,20 +20,11 @@ public class Episode
         public Boolean Ignored { get; set; }
         public PostDownloadStatusType PostDownloadStatus { get; set; }
         public int AbsoluteEpisodeNumber { get; set; }
-        public int SceneAbsoluteEpisodeNumber { get; set; }
         public int SceneSeasonNumber { get; set; }
         public int SceneEpisodeNumber { get; set; }
 
-        /// <summary>
-        /// Gets or sets the grab date.
-        /// </summary>
-        /// <remarks>
-        /// Used to specify when the episode was grapped.
-        /// this filed is used by status as an expirable "Grabbed" status.
-        /// </remarks>
         public DateTime? GrabDate { get; set; }
 
-        [ResultColumn]
         public EpisodeStatusType Status
         {
             get
@@ -68,10 +56,8 @@ public EpisodeStatusType Status
             }
         }
 
-        [ResultColumn]
         public Series Series { get; set; }
 
-        [ResultColumn]
         public EpisodeFile EpisodeFile { get; set; }
 
         public override string ToString()
diff --git a/NzbDrone.Core/Repository/EpisodeFile.cs b/NzbDrone.Core/Tv/EpisodeFile.cs
similarity index 79%
rename from NzbDrone.Core/Repository/EpisodeFile.cs
rename to NzbDrone.Core/Tv/EpisodeFile.cs
index c6b137c47..3bbfa3ba1 100644
--- a/NzbDrone.Core/Repository/EpisodeFile.cs
+++ b/NzbDrone.Core/Tv/EpisodeFile.cs
@@ -1,12 +1,10 @@
-using System;
-using System.Collections.Generic;
+using System.Linq;
+using System;
 using NzbDrone.Core.Repository.Quality;
 using PetaPoco;
 
-namespace NzbDrone.Core.Repository
+namespace NzbDrone.Core.Tv
 {
-    [TableName("EpisodeFiles")]
-    [PrimaryKey("EpisodeFileId", autoIncrement = true)]
     public class EpisodeFile
     {
         public EpisodeFile()
@@ -37,12 +35,11 @@ public EpisodeFile(EpisodeFile source)
         public string SceneName { get; set; }
         public string ReleaseGroup { get; set; }
 
-        [Ignore]
-        public Model.QualityModel QualityWrapper
+        public QualityModel QualityWrapper
         {
             get
             {
-                return new Model.QualityModel(Quality, Proper);
+                return new QualityModel(Quality, Proper);
             }
             set
             {
diff --git a/NzbDrone.Core/Providers/EpisodeProvider.cs b/NzbDrone.Core/Tv/EpisodeProvider.cs
similarity index 97%
rename from NzbDrone.Core/Providers/EpisodeProvider.cs
rename to NzbDrone.Core/Tv/EpisodeProvider.cs
index bfa969ba5..9433d3ca6 100644
--- a/NzbDrone.Core/Providers/EpisodeProvider.cs
+++ b/NzbDrone.Core/Tv/EpisodeProvider.cs
@@ -1,14 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.RegularExpressions;
 using NLog;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.Repository;
+using NzbDrone.Core.Providers;
 using PetaPoco;
 using TvdbLib.Data;
 
-namespace NzbDrone.Core.Providers
+namespace NzbDrone.Core.Tv
 {
     public class EpisodeProvider
     {
diff --git a/NzbDrone.Core/Model/QualityModel.cs b/NzbDrone.Core/Tv/QualityModel.cs
similarity index 97%
rename from NzbDrone.Core/Model/QualityModel.cs
rename to NzbDrone.Core/Tv/QualityModel.cs
index 6987b2177..fe31765f0 100644
--- a/NzbDrone.Core/Model/QualityModel.cs
+++ b/NzbDrone.Core/Tv/QualityModel.cs
@@ -1,7 +1,8 @@
-using System;
+using System.Linq;
+using System;
 using NzbDrone.Core.Repository.Quality;
 
-namespace NzbDrone.Core.Model
+namespace NzbDrone.Core.Tv
 {
     public class QualityModel : IComparable<QualityModel>
     {
diff --git a/NzbDrone.Core/Repository/Season.cs b/NzbDrone.Core/Tv/Season.cs
similarity index 63%
rename from NzbDrone.Core/Repository/Season.cs
rename to NzbDrone.Core/Tv/Season.cs
index ac76d67df..a7d39f541 100644
--- a/NzbDrone.Core/Repository/Season.cs
+++ b/NzbDrone.Core/Tv/Season.cs
@@ -1,12 +1,10 @@
-using System;
+using System.Linq;
+using System;
 using System.Collections.Generic;
-using NzbDrone.Core.Model;
 using PetaPoco;
 
-namespace NzbDrone.Core.Repository
+namespace NzbDrone.Core.Tv
 {
-    [TableName("Seasons")]
-    [PrimaryKey("SeasonId", autoIncrement = true)]
     public class Season
     {
         public int SeasonId { get; set; }
@@ -14,7 +12,6 @@ public class Season
         public int SeasonNumber { get; set; }
         public Boolean Ignored { get; set; }
 
-        [ResultColumn]
         public List<Episode> Episodes { get; set; }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Core/Providers/SeasonProvider.cs b/NzbDrone.Core/Tv/SeasonProvider.cs
similarity index 99%
rename from NzbDrone.Core/Providers/SeasonProvider.cs
rename to NzbDrone.Core/Tv/SeasonProvider.cs
index 7e65b268b..54490c086 100644
Binary files a/NzbDrone.Core/Providers/SeasonProvider.cs and b/NzbDrone.Core/Tv/SeasonProvider.cs differ
diff --git a/NzbDrone.Core/Repository/Series.cs b/NzbDrone.Core/Tv/Series.cs
similarity index 70%
rename from NzbDrone.Core/Repository/Series.cs
rename to NzbDrone.Core/Tv/Series.cs
index 7084cfcb9..74783ec9a 100644
--- a/NzbDrone.Core/Repository/Series.cs
+++ b/NzbDrone.Core/Tv/Series.cs
@@ -1,12 +1,10 @@
-using System;
-using System.ComponentModel;
+using System.Linq;
+using System;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Repository.Quality;
-using PetaPoco;
 
-namespace NzbDrone.Core.Repository
+namespace NzbDrone.Core.Tv
 {
-    [PrimaryKey("SeriesId", autoIncrement = false)]
     public class Series
     {
         public virtual int SeriesId { get; set; }
@@ -19,10 +17,8 @@ public class Series
 
         public string Overview { get; set; }
 
-        [DisplayName("Air on")]
         public DayOfWeek? AirsDayOfWeek { get; set; }
 
-        [Column("AirTimes")]
         public String AirTime { get; set; }
 
         public string Language { get; set; }
@@ -62,28 +58,16 @@ public class Series
 
         public DateTime? FirstAired { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether this <see cref="Series"/> is hidden.
-        /// </summary>
-        /// <value><c>true</c> if hidden; otherwise, <c>false</c>.</value>
-        /// <remarks>This field will be used for shows that are pending delete or 
-        /// new series that haven't been successfully imported</remarks>
-        [PetaPoco.Ignore]
         public bool Hidden { get; set; }
 
-        [ResultColumn]
         public QualityProfile QualityProfile { get; set; }
 
-        [ResultColumn]
         public int EpisodeCount { get; set; }
 
-        [ResultColumn]
         public int EpisodeFileCount { get; set; }
 
-        [ResultColumn]
         public int SeasonCount { get; set; }
 
-        [ResultColumn]
         public DateTime? NextAiring { get; set; }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Core/Providers/SeriesProvider.cs b/NzbDrone.Core/Tv/SeriesProvider.cs
similarity index 99%
rename from NzbDrone.Core/Providers/SeriesProvider.cs
rename to NzbDrone.Core/Tv/SeriesProvider.cs
index 5ac92fe32..0a2873b94 100644
--- a/NzbDrone.Core/Providers/SeriesProvider.cs
+++ b/NzbDrone.Core/Tv/SeriesProvider.cs
@@ -5,12 +5,13 @@
 using NLog;
 using NzbDrone.Common;
 using NzbDrone.Core.Model;
+using NzbDrone.Core.Providers;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Repository.Quality;
 using PetaPoco;
 
-namespace NzbDrone.Core.Providers
+namespace NzbDrone.Core.Tv
 {
     public class SeriesProvider
     {
diff --git a/NzbDrone.ncrunchsolution b/NzbDrone.ncrunchsolution
index c875ef518..e88d63cdb 100644
--- a/NzbDrone.ncrunchsolution
+++ b/NzbDrone.ncrunchsolution
@@ -1,7 +1,8 @@
 <SolutionConfiguration>
   <FileVersion>1</FileVersion>
-  <AutoEnableOnStartup>True</AutoEnableOnStartup>
+  <AutoEnableOnStartup>False</AutoEnableOnStartup>
   <AllowParallelTestExecution>true</AllowParallelTestExecution>
+  <AllowTestsToRunInParallelWithThemselves>true</AllowTestsToRunInParallelWithThemselves>
   <FrameworkUtilisationTypeForNUnit>UseDynamicAnalysis</FrameworkUtilisationTypeForNUnit>
   <FrameworkUtilisationTypeForGallio>Disabled</FrameworkUtilisationTypeForGallio>
   <FrameworkUtilisationTypeForMSpec>Disabled</FrameworkUtilisationTypeForMSpec>