From 5450170718abeeef4adb5ce645628f621ed8ba76 Mon Sep 17 00:00:00 2001
From: Taloth Saldono <Taloth@users.noreply.github.com>
Date: Sat, 26 Jul 2014 14:16:02 +0200
Subject: [PATCH] Cleanup, sorted project files.

---
 .../NzbDrone.Api.Test.csproj                  |  20 +-
 src/NzbDrone.Api/NzbDrone.Api.csproj          | 144 ++--
 .../NzbDrone.Host.Test.csproj                 |  12 +-
 .../NzbDrone.Automation.Test.csproj           |  20 +-
 .../NzbDrone.Common.Test.csproj               |  30 +-
 src/NzbDrone.Common/NzbDrone.Common.csproj    |  80 +--
 .../NzbDrone.Core.Test.csproj                 | 226 +++---
 src/NzbDrone.Core/NzbDrone.Core.csproj        | 672 +++++++++---------
 src/NzbDrone.Host/NzbDrone.Host.csproj        |  34 +-
 .../NzbDrone.Integration.Test.csproj          |  40 +-
 .../NzbDrone.Libraries.Test.csproj            |  12 +-
 .../NzbDrone.Mono.Test.csproj                 |  22 +-
 src/NzbDrone.Mono/NzbDrone.Mono.csproj        |  14 +-
 .../NzbDrone.Test.Common.csproj               |  28 +-
 .../NzbDrone.Test.Dummy.csproj                |   6 +-
 .../NzbDrone.Update.Test.csproj               |  18 +-
 src/NzbDrone.Update/NzbDrone.Update.csproj    |   4 +-
 .../NzbDrone.Windows.Test.csproj              |  22 +-
 src/NzbDrone.Windows/NzbDrone.Windows.csproj  |  12 +-
 src/NzbDrone/NzbDrone.csproj                  |   4 +-
 20 files changed, 707 insertions(+), 713 deletions(-)

diff --git a/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj b/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj
index 661e3279d..3e355f4ac 100644
--- a/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj
+++ b/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj
@@ -38,9 +38,19 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="FizzWare.NBuilder">
       <HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
     </Reference>
+    <Reference Include="FluentAssertions">
+      <HintPath>..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
+    </Reference>
     <Reference Include="Moq">
       <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
     </Reference>
@@ -50,16 +60,6 @@
     <Reference Include="Omu.ValueInjecter">
       <HintPath>..\packages\valueinjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll</HintPath>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="FluentAssertions">
-      <HintPath>..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ClientSchemaTests\SchemaBuilderFixture.cs" />
diff --git a/src/NzbDrone.Api/NzbDrone.Api.csproj b/src/NzbDrone.Api/NzbDrone.Api.csproj
index 80bb065fb..a10896797 100644
--- a/src/NzbDrone.Api/NzbDrone.Api.csproj
+++ b/src/NzbDrone.Api/NzbDrone.Api.csproj
@@ -40,22 +40,20 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="DDay.iCal">
       <HintPath>..\packages\DDay.iCal.1.0.2.575\lib\DDay.iCal.dll</HintPath>
     </Reference>
+    <Reference Include="FluentValidation">
+      <HintPath>..\packages\FluentValidation.5.0.0.1\lib\Net40\FluentValidation.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.AspNet.SignalR.Core, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.1.1.3\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Omu.ValueInjecter">
-      <HintPath>..\packages\ValueInjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="FluentValidation">
-      <HintPath>..\packages\FluentValidation.5.0.0.1\lib\Net40\FluentValidation.dll</HintPath>
-    </Reference>
     <Reference Include="Nancy">
       <HintPath>..\packages\Nancy.0.21.1\lib\net40\Nancy.dll</HintPath>
     </Reference>
@@ -71,10 +69,6 @@
     <Reference Include="Omu.ValueInjecter">
       <HintPath>..\packages\ValueInjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll</HintPath>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Data.SQLite, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Libraries\Sqlite\System.Data.SQLite.dll</HintPath>
@@ -89,131 +83,131 @@
     <Compile Include="Authentication\NzbDroneUser.cs" />
     <Compile Include="Blacklist\BlacklistModule.cs" />
     <Compile Include="Blacklist\BlacklistResource.cs" />
-    <Compile Include="Calendar\CalendarModule.cs" />
     <Compile Include="Calendar\CalendarFeedModule.cs" />
-    <Compile Include="ClientSchema\SchemaDeserializer.cs" />
-    <Compile Include="ClientSchema\FieldDefinitionAttribute.cs" />
+    <Compile Include="Calendar\CalendarModule.cs" />
     <Compile Include="ClientSchema\Field.cs" />
+    <Compile Include="ClientSchema\FieldDefinitionAttribute.cs" />
     <Compile Include="ClientSchema\SchemaBuilder.cs" />
+    <Compile Include="ClientSchema\SchemaDeserializer.cs" />
     <Compile Include="ClientSchema\SelectOption.cs" />
     <Compile Include="Commands\CommandModule.cs" />
     <Compile Include="Commands\CommandResource.cs" />
-    <Compile Include="Config\IndexerConfigModule.cs" />
-    <Compile Include="Config\MediaManagementConfigModule.cs" />
-    <Compile Include="Config\MediaManagementConfigResource.cs" />
-    <Compile Include="Config\NzbDroneConfigModule.cs" />
     <Compile Include="Config\DownloadClientConfigModule.cs" />
     <Compile Include="Config\DownloadClientConfigResource.cs" />
     <Compile Include="Config\HostConfigModule.cs" />
     <Compile Include="Config\HostConfigResource.cs" />
-    <Compile Include="Config\NamingConfigResource.cs" />
-    <Compile Include="Config\NamingConfigModule.cs" />
+    <Compile Include="Config\IndexerConfigModule.cs" />
     <Compile Include="Config\IndexerConfigResource.cs" />
-    <Compile Include="DownloadClient\DownloadClientModule.cs" />
-    <Compile Include="DownloadClient\DownloadClientResource.cs" />
+    <Compile Include="Config\MediaManagementConfigModule.cs" />
+    <Compile Include="Config\MediaManagementConfigResource.cs" />
+    <Compile Include="Config\NamingConfigModule.cs" />
+    <Compile Include="Config\NamingConfigResource.cs" />
+    <Compile Include="Config\NamingSampleResource.cs" />
+    <Compile Include="Config\NzbDroneConfigModule.cs" />
+    <Compile Include="Directories\DirectoryLookupService.cs" />
+    <Compile Include="Directories\DirectoryModule.cs" />
     <Compile Include="DiskSpace\DiskSpaceModule.cs" />
     <Compile Include="DiskSpace\DiskSpaceResource.cs" />
+    <Compile Include="DownloadClient\DownloadClientModule.cs" />
+    <Compile Include="DownloadClient\DownloadClientResource.cs" />
     <Compile Include="EpisodeFiles\EpisodeFileModule.cs" />
     <Compile Include="EpisodeFiles\EpisodeFileResource.cs" />
-    <Compile Include="Directories\DirectoryLookupService.cs" />
-    <Compile Include="Directories\DirectoryModule.cs" />
-    <Compile Include="Episodes\EpisodeModuleWithSignalR.cs" />
     <Compile Include="Episodes\EpisodeModule.cs" />
+    <Compile Include="Episodes\EpisodeModuleWithSignalR.cs" />
     <Compile Include="Episodes\EpisodeResource.cs" />
     <Compile Include="Episodes\RenameEpisodeModule.cs" />
     <Compile Include="Episodes\RenameEpisodeResource.cs" />
-    <Compile Include="Extensions\Pipelines\NzbDroneVersionPipeline.cs" />
+    <Compile Include="ErrorManagement\ApiException.cs" />
+    <Compile Include="ErrorManagement\ErrorHandler.cs" />
+    <Compile Include="ErrorManagement\ErrorModel.cs" />
+    <Compile Include="ErrorManagement\NzbDroneErrorPipeline.cs" />
+    <Compile Include="Exceptions\InvalidApiKeyException.cs" />
+    <Compile Include="Extensions\LazyExtensions.cs" />
+    <Compile Include="Extensions\NancyJsonSerializer.cs" />
     <Compile Include="Extensions\Pipelines\CacheHeaderPipeline.cs" />
     <Compile Include="Extensions\Pipelines\GZipPipeline.cs" />
     <Compile Include="Extensions\Pipelines\IfModifiedPipeline.cs" />
     <Compile Include="Extensions\Pipelines\IRegisterNancyPipeline.cs" />
-    <Compile Include="Extensions\NancyJsonSerializer.cs" />
+    <Compile Include="Extensions\Pipelines\NzbDroneVersionPipeline.cs" />
+    <Compile Include="Extensions\ReqResExtensions.cs" />
     <Compile Include="Extensions\RequestExtensions.cs" />
     <Compile Include="Frontend\CacheableSpecification.cs" />
-    <Compile Include="Frontend\Mappers\UpdateLogFileMapper.cs" />
     <Compile Include="Frontend\Mappers\BackupFileMapper.cs" />
     <Compile Include="Frontend\Mappers\FaviconMapper.cs" />
+    <Compile Include="Frontend\Mappers\IMapHttpRequestsToDisk.cs" />
     <Compile Include="Frontend\Mappers\IndexHtmlMapper.cs" />
     <Compile Include="Frontend\Mappers\LogFileMapper.cs" />
     <Compile Include="Frontend\Mappers\MediaCoverMapper.cs" />
     <Compile Include="Frontend\Mappers\StaticResourceMapper.cs" />
-    <Compile Include="Frontend\Mappers\IMapHttpRequestsToDisk.cs" />
     <Compile Include="Frontend\Mappers\StaticResourceMapperBase.cs" />
+    <Compile Include="Frontend\Mappers\UpdateLogFileMapper.cs" />
     <Compile Include="Frontend\StaticResourceModule.cs" />
-    <Compile Include="Health\HealthResource.cs" />
     <Compile Include="Health\HealthModule.cs" />
-    <Compile Include="History\HistoryResource.cs" />
+    <Compile Include="Health\HealthResource.cs" />
     <Compile Include="History\HistoryModule.cs" />
-    <Compile Include="Logs\LogFileModuleBase.cs" />
-    <Compile Include="Logs\UpdateLogFileModule.cs" />
-    <Compile Include="MediaCovers\MediaCoverModule.cs" />
-    <Compile Include="Metadata\MetadataResource.cs" />
-    <Compile Include="Metadata\MetadataModule.cs" />
-    <Compile Include="NzbDroneFeedModule.cs" />
-    <Compile Include="Profiles\Languages\LanguageModule.cs" />
-    <Compile Include="Profiles\Languages\LanguageResource.cs" />
-    <Compile Include="Profiles\LegacyProfileModule.cs" />
-    <Compile Include="ProviderResource.cs" />
-    <Compile Include="ProviderModuleBase.cs" />
+    <Compile Include="History\HistoryResource.cs" />
     <Compile Include="Indexers\IndexerModule.cs" />
     <Compile Include="Indexers\IndexerResource.cs" />
     <Compile Include="Indexers\ReleaseModule.cs" />
-    <Compile Include="Extensions\LazyExtensions.cs" />
     <Compile Include="Indexers\ReleaseResource.cs" />
-    <Compile Include="Logs\LogFileResource.cs" />
     <Compile Include="Logs\LogFileModule.cs" />
+    <Compile Include="Logs\LogFileModuleBase.cs" />
+    <Compile Include="Logs\LogFileResource.cs" />
     <Compile Include="Logs\LogModule.cs" />
     <Compile Include="Logs\LogResource.cs" />
+    <Compile Include="Logs\UpdateLogFileModule.cs" />
     <Compile Include="Mapping\CloneInjection.cs" />
     <Compile Include="Mapping\MappingValidation.cs" />
     <Compile Include="Mapping\ResourceMappingException.cs" />
     <Compile Include="Mapping\ValueInjectorExtensions.cs" />
-    <Compile Include="Series\AlternateTitleResource.cs" />
-    <Compile Include="Series\SeasonResource.cs" />
-    <Compile Include="System\Backup\BackupModule.cs" />
-    <Compile Include="System\Backup\BackupResource.cs" />
-    <Compile Include="Update\UpdateResource.cs" />
-    <Compile Include="Wanted\CutoffModule.cs" />
-    <Compile Include="Wanted\LegacyMissingModule.cs" />
-    <Compile Include="Wanted\MissingModule.cs" />
-    <Compile Include="Config\NamingSampleResource.cs" />
-    <Compile Include="NzbDroneRestModuleWithSignalR.cs" />
-    <Compile Include="Profiles\ProfileValidation.cs" />
-    <Compile Include="Queue\QueueModule.cs" />
-    <Compile Include="Queue\QueueResource.cs" />
-    <Compile Include="ResourceChangeMessage.cs" />
+    <Compile Include="MediaCovers\MediaCoverModule.cs" />
+    <Compile Include="Metadata\MetadataModule.cs" />
+    <Compile Include="Metadata\MetadataResource.cs" />
+    <Compile Include="NancyBootstrapper.cs" />
     <Compile Include="Notifications\NotificationModule.cs" />
     <Compile Include="Notifications\NotificationResource.cs" />
+    <Compile Include="NzbDroneApiModule.cs" />
+    <Compile Include="NzbDroneFeedModule.cs" />
     <Compile Include="NzbDroneRestModule.cs" />
+    <Compile Include="NzbDroneRestModuleWithSignalR.cs" />
     <Compile Include="PagingResource.cs" />
+    <Compile Include="Profiles\Languages\LanguageModule.cs" />
+    <Compile Include="Profiles\Languages\LanguageResource.cs" />
+    <Compile Include="Profiles\LegacyProfileModule.cs" />
+    <Compile Include="Profiles\ProfileModule.cs" />
+    <Compile Include="Profiles\ProfileResource.cs" />
     <Compile Include="Profiles\ProfileSchemaModule.cs" />
+    <Compile Include="Profiles\ProfileValidation.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ProviderModuleBase.cs" />
+    <Compile Include="ProviderResource.cs" />
+    <Compile Include="Qualities\QualityDefinitionModule.cs" />
+    <Compile Include="Qualities\QualityDefinitionResource.cs" />
+    <Compile Include="Queue\QueueModule.cs" />
+    <Compile Include="Queue\QueueResource.cs" />
+    <Compile Include="ResourceChangeMessage.cs" />
     <Compile Include="REST\BadRequestException.cs" />
     <Compile Include="REST\ResourceValidator.cs" />
     <Compile Include="REST\RestModule.cs" />
     <Compile Include="REST\RestResource.cs" />
     <Compile Include="RootFolders\RootFolderModule.cs" />
     <Compile Include="RootFolders\RootFolderResource.cs" />
+    <Compile Include="Series\AlternateTitleResource.cs" />
+    <Compile Include="Series\SeasonResource.cs" />
     <Compile Include="Series\SeriesEditorModule.cs" />
-    <Compile Include="Series\SeriesResource.cs" />
-    <Compile Include="Series\SeriesModule.cs" />
     <Compile Include="Series\SeriesLookupModule.cs" />
-    <Compile Include="ErrorManagement\ApiException.cs" />
-    <Compile Include="NancyBootstrapper.cs" />
-    <Compile Include="ErrorManagement\ErrorHandler.cs" />
-    <Compile Include="ErrorManagement\ErrorModel.cs" />
-    <Compile Include="ErrorManagement\NzbDroneErrorPipeline.cs" />
-    <Compile Include="Exceptions\InvalidApiKeyException.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="NzbDroneApiModule.cs" />
-    <Compile Include="Profiles\ProfileResource.cs" />
-    <Compile Include="Profiles\ProfileModule.cs" />
-    <Compile Include="Qualities\QualityDefinitionResource.cs" />
-    <Compile Include="Qualities\QualityDefinitionModule.cs" />
-    <Compile Include="Extensions\ReqResExtensions.cs" />
+    <Compile Include="Series\SeriesModule.cs" />
+    <Compile Include="Series\SeriesResource.cs" />
+    <Compile Include="System\Backup\BackupModule.cs" />
+    <Compile Include="System\Backup\BackupResource.cs" />
     <Compile Include="System\SystemModule.cs" />
     <Compile Include="TinyIoCNancyBootstrapper.cs" />
     <Compile Include="Update\UpdateModule.cs" />
+    <Compile Include="Update\UpdateResource.cs" />
     <Compile Include="Validation\RuleBuilderExtensions.cs" />
+    <Compile Include="Wanted\CutoffModule.cs" />
+    <Compile Include="Wanted\LegacyMissingModule.cs" />
+    <Compile Include="Wanted\MissingModule.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config">
diff --git a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj
index 0b00efb90..a7ddd84f0 100644
--- a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj
+++ b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj
@@ -37,20 +37,20 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Moq">
-      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
     <Reference Include="FizzWare.NBuilder, Version=3.0.1.0, Culture=neutral, PublicKeyToken=5651b03e12e42c12">
       <HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
     </Reference>
     <Reference Include="FluentAssertions">
       <HintPath>..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
     </Reference>
+    <Reference Include="Moq">
+      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
+    </Reference>
     <Reference Include="NLog">
       <HintPath>..\packages\NLog.2.1.0\lib\net40\NLog.dll</HintPath>
     </Reference>
@@ -60,10 +60,10 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ContainerFixture.cs" />
-    <Compile Include="NzbDroneProcessServiceFixture.cs" />
-    <Compile Include="RouterTest.cs" />
     <Compile Include="MonitoringProviderTest.cs" />
+    <Compile Include="NzbDroneProcessServiceFixture.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RouterTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\NzbDrone.Test.Common\App.config">
diff --git a/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj b/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj
index c09932bcb..9410073dd 100644
--- a/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj
+++ b/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj
@@ -38,23 +38,23 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NLog">
-      <HintPath>..\packages\NLog.2.1.0\lib\net40\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
     <Reference Include="FluentAssertions">
       <HintPath>..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
     </Reference>
+    <Reference Include="NLog">
+      <HintPath>..\packages\NLog.2.1.0\lib\net40\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework">
+      <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="WebDriver, Version=2.41.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Selenium.WebDriver.2.41.0\lib\net40\WebDriver.dll</HintPath>
@@ -65,8 +65,8 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AutomationTestAttribute.cs" />
     <Compile Include="AutomationTest.cs" />
+    <Compile Include="AutomationTestAttribute.cs" />
     <Compile Include="MainPagesTest.cs" />
     <Compile Include="PageModel\PageBase.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
index 5b9259033..d813e54f9 100644
--- a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
+++ b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
@@ -37,20 +37,20 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Moq">
-      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
     <Reference Include="FluentAssertions">
       <HintPath>..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
     </Reference>
+    <Reference Include="Moq">
+      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
+    </Reference>
     <Reference Include="NLog">
       <HintPath>..\packages\NLog.2.1.0\lib\net40\NLog.dll</HintPath>
     </Reference>
@@ -59,21 +59,21 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CacheTests\CachedManagerFixture.cs" />
     <Compile Include="CacheTests\CachedFixture.cs" />
+    <Compile Include="CacheTests\CachedManagerFixture.cs" />
     <Compile Include="ConfigFileProviderTest.cs" />
+    <Compile Include="DiskProviderTests\DiskProviderFixtureBase.cs" />
     <Compile Include="DiskProviderTests\FreeSpaceFixtureBase.cs" />
     <Compile Include="DiskProviderTests\IsParentFixtureBase.cs" />
     <Compile Include="EnsureTest\PathExtensionFixture.cs" />
-    <Compile Include="EnvironmentTests\StartupArgumentsFixture.cs" />
+    <Compile Include="EnvironmentProviderTest.cs" />
     <Compile Include="EnvironmentTests\EnvironmentProviderTest.cs" />
+    <Compile Include="EnvironmentTests\StartupArgumentsFixture.cs" />
     <Compile Include="InstrumentationTests\CleanseLogMessageFixture.cs" />
     <Compile Include="LevenshteinDistanceFixture.cs" />
-    <Compile Include="ReflectionExtensions.cs" />
     <Compile Include="PathExtensionFixture.cs" />
-    <Compile Include="DiskProviderTests\DiskProviderFixtureBase.cs" />
-    <Compile Include="EnvironmentProviderTest.cs" />
     <Compile Include="ProcessProviderTests.cs" />
+    <Compile Include="ReflectionExtensions.cs" />
     <Compile Include="ReflectionTests\ReflectionExtensionFixture.cs" />
     <Compile Include="ServiceProviderTests.cs" />
     <Compile Include="WebClientTests.cs" />
@@ -97,6 +97,10 @@
       <Project>{95C11A9E-56ED-456A-8447-2C89C1139266}</Project>
       <Name>NzbDrone.Host</Name>
     </ProjectReference>
+    <ProjectReference Include="..\NzbDrone\NzbDrone.csproj">
+      <Project>{D12F7F2F-8A3C-415F-88FA-6DD061A84869}</Project>
+      <Name>NzbDrone</Name>
+    </ProjectReference>
     <ProjectReference Include="..\NzbDrone.Test.Common\NzbDrone.Test.Common.csproj">
       <Project>{CADDFCE0-7509-4430-8364-2074E1EEFCA2}</Project>
       <Name>NzbDrone.Test.Common</Name>
@@ -105,10 +109,6 @@
       <Project>{FAFB5948-A222-4CF6-AD14-026BE7564802}</Project>
       <Name>NzbDrone.Test.Dummy</Name>
     </ProjectReference>
-    <ProjectReference Include="..\NzbDrone\NzbDrone.csproj">
-      <Project>{D12F7F2F-8A3C-415F-88FA-6DD061A84869}</Project>
-      <Name>NzbDrone</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj
index e5ef0d4e7..ad6f21b9a 100644
--- a/src/NzbDrone.Common/NzbDrone.Common.csproj
+++ b/src/NzbDrone.Common/NzbDrone.Common.csproj
@@ -39,19 +39,15 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="RestSharp, Version=104.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Configuration.Install" />
     <Reference Include="System.Core" />
     <Reference Include="System.ServiceProcess" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="ICSharpCode.SharpZipLib">
+      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
     <Reference Include="Loggly">
       <HintPath>..\packages\loggly-csharp.2.3\lib\net35\Loggly.dll</HintPath>
     </Reference>
@@ -61,18 +57,24 @@
     <Reference Include="NLog">
       <HintPath>..\packages\NLog.2.1.0\lib\net40\NLog.dll</HintPath>
     </Reference>
+    <Reference Include="RestSharp, Version=104.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ConvertBase32.cs" />
     <Compile Include="ArchiveService.cs" />
     <Compile Include="Cache\Cached.cs" />
     <Compile Include="Cache\CacheManager.cs" />
     <Compile Include="Cache\ICached.cs" />
     <Compile Include="Composition\Container.cs" />
-    <Compile Include="Composition\IContainer.cs" />
     <Compile Include="Composition\ContainerBuilderBase.cs" />
+    <Compile Include="Composition\IContainer.cs" />
+    <Compile Include="ConsoleService.cs" />
+    <Compile Include="ConvertBase32.cs" />
     <Compile Include="DictionaryExtensions.cs" />
     <Compile Include="Disk\DiskProviderBase.cs" />
+    <Compile Include="Disk\IDiskProvider.cs" />
     <Compile Include="EnsureThat\Ensure.cs" />
     <Compile Include="EnsureThat\EnsureBoolExtensions.cs" />
     <Compile Include="EnsureThat\EnsureCollectionExtensions.cs" />
@@ -91,62 +93,60 @@
     <Compile Include="EnsureThat\ExpressionExtensions.cs" />
     <Compile Include="EnsureThat\Param.cs" />
     <Compile Include="EnsureThat\Resources\ExceptionMessages.Designer.cs" />
+    <Compile Include="EnsureThat\TypeParam.cs" />
     <Compile Include="EnvironmentInfo\AppFolderFactory.cs" />
+    <Compile Include="EnvironmentInfo\AppFolderInfo.cs" />
     <Compile Include="EnvironmentInfo\BuildInfo.cs" />
-    <Compile Include="EnvironmentInfo\StartupContext.cs" />
-    <Compile Include="EnvironmentInfo\RuntimeInfo.cs" />
     <Compile Include="EnvironmentInfo\OsInfo.cs" />
+    <Compile Include="EnvironmentInfo\RuntimeInfo.cs" />
+    <Compile Include="EnvironmentInfo\StartupContext.cs" />
     <Compile Include="Exceptions\NotParentException.cs" />
     <Compile Include="Exceptions\NzbDroneException.cs" />
+    <Compile Include="Expansive\CircularReferenceException.cs" />
+    <Compile Include="Expansive\Expansive.cs" />
+    <Compile Include="Expansive\PatternStyle.cs" />
+    <Compile Include="Expansive\Tree.cs" />
+    <Compile Include="Expansive\TreeNode.cs" />
+    <Compile Include="Expansive\TreeNodeList.cs" />
+    <Compile Include="Extensions\StreamExtensions.cs" />
+    <Compile Include="HashUtil.cs" />
+    <Compile Include="Http\HttpProvider.cs" />
     <Compile Include="Http\NzbDroneWebClient.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="IEnumerableExtensions.cs" />
     <Compile Include="Instrumentation\CleanseLogMessage.cs" />
-    <Compile Include="Instrumentation\GlobalExceptionHandlers.cs" />
     <Compile Include="Instrumentation\ExceptronTarget.cs" />
+    <Compile Include="Instrumentation\GlobalExceptionHandlers.cs" />
     <Compile Include="Instrumentation\LogEventExtensions.cs" />
+    <Compile Include="Instrumentation\LogglyTarget.cs" />
+    <Compile Include="Instrumentation\LogTargets.cs" />
     <Compile Include="Instrumentation\NzbDroneFileTarget.cs" />
     <Compile Include="Instrumentation\NzbDroneLogger.cs" />
-    <Compile Include="Instrumentation\LogTargets.cs" />
+    <Compile Include="Instrumentation\VersionLayoutRenderer.cs" />
+    <Compile Include="LevenstheinExtensions.cs" />
     <Compile Include="Messaging\IEvent.cs" />
     <Compile Include="Messaging\IMessage.cs" />
+    <Compile Include="Model\ProcessInfo.cs" />
     <Compile Include="PathEqualityComparer.cs" />
+    <Compile Include="PathExtensions.cs" />
     <Compile Include="Processes\IRuntimeProvider.cs" />
     <Compile Include="Processes\PidFileProvider.cs" />
     <Compile Include="Processes\ProcessOutput.cs" />
+    <Compile Include="Processes\ProcessProvider.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\SharedAssemblyInfo.cs" />
     <Compile Include="RateGate.cs" />
-    <Compile Include="Serializer\IntConverter.cs" />
-    <Compile Include="Services.cs" />
-    <Compile Include="Extensions\StreamExtensions.cs" />
-    <Compile Include="LevenstheinExtensions.cs" />
-    <Compile Include="TPL\LimitedConcurrencyLevelTaskScheduler.cs" />
+    <Compile Include="Reflection\ReflectionExtensions.cs" />
     <Compile Include="Security\IgnoreCertErrorPolicy.cs" />
-    <Compile Include="StringExtensions.cs" />
-    <Compile Include="EnsureThat\TypeParam.cs" />
-    <Compile Include="HashUtil.cs" />
-    <Compile Include="Instrumentation\LogglyTarget.cs" />
+    <Compile Include="Serializer\IntConverter.cs" />
     <Compile Include="Serializer\Json.cs" />
-    <Compile Include="Expansive\CircularReferenceException.cs" />
-    <Compile Include="Expansive\Expansive.cs" />
-    <Compile Include="Expansive\PatternStyle.cs" />
-    <Compile Include="Expansive\Tree.cs" />
-    <Compile Include="Expansive\TreeNode.cs" />
-    <Compile Include="Expansive\TreeNodeList.cs" />
-    <Compile Include="Instrumentation\VersionLayoutRenderer.cs" />
-    <Compile Include="Reflection\ReflectionExtensions.cs" />
     <Compile Include="ServiceFactory.cs" />
-    <Compile Include="Http\HttpProvider.cs" />
-    <Compile Include="ConsoleService.cs" />
-    <Compile Include="PathExtensions.cs" />
-    <Compile Include="Disk\IDiskProvider.cs" />
-    <Compile Include="EnvironmentInfo\AppFolderInfo.cs" />
-    <Compile Include="Model\ProcessInfo.cs" />
-    <Compile Include="Processes\ProcessProvider.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\SharedAssemblyInfo.cs" />
     <Compile Include="ServiceProvider.cs" />
+    <Compile Include="Services.cs" />
+    <Compile Include="StringExtensions.cs" />
     <Compile Include="TinyIoC.cs" />
+    <Compile Include="TPL\LimitedConcurrencyLevelTaskScheduler.cs" />
     <Compile Include="TPL\TaskExtensions.cs" />
     <Compile Include="TryParseExtension.cs" />
   </ItemGroup>
diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index b04fdc1b6..0c0179034 100644
--- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -40,17 +40,14 @@
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AutoMoq">
-      <HintPath>..\packages\AutoMoq.1.6.1\lib\AutoMoq.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Practices.Unity.Configuration">
-      <HintPath>..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="AutoMoq">
+      <HintPath>..\packages\AutoMoq.1.6.1\lib\AutoMoq.dll</HintPath>
+    </Reference>
     <Reference Include="FizzWare.NBuilder, Version=3.0.1.0, Culture=neutral, PublicKeyToken=5651b03e12e42c12">
       <HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
     </Reference>
@@ -72,6 +69,9 @@
     <Reference Include="Microsoft.Practices.Unity">
       <HintPath>..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Practices.Unity.Configuration">
+      <HintPath>..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll</HintPath>
+    </Reference>
     <Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920">
       <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
     </Reference>
@@ -92,58 +92,73 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Blacklisting\BlacklistServiceFixture.cs" />
     <Compile Include="Blacklisting\BlacklistRepositoryFixture.cs" />
+    <Compile Include="Blacklisting\BlacklistServiceFixture.cs" />
+    <Compile Include="Configuration\ConfigCachingFixture.cs" />
+    <Compile Include="Configuration\ConfigServiceFixture.cs" />
     <Compile Include="DataAugmentationFixture\Scene\SceneMappingProxyFixture.cs" />
     <Compile Include="DataAugmentationFixture\Scene\SceneMappingServiceFixture.cs" />
-    <Compile Include="Datastore\MarrDataLazyLoadingFixture.cs" />
     <Compile Include="Datastore\BasicRepositoryFixture.cs" />
     <Compile Include="Datastore\Converters\ProviderSettingConverterFixture.cs" />
     <Compile Include="Datastore\DatabaseFixture.cs" />
     <Compile Include="Datastore\DatabaseRelationshipFixture.cs" />
     <Compile Include="Datastore\MappingExtentionFixture.cs" />
+    <Compile Include="Datastore\MarrDataLazyLoadingFixture.cs" />
     <Compile Include="Datastore\ObjectDatabaseFixture.cs" />
-    <Compile Include="Datastore\PagingSpecExtensionsTests\ToSortDirectionFixture.cs" />
     <Compile Include="Datastore\PagingSpecExtensionsTests\PagingOffsetFixture.cs" />
+    <Compile Include="Datastore\PagingSpecExtensionsTests\ToSortDirectionFixture.cs" />
     <Compile Include="Datastore\ReflectionStrategyFixture\Benchmarks.cs" />
     <Compile Include="Datastore\SQLiteMigrationHelperTests\AlterFixture.cs" />
     <Compile Include="Datastore\SQLiteMigrationHelperTests\DuplicateFixture.cs" />
-    <Compile Include="DecisionEngineTests\NotInQueueSpecificationFixture.cs" />
+    <Compile Include="DecisionEngineTests\AcceptableSizeSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\CutoffSpecificationFixture.cs" />
+    <Compile Include="DecisionEngineTests\DownloadDecisionMakerFixture.cs" />
+    <Compile Include="DecisionEngineTests\HistorySpecificationFixture.cs" />
+    <Compile Include="DecisionEngineTests\LanguageSpecificationFixture.cs" />
+    <Compile Include="DecisionEngineTests\MonitoredEpisodeSpecificationFixture.cs" />
+    <Compile Include="DecisionEngineTests\NotInQueueSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\NotRestrictedReleaseSpecificationFixture.cs" />
+    <Compile Include="DecisionEngineTests\PrioritizeDownloadDecisionFixture.cs" />
+    <Compile Include="DecisionEngineTests\QualityAllowedByProfileSpecificationFixture.cs" />
+    <Compile Include="DecisionEngineTests\QualityUpgradeSpecificationFixture.cs" />
+    <Compile Include="DecisionEngineTests\RetentionSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\RssSync\DelaySpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\RssSync\ProperSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\Search\SeriesSpecificationFixture.cs" />
+    <Compile Include="DecisionEngineTests\UpgradeDiskSpecificationFixture.cs" />
+    <Compile Include="Download\CompletedDownloadServiceFixture.cs" />
     <Compile Include="Download\DownloadApprovedReportsTests\DownloadApprovedFixture.cs" />
-    <Compile Include="DecisionEngineTests\PrioritizeDownloadDecisionFixture.cs" />
     <Compile Include="Download\DownloadClientTests\Blackhole\UsenetBlackholeFixture.cs" />
     <Compile Include="Download\DownloadClientTests\DownloadClientFixtureBase.cs" />
     <Compile Include="Download\DownloadClientTests\NzbgetTests\NzbgetFixture.cs" />
     <Compile Include="Download\DownloadClientTests\PneumaticProviderFixture.cs" />
     <Compile Include="Download\DownloadClientTests\SabnzbdTests\SabnzbdFixture.cs" />
     <Compile Include="Download\DownloadServiceFixture.cs" />
-    <Compile Include="Download\CompletedDownloadServiceFixture.cs" />
     <Compile Include="Download\FailedDownloadServiceFixture.cs" />
     <Compile Include="Download\Pending\PendingReleaseServiceTests\ProcessFixture.cs" />
+    <Compile Include="FluentTest.cs" />
     <Compile Include="Framework\CoreTest.cs" />
     <Compile Include="Framework\DbTest.cs" />
     <Compile Include="Framework\NBuilderExtensions.cs" />
+    <Compile Include="Framework\TestDbHelper.cs" />
     <Compile Include="HealthCheck\Checks\AppDataLocationFixture.cs" />
-    <Compile Include="HealthCheck\Checks\RootFolderCheckFixture.cs" />
     <Compile Include="HealthCheck\Checks\DownloadClientCheckFixture.cs" />
+    <Compile Include="HealthCheck\Checks\DroneFactoryCheckFixture.cs" />
+    <Compile Include="HealthCheck\Checks\HealthCheckFixtureExtentions.cs" />
     <Compile Include="HealthCheck\Checks\ImportMechanismCheckFixture.cs" />
-    <Compile Include="HealthCheck\Checks\UpdateCheckFixture.cs" />
     <Compile Include="HealthCheck\Checks\IndexerCheckFixture.cs" />
-    <Compile Include="HealthCheck\Checks\DroneFactoryCheckFixture.cs" />
     <Compile Include="HealthCheck\Checks\MonoVersionCheckFixture.cs" />
-    <Compile Include="HealthCheck\Checks\HealthCheckFixtureExtentions.cs" />
+    <Compile Include="HealthCheck\Checks\RootFolderCheckFixture.cs" />
+    <Compile Include="HealthCheck\Checks\UpdateCheckFixture.cs" />
+    <Compile Include="HistoryTests\HistoryRepositoryFixture.cs" />
     <Compile Include="HistoryTests\HistoryServiceFixture.cs" />
-    <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedHistoryItemsFixture.cs" />
-    <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedEpisodeFilesFixture.cs" />
     <Compile Include="Housekeeping\Housekeepers\CleanupAdditionalNamingSpecsFixture.cs" />
-    <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedMetadataFilesFixture.cs" />
     <Compile Include="Housekeeping\Housekeepers\CleanupDuplicateMetadataFilesFixture.cs" />
     <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedBlacklistFixture.cs" />
+    <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedEpisodeFilesFixture.cs" />
+    <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedEpisodesFixture.cs" />
+    <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedHistoryItemsFixture.cs" />
+    <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedMetadataFilesFixture.cs" />
     <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedPendingReleasesFixture.cs" />
     <Compile Include="Housekeeping\Housekeepers\FixFutureRunScheduledTasksFixture.cs" />
     <Compile Include="IndexerSearchTests\NzbSearchServiceFixture.cs" />
@@ -154,34 +169,38 @@
     <Compile Include="IndexerTests\NewznabTests\NewznabSettingFixture.cs" />
     <Compile Include="IndexerTests\SeasonSearchFixture.cs" />
     <Compile Include="IndexerTests\XElementExtensionsFixture.cs" />
+    <Compile Include="InstrumentationTests\DatabaseTargetFixture.cs" />
     <Compile Include="JobTests\JobRepositoryFixture.cs" />
-    <Compile Include="DecisionEngineTests\LanguageSpecificationFixture.cs" />
     <Compile Include="JobTests\TestJobs.cs" />
     <Compile Include="MediaCoverTests\CoverExistsSpecificationFixture.cs" />
     <Compile Include="MediaCoverTests\MediaCoverServiceFixture.cs" />
     <Compile Include="MediaFiles\DiskScanServiceTests\ScanFixture.cs" />
+    <Compile Include="MediaFiles\DownloadedEpisodesImportServiceFixture.cs" />
     <Compile Include="MediaFiles\EpisodeFileMovingServiceTests\MoveEpisodeFileFixture.cs" />
-    <Compile Include="MediaFiles\EpisodeImport\Specifications\FullSeasonSpecificationFixture.cs" />
-    <Compile Include="MediaFiles\EpisodeImport\Specifications\FreeSpaceSpecificationFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\ImportDecisionMakerFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\SampleServiceFixture.cs" />
+    <Compile Include="MediaFiles\EpisodeImport\Specifications\FreeSpaceSpecificationFixture.cs" />
+    <Compile Include="MediaFiles\EpisodeImport\Specifications\FullSeasonSpecificationFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\Specifications\NotSampleSpecificationFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\Specifications\NotUnpackingSpecificationFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\Specifications\UpgradeSpecificationFixture.cs" />
+    <Compile Include="MediaFiles\ImportApprovedEpisodesFixture.cs" />
+    <Compile Include="MediaFiles\MediaFileRepositoryFixture.cs" />
+    <Compile Include="MediaFiles\MediaFileServiceTest.cs" />
+    <Compile Include="MediaFiles\MediaFileTableCleanupServiceFixture.cs" />
     <Compile Include="MediaFiles\MediaInfo\VideoFileInfoReaderFixture.cs" />
     <Compile Include="MediaFiles\RenameEpisodeFileServiceFixture.cs" />
     <Compile Include="MediaFiles\UpgradeMediaFileServiceFixture.cs" />
-    <Compile Include="MediaFiles\ImportApprovedEpisodesFixture.cs" />
-    <Compile Include="MediaFiles\MediaFileTableCleanupServiceFixture.cs" />
-    <Compile Include="MediaFiles\MediaFileRepositoryFixture.cs" />
     <Compile Include="Messaging\Commands\CommandEqualityComparerFixture.cs" />
     <Compile Include="Messaging\Commands\CommandExecutorFixture.cs" />
     <Compile Include="Messaging\Commands\CommandFixture.cs" />
     <Compile Include="Messaging\Events\EventAggregatorFixture.cs" />
-    <Compile Include="MetadataSourceTests\TvdbProxyFixture.cs" />
-    <Compile Include="MetadataSourceTests\TraktProxyFixture.cs" />
     <Compile Include="Metadata\Consumers\Roksbox\FindMetadataFileFixture.cs" />
     <Compile Include="Metadata\Consumers\Wdtv\FindMetadataFileFixture.cs" />
+    <Compile Include="MetadataSourceTests\TraktProxyFixture.cs" />
+    <Compile Include="MetadataSourceTests\TvdbProxyFixture.cs" />
+    <Compile Include="NotificationTests\PlexProviderTest.cs" />
+    <Compile Include="NotificationTests\ProwlProviderTest.cs" />
     <Compile Include="NotificationTests\Xbmc\GetJsonVersionFixture.cs" />
     <Compile Include="NotificationTests\Xbmc\Http\ActivePlayersFixture.cs" />
     <Compile Include="NotificationTests\Xbmc\Http\CheckForErrorFixture.cs" />
@@ -193,83 +212,64 @@
     <Compile Include="NotificationTests\Xbmc\Json\UpdateFixture.cs" />
     <Compile Include="NotificationTests\Xbmc\OnDownloadFixture.cs" />
     <Compile Include="OrganizerTests\BuildFilePathFixture.cs" />
+    <Compile Include="OrganizerTests\FileNameBuilderFixture.cs" />
     <Compile Include="OrganizerTests\GetSeriesFolderFixture.cs" />
     <Compile Include="ParserTests\AbsoluteEpisodeNumberParserFixture.cs" />
     <Compile Include="ParserTests\AnimeMetadataParserFixture.cs" />
-    <Compile Include="ParserTests\IsPossibleSpecialEpisodeFixture.cs" />
-    <Compile Include="ParserTests\ReleaseGroupParserFixture.cs" />
-    <Compile Include="ParserTests\LanguageParserFixture.cs" />
-    <Compile Include="ParserTests\SeasonParserFixture.cs" />
-    <Compile Include="ParserTests\NormalizeTitleFixture.cs" />
     <Compile Include="ParserTests\CrapParserFixture.cs" />
     <Compile Include="ParserTests\DailyEpisodeParserFixture.cs" />
     <Compile Include="ParserTests\HashedReleaseFixture.cs" />
-    <Compile Include="ParserTests\SingleEpisodeParserFixture.cs" />
-    <Compile Include="ParserTests\PathParserFixture.cs" />
+    <Compile Include="ParserTests\IsPossibleSpecialEpisodeFixture.cs" />
+    <Compile Include="ParserTests\LanguageParserFixture.cs" />
     <Compile Include="ParserTests\MultiEpisodeParserFixture.cs" />
+    <Compile Include="ParserTests\NormalizeTitleFixture.cs" />
+    <Compile Include="ParserTests\ParserFixture.cs" />
     <Compile Include="ParserTests\ParsingServiceTests\GetEpisodesFixture.cs" />
     <Compile Include="ParserTests\ParsingServiceTests\GetSeriesFixture.cs" />
     <Compile Include="ParserTests\ParsingServiceTests\MapFixture.cs" />
+    <Compile Include="ParserTests\PathParserFixture.cs" />
+    <Compile Include="ParserTests\QualityParserFixture.cs" />
+    <Compile Include="ParserTests\ReleaseGroupParserFixture.cs" />
+    <Compile Include="ParserTests\SeasonParserFixture.cs" />
     <Compile Include="ParserTests\SeriesTitleInfoFixture.cs" />
-    <Compile Include="Providers\XemProxyFixture.cs" />
-    <Compile Include="Qualities\QualityDefinitionRepositoryFixture.cs" />
+    <Compile Include="ParserTests\SingleEpisodeParserFixture.cs" />
     <Compile Include="Profiles\ProfileRepositoryFixture.cs" />
-    <Compile Include="RootFolderTests\FreeSpaceOnDrivesFixture.cs" />
-    <Compile Include="Qualities\QualityFixture.cs" />
-    <Compile Include="ParserTests\QualityParserFixture.cs" />
-    <Compile Include="Configuration\ConfigCachingFixture.cs" />
+    <Compile Include="Profiles\ProfileServiceFixture.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Providers\XemProxyFixture.cs" />
+    <Compile Include="ProviderTests\DiskProviderTests\ArchiveProviderFixture.cs" />
     <Compile Include="ProviderTests\DiskScanProviderTests\GetVideoFilesFixture.cs" />
     <Compile Include="ProviderTests\RecycleBinProviderTests\CleanupFixture.cs" />
-    <Compile Include="ProviderTests\RecycleBinProviderTests\EmptyFixture.cs" />
-    <Compile Include="ProviderTests\RecycleBinProviderTests\DeleteFileFixture.cs" />
     <Compile Include="ProviderTests\RecycleBinProviderTests\DeleteDirectoryFixture.cs" />
-    <Compile Include="NotificationTests\PlexProviderTest.cs" />
-    <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedEpisodesFixture.cs" />
-    <Compile Include="ThingiProviderTests\NullConfigFixture.cs" />
+    <Compile Include="ProviderTests\RecycleBinProviderTests\DeleteFileFixture.cs" />
+    <Compile Include="ProviderTests\RecycleBinProviderTests\EmptyFixture.cs" />
+    <Compile Include="Qualities\QualityDefinitionRepositoryFixture.cs" />
+    <Compile Include="Qualities\QualityDefinitionServiceFixture.cs" />
+    <Compile Include="Qualities\QualityFixture.cs" />
+    <Compile Include="Qualities\QualityModelComparerFixture.cs" />
+    <Compile Include="RootFolderTests\FreeSpaceOnDrivesFixture.cs" />
+    <Compile Include="RootFolderTests\RootFolderServiceFixture.cs" />
+    <Compile Include="SeriesStatsTests\SeriesStatisticsFixture.cs" />
     <Compile Include="ThingiProvider\ProviderBaseFixture.cs" />
-    <Compile Include="TvTests\EpisodeRepositoryTests\ByAirDateFixture.cs" />
-    <Compile Include="TvTests\EpisodeRepositoryTests\EpisodesWithFilesFixture.cs" />
-    <Compile Include="TvTests\EpisodeRepositoryTests\EpisodesWhereCutoffUnmetFixture.cs" />
-    <Compile Include="TvTests\RefreshEpisodeServiceFixture.cs" />
+    <Compile Include="ThingiProviderTests\NullConfigFixture.cs" />
+    <Compile Include="TvTests\EpisodeProviderTests\EpisodeProviderTest_GetEpisodesByParseResult.cs" />
     <Compile Include="TvTests\EpisodeProviderTests\HandleEpisodeFileDeletedFixture.cs" />
-    <Compile Include="TvTests\EpisodeRepositoryTests\FindEpisodeFixture.cs" />
+    <Compile Include="TvTests\EpisodeRepositoryTests\ByAirDateFixture.cs" />
+    <Compile Include="TvTests\EpisodeRepositoryTests\EpisodesBetweenDatesFixture.cs" />
     <Compile Include="TvTests\EpisodeRepositoryTests\EpisodesRepositoryReadFixture.cs" />
+    <Compile Include="TvTests\EpisodeRepositoryTests\EpisodesWhereCutoffUnmetFixture.cs" />
+    <Compile Include="TvTests\EpisodeRepositoryTests\EpisodesWithFilesFixture.cs" />
     <Compile Include="TvTests\EpisodeRepositoryTests\EpisodesWithoutFilesFixture.cs" />
-    <Compile Include="TvTests\EpisodeRepositoryTests\EpisodesBetweenDatesFixture.cs" />
-    <Compile Include="DecisionEngineTests\RetentionSpecificationFixture.cs" />
-    <Compile Include="DecisionEngineTests\QualityAllowedByProfileSpecificationFixture.cs" />
-    <Compile Include="DecisionEngineTests\HistorySpecificationFixture.cs" />
-    <Compile Include="DecisionEngineTests\UpgradeDiskSpecificationFixture.cs" />
-    <Compile Include="DecisionEngineTests\QualityUpgradeSpecificationFixture.cs" />
-    <Compile Include="NotificationTests\ProwlProviderTest.cs" />
-    <Compile Include="ProviderTests\DiskProviderTests\ArchiveProviderFixture.cs" />
-    <Compile Include="MediaFiles\DownloadedEpisodesImportServiceFixture.cs" />
-    <Compile Include="SeriesStatsTests\SeriesStatisticsFixture.cs" />
+    <Compile Include="TvTests\EpisodeRepositoryTests\FindEpisodeFixture.cs" />
+    <Compile Include="TvTests\RefreshEpisodeServiceFixture.cs" />
     <Compile Include="TvTests\RefreshSeriesServiceFixture.cs" />
     <Compile Include="TvTests\SeriesRepositoryTests\SeriesRepositoryFixture.cs" />
+    <Compile Include="TvTests\SeriesServiceTests\AddSeriesFixture.cs" />
     <Compile Include="TvTests\SeriesServiceTests\UpdateMultipleSeriesFixture.cs" />
     <Compile Include="TvTests\SeriesServiceTests\UpdateSeriesFixture.cs" />
     <Compile Include="TvTests\ShouldRefreshSeriesFixture.cs" />
-    <Compile Include="UpdateTests\UpdateServiceFixture.cs" />
-    <Compile Include="DecisionEngineTests\AcceptableSizeSpecificationFixture.cs" />
-    <Compile Include="Qualities\QualityDefinitionServiceFixture.cs" />
-    <Compile Include="TvTests\EpisodeProviderTests\EpisodeProviderTest_GetEpisodesByParseResult.cs" />
-    <Compile Include="FluentTest.cs" />
-    <Compile Include="InstrumentationTests\DatabaseTargetFixture.cs" />
-    <Compile Include="OrganizerTests\FileNameBuilderFixture.cs" />
-    <Compile Include="DecisionEngineTests\MonitoredEpisodeSpecificationFixture.cs" />
-    <Compile Include="DecisionEngineTests\DownloadDecisionMakerFixture.cs" />
-    <Compile Include="Qualities\QualityModelComparerFixture.cs" />
-    <Compile Include="RootFolderTests\RootFolderServiceFixture.cs" />
-    <Compile Include="HistoryTests\HistoryRepositoryFixture.cs" />
-    <Compile Include="MediaFiles\MediaFileServiceTest.cs" />
-    <Compile Include="Configuration\ConfigServiceFixture.cs" />
-    <Compile Include="Framework\TestDbHelper.cs" />
-    <Compile Include="ParserTests\ParserFixture.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Profiles\ProfileServiceFixture.cs" />
-    <Compile Include="TvTests\SeriesServiceTests\AddSeriesFixture.cs" />
     <Compile Include="UpdateTests\UpdatePackageProviderFixture.cs" />
+    <Compile Include="UpdateTests\UpdateServiceFixture.cs" />
     <Compile Include="XbmcVersionTests.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -299,94 +299,94 @@
       <Link>sqlite3.dll</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <None Include="..\NzbDrone.Test.Common\App.config">
+      <Link>App.config</Link>
+    </None>
     <Content Include="Files\Indexers\Newznab\unauthorized.xml" />
-    <Content Include="Files\Media\H264_sample.mp4">
+    <Content Include="Files\LongOverview.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\Nzbget\JsonError.txt">
+    <Content Include="Files\Media\H264_sample.mp4">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\Nzbget\Queue_empty.txt">
+    <Content Include="Files\Nzbget\JsonError.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Files\Nzbget\Queue.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\QueueUnknownPriority.txt">
+    <Content Include="Files\Nzbget\Queue_empty.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\LongOverview.txt">
+    <Content Include="Files\Queue.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\Queue.txt">
+    <Content Include="Files\QueueEmpty.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="..\NzbDrone.Test.Common\App.config">
-      <Link>App.config</Link>
-    </None>
-    <Content Include="Files\RSS\omgwtfnzbs.xml">
+    <Content Include="Files\QueueUnknownPriority.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\RSS\nzbclub.xml">
+    <Content Include="Files\RSS\filesharingtalk.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\RSS\nzbindex.xml">
+    <Content Include="Files\RSS\newznab.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\RSS\SizeParsing\omgwtfnzbs.xml">
+    <Content Include="Files\RSS\nzbclub.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\RSS\SizeParsing\nzbclub.xml">
+    <Content Include="Files\RSS\nzbindex.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\RSS\SizeParsing\nzbindex.xml">
+    <Content Include="Files\RSS\nzbsrus.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\RSS\wombles.xml">
+    <Content Include="Files\RSS\omgwtfnzbs.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <SubType>Designer</SubType>
     </Content>
-    <Content Include="Files\RSS\filesharingtalk.xml">
+    <Content Include="Files\RSS\SizeParsing\newznab.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\RSS\newznab.xml">
+    <Content Include="Files\RSS\SizeParsing\nzbclub.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\RSS\SizeParsing\newznab.xml">
+    <Content Include="Files\RSS\SizeParsing\nzbindex.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Files\RSS\SizeParsing\nzbsrus.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\RSS\nzbsrus.xml">
+    <Content Include="Files\RSS\SizeParsing\omgwtfnzbs.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\QueueEmpty.txt">
+    <Content Include="Files\RSS\wombles.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Files\Xem\Ids.txt">
+    <None Include="Files\SceneMappings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    </None>
+    <None Include="Files\TestArchive.tar.gz">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Files\TestArchive.zip">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <Content Include="Files\Xem\Failure.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\Xem\Names.txt">
+    <Content Include="Files\Xem\Ids.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Files\Xem\Mappings.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="Files\SceneMappings.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Files\TestArchive.tar.gz">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Files\TestArchive.zip">
+    <Content Include="Files\Xem\Names.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    </Content>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj
index 0d87b71f6..0c7652dea 100644
--- a/src/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/src/NzbDrone.Core/NzbDrone.Core.csproj
@@ -52,30 +52,15 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Growl.Connector">
-      <HintPath>..\packages\Growl.0.6\lib\Growl.Connector.dll</HintPath>
-    </Reference>
-    <Reference Include="Growl.CoreLibrary">
-      <HintPath>..\packages\Growl.0.6\lib\Growl.CoreLibrary.dll</HintPath>
-    </Reference>
-    <Reference Include="MediaInfoDotNet">
-      <HintPath>..\packages\MediaInfoNet.0.3\lib\MediaInfoDotNet.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Omu.ValueInjecter">
-      <HintPath>..\packages\valueinjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll</HintPath>
-    </Reference>
-    <Reference Include="RestSharp, Version=104.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="FluentMigrator">
       <HintPath>..\packages\FluentMigrator.1.1.1.0\lib\40\FluentMigrator.dll</HintPath>
     </Reference>
@@ -85,19 +70,34 @@
     <Reference Include="FluentValidation">
       <HintPath>..\packages\FluentValidation.5.0.0.1\lib\Net40\FluentValidation.dll</HintPath>
     </Reference>
+    <Reference Include="Growl.Connector">
+      <HintPath>..\packages\Growl.0.6\lib\Growl.Connector.dll</HintPath>
+    </Reference>
+    <Reference Include="Growl.CoreLibrary">
+      <HintPath>..\packages\Growl.0.6\lib\Growl.CoreLibrary.dll</HintPath>
+    </Reference>
+    <Reference Include="MediaInfoDotNet">
+      <HintPath>..\packages\MediaInfoNet.0.3\lib\MediaInfoDotNet.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog">
       <HintPath>..\packages\NLog.2.1.0\lib\net40\NLog.dll</HintPath>
     </Reference>
+    <Reference Include="Omu.ValueInjecter">
+      <HintPath>..\packages\valueinjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll</HintPath>
+    </Reference>
     <Reference Include="Prowlin">
       <HintPath>..\packages\Prowlin.0.9.4456.26422\lib\net40\Prowlin.dll</HintPath>
     </Reference>
+    <Reference Include="RestSharp, Version=104.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll</HintPath>
+    </Reference>
     <Reference Include="System.Data.SQLite">
       <HintPath>..\Libraries\Sqlite\System.Data.SQLite.dll</HintPath>
     </Reference>
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs">
@@ -114,6 +114,9 @@
     <Compile Include="Configuration\Config.cs" />
     <Compile Include="Configuration\ConfigFileProvider.cs" />
     <Compile Include="Configuration\ConfigRepository.cs" />
+    <Compile Include="Configuration\ConfigService.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Configuration\Events\ConfigFileSavedEvent.cs" />
     <Compile Include="Configuration\Events\ConfigSavedEvent.cs" />
     <Compile Include="Configuration\IConfigService.cs" />
@@ -123,9 +126,9 @@
     <Compile Include="DataAugmentation\DailySeries\DailySeriesService.cs" />
     <Compile Include="DataAugmentation\Scene\ISceneMappingProvider.cs" />
     <Compile Include="DataAugmentation\Scene\SceneMapping.cs" />
-    <Compile Include="DataAugmentation\Scene\SceneMappingService.cs" />
     <Compile Include="DataAugmentation\Scene\SceneMappingProxy.cs" />
     <Compile Include="DataAugmentation\Scene\SceneMappingRepository.cs" />
+    <Compile Include="DataAugmentation\Scene\SceneMappingService.cs" />
     <Compile Include="DataAugmentation\Scene\ServicesProvider.cs" />
     <Compile Include="DataAugmentation\Scene\UpdateSceneMappingCommand.cs" />
     <Compile Include="DataAugmentation\Xem\Model\XemResult.cs" />
@@ -133,22 +136,24 @@
     <Compile Include="DataAugmentation\Xem\Model\XemValues.cs" />
     <Compile Include="DataAugmentation\Xem\XemProxy.cs" />
     <Compile Include="DataAugmentation\Xem\XemService.cs" />
+    <Compile Include="Datastore\BasicRepository.cs" />
     <Compile Include="Datastore\ConnectionStringFactory.cs" />
     <Compile Include="Datastore\Converters\BooleanIntConverter.cs" />
+    <Compile Include="Datastore\Converters\EmbeddedDocumentConverter.cs" />
+    <Compile Include="Datastore\Converters\EnumIntConverter.cs" />
+    <Compile Include="Datastore\Converters\Int32Converter.cs" />
     <Compile Include="Datastore\Converters\ProviderSettingConverter.cs" />
     <Compile Include="Datastore\Converters\QualityIntConverter.cs" />
-    <Compile Include="Datastore\Converters\Int32Converter.cs" />
-    <Compile Include="Datastore\Converters\EmbeddedDocumentConverter.cs" />
     <Compile Include="Datastore\Converters\UtcConverter.cs" />
     <Compile Include="Datastore\Database.cs" />
     <Compile Include="Datastore\DbFactory.cs" />
-    <Compile Include="Datastore\Converters\EnumIntConverter.cs" />
     <Compile Include="Datastore\Events\ModelEvent.cs" />
     <Compile Include="Datastore\Extensions\MappingExtensions.cs" />
     <Compile Include="Datastore\Extensions\PagingSpecExtensions.cs" />
     <Compile Include="Datastore\Extensions\RelationshipExtensions.cs" />
     <Compile Include="Datastore\IEmbeddedDocument.cs" />
     <Compile Include="Datastore\LazyList.cs" />
+    <Compile Include="Datastore\Migration\001_initialSetup.cs" />
     <Compile Include="Datastore\Migration\002_remove_tvrage_imdb_unique_constraint.cs" />
     <Compile Include="Datastore\Migration\003_remove_clean_title_from_scene_mapping.cs" />
     <Compile Include="Datastore\Migration\004_updated_history.cs" />
@@ -172,16 +177,15 @@
     <Compile Include="Datastore\Migration\022_move_indexer_to_generic_provider.cs" />
     <Compile Include="Datastore\Migration\023_add_config_contract_to_indexers.cs" />
     <Compile Include="Datastore\Migration\024_drop_tvdb_episodeid.cs" />
-    <Compile Include="Datastore\Migration\026_add_config_contract_to_notifications.cs" />
     <Compile Include="Datastore\Migration\025_move_notification_to_generic_provider.cs" />
+    <Compile Include="Datastore\Migration\026_add_config_contract_to_notifications.cs" />
     <Compile Include="Datastore\Migration\027_fix_omgwtfnzbs.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Datastore\Migration\028_add_blacklist_table.cs" />
     <Compile Include="Datastore\Migration\029_add_formats_to_naming_config.cs" />
-    <Compile Include="Datastore\Migration\031_delete_old_naming_config_columns.cs" />
-    <Compile Include="Datastore\Migration\045_add_indexes.cs" />
     <Compile Include="Datastore\Migration\030_add_season_folder_format_to_naming_config.cs" />
+    <Compile Include="Datastore\Migration\031_delete_old_naming_config_columns.cs" />
     <Compile Include="Datastore\Migration\032_set_default_release_group.cs" />
     <Compile Include="Datastore\Migration\033_add_api_key_to_pushover.cs" />
     <Compile Include="Datastore\Migration\034_remove_series_contraints.cs" />
@@ -189,14 +193,15 @@
     <Compile Include="Datastore\Migration\036_update_with_quality_converters.cs" />
     <Compile Include="Datastore\Migration\037_add_configurable_qualities.cs" />
     <Compile Include="Datastore\Migration\038_add_on_upgrade_to_notifications.cs" />
-    <Compile Include="Datastore\Migration\040_add_metadata_to_episodes_and_series.cs" />
     <Compile Include="Datastore\Migration\039_add_metadata_tables.cs" />
+    <Compile Include="Datastore\Migration\040_add_metadata_to_episodes_and_series.cs" />
     <Compile Include="Datastore\Migration\041_fix_xbmc_season_images_metadata.cs" />
     <Compile Include="Datastore\Migration\042_add_download_clients_table.cs" />
     <Compile Include="Datastore\Migration\043_convert_config_to_download_clients.cs" />
     <Compile Include="Datastore\Migration\044_fix_xbmc_episode_metadata.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Datastore\Migration\045_add_indexes.cs" />
     <Compile Include="Datastore\Migration\046_fix_nzb_su_url.cs" />
     <Compile Include="Datastore\Migration\047_add_published_date_blacklist_column.cs" />
     <Compile Include="Datastore\Migration\048_add_title_to_scenemappings.cs" />
@@ -210,9 +215,8 @@
     <Compile Include="Datastore\Migration\Framework\MigrationContext.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationController.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationExtension.cs" />
-    <Compile Include="Datastore\Migration\Framework\MigrationOptions.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationLogger.cs" />
-    <Compile Include="Datastore\Migration\001_initialSetup.cs" />
+    <Compile Include="Datastore\Migration\Framework\MigrationOptions.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationType.cs" />
     <Compile Include="Datastore\Migration\Framework\NzbDroneMigrationBase.cs" />
     <Compile Include="Datastore\Migration\Framework\SQLiteAlter.cs" />
@@ -220,127 +224,151 @@
     <Compile Include="Datastore\Migration\Framework\SQLiteIndex.cs" />
     <Compile Include="Datastore\Migration\Framework\SQLiteMigrationHelper.cs" />
     <Compile Include="Datastore\ModelBase.cs" />
-    <Compile Include="Datastore\BasicRepository.cs" />
     <Compile Include="Datastore\ModelNotFoundException.cs" />
     <Compile Include="Datastore\PagingSpec.cs" />
+    <Compile Include="Datastore\ResultSet.cs" />
     <Compile Include="Datastore\TableMapping.cs" />
     <Compile Include="DecisionEngine\DownloadDecision.cs" />
+    <Compile Include="DecisionEngine\DownloadDecisionMaker.cs" />
+    <Compile Include="DecisionEngine\DownloadDecisionPriorizationService.cs" />
+    <Compile Include="DecisionEngine\IDecisionEngineSpecification.cs" />
+    <Compile Include="DecisionEngine\IRejectWithReason.cs" />
+    <Compile Include="DecisionEngine\QualityUpgradableSpecification.cs" />
     <Compile Include="DecisionEngine\Rejection.cs" />
     <Compile Include="DecisionEngine\RejectionType.cs" />
-    <Compile Include="DecisionEngine\Specifications\RetrySpecification.cs" />
-    <Compile Include="DecisionEngine\DownloadDecisionPriorizationService.cs" />
+    <Compile Include="DecisionEngine\Specifications\AcceptableSizeSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\BlacklistSpecification.cs" />
-    <Compile Include="DecisionEngine\IRejectWithReason.cs" />
-    <Compile Include="DecisionEngine\IDecisionEngineSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\CutoffSpecification.cs" />
+    <Compile Include="DecisionEngine\Specifications\LanguageSpecification.cs" />
+    <Compile Include="DecisionEngine\Specifications\NotInQueueSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\NotRestrictedReleaseSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\NotSampleSpecification.cs" />
+    <Compile Include="DecisionEngine\Specifications\QualityAllowedByProfileSpecification.cs" />
+    <Compile Include="DecisionEngine\Specifications\RetentionSpecification.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DecisionEngine\Specifications\RetrySpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\RssSync\DelaySpecification.cs" />
+    <Compile Include="DecisionEngine\Specifications\RssSync\HistorySpecification.cs" />
+    <Compile Include="DecisionEngine\Specifications\RssSync\MonitoredEpisodeSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\RssSync\ProperSpecification.cs" />
+    <Compile Include="DecisionEngine\Specifications\Search\DailyEpisodeMatchSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\Search\EpisodeRequestedSpecification.cs" />
-    <Compile Include="DecisionEngine\Specifications\Search\SeriesSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\Search\SeasonMatchSpecification.cs" />
-    <Compile Include="DecisionEngine\Specifications\Search\DailyEpisodeMatchSpecification.cs" />
-    <Compile Include="DecisionEngine\Specifications\AcceptableSizeSpecification.cs" />
-    <Compile Include="DecisionEngine\DownloadDecisionMaker.cs" />
-    <Compile Include="DecisionEngine\Specifications\NotInQueueSpecification.cs" />
-    <Compile Include="DecisionEngine\Specifications\LanguageSpecification.cs" />
-    <Compile Include="DecisionEngine\Specifications\RssSync\MonitoredEpisodeSpecification.cs" />
-    <Compile Include="DecisionEngine\Specifications\QualityAllowedByProfileSpecification.cs" />
-    <Compile Include="DecisionEngine\QualityUpgradableSpecification.cs" />
+    <Compile Include="DecisionEngine\Specifications\Search\SeriesSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\Search\SingleEpisodeSearchMatchSpecification.cs" />
     <Compile Include="DecisionEngine\Specifications\UpgradeDiskSpecification.cs" />
-    <Compile Include="DecisionEngine\Specifications\RssSync\HistorySpecification.cs" />
     <Compile Include="DiskSpace\DiskSpace.cs" />
     <Compile Include="DiskSpace\DiskSpaceService.cs" />
+    <Compile Include="Download\CheckForFinishedDownloadCommand.cs" />
+    <Compile Include="Download\Clients\DownloadClientException.cs" />
+    <Compile Include="Download\Clients\Nzbget\ErrorModel.cs" />
+    <Compile Include="Download\Clients\Nzbget\JsonError.cs" />
+    <Compile Include="Download\Clients\Nzbget\JsonRequest.cs" />
+    <Compile Include="Download\Clients\Nzbget\Nzbget.cs" />
     <Compile Include="Download\Clients\Nzbget\NzbgetCategory.cs" />
     <Compile Include="Download\Clients\Nzbget\NzbgetConfigItem.cs" />
     <Compile Include="Download\Clients\Nzbget\NzbgetGlobalStatus.cs" />
-    <Compile Include="Download\Clients\Nzbget\NzbgetPostQueueItem.cs" />
-    <Compile Include="Download\Clients\UsenetBlackhole\UsenetBlackhole.cs" />
-    <Compile Include="Download\Clients\UsenetBlackhole\UsenetBlackholeSettings.cs" />
-    <Compile Include="Download\Clients\DownloadClientException.cs" />
-    <Compile Include="Download\Clients\Pneumatic\PneumaticSettings.cs" />
     <Compile Include="Download\Clients\Nzbget\NzbgetHistoryItem.cs" />
     <Compile Include="Download\Clients\Nzbget\NzbgetParameter.cs" />
+    <Compile Include="Download\Clients\Nzbget\NzbgetPostQueueItem.cs" />
+    <Compile Include="Download\Clients\Nzbget\NzbgetPriority.cs" />
+    <Compile Include="Download\Clients\Nzbget\NzbgetProxy.cs" />
+    <Compile Include="Download\Clients\Nzbget\NzbgetQueueItem.cs" />
+    <Compile Include="Download\Clients\Nzbget\NzbgetResponse.cs" />
     <Compile Include="Download\Clients\Nzbget\NzbgetSettings.cs" />
     <Compile Include="Download\Clients\Pneumatic\Pneumatic.cs" />
+    <Compile Include="Download\Clients\Pneumatic\PneumaticSettings.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\JsonConverters\SabnzbdPriorityTypeConverter.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\JsonConverters\SabnzbdQueueTimeConverter.cs" />
     <Compile Include="Download\Clients\Sabnzbd\Responses\SabnzbdAddResponse.cs" />
     <Compile Include="Download\Clients\Sabnzbd\Responses\SabnzbdCategoryResponse.cs" />
     <Compile Include="Download\Clients\Sabnzbd\Responses\SabnzbdConfigResponse.cs" />
     <Compile Include="Download\Clients\Sabnzbd\Responses\SabnzbdVersionResponse.cs" />
-    <Compile Include="Download\Clients\Sabnzbd\SabnzbdSettings.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\Sabnzbd.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Download\Clients\Sabnzbd\SabnzbdCategory.cs" />
     <Compile Include="Download\Clients\Sabnzbd\SabnzbdDownloadStatus.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabnzbdHistory.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabnzbdHistoryItem.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabnzbdJsonError.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabnzbdPriority.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabnzbdProxy.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabnzbdQueue.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabnzbdQueueItem.cs" />
+    <Compile Include="Download\Clients\Sabnzbd\SabnzbdSettings.cs" />
+    <Compile Include="Download\Clients\UsenetBlackhole\UsenetBlackhole.cs" />
+    <Compile Include="Download\Clients\UsenetBlackhole\UsenetBlackholeSettings.cs" />
     <Compile Include="Download\CompletedDownloadService.cs" />
     <Compile Include="Download\DownloadClientBase.cs" />
     <Compile Include="Download\DownloadClientDefinition.cs" />
     <Compile Include="Download\DownloadClientFactory.cs" />
-    <Compile Include="Download\DownloadClientRepository.cs" />
-    <Compile Include="Download\Clients\Nzbget\JsonRequest.cs" />
-    <Compile Include="Download\Clients\Nzbget\NzbgetProxy.cs" />
-    <Compile Include="Download\Clients\Sabnzbd\JsonConverters\SabnzbdPriorityTypeConverter.cs" />
-    <Compile Include="Download\Clients\Sabnzbd\JsonConverters\SabnzbdQueueTimeConverter.cs" />
-    <Compile Include="Download\Clients\Sabnzbd\SabnzbdProxy.cs" />
-    <Compile Include="Download\CheckForFinishedDownloadCommand.cs" />
     <Compile Include="Download\DownloadClientItem.cs" />
+    <Compile Include="Download\DownloadClientProvider.cs" />
+    <Compile Include="Download\DownloadClientRepository.cs" />
     <Compile Include="Download\DownloadClientStatus.cs" />
-    <Compile Include="Download\FailedDownloadService.cs" />
+    <Compile Include="Download\DownloadClientType.cs" />
+    <Compile Include="Download\DownloadFailedEvent.cs" />
     <Compile Include="Download\DownloadItemStatus.cs" />
+    <Compile Include="Download\DownloadService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Download\DownloadTrackingService.cs" />
+    <Compile Include="Download\EpisodeGrabbedEvent.cs" />
+    <Compile Include="Download\FailedDownloadService.cs" />
+    <Compile Include="Download\IDownloadClient.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Download\Pending\PendingRelease.cs" />
     <Compile Include="Download\Pending\PendingReleaseRepository.cs" />
     <Compile Include="Download\Pending\PendingReleaseService.cs" />
     <Compile Include="Download\Pending\PendingReleasesUpdatedEvent.cs" />
-    <Compile Include="Download\ProcessedDecisions.cs" />
-    <Compile Include="Download\TrackedDownload.cs" />
-    <Compile Include="Download\DownloadFailedEvent.cs" />
     <Compile Include="Download\ProcessDownloadDecisions.cs" />
-    <Compile Include="Download\DownloadClientProvider.cs" />
-    <Compile Include="Download\DownloadClientType.cs" />
-    <Compile Include="Download\DownloadTrackingService.cs" />
+    <Compile Include="Download\ProcessedDecisions.cs" />
     <Compile Include="Download\RedownloadFailedDownloadService.cs" />
+    <Compile Include="Download\TrackedDownload.cs" />
     <Compile Include="Exceptions\BadRequestException.cs" />
     <Compile Include="Exceptions\DownstreamException.cs" />
     <Compile Include="Exceptions\NzbDroneClientException.cs" />
     <Compile Include="Exceptions\StatusCodeToExceptions.cs" />
+    <Compile Include="Fluent.cs" />
     <Compile Include="HealthCheck\CheckHealthCommand.cs" />
     <Compile Include="HealthCheck\Checks\AppDataLocationCheck.cs" />
     <Compile Include="HealthCheck\Checks\DownloadClientCheck.cs" />
-    <Compile Include="HealthCheck\Checks\ImportMechanismCheck.cs" />
-    <Compile Include="HealthCheck\Checks\MonoVersionCheck.cs" />
     <Compile Include="HealthCheck\Checks\DroneFactoryCheck.cs" />
+    <Compile Include="HealthCheck\Checks\ImportMechanismCheck.cs" />
     <Compile Include="HealthCheck\Checks\IndexerCheck.cs" />
+    <Compile Include="HealthCheck\Checks\MonoVersionCheck.cs" />
     <Compile Include="HealthCheck\Checks\RootFolderCheck.cs" />
     <Compile Include="HealthCheck\Checks\UpdateCheck.cs" />
     <Compile Include="HealthCheck\HealthCheck.cs" />
     <Compile Include="HealthCheck\HealthCheckBase.cs" />
     <Compile Include="HealthCheck\HealthCheckCompleteEvent.cs" />
+    <Compile Include="HealthCheck\HealthCheckService.cs" />
+    <Compile Include="HealthCheck\IProvideHealthCheck.cs" />
+    <Compile Include="History\History.cs" />
+    <Compile Include="History\HistoryRepository.cs" />
+    <Compile Include="History\HistoryService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Housekeeping\Housekeepers\CleanupAdditionalNamingSpecs.cs" />
+    <Compile Include="Housekeeping\Housekeepers\CleanupDuplicateMetadataFiles.cs" />
+    <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedBlacklist.cs" />
+    <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedEpisodeFiles.cs" />
     <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedEpisodes.cs" />
     <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedHistoryItems.cs" />
     <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedMetadataFiles.cs" />
-    <Compile Include="Housekeeping\Housekeepers\CleanupAdditionalNamingSpecs.cs" />
-    <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedBlacklist.cs" />
-    <Compile Include="Housekeeping\Housekeepers\CleanupDuplicateMetadataFiles.cs" />
     <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedPendingReleases.cs" />
+    <Compile Include="Housekeeping\Housekeepers\FixFutureRunScheduledTasks.cs" />
     <Compile Include="Housekeeping\Housekeepers\UpdateAnimeCategories.cs" />
     <Compile Include="Housekeeping\Housekeepers\UpdateCleanTitleForSeries.cs" />
-    <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedEpisodeFiles.cs" />
-    <Compile Include="Housekeeping\Housekeepers\FixFutureRunScheduledTasks.cs" />
     <Compile Include="Housekeeping\HousekeepingCommand.cs" />
     <Compile Include="Housekeeping\HousekeepingService.cs" />
     <Compile Include="Housekeeping\IHousekeepingTask.cs" />
-    <Compile Include="IndexerSearch\Definitions\AnimeEpisodeSearchCriteria.cs" />
-    <Compile Include="IndexerSearch\MissingEpisodeSearchCommand.cs" />
-    <Compile Include="IndexerSearch\Definitions\SpecialEpisodeSearchCriteria.cs" />
-    <Compile Include="IndexerSearch\SeriesSearchService.cs" />
-    <Compile Include="IndexerSearch\SeriesSearchCommand.cs" />
-    <Compile Include="IndexerSearch\EpisodeSearchService.cs" />
-    <Compile Include="IndexerSearch\EpisodeSearchCommand.cs" />
-    <Compile Include="IndexerSearch\SeasonSearchCommand.cs" />
-    <Compile Include="IndexerSearch\SeasonSearchService.cs" />
-    <Compile Include="Indexers\BasicTorrentRssParser.cs" />
     <Compile Include="Indexers\Animezb\Animezb.cs" />
     <Compile Include="Indexers\Animezb\AnimezbParser.cs" />
+    <Compile Include="Indexers\BasicTorrentRssParser.cs" />
     <Compile Include="Indexers\DownloadProtocol.cs" />
     <Compile Include="Indexers\Exceptions\ApiKeyException.cs" />
     <Compile Include="Indexers\Exceptions\RequestLimitReachedException.cs" />
@@ -348,106 +376,237 @@
     <Compile Include="Indexers\Fanzub\FanzubParser.cs" />
     <Compile Include="Indexers\FetchAndParseRssService.cs" />
     <Compile Include="Indexers\IIndexer.cs" />
+    <Compile Include="Indexers\IndexerBase.cs" />
+    <Compile Include="Indexers\IndexerDefinition.cs" />
+    <Compile Include="Indexers\IndexerFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Indexers\IndexerFetchService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Indexers\IndexerRepository.cs" />
     <Compile Include="Indexers\IndexerSettingUpdatedEvent.cs" />
-    <Compile Include="Indexers\NewznabTestService.cs" />
     <Compile Include="Indexers\IParseFeed.cs" />
+    <Compile Include="Indexers\Newznab\Newznab.cs" />
     <Compile Include="Indexers\Newznab\NewznabException.cs" />
+    <Compile Include="Indexers\Newznab\NewznabParser.cs" />
     <Compile Include="Indexers\Newznab\NewznabPreProcessor.cs" />
+    <Compile Include="Indexers\Newznab\NewznabSettings.cs" />
     <Compile Include="Indexers\Newznab\SizeParsingException.cs" />
+    <Compile Include="Indexers\NewznabTestService.cs" />
+    <Compile Include="Indexers\Omgwtfnzbs\Omgwtfnzbs.cs" />
+    <Compile Include="Indexers\Omgwtfnzbs\OmgwtfnzbsParser.cs" />
+    <Compile Include="Indexers\Omgwtfnzbs\OmgwtfnzbsSettings.cs" />
+    <Compile Include="Indexers\RssParserBase.cs" />
     <Compile Include="Indexers\RssSyncCommand.cs" />
     <Compile Include="Indexers\RssSyncCompleteEvent.cs" />
+    <Compile Include="Indexers\RssSyncService.cs" />
+    <Compile Include="Indexers\Wombles\Wombles.cs" />
+    <Compile Include="Indexers\Wombles\WomblesParser.cs" />
     <Compile Include="Indexers\XElementExtensions.cs" />
+    <Compile Include="IndexerSearch\Definitions\AnimeEpisodeSearchCriteria.cs" />
+    <Compile Include="IndexerSearch\Definitions\DailyEpisodeSearchCriteria.cs" />
+    <Compile Include="IndexerSearch\Definitions\SearchCriteriaBase.cs" />
+    <Compile Include="IndexerSearch\Definitions\SeasonSearchCriteria.cs" />
+    <Compile Include="IndexerSearch\Definitions\SingleEpisodeSearchCriteria.cs" />
+    <Compile Include="IndexerSearch\Definitions\SpecialEpisodeSearchCriteria.cs" />
+    <Compile Include="IndexerSearch\EpisodeSearchCommand.cs" />
+    <Compile Include="IndexerSearch\EpisodeSearchService.cs" />
+    <Compile Include="IndexerSearch\MissingEpisodeSearchCommand.cs" />
+    <Compile Include="IndexerSearch\NzbSearchService.cs" />
+    <Compile Include="IndexerSearch\SeasonSearchCommand.cs" />
+    <Compile Include="IndexerSearch\SeasonSearchService.cs" />
+    <Compile Include="IndexerSearch\SeriesSearchCommand.cs" />
+    <Compile Include="IndexerSearch\SeriesSearchService.cs" />
     <Compile Include="Instrumentation\Commands\ClearLogCommand.cs" />
-    <Compile Include="Instrumentation\Commands\DeleteUpdateLogFilesCommand.cs" />
     <Compile Include="Instrumentation\Commands\DeleteLogFilesCommand.cs" />
+    <Compile Include="Instrumentation\Commands\DeleteUpdateLogFilesCommand.cs" />
     <Compile Include="Instrumentation\Commands\TrimLogCommand.cs" />
+    <Compile Include="Instrumentation\DatabaseTarget.cs" />
     <Compile Include="Instrumentation\DeleteLogFilesService.cs" />
     <Compile Include="Instrumentation\Extensions\LoggerProgressExtensions.cs" />
-    <Compile Include="MediaFiles\Commands\RenameSeriesCommand.cs" />
-    <Compile Include="MediaFiles\Commands\RescanSeriesCommand.cs" />
-    <Compile Include="Lifecycle\Commands\ShutdownCommand.cs" />
+    <Compile Include="Instrumentation\Log.cs" />
+    <Compile Include="Instrumentation\LogRepository.cs" />
+    <Compile Include="Instrumentation\LogService.cs" />
+    <Compile Include="Instrumentation\SetLoggingLevel.cs" />
+    <Compile Include="Jobs\JobRepository.cs" />
+    <Compile Include="Jobs\ScheduledTask.cs" />
+    <Compile Include="Jobs\Scheduler.cs" />
+    <Compile Include="Jobs\TaskManager.cs" />
+    <Compile Include="Lifecycle\ApplicationShutdownRequested.cs" />
+    <Compile Include="Lifecycle\ApplicationStartedEvent.cs" />
     <Compile Include="Lifecycle\Commands\RestartCommand.cs" />
+    <Compile Include="Lifecycle\Commands\ShutdownCommand.cs" />
     <Compile Include="Lifecycle\LifecycleService.cs" />
+    <Compile Include="MediaCover\CoverAlreadyExistsSpecification.cs" />
+    <Compile Include="MediaCover\MediaCover.cs" />
+    <Compile Include="MediaCover\MediaCoverService.cs" />
     <Compile Include="MediaCover\MediaCoversUpdatedEvent.cs" />
+    <Compile Include="MediaFiles\Commands\BackendCommandAttribute.cs" />
+    <Compile Include="MediaFiles\Commands\CleanMediaFileDb.cs" />
+    <Compile Include="MediaFiles\Commands\CleanUpRecycleBinCommand.cs" />
+    <Compile Include="MediaFiles\Commands\DownloadedEpisodesScanCommand.cs" />
     <Compile Include="MediaFiles\Commands\RenameFilesCommand.cs" />
+    <Compile Include="MediaFiles\Commands\RenameSeriesCommand.cs" />
+    <Compile Include="MediaFiles\Commands\RescanSeriesCommand.cs" />
+    <Compile Include="MediaFiles\DiskScanService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MediaFiles\DownloadedEpisodesImportService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MediaFiles\EpisodeFile.cs" />
     <Compile Include="MediaFiles\EpisodeFileMoveResult.cs" />
+    <Compile Include="MediaFiles\EpisodeFileMovingService.cs" />
+    <Compile Include="MediaFiles\EpisodeImport\IImportDecisionEngineSpecification.cs" />
+    <Compile Include="MediaFiles\EpisodeImport\ImportApprovedEpisodes.cs" />
+    <Compile Include="MediaFiles\EpisodeImport\ImportDecision.cs" />
+    <Compile Include="MediaFiles\EpisodeImport\ImportDecisionMaker.cs" />
     <Compile Include="MediaFiles\EpisodeImport\SampleService.cs" />
+    <Compile Include="MediaFiles\EpisodeImport\Specifications\FreeSpaceSpecification.cs" />
     <Compile Include="MediaFiles\EpisodeImport\Specifications\FullSeasonSpecification.cs" />
+    <Compile Include="MediaFiles\EpisodeImport\Specifications\NotSampleSpecification.cs" />
+    <Compile Include="MediaFiles\EpisodeImport\Specifications\NotUnpackingSpecification.cs" />
+    <Compile Include="MediaFiles\EpisodeImport\Specifications\UpgradeSpecification.cs" />
+    <Compile Include="MediaFiles\Events\EpisodeDownloadedEvent.cs" />
+    <Compile Include="MediaFiles\Events\EpisodeFileAddedEvent.cs" />
+    <Compile Include="MediaFiles\Events\EpisodeFileDeletedEvent.cs" />
+    <Compile Include="MediaFiles\Events\EpisodeImportedEvent.cs" />
+    <Compile Include="MediaFiles\Events\SeriesRenamedEvent.cs" />
     <Compile Include="MediaFiles\Events\SeriesScannedEvent.cs" />
     <Compile Include="MediaFiles\FileDateType.cs" />
     <Compile Include="MediaFiles\MediaFileExtensions.cs" />
+    <Compile Include="MediaFiles\MediaFileRepository.cs" />
+    <Compile Include="MediaFiles\MediaFileService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MediaFiles\MediaFileTableCleanupService.cs" />
+    <Compile Include="MediaFiles\MediaInfo\MediaInfoModel.cs" />
     <Compile Include="MediaFiles\MediaInfo\VideoFileInfoReader.cs" />
+    <Compile Include="MediaFiles\RecycleBinProvider.cs" />
     <Compile Include="MediaFiles\RenameEpisodeFilePreview.cs" />
+    <Compile Include="MediaFiles\RenameEpisodeFileService.cs" />
+    <Compile Include="MediaFiles\SameFilenameException.cs" />
     <Compile Include="MediaFiles\UpdateEpisodeFileService.cs" />
+    <Compile Include="MediaFiles\UpgradeMediaFileService.cs" />
+    <Compile Include="Messaging\Commands\BackendCommandAttribute.cs" />
+    <Compile Include="Messaging\Commands\Command.cs" />
+    <Compile Include="Messaging\Commands\CommandEqualityComparer.cs" />
     <Compile Include="Messaging\Commands\CommandExecutor.cs" />
     <Compile Include="Messaging\Commands\ICommandExecutor.cs" />
     <Compile Include="Messaging\Commands\IExecute.cs" />
+    <Compile Include="Messaging\Commands\TestCommand.cs" />
+    <Compile Include="Messaging\Commands\TestCommandExecutor.cs" />
     <Compile Include="Messaging\Commands\Tracking\CommandStatus.cs" />
     <Compile Include="Messaging\Commands\Tracking\CommandTrackingService.cs" />
     <Compile Include="Messaging\Commands\Tracking\ExistingCommand.cs" />
     <Compile Include="Messaging\Commands\Tracking\TrackedCommandCleanupCommand.cs" />
+    <Compile Include="Messaging\Events\CommandCreatedEvent.cs" />
+    <Compile Include="Messaging\Events\CommandExecutedEvent.cs" />
     <Compile Include="Messaging\Events\EventAggregator.cs" />
     <Compile Include="Messaging\Events\IEventAggregator.cs" />
     <Compile Include="Messaging\Events\IHandle.cs" />
-    <Compile Include="MetadataSource\Trakt\Actor.cs" />
-    <Compile Include="MetadataSource\Trakt\People.cs" />
-    <Compile Include="MetadataSource\Trakt\Ratings.cs" />
-    <Compile Include="MetadataSource\Tvdb\TvdbProxy.cs" />
+    <Compile Include="Messaging\IProcessMessage.cs" />
+    <Compile Include="Metadata\Consumers\MediaBrowser\MediaBrowserMetadata.cs" />
+    <Compile Include="Metadata\Consumers\MediaBrowser\MediaBrowserMetadataSettings.cs" />
     <Compile Include="Metadata\Consumers\Roksbox\RoksboxMetadata.cs" />
     <Compile Include="Metadata\Consumers\Roksbox\RoksboxMetadataSettings.cs" />
     <Compile Include="Metadata\Consumers\Wdtv\WdtvMetadata.cs" />
     <Compile Include="Metadata\Consumers\Wdtv\WdtvMetadataSettings.cs" />
-    <Compile Include="Metadata\Consumers\MediaBrowser\MediaBrowserMetadata.cs" />
-    <Compile Include="Metadata\Consumers\MediaBrowser\MediaBrowserMetadataSettings.cs" />
-    <Compile Include="Metadata\Files\CleanMetadataService.cs" />
     <Compile Include="Metadata\Consumers\Xbmc\XbmcMetadata.cs" />
     <Compile Include="Metadata\Consumers\Xbmc\XbmcMetadataSettings.cs" />
     <Compile Include="Metadata\ExistingMetadataService.cs" />
+    <Compile Include="Metadata\Files\CleanMetadataService.cs" />
     <Compile Include="Metadata\Files\ImageFileResult.cs" />
-    <Compile Include="Metadata\Files\MetadataFileResult.cs" />
-    <Compile Include="Metadata\Files\MetadataFilesUpdated.cs" />
     <Compile Include="Metadata\Files\MetadataFile.cs" />
     <Compile Include="Metadata\Files\MetadataFileRepository.cs" />
+    <Compile Include="Metadata\Files\MetadataFileResult.cs" />
     <Compile Include="Metadata\Files\MetadataFileService.cs" />
+    <Compile Include="Metadata\Files\MetadataFilesUpdated.cs" />
     <Compile Include="Metadata\IMetadata.cs" />
     <Compile Include="Metadata\MetadataBase.cs" />
-    <Compile Include="MetadataSource\Trakt\TraktException.cs" />
     <Compile Include="Metadata\MetadataDefinition.cs" />
     <Compile Include="Metadata\MetadataFactory.cs" />
     <Compile Include="Metadata\MetadataRepository.cs" />
     <Compile Include="Metadata\MetadataService.cs" />
     <Compile Include="Metadata\MetadataType.cs" />
-    <Compile Include="HealthCheck\HealthCheckService.cs" />
-    <Compile Include="HealthCheck\IProvideHealthCheck.cs" />
+    <Compile Include="MetadataSource\IProvideSeriesInfo.cs" />
+    <Compile Include="MetadataSource\ISearchForNewSeries.cs" />
+    <Compile Include="MetadataSource\Trakt\Actor.cs" />
+    <Compile Include="MetadataSource\Trakt\Episode.cs" />
+    <Compile Include="MetadataSource\Trakt\FullShow.cs" />
+    <Compile Include="MetadataSource\Trakt\Images.cs" />
+    <Compile Include="MetadataSource\Trakt\People.cs" />
+    <Compile Include="MetadataSource\Trakt\Ratings.cs" />
+    <Compile Include="MetadataSource\Trakt\Season.cs" />
+    <Compile Include="MetadataSource\Trakt\TraktException.cs" />
+    <Compile Include="MetadataSource\TraktProxy.cs" />
+    <Compile Include="MetadataSource\Tvdb\TvdbProxy.cs" />
+    <Compile Include="Notifications\DownloadMessage.cs" />
+    <Compile Include="Notifications\Email\Email.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Notifications\Email\EmailService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Notifications\Email\EmailSettings.cs" />
+    <Compile Include="Notifications\Growl\Growl.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Notifications\Growl\GrowlService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Notifications\Growl\GrowlSettings.cs" />
+    <Compile Include="Notifications\INotification.cs" />
+    <Compile Include="Notifications\NotificationBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Notifications\NotificationDefinition.cs" />
     <Compile Include="Notifications\NotificationFactory.cs" />
+    <Compile Include="Notifications\NotificationRepository.cs" />
     <Compile Include="Notifications\NotificationService.cs" />
-    <Compile Include="Notifications\DownloadMessage.cs" />
+    <Compile Include="Notifications\NotifyMyAndroid\NotifyMyAndroid.cs" />
+    <Compile Include="Notifications\NotifyMyAndroid\NotifyMyAndroidPriority.cs" />
+    <Compile Include="Notifications\NotifyMyAndroid\NotifyMyAndroidProxy.cs" />
+    <Compile Include="Notifications\NotifyMyAndroid\NotifyMyAndroidSettings.cs" />
+    <Compile Include="Notifications\Plex\PlexClient.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Notifications\Plex\PlexClientSettings.cs" />
     <Compile Include="Notifications\Plex\PlexError.cs" />
     <Compile Include="Notifications\Plex\PlexException.cs" />
     <Compile Include="Notifications\Plex\PlexSection.cs" />
+    <Compile Include="Notifications\Plex\PlexServer.cs" />
     <Compile Include="Notifications\Plex\PlexServerProxy.cs" />
+    <Compile Include="Notifications\Plex\PlexServerSettings.cs" />
+    <Compile Include="Notifications\Plex\PlexService.cs" />
     <Compile Include="Notifications\Plex\PlexUser.cs" />
+    <Compile Include="Notifications\Prowl\InvalidApiKeyException.cs" />
+    <Compile Include="Notifications\Prowl\Prowl.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Notifications\Prowl\ProwlPriority.cs" />
+    <Compile Include="Notifications\Prowl\ProwlService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Notifications\Prowl\ProwlSettings.cs" />
     <Compile Include="Notifications\Pushalot\Pushalot.cs" />
+    <Compile Include="Notifications\Pushalot\PushalotPriority.cs" />
     <Compile Include="Notifications\Pushalot\PushalotProxy.cs" />
     <Compile Include="Notifications\Pushalot\PushalotResponse.cs" />
     <Compile Include="Notifications\Pushalot\PushalotSettings.cs" />
-    <Compile Include="Notifications\Pushalot\PushalotPriority.cs" />
     <Compile Include="Notifications\PushBullet\PushBullet.cs" />
     <Compile Include="Notifications\PushBullet\PushBulletProxy.cs" />
     <Compile Include="Notifications\PushBullet\PushBulletSettings.cs" />
-    <Compile Include="Notifications\NotifyMyAndroid\NotifyMyAndroid.cs" />
-    <Compile Include="Notifications\NotifyMyAndroid\NotifyMyAndroidPriority.cs" />
-    <Compile Include="Notifications\NotifyMyAndroid\NotifyMyAndroidProxy.cs" />
-    <Compile Include="Notifications\NotifyMyAndroid\NotifyMyAndroidSettings.cs" />
-    <Compile Include="MediaFiles\Commands\BackendCommandAttribute.cs" />
-    <Compile Include="Messaging\Commands\BackendCommandAttribute.cs" />
-    <Compile Include="Messaging\Commands\Command.cs" />
-    <Compile Include="Messaging\Commands\CommandEqualityComparer.cs" />
-    <Compile Include="Messaging\Commands\TestCommand.cs" />
-    <Compile Include="Messaging\Commands\TestCommandExecutor.cs" />
-    <Compile Include="Messaging\Events\CommandCreatedEvent.cs" />
-    <Compile Include="Messaging\Events\CommandExecutedEvent.cs" />
-    <Compile Include="Messaging\IProcessMessage.cs" />
+    <Compile Include="Notifications\Pushover\InvalidResponseException.cs" />
+    <Compile Include="Notifications\Pushover\Pushover.cs" />
+    <Compile Include="Notifications\Pushover\PushoverPriority.cs" />
+    <Compile Include="Notifications\Pushover\PushoverService.cs" />
+    <Compile Include="Notifications\Pushover\PushoverSettings.cs" />
+    <Compile Include="Notifications\Xbmc\HttpApiProvider.cs" />
+    <Compile Include="Notifications\Xbmc\IApiProvider.cs" />
+    <Compile Include="Notifications\Xbmc\InvalidXbmcVersionException.cs" />
+    <Compile Include="Notifications\Xbmc\JsonApiProvider.cs" />
     <Compile Include="Notifications\Xbmc\Model\ActivePlayer.cs" />
     <Compile Include="Notifications\Xbmc\Model\ActivePlayersDharmaResult.cs" />
     <Compile Include="Notifications\Xbmc\Model\ActivePlayersEdenResult.cs" />
@@ -458,18 +617,37 @@
     <Compile Include="Notifications\Xbmc\Model\VersionResult.cs" />
     <Compile Include="Notifications\Xbmc\Model\XbmcJsonResult.cs" />
     <Compile Include="Notifications\Xbmc\Model\XbmcVersion.cs" />
-    <Compile Include="Organizer\BasicNamingConfig.cs" />
+    <Compile Include="Notifications\Xbmc\Xbmc.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Notifications\Xbmc\XbmcService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Notifications\Xbmc\XbmcSettings.cs" />
     <Compile Include="Organizer\AbsoluteEpisodeFormat.cs" />
-    <Compile Include="Organizer\FilenameValidationService.cs" />
+    <Compile Include="Organizer\BasicNamingConfig.cs" />
     <Compile Include="Organizer\EpisodeFormat.cs" />
+    <Compile Include="Organizer\EpisodeSortingType.cs" />
     <Compile Include="Organizer\Exception.cs" />
+    <Compile Include="Organizer\FileNameBuilder.cs" />
     <Compile Include="Organizer\FilenameBuilderTokenEqualityComparer.cs" />
+    <Compile Include="Organizer\FilenameSampleService.cs" />
     <Compile Include="Organizer\FileNameValidation.cs" />
+    <Compile Include="Organizer\FilenameValidationService.cs" />
+    <Compile Include="Organizer\NamingConfig.cs" />
     <Compile Include="Organizer\NamingConfigService.cs" />
-    <Compile Include="Organizer\FilenameSampleService.cs" />
     <Compile Include="Organizer\SampleResult.cs" />
     <Compile Include="Parser\InvalidDateException.cs" />
+    <Compile Include="Parser\Language.cs" />
+    <Compile Include="Parser\Model\LocalEpisode.cs" />
+    <Compile Include="Parser\Model\ParsedEpisodeInfo.cs" />
+    <Compile Include="Parser\Model\ReleaseInfo.cs" />
+    <Compile Include="Parser\Model\RemoteEpisode.cs" />
     <Compile Include="Parser\Model\SeriesTitleInfo.cs" />
+    <Compile Include="Parser\Model\TorrentInfo.cs" />
+    <Compile Include="Parser\Parser.cs" />
+    <Compile Include="Parser\ParsingService.cs" />
+    <Compile Include="Parser\QualityParser.cs" />
     <Compile Include="Profiles\GrabDelayMode.cs" />
     <Compile Include="Profiles\Profile.cs" />
     <Compile Include="Profiles\ProfileInUseException.cs" />
@@ -478,274 +656,96 @@
     <Compile Include="Profiles\ProfileService.cs" />
     <Compile Include="ProgressMessaging\CommandUpdatedEvent.cs" />
     <Compile Include="ProgressMessaging\ProgressMessageTarget.cs" />
-    <Compile Include="Instrumentation\SetLoggingLevel.cs" />
-    <Compile Include="Jobs\TaskManager.cs" />
-    <Compile Include="Lifecycle\ApplicationShutdownRequested.cs" />
-    <Compile Include="MediaCover\CoverAlreadyExistsSpecification.cs" />
-    <Compile Include="MediaFiles\Commands\CleanMediaFileDb.cs" />
-    <Compile Include="MediaFiles\Commands\CleanUpRecycleBinCommand.cs" />
-    <Compile Include="MediaFiles\Commands\DownloadedEpisodesScanCommand.cs" />
-    <Compile Include="MediaFiles\EpisodeImport\ImportDecision.cs" />
-    <Compile Include="MediaFiles\EpisodeImport\IImportDecisionEngineSpecification.cs" />
-    <Compile Include="MediaFiles\EpisodeImport\ImportDecisionMaker.cs" />
-    <Compile Include="MediaFiles\EpisodeImport\ImportApprovedEpisodes.cs" />
-    <Compile Include="MediaFiles\EpisodeImport\Specifications\NotUnpackingSpecification.cs" />
-    <Compile Include="MediaFiles\EpisodeImport\Specifications\FreeSpaceSpecification.cs" />
-    <Compile Include="MediaFiles\EpisodeImport\Specifications\UpgradeSpecification.cs" />
-    <Compile Include="MediaFiles\EpisodeImport\Specifications\NotSampleSpecification.cs" />
-    <Compile Include="MediaFiles\Events\EpisodeImportedEvent.cs" />
-    <Compile Include="MediaFiles\Events\EpisodeDownloadedEvent.cs" />
-    <Compile Include="Download\EpisodeGrabbedEvent.cs" />
-    <Compile Include="MediaFiles\Events\SeriesRenamedEvent.cs" />
-    <Compile Include="MediaFiles\RenameEpisodeFileService.cs" />
-    <Compile Include="MediaFiles\SameFilenameException.cs" />
-    <Compile Include="MediaFiles\UpgradeMediaFileService.cs" />
-    <Compile Include="Notifications\Growl\GrowlSettings.cs" />
-    <Compile Include="Notifications\INotification.cs" />
-    <Compile Include="Notifications\NotificationRepository.cs" />
-    <Compile Include="Fluent.cs" />
-    <Compile Include="History\HistoryRepository.cs" />
-    <Compile Include="IndexerSearch\Definitions\DailyEpisodeSearchCriteria.cs" />
-    <Compile Include="IndexerSearch\Definitions\SearchCriteriaBase.cs" />
-    <Compile Include="IndexerSearch\Definitions\SeasonSearchCriteria.cs" />
-    <Compile Include="IndexerSearch\Definitions\SingleEpisodeSearchCriteria.cs" />
-    <Compile Include="IndexerSearch\NzbSearchService.cs" />
-    <Compile Include="Indexers\RssParserBase.cs" />
-    <Compile Include="Indexers\RssSyncService.cs" />
-    <Compile Include="Indexers\IndexerBase.cs" />
-    <Compile Include="Indexers\IndexerDefinition.cs" />
-    <Compile Include="Indexers\IndexerRepository.cs" />
-    <Compile Include="Indexers\Newznab\Newznab.cs" />
-    <Compile Include="Indexers\Newznab\NewznabSettings.cs" />
-    <Compile Include="Indexers\Newznab\NewznabParser.cs" />
-    <Compile Include="Indexers\Omgwtfnzbs\Omgwtfnzbs.cs" />
-    <Compile Include="Indexers\Omgwtfnzbs\OmgwtfnzbsParser.cs" />
-    <Compile Include="Indexers\Omgwtfnzbs\OmgwtfnzbsSettings.cs" />
-    <Compile Include="Indexers\Wombles\Wombles.cs" />
-    <Compile Include="Indexers\Wombles\WomblesParser.cs" />
-    <Compile Include="Instrumentation\LogRepository.cs" />
-    <Compile Include="Jobs\ScheduledTask.cs" />
-    <Compile Include="Jobs\JobRepository.cs" />
-    <Compile Include="Jobs\Scheduler.cs" />
-    <Compile Include="Lifecycle\ApplicationStartedEvent.cs" />
-    <Compile Include="MediaCover\MediaCover.cs" />
-    <Compile Include="MediaFiles\EpisodeFileMovingService.cs" />
-    <Compile Include="MediaFiles\Events\EpisodeFileAddedEvent.cs" />
-    <Compile Include="MediaFiles\Events\EpisodeFileDeletedEvent.cs" />
-    <Compile Include="MediaFiles\MediaFileTableCleanupService.cs" />
-    <Compile Include="MediaFiles\MediaFileRepository.cs" />
-    <Compile Include="MetadataSource\IProvideSeriesInfo.cs" />
-    <Compile Include="MetadataSource\ISearchForNewSeries.cs" />
-    <Compile Include="MetadataSource\TraktProxy.cs" />
-    <Compile Include="MetadataSource\Trakt\Episode.cs" />
-    <Compile Include="MetadataSource\Trakt\Images.cs" />
-    <Compile Include="MetadataSource\Trakt\Season.cs" />
-    <Compile Include="MetadataSource\Trakt\FullShow.cs" />
-    <Compile Include="Notifications\Plex\PlexServer.cs" />
-    <Compile Include="Notifications\Plex\PlexClientSettings.cs" />
-    <Compile Include="Notifications\Plex\PlexServerSettings.cs" />
-    <Compile Include="Notifications\Prowl\InvalidApiKeyException.cs" />
-    <Compile Include="Notifications\Prowl\ProwlPriority.cs" />
-    <Compile Include="Notifications\Prowl\ProwlSettings.cs" />
-    <Compile Include="Notifications\Email\EmailSettings.cs" />
-    <Compile Include="Notifications\Pushover\InvalidResponseException.cs" />
-    <Compile Include="Notifications\Pushover\Pushover.cs" />
-    <Compile Include="Notifications\Pushover\PushoverPriority.cs" />
-    <Compile Include="Notifications\Pushover\PushoverService.cs" />
-    <Compile Include="Notifications\Pushover\PushoverSettings.cs" />
-    <Compile Include="Notifications\Xbmc\HttpApiProvider.cs" />
-    <Compile Include="Notifications\Xbmc\IApiProvider.cs" />
-    <Compile Include="Notifications\Xbmc\InvalidXbmcVersionException.cs" />
-    <Compile Include="Notifications\Xbmc\JsonApiProvider.cs" />
-    <Compile Include="Notifications\Xbmc\XbmcSettings.cs" />
-    <Compile Include="Organizer\EpisodeSortingType.cs" />
-    <Compile Include="Organizer\FileNameBuilder.cs" />
-    <Compile Include="Instrumentation\LogService.cs" />
-    <Compile Include="Instrumentation\DatabaseTarget.cs" />
-    <Compile Include="MediaFiles\MediaInfo\MediaInfoModel.cs" />
-    <Compile Include="Download\Clients\Nzbget\ErrorModel.cs" />
-    <Compile Include="Download\Clients\Nzbget\JsonError.cs" />
-    <Compile Include="Download\Clients\Nzbget\NzbgetResponse.cs" />
-    <Compile Include="Download\Clients\Nzbget\NzbgetQueueItem.cs" />
-    <Compile Include="Download\Clients\Nzbget\NzbgetPriority.cs" />
-    <Compile Include="Organizer\NamingConfig.cs" />
-    <Compile Include="Parser\Language.cs" />
-    <Compile Include="Parser\Model\LocalEpisode.cs" />
-    <Compile Include="Parser\Model\ParsedEpisodeInfo.cs" />
-    <Compile Include="Parser\Model\RemoteEpisode.cs" />
-    <Compile Include="Parser\Model\ReleaseInfo.cs" />
-    <Compile Include="Parser\Model\TorrentInfo.cs" />
-    <Compile Include="Parser\Parser.cs" />
-    <Compile Include="Parser\ParsingService.cs" />
-    <Compile Include="Parser\QualityParser.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Qualities\QualitiesBelowCutoff.cs" />
+    <Compile Include="Qualities\Quality.cs" />
+    <Compile Include="Qualities\QualityDefinition.cs" />
+    <Compile Include="Qualities\QualityDefinitionRepository.cs" />
+    <Compile Include="Qualities\QualityDefinitionService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Qualities\QualityModel.cs" />
     <Compile Include="Qualities\QualityModelComparer.cs" />
+    <Compile Include="Queue\Queue.cs" />
+    <Compile Include="Queue\QueueScheduler.cs" />
+    <Compile Include="Queue\QueueService.cs" />
+    <Compile Include="Queue\UpdateQueueEvent.cs" />
     <Compile Include="Rest\JsonNetSerializer.cs" />
     <Compile Include="Rest\RestClientFactory.cs" />
+    <Compile Include="Rest\RestException.cs" />
+    <Compile Include="Rest\RestSharpExtensions.cs" />
+    <Compile Include="RootFolders\RootFolder.cs" />
     <Compile Include="RootFolders\RootFolderRepository.cs" />
+    <Compile Include="RootFolders\RootFolderService.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="RootFolders\UnmappedFolder.cs" />
     <Compile Include="Security.cs" />
+    <Compile Include="SeriesStats\SeriesStatistics.cs" />
+    <Compile Include="SeriesStats\SeriesStatisticsRepository.cs" />
+    <Compile Include="SeriesStats\SeriesStatisticsService.cs" />
     <Compile Include="ThingiProvider\ConfigContractNotFoundException.cs" />
     <Compile Include="ThingiProvider\Events\ProviderUpdatedEvent.cs" />
     <Compile Include="ThingiProvider\IProvider.cs" />
-    <Compile Include="Qualities\QualityDefinitionRepository.cs" />
-    <Compile Include="Queue\Queue.cs" />
-    <Compile Include="Queue\UpdateQueueEvent.cs" />
-    <Compile Include="Queue\QueueScheduler.cs" />
-    <Compile Include="Queue\QueueService.cs" />
-    <Compile Include="Rest\RestSharpExtensions.cs" />
-    <Compile Include="Rest\RestException.cs" />
-    <Compile Include="SeriesStats\SeriesStatisticsService.cs" />
     <Compile Include="ThingiProvider\IProviderConfig.cs" />
     <Compile Include="ThingiProvider\IProviderFactory.cs" />
     <Compile Include="ThingiProvider\IProviderRepository.cs" />
     <Compile Include="ThingiProvider\NullConfig.cs" />
     <Compile Include="ThingiProvider\ProviderDefinition.cs" />
-    <Compile Include="ThingiProvider\ProviderRepository.cs" />
     <Compile Include="ThingiProvider\ProviderFactory.cs" />
+    <Compile Include="ThingiProvider\ProviderRepository.cs" />
     <Compile Include="Tv\Actor.cs" />
+    <Compile Include="Tv\Commands\RefreshSeriesCommand.cs" />
+    <Compile Include="Tv\Episode.cs" />
     <Compile Include="Tv\EpisodeCutoffService.cs" />
+    <Compile Include="Tv\EpisodeRepository.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Tv\EpisodeService.cs" />
-    <Compile Include="Tv\Events\SeriesEditedEvent.cs" />
-    <Compile Include="Tv\Events\SeriesRefreshStartingEvent.cs" />
+    <Compile Include="Tv\Events\EpisodeInfoAddedEvent.cs" />
     <Compile Include="Tv\Events\EpisodeInfoDeletedEvent.cs" />
     <Compile Include="Tv\Events\EpisodeInfoUpdatedEvent.cs" />
-    <Compile Include="Tv\Events\EpisodeInfoAddedEvent.cs" />
     <Compile Include="Tv\Events\SeriesAddedEvent.cs" />
     <Compile Include="Tv\Events\SeriesDeletedEvent.cs" />
+    <Compile Include="Tv\Events\SeriesEditedEvent.cs" />
+    <Compile Include="Tv\Events\SeriesRefreshStartingEvent.cs" />
     <Compile Include="Tv\Events\SeriesUpdatedEvent.cs" />
-    <Compile Include="Datastore\ResultSet.cs" />
-    <Compile Include="Tv\Commands\RefreshSeriesCommand.cs" />
     <Compile Include="Tv\Ratings.cs" />
     <Compile Include="Tv\RefreshEpisodeService.cs" />
+    <Compile Include="Tv\RefreshSeriesService.cs" />
+    <Compile Include="Tv\Season.cs" />
+    <Compile Include="Tv\Series.cs" />
     <Compile Include="Tv\SeriesEditedService.cs" />
     <Compile Include="Tv\SeriesRepository.cs" />
-    <Compile Include="Qualities\QualityModel.cs" />
-    <Compile Include="Download\Clients\Sabnzbd\SabnzbdHistoryItem.cs" />
-    <Compile Include="Download\Clients\Sabnzbd\SabnzbdHistory.cs" />
-    <Compile Include="Download\Clients\Sabnzbd\SabnzbdJsonError.cs" />
-    <Compile Include="Download\Clients\Sabnzbd\SabnzbdQueue.cs" />
-    <Compile Include="Download\Clients\Sabnzbd\SabnzbdQueueItem.cs" />
-    <Compile Include="MediaCover\MediaCoverService.cs" />
-    <Compile Include="Download\Clients\Nzbget\Nzbget.cs" />
-    <Compile Include="MediaFiles\RecycleBinProvider.cs" />
-    <Compile Include="SeriesStats\SeriesStatistics.cs" />
-    <Compile Include="SeriesStats\SeriesStatisticsRepository.cs" />
-    <Compile Include="Tv\SeriesTypes.cs" />
-    <Compile Include="Qualities\Quality.cs" />
-    <Compile Include="Tv\Season.cs" />
-    <Compile Include="Configuration\ConfigService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="DecisionEngine\Specifications\RetentionSpecification.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MediaFiles\DiskScanService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Download\IDownloadClient.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Download\Clients\Sabnzbd\Sabnzbd.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Download\DownloadService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Tv\EpisodeRepository.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Notifications\NotificationBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Notifications\Growl\Growl.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Notifications\Plex\PlexClient.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Notifications\Prowl\Prowl.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Notifications\Email\Email.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Notifications\Xbmc\Xbmc.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Notifications\Growl\GrowlService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="History\HistoryService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Indexers\IndexerFactory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Indexers\IndexerFetchService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MediaFiles\MediaFileService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Notifications\Plex\PlexService.cs" />
-    <Compile Include="MediaFiles\DownloadedEpisodesImportService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Notifications\Prowl\ProwlService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Qualities\QualityDefinitionService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="RootFolders\UnmappedFolder.cs" />
-    <Compile Include="RootFolders\RootFolderService.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Tv\SeriesService.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Notifications\Email\EmailService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Notifications\Xbmc\XbmcService.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Notifications\NotificationDefinition.cs" />
-    <Compile Include="Download\Clients\Sabnzbd\SabnzbdPriority.cs" />
-    <Compile Include="MediaFiles\EpisodeFile.cs" />
-    <Compile Include="Tv\Episode.cs" />
-    <Compile Include="Instrumentation\Log.cs" />
-    <Compile Include="History\History.cs" />
-    <Compile Include="Qualities\QualityDefinition.cs" />
-    <Compile Include="RootFolders\RootFolder.cs" />
-    <Compile Include="Tv\Series.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Tv\SeriesStatusType.cs" />
-    <Compile Include="Tv\RefreshSeriesService.cs" />
+    <Compile Include="Tv\SeriesTypes.cs" />
     <Compile Include="Tv\ShouldRefreshSeries.cs" />
     <Compile Include="Update\Commands\ApplicationUpdateCommand.cs" />
     <Compile Include="Update\Commands\InstallUpdateCommand.cs" />
     <Compile Include="Update\InstallUpdateService.cs" />
     <Compile Include="Update\RecentUpdateProvider.cs" />
     <Compile Include="Update\UpdateChanges.cs" />
+    <Compile Include="Update\UpdateCheckService.cs" />
     <Compile Include="Update\UpdateMechanism.cs" />
+    <Compile Include="Update\UpdatePackage.cs" />
     <Compile Include="Update\UpdatePackageAvailable.cs" />
     <Compile Include="Update\UpdatePackageProvider.cs" />
-    <Compile Include="Update\UpdatePackage.cs" />
-    <Compile Include="Update\UpdateCheckService.cs" />
     <Compile Include="Update\UpdateVerification.cs" />
     <Compile Include="Update\UpdateVerificationFailedException.cs" />
+    <Compile Include="Validation\FolderValidator.cs" />
     <Compile Include="Validation\LangaugeValidator.cs" />
-    <Compile Include="Validation\Paths\SeriesAncestorValidator.cs" />
-    <Compile Include="Validation\Paths\SeriesExistsValidator.cs" />
-    <Compile Include="Validation\Paths\RootFolderValidator.cs" />
+    <Compile Include="Validation\NzbDroneValidationFailure.cs" />
     <Compile Include="Validation\Paths\DroneFactoryValidator.cs" />
+    <Compile Include="Validation\Paths\PathExistsValidator.cs" />
     <Compile Include="Validation\Paths\PathValidator.cs" />
+    <Compile Include="Validation\Paths\RootFolderValidator.cs" />
+    <Compile Include="Validation\Paths\SeriesAncestorValidator.cs" />
+    <Compile Include="Validation\Paths\SeriesExistsValidator.cs" />
     <Compile Include="Validation\Paths\SeriesPathValidator.cs" />
-    <Compile Include="Validation\Paths\PathExistsValidator.cs" />
-    <Compile Include="Validation\FolderValidator.cs" />
     <Compile Include="Validation\RuleBuilderExtensions.cs" />
-    <Compile Include="Validation\NzbDroneValidationFailure.cs" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
diff --git a/src/NzbDrone.Host/NzbDrone.Host.csproj b/src/NzbDrone.Host/NzbDrone.Host.csproj
index 8aba54433..67d954511 100644
--- a/src/NzbDrone.Host/NzbDrone.Host.csproj
+++ b/src/NzbDrone.Host/NzbDrone.Host.csproj
@@ -57,13 +57,13 @@
     <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.ServiceProcess" />
     <Reference Include="Interop.NetFwTypeLib">
       <HintPath>..\Libraries\Interop.NetFwTypeLib.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.ServiceProcess" />
     <Reference Include="Microsoft.Owin">
       <HintPath>..\packages\Microsoft.Owin.1.1.0-beta2\lib\net40\Microsoft.Owin.dll</HintPath>
     </Reference>
@@ -93,34 +93,34 @@
     <Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="AccessControl\FirewallAdapter.cs" />
     <Compile Include="AccessControl\NetshProvider.cs" />
     <Compile Include="AccessControl\SslAdapter.cs" />
+    <Compile Include="AccessControl\UrlAclAdapter.cs" />
+    <Compile Include="ApplicationModes.cs" />
     <Compile Include="ApplicationServer.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="AccessControl\FirewallAdapter.cs" />
-    <Compile Include="AccessControl\UrlAclAdapter.cs" />
+    <Compile Include="Bootstrap.cs" />
     <Compile Include="BrowserService.cs" />
-    <Compile Include="Owin\MiddleWare\NzbDroneVersionMiddleWare.cs" />
-    <Compile Include="SpinService.cs" />
-    <Compile Include="SingleInstancePolicy.cs" />
     <Compile Include="IUserAlert.cs" />
-    <Compile Include="Owin\NlogTextWriter.cs" />
-    <Compile Include="Owin\OwinServiceProvider.cs" />
-    <Compile Include="Owin\OwinTraceOutputFactory.cs" />
-    <Compile Include="Owin\PortInUseException.cs" />
-    <Compile Include="PlatformValidation.cs" />
     <Compile Include="MainAppContainerBuilder.cs" />
-    <Compile Include="ApplicationModes.cs" />
-    <Compile Include="Bootstrap.cs" />
-    <Compile Include="Owin\MiddleWare\NancyMiddleWare.cs" />
     <Compile Include="Owin\IHostController.cs" />
     <Compile Include="Owin\MiddleWare\IOwinMiddleWare.cs" />
+    <Compile Include="Owin\MiddleWare\NancyMiddleWare.cs" />
+    <Compile Include="Owin\MiddleWare\NzbDroneVersionMiddleWare.cs" />
     <Compile Include="Owin\MiddleWare\SignalRMiddleWare.cs" />
+    <Compile Include="Owin\NlogTextWriter.cs" />
     <Compile Include="Owin\OwinHostController.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Owin\OwinServiceProvider.cs" />
+    <Compile Include="Owin\OwinTraceOutputFactory.cs" />
+    <Compile Include="Owin\PortInUseException.cs" />
+    <Compile Include="PlatformValidation.cs" />
     <Compile Include="PriorityMonitor.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Router.cs" />
+    <Compile Include="SingleInstancePolicy.cs" />
+    <Compile Include="SpinService.cs" />
     <Compile Include="TerminateApplicationException.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
index eb1ca6f15..d86f1890c 100644
--- a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
+++ b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
@@ -38,23 +38,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Owin">
-      <HintPath>..\packages\Microsoft.Owin.1.1.0-beta2\lib\net40\Microsoft.Owin.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="RestSharp, Version=104.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="FluentAssertions">
       <HintPath>..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
     </Reference>
@@ -64,6 +54,9 @@
     <Reference Include="Microsoft.AspNet.SignalR.Client">
       <HintPath>..\packages\Microsoft.AspNet.SignalR.Client.1.1.3\lib\net40\Microsoft.AspNet.SignalR.Client.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Owin">
+      <HintPath>..\packages\Microsoft.Owin.1.1.0-beta2\lib\net40\Microsoft.Owin.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Owin.Host.HttpListener">
       <HintPath>..\packages\Microsoft.Owin.Host.HttpListener.1.1.0-beta2\lib\net40\Microsoft.Owin.Host.HttpListener.dll</HintPath>
     </Reference>
@@ -85,29 +78,36 @@
     <Reference Include="NLog">
       <HintPath>..\packages\NLog.2.1.0\lib\net40\NLog.dll</HintPath>
     </Reference>
+    <Reference Include="nunit.framework">
+      <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="Owin">
       <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
     </Reference>
+    <Reference Include="RestSharp, Version=104.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Client\ClientBase.cs" />
-    <Compile Include="Client\NotificationClient.cs" />
     <Compile Include="Client\EpisodeClient.cs" />
     <Compile Include="Client\IndexerClient.cs" />
+    <Compile Include="Client\NotificationClient.cs" />
     <Compile Include="Client\ReleaseClient.cs" />
     <Compile Include="Client\SeriesClient.cs" />
     <Compile Include="CommandIntegerationTests.cs" />
-    <Compile Include="NotificationIntegrationFixture.cs" />
-    <Compile Include="SeriesEditorIntegrationTest.cs" />
-    <Compile Include="HistoryIntegrationTest.cs" />
-    <Compile Include="NamingConfigTests.cs" />
     <Compile Include="EpisodeIntegrationTests.cs" />
+    <Compile Include="HistoryIntegrationTest.cs" />
     <Compile Include="IndexerIntegrationFixture.cs" />
-    <Compile Include="IntegrationTestDirectoryInfo.cs" />
-    <Compile Include="ReleaseIntegrationTest.cs" />
     <Compile Include="IntegrationTest.cs" />
+    <Compile Include="IntegrationTestDirectoryInfo.cs" />
+    <Compile Include="NamingConfigTests.cs" />
+    <Compile Include="NotificationIntegrationFixture.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ReleaseIntegrationTest.cs" />
     <Compile Include="RootFolderIntegrationTest.cs" />
+    <Compile Include="SeriesEditorIntegrationTest.cs" />
     <Compile Include="SeriesIntegrationTest.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj
index ca67bc8f8..9795e646f 100644
--- a/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj
+++ b/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj
@@ -38,22 +38,22 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="FluentAssertions">
       <HintPath>..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="nunit.framework">
+      <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="JsonTests\JsonFixture.cs" />
diff --git a/src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj b/src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj
index c69ab2d68..11b859a9a 100644
--- a/src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj
+++ b/src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj
@@ -50,6 +50,13 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="FluentAssertions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
@@ -57,13 +64,6 @@
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DiskProviderTests\DiskProviderFixture.cs" />
@@ -75,14 +75,14 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NzbDrone.Common.Test\NzbDrone.Common.Test.csproj">
-      <Project>{bec74619-ddbb-4fba-b517-d3e20afc9997}</Project>
-      <Name>NzbDrone.Common.Test</Name>
-    </ProjectReference>
     <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
       <Project>{f2be0fdf-6e47-4827-a420-dd4ef82407f8}</Project>
       <Name>NzbDrone.Common</Name>
     </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Common.Test\NzbDrone.Common.Test.csproj">
+      <Project>{bec74619-ddbb-4fba-b517-d3e20afc9997}</Project>
+      <Name>NzbDrone.Common.Test</Name>
+    </ProjectReference>
     <ProjectReference Include="..\NzbDrone.Core\NzbDrone.Core.csproj">
       <Project>{ff5ee3b6-913b-47ce-9ceb-11c51b4e1205}</Project>
       <Name>NzbDrone.Core</Name>
diff --git a/src/NzbDrone.Mono/NzbDrone.Mono.csproj b/src/NzbDrone.Mono/NzbDrone.Mono.csproj
index fa37ac15e..27a0788da 100644
--- a/src/NzbDrone.Mono/NzbDrone.Mono.csproj
+++ b/src/NzbDrone.Mono/NzbDrone.Mono.csproj
@@ -51,6 +51,13 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Libraries\Mono.Posix.dll</HintPath>
@@ -59,13 +66,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NLog.2.1.0\lib\net40\NLog.dll</HintPath>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DiskProvider.cs" />
diff --git a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
index 017ace6e1..ad1812390 100644
--- a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
+++ b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
@@ -37,32 +37,28 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Practices.ServiceLocation">
-      <HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
-    </Reference>
-    <Reference Include="Moq">
-      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
-    </Reference>
-    <Reference Include="RestSharp, Version=104.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="FluentAssertions">
       <HintPath>..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Practices.ServiceLocation">
+      <HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Practices.Unity">
       <HintPath>..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Practices.Unity.Configuration">
       <HintPath>..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll</HintPath>
     </Reference>
+    <Reference Include="Moq">
+      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -72,15 +68,19 @@
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
     </Reference>
+    <Reference Include="RestSharp, Version=104.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AutoMoq\AutoMoqer.cs" />
     <Compile Include="AutoMoq\Unity\AutoMockingBuilderStrategy.cs" />
     <Compile Include="AutoMoq\Unity\AutoMockingContainerExtension.cs" />
     <Compile Include="Categories\DiskAccessTestAttribute.cs" />
+    <Compile Include="Categories\IntegrationTestAttribute.cs" />
     <Compile Include="ConcurrencyCounter.cs" />
     <Compile Include="ExceptionVerification.cs" />
-    <Compile Include="Categories\IntegrationTestAttribute.cs" />
     <Compile Include="LoggingTest.cs" />
     <Compile Include="MockerExtensions.cs" />
     <Compile Include="NzbDroneRunner.cs" />
diff --git a/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj b/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj
index 7d6a56fa8..0c445bc4c 100644
--- a/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj
+++ b/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj
@@ -39,11 +39,11 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DummyApp.cs" />
diff --git a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj
index a5cd2def6..0c67a4344 100644
--- a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj
+++ b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj
@@ -37,22 +37,22 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Moq">
-      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="FizzWare.NBuilder, Version=3.0.1.0, Culture=neutral, PublicKeyToken=5651b03e12e42c12">
       <HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
     </Reference>
     <Reference Include="FluentAssertions">
       <HintPath>..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
     </Reference>
+    <Reference Include="Moq">
+      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
+    </Reference>
     <Reference Include="NLog">
       <HintPath>..\packages\NLog.2.1.0\lib\net40\NLog.dll</HintPath>
     </Reference>
@@ -61,11 +61,11 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="StartNzbDroneService.cs" />
-    <Compile Include="ProgramFixture.cs" />
     <Compile Include="InstallUpdateServiceFixture.cs" />
-    <Compile Include="UpdateProviderStartFixture.cs" />
+    <Compile Include="ProgramFixture.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="StartNzbDroneService.cs" />
+    <Compile Include="UpdateProviderStartFixture.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\NzbDrone.Test.Common\App.config">
diff --git a/src/NzbDrone.Update/NzbDrone.Update.csproj b/src/NzbDrone.Update/NzbDrone.Update.csproj
index 399a39203..343da2d2f 100644
--- a/src/NzbDrone.Update/NzbDrone.Update.csproj
+++ b/src/NzbDrone.Update/NzbDrone.Update.csproj
@@ -51,9 +51,8 @@
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="AppType.cs" />
-    <Compile Include="UpdateStartupContext.cs" />
-    <Compile Include="UpdateApp.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UpdateApp.cs" />
     <Compile Include="UpdateContainerBuilder.cs" />
     <Compile Include="UpdateEngine\BackupAndRestore.cs" />
     <Compile Include="UpdateEngine\BackupAppData.cs" />
@@ -61,6 +60,7 @@
     <Compile Include="UpdateEngine\InstallUpdateService.cs" />
     <Compile Include="UpdateEngine\StartNzbDrone.cs" />
     <Compile Include="UpdateEngine\TerminateNzbDrone.cs" />
+    <Compile Include="UpdateStartupContext.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj b/src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj
index 7a1f8826a..2743876e1 100644
--- a/src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj
+++ b/src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj
@@ -50,6 +50,13 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="FluentAssertions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll</HintPath>
@@ -58,13 +65,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DiskProviderTests\DiskProviderFixture.cs" />
@@ -73,14 +73,14 @@
     <Compile Include="ServiceFactoryFixture.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NzbDrone.Common.Test\NzbDrone.Common.Test.csproj">
-      <Project>{bec74619-ddbb-4fba-b517-d3e20afc9997}</Project>
-      <Name>NzbDrone.Common.Test</Name>
-    </ProjectReference>
     <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
       <Project>{f2be0fdf-6e47-4827-a420-dd4ef82407f8}</Project>
       <Name>NzbDrone.Common</Name>
     </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Common.Test\NzbDrone.Common.Test.csproj">
+      <Project>{bec74619-ddbb-4fba-b517-d3e20afc9997}</Project>
+      <Name>NzbDrone.Common.Test</Name>
+    </ProjectReference>
     <ProjectReference Include="..\NzbDrone.Core\NzbDrone.Core.csproj">
       <Project>{ff5ee3b6-913b-47ce-9ceb-11c51b4e1205}</Project>
       <Name>NzbDrone.Core</Name>
diff --git a/src/NzbDrone.Windows/NzbDrone.Windows.csproj b/src/NzbDrone.Windows/NzbDrone.Windows.csproj
index 4c3d83721..207e4b315 100644
--- a/src/NzbDrone.Windows/NzbDrone.Windows.csproj
+++ b/src/NzbDrone.Windows/NzbDrone.Windows.csproj
@@ -50,16 +50,16 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NLog">
-      <HintPath>..\packages\NLog.2.1.0\lib\net40\NLog.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog">
+      <HintPath>..\packages\NLog.2.1.0\lib\net40\NLog.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DiskProvider.cs" />
diff --git a/src/NzbDrone/NzbDrone.csproj b/src/NzbDrone/NzbDrone.csproj
index 5437239ca..2fd732f12 100644
--- a/src/NzbDrone/NzbDrone.csproj
+++ b/src/NzbDrone/NzbDrone.csproj
@@ -88,16 +88,16 @@
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="MessageBoxUserAlert.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="WindowsApp.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SysTray\SysTrayApp.cs">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="WindowsApp.cs" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0">