diff --git a/NzbDrone.Core/Libraries/Exceptioneer.WindowsFormsClient.dll b/NzbDrone.Core/Libraries/Exceptioneer.WindowsFormsClient.dll
index 52635882f7..c3c9bde07b 100644
Binary files a/NzbDrone.Core/Libraries/Exceptioneer.WindowsFormsClient.dll and b/NzbDrone.Core/Libraries/Exceptioneer.WindowsFormsClient.dll differ
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index 1ef76a2877..a50fd16cef 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -91,7 +91,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <CodeAnalysisLogFile>bin\Debug\SABSync.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
     <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
@@ -121,7 +121,9 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Castle.Core, Version=2.5.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL" />
+    <Reference Include="Castle.Core">
+      <HintPath>Libraries\Castle.Core.dll</HintPath>
+    </Reference>
     <Reference Include="Exceptioneer.WindowsFormsClient, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Libraries\Exceptioneer.WindowsFormsClient.dll</HintPath>
@@ -132,13 +134,17 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Ninject.2.2.1.0\lib\.NetFramework 4.0\Ninject.dll</HintPath>
     </Reference>
+    <Reference Include="Ninject.Extensions.Conventions">
+      <HintPath>Libraries\Ninject.Extensions.Conventions.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL" />
     <Reference Include="NLog.Extended, Version=2.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Libraries\NLog.Extended.dll</HintPath>
     </Reference>
     <Reference Include="SubSonic.Core, Version=3.0.0.3, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>D:\OpenSource\sabscripts\SABSync\References\SubSonic.Core.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Libraries\SubSonic.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -151,7 +157,9 @@
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.XML" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="TvdbLib, Version=0.8.8.0, Culture=neutral, processorArchitecture=MSIL" />
+    <Reference Include="TvdbLib">
+      <HintPath>Libraries\TvdbLib.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Helpers\EpisodeRenameHelper.cs" />
@@ -263,24 +271,6 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Libraries\Castle.Core.dll" />
-    <Content Include="Libraries\Castle.Core.xml" />
-    <Content Include="Libraries\Exceptioneer.WindowsFormsClient.dll" />
-    <Content Include="Libraries\NLog.dll" />
-    <Content Include="Libraries\NLog.Extended.dll" />
-    <Content Include="Libraries\NLog.Extended.xml" />
-    <Content Include="Libraries\NLog.xml" />
-    <Content Include="Libraries\SubSonic.Core.dll" />
-    <Content Include="Libraries\SubSonic.Core.XML" />
-    <Content Include="Libraries\System.Data.SQLite.dll" />
-    <Content Include="Libraries\System.Data.SQLite.XML" />
-    <Content Include="Libraries\TvdbLib.dll" />
-    <Content Include="Libraries\TvdbLib.XML" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Libraries\nlog.xsd">
-      <SubType>Designer</SubType>
-    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/NzbDrone.Core/Providers/IRssSyncProvider.cs b/NzbDrone.Core/Providers/IRssSyncProvider.cs
index 4488078152..61a46e3435 100644
--- a/NzbDrone.Core/Providers/IRssSyncProvider.cs
+++ b/NzbDrone.Core/Providers/IRssSyncProvider.cs
@@ -10,7 +10,7 @@ public interface IRssSyncProvider
         void Begin();
     }
 
-    class RssSyncProvider : IRssSyncProvider
+    public class RssSyncProvider : IRssSyncProvider
     {
         public void Begin()
         {
diff --git a/NzbDrone.Core/Providers/SeasonProvider.cs b/NzbDrone.Core/Providers/SeasonProvider.cs
index eea1a53708..fae1d47770 100644
--- a/NzbDrone.Core/Providers/SeasonProvider.cs
+++ b/NzbDrone.Core/Providers/SeasonProvider.cs
@@ -8,7 +8,7 @@
 
 namespace NzbDrone.Core.Providers
 {
-    class SeasonProvider : ISeasonProvider
+    public class SeasonProvider : ISeasonProvider
     {
         private readonly IRepository _sonicRepo;
         private readonly ISeriesProvider _seriesProvider;
diff --git a/NzbDrone.Core/Providers/SeriesProvider.cs b/NzbDrone.Core/Providers/SeriesProvider.cs
index 330bc8706e..364b2b66bd 100644
--- a/NzbDrone.Core/Providers/SeriesProvider.cs
+++ b/NzbDrone.Core/Providers/SeriesProvider.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using Ninject;
 using NLog;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
@@ -22,7 +23,6 @@ public class SeriesProvider : ISeriesProvider
         private readonly IRepository _sonioRepo;
         private readonly ITvDbProvider _tvDb;
         private readonly IQualityProvider _quality;
-
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         public SeriesProvider(IConfigProvider configProvider,
diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj
index 48a753080e..26c0525fd2 100644
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@@ -26,7 +26,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <PublishDatabases>false</PublishDatabases>
     <MvcBuildViews>true</MvcBuildViews>
     <EnableUpdateable>false</EnableUpdateable>
@@ -809,15 +809,7 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>21704</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost/NzbDrone</IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>http://localhost:8989</CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+          <SaveServerSettingsInUserFile>True</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
     </VisualStudio>
diff --git a/NzbDrone.Web/Web.config b/NzbDrone.Web/Web.config
index 7a6e98f0df..75336766bf 100644
--- a/NzbDrone.Web/Web.config
+++ b/NzbDrone.Web/Web.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup useLegacyV2RuntimeActivationPolicy="true">
     <supportedRuntime version="v4.0" />
@@ -18,10 +18,7 @@
         <add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
       </assemblies>
     </compilation>
-    <pages validateRequest="false"
-           pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
-           pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
-           userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+    <pages validateRequest="false" pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
       <controls>
         <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
       </controls>
@@ -45,11 +42,13 @@
   <system.webServer>
     <modules runAllManagedModulesForAllRequests="true"></modules>
     <handlers>
+      <remove name="MvcHttpHandler"/>
       <remove name="UrlRoutingHandler" />
       <remove name="asset" />
       <add name="asset" preCondition="integratedMode" verb="GET,HEAD" path="asset.axd" type="Telerik.Web.Mvc.WebAssetHttpHandler, Telerik.Web.Mvc" />
+      <add name="MvcHttpHandler" preCondition="integratedMode" verb="" path=".mvc" type="System.Web.Mvc.MvcHttpHandler"/>
     </handlers>
-    <directoryBrowse enabled="true" />
+    <directoryBrowse enabled="false" />
     <validation validateIntegratedModeConfiguration="false" />
   </system.webServer>
   <runtime>