diff --git a/gulp/copy.js b/gulp/copy.js
index 77787e067a..49f60e168a 100644
--- a/gulp/copy.js
+++ b/gulp/copy.js
@@ -8,7 +8,7 @@ gulp.task('copyJs', function () {
     return gulp.src(
       [
         paths.src.root + "polyfills.js",
-        paths.src.root + "JsLibraries\\handlebars.runtime.js",
+        paths.src.root + "JsLibraries/handlebars.runtime.js",
       ])
         .pipe(cache('copyJs'))
         .pipe(print())
diff --git a/gulpFile.js b/gulpFile.js
index 0a9c8c19f7..28dc9b0f17 100644
--- a/gulpFile.js
+++ b/gulpFile.js
@@ -1 +1 @@
-require('./gulp/gulpfile.js');
+require('./gulp/gulpFile.js');
diff --git a/src/Marr.Data/Marr.Data.csproj b/src/Marr.Data/Marr.Data.csproj
index 2883730399..efb14572ad 100644
--- a/src/Marr.Data/Marr.Data.csproj
+++ b/src/Marr.Data/Marr.Data.csproj
@@ -144,7 +144,7 @@
     <PreBuildEvent>
     </PreBuildEvent>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj b/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj
index ce3d9dcdfd..4a66ceb78d 100644
--- a/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj
+++ b/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj
@@ -64,7 +64,7 @@
       <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
     </Reference>
     <Reference Include="Omu.ValueInjecter">
-      <HintPath>..\packages\valueinjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll</HintPath>
+      <HintPath>..\packages\ValueInjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -104,7 +104,7 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -112,4 +112,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/NzbDrone.Api.Test/packages.config b/src/NzbDrone.Api.Test/packages.config
index 25761a0dd4..062d8c3a10 100644
--- a/src/NzbDrone.Api.Test/packages.config
+++ b/src/NzbDrone.Api.Test/packages.config
@@ -4,5 +4,5 @@
   <package id="Moq" version="4.0.10827" />
   <package id="NBuilder" version="3.0.1.1" targetFramework="net40" />
   <package id="NUnit" version="2.6.3" targetFramework="net40" />
-  <package id="valueinjecter" version="2.3.3" targetFramework="net40" />
-</packages>
\ No newline at end of file
+  <package id="ValueInjecter" version="2.3.3" targetFramework="net40" />
+</packages>
diff --git a/src/NzbDrone.Api/NzbDrone.Api.csproj b/src/NzbDrone.Api/NzbDrone.Api.csproj
index 5305a562f8..1f6f2ef85d 100644
--- a/src/NzbDrone.Api/NzbDrone.Api.csproj
+++ b/src/NzbDrone.Api/NzbDrone.Api.csproj
@@ -264,7 +264,7 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -272,4 +272,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/NzbDrone.Api/packages.config b/src/NzbDrone.Api/packages.config
index 0711096584..e6993c37ca 100644
--- a/src/NzbDrone.Api/packages.config
+++ b/src/NzbDrone.Api/packages.config
@@ -8,4 +8,4 @@
   <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
   <package id="NLog" version="2.1.0" targetFramework="net40" />
   <package id="ValueInjecter" version="2.3.3" targetFramework="net40" />
-</packages>
\ No newline at end of file
+</packages>
diff --git a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj
index 988ae6ebd3..248e8c1966 100644
--- a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj
+++ b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj
@@ -104,7 +104,7 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <PropertyGroup>
     <PostBuildEvent>xcopy /s /y "$(SolutionDir)\..\_output\NzbDrone.Mono.*"   "$(TargetDir)"
 xcopy /s /y "$(SolutionDir)\..\_output\NzbDrone.Windows.*"   "$(TargetDir)"</PostBuildEvent>
diff --git a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
index 9d776b2188..1a40f63348 100644
--- a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
+++ b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
@@ -139,7 +139,7 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj
index c195581161..6a2a77deb4 100644
--- a/src/NzbDrone.Common/NzbDrone.Common.csproj
+++ b/src/NzbDrone.Common/NzbDrone.Common.csproj
@@ -213,7 +213,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/NzbDrone.Console/NzbDrone.Console.csproj b/src/NzbDrone.Console/NzbDrone.Console.csproj
index 7585881425..4024569973 100644
--- a/src/NzbDrone.Console/NzbDrone.Console.csproj
+++ b/src/NzbDrone.Console/NzbDrone.Console.csproj
@@ -143,7 +143,7 @@
     <PreBuildEvent>
     </PreBuildEvent>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/NzbDrone.Core.Test/IndexerTests/BitMeTvTests/BitMeTVFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/BitMeTvTests/BitMeTvFixture.cs
similarity index 100%
rename from src/NzbDrone.Core.Test/IndexerTests/BitMeTvTests/BitMeTVFixture.cs
rename to src/NzbDrone.Core.Test/IndexerTests/BitMeTvTests/BitMeTvFixture.cs
diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index 12babe1977..1328e6e351 100644
--- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -505,7 +505,7 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/NzbDrone.Core/Datastore/Migration/001_InitialSetup.cs b/src/NzbDrone.Core/Datastore/Migration/001_initial_setup.cs
similarity index 100%
rename from src/NzbDrone.Core/Datastore/Migration/001_InitialSetup.cs
rename to src/NzbDrone.Core/Datastore/Migration/001_initial_setup.cs
diff --git a/src/NzbDrone.Core/Datastore/Migration/002_Remove_tvrage_imdb_unique_constraint.cs b/src/NzbDrone.Core/Datastore/Migration/002_remove_tvrage_imdb_unique_constraint.cs
similarity index 100%
rename from src/NzbDrone.Core/Datastore/Migration/002_Remove_tvrage_imdb_unique_constraint.cs
rename to src/NzbDrone.Core/Datastore/Migration/002_remove_tvrage_imdb_unique_constraint.cs
diff --git a/src/NzbDrone.Core/Download/Clients/Nzbget/NzbGetQueueItem.cs b/src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetQueueItem.cs
similarity index 100%
rename from src/NzbDrone.Core/Download/Clients/Nzbget/NzbGetQueueItem.cs
rename to src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetQueueItem.cs
diff --git a/src/NzbDrone.Core/MetaData/Consumers/MediaBrowser/MediaBrowserMetadata.cs b/src/NzbDrone.Core/Metadata/Consumers/MediaBrowser/MediaBrowserMetadata.cs
similarity index 100%
rename from src/NzbDrone.Core/MetaData/Consumers/MediaBrowser/MediaBrowserMetadata.cs
rename to src/NzbDrone.Core/Metadata/Consumers/MediaBrowser/MediaBrowserMetadata.cs
diff --git a/src/NzbDrone.Core/MetaData/Consumers/MediaBrowser/MediaBrowserMetadataSettings.cs b/src/NzbDrone.Core/Metadata/Consumers/MediaBrowser/MediaBrowserMetadataSettings.cs
similarity index 100%
rename from src/NzbDrone.Core/MetaData/Consumers/MediaBrowser/MediaBrowserMetadataSettings.cs
rename to src/NzbDrone.Core/Metadata/Consumers/MediaBrowser/MediaBrowserMetadataSettings.cs
diff --git a/src/NzbDrone.Core/MetaData/Consumers/Roksbox/RoksboxMetadata.cs b/src/NzbDrone.Core/Metadata/Consumers/Roksbox/RoksboxMetadata.cs
similarity index 100%
rename from src/NzbDrone.Core/MetaData/Consumers/Roksbox/RoksboxMetadata.cs
rename to src/NzbDrone.Core/Metadata/Consumers/Roksbox/RoksboxMetadata.cs
diff --git a/src/NzbDrone.Core/MetaData/Consumers/Roksbox/RoksboxMetadataSettings.cs b/src/NzbDrone.Core/Metadata/Consumers/Roksbox/RoksboxMetadataSettings.cs
similarity index 100%
rename from src/NzbDrone.Core/MetaData/Consumers/Roksbox/RoksboxMetadataSettings.cs
rename to src/NzbDrone.Core/Metadata/Consumers/Roksbox/RoksboxMetadataSettings.cs
diff --git a/src/NzbDrone.Core/MetaData/Consumers/Wdtv/WdtvMetadata.cs b/src/NzbDrone.Core/Metadata/Consumers/Wdtv/WdtvMetadata.cs
similarity index 100%
rename from src/NzbDrone.Core/MetaData/Consumers/Wdtv/WdtvMetadata.cs
rename to src/NzbDrone.Core/Metadata/Consumers/Wdtv/WdtvMetadata.cs
diff --git a/src/NzbDrone.Core/MetaData/Consumers/Wdtv/WdtvMetadataSettings.cs b/src/NzbDrone.Core/Metadata/Consumers/Wdtv/WdtvMetadataSettings.cs
similarity index 100%
rename from src/NzbDrone.Core/MetaData/Consumers/Wdtv/WdtvMetadataSettings.cs
rename to src/NzbDrone.Core/Metadata/Consumers/Wdtv/WdtvMetadataSettings.cs
diff --git a/src/NzbDrone.Core/MetaData/Consumers/Xbmc/XbmcMetadata.cs b/src/NzbDrone.Core/Metadata/Consumers/Xbmc/XbmcMetadata.cs
similarity index 100%
rename from src/NzbDrone.Core/MetaData/Consumers/Xbmc/XbmcMetadata.cs
rename to src/NzbDrone.Core/Metadata/Consumers/Xbmc/XbmcMetadata.cs
diff --git a/src/NzbDrone.Core/MetaData/Consumers/Xbmc/XbmcMetadataSettings.cs b/src/NzbDrone.Core/Metadata/Consumers/Xbmc/XbmcMetadataSettings.cs
similarity index 100%
rename from src/NzbDrone.Core/MetaData/Consumers/Xbmc/XbmcMetadataSettings.cs
rename to src/NzbDrone.Core/Metadata/Consumers/Xbmc/XbmcMetadataSettings.cs
diff --git a/src/NzbDrone.Core/MetaData/Files/CleanMetadataService.cs b/src/NzbDrone.Core/Metadata/Files/CleanMetadataService.cs
similarity index 100%
rename from src/NzbDrone.Core/MetaData/Files/CleanMetadataService.cs
rename to src/NzbDrone.Core/Metadata/Files/CleanMetadataService.cs
diff --git a/src/NzbDrone.Core/MetaData/Files/ImageFileResult.cs b/src/NzbDrone.Core/Metadata/Files/ImageFileResult.cs
similarity index 100%
rename from src/NzbDrone.Core/MetaData/Files/ImageFileResult.cs
rename to src/NzbDrone.Core/Metadata/Files/ImageFileResult.cs
diff --git a/src/NzbDrone.Core/MetaData/Files/MetadataFileResult.cs b/src/NzbDrone.Core/Metadata/Files/MetadataFileResult.cs
similarity index 100%
rename from src/NzbDrone.Core/MetaData/Files/MetadataFileResult.cs
rename to src/NzbDrone.Core/Metadata/Files/MetadataFileResult.cs
diff --git a/src/NzbDrone.Core/MetaData/Files/MetadataFilesUpdated.cs b/src/NzbDrone.Core/Metadata/Files/MetadataFilesUpdated.cs
similarity index 100%
rename from src/NzbDrone.Core/MetaData/Files/MetadataFilesUpdated.cs
rename to src/NzbDrone.Core/Metadata/Files/MetadataFilesUpdated.cs
diff --git a/src/NzbDrone.Core/MetaData/IMetadata.cs b/src/NzbDrone.Core/Metadata/IMetadata.cs
similarity index 100%
rename from src/NzbDrone.Core/MetaData/IMetadata.cs
rename to src/NzbDrone.Core/Metadata/IMetadata.cs
diff --git a/src/NzbDrone.Core/MetaData/MetadataDefinition.cs b/src/NzbDrone.Core/Metadata/MetadataDefinition.cs
similarity index 100%
rename from src/NzbDrone.Core/MetaData/MetadataDefinition.cs
rename to src/NzbDrone.Core/Metadata/MetadataDefinition.cs
diff --git a/src/NzbDrone.Core/MetaData/MetadataFactory.cs b/src/NzbDrone.Core/Metadata/MetadataFactory.cs
similarity index 100%
rename from src/NzbDrone.Core/MetaData/MetadataFactory.cs
rename to src/NzbDrone.Core/Metadata/MetadataFactory.cs
diff --git a/src/NzbDrone.Core/MetaData/MetadataRepository.cs b/src/NzbDrone.Core/Metadata/MetadataRepository.cs
similarity index 100%
rename from src/NzbDrone.Core/MetaData/MetadataRepository.cs
rename to src/NzbDrone.Core/Metadata/MetadataRepository.cs
diff --git a/src/NzbDrone.Core/MetaData/MetadataService.cs b/src/NzbDrone.Core/Metadata/MetadataService.cs
similarity index 100%
rename from src/NzbDrone.Core/MetaData/MetadataService.cs
rename to src/NzbDrone.Core/Metadata/MetadataService.cs
diff --git a/src/NzbDrone.Core/MetaData/MetadataType.cs b/src/NzbDrone.Core/Metadata/MetadataType.cs
similarity index 100%
rename from src/NzbDrone.Core/MetaData/MetadataType.cs
rename to src/NzbDrone.Core/Metadata/MetadataType.cs
diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj
index e09d61b9e4..d35950e2f0 100644
--- a/src/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/src/NzbDrone.Core/NzbDrone.Core.csproj
@@ -100,7 +100,7 @@
       <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>
+      <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>
@@ -174,7 +174,7 @@
     <Compile Include="Datastore\LazyList.cs" />
     <Compile Include="Datastore\MainDatabase.cs" />
     <Compile Include="Datastore\LogDatabase.cs" />
-    <Compile Include="Datastore\Migration\001_initialSetup.cs" />
+    <Compile Include="Datastore\Migration\001_initial_setup.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" />
@@ -977,7 +977,7 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -985,4 +985,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/NzbDrone.Core/Organizer/FilenameBuilderTokenEqualityComparer.cs b/src/NzbDrone.Core/Organizer/FileNameBuilderTokenEqualityComparer.cs
similarity index 100%
rename from src/NzbDrone.Core/Organizer/FilenameBuilderTokenEqualityComparer.cs
rename to src/NzbDrone.Core/Organizer/FileNameBuilderTokenEqualityComparer.cs
diff --git a/src/NzbDrone.Core/Organizer/FilenameSampleService.cs b/src/NzbDrone.Core/Organizer/FileNameSampleService.cs
similarity index 100%
rename from src/NzbDrone.Core/Organizer/FilenameSampleService.cs
rename to src/NzbDrone.Core/Organizer/FileNameSampleService.cs
diff --git a/src/NzbDrone.Core/Organizer/FilenameValidationService.cs b/src/NzbDrone.Core/Organizer/FileNameValidationService.cs
similarity index 100%
rename from src/NzbDrone.Core/Organizer/FilenameValidationService.cs
rename to src/NzbDrone.Core/Organizer/FileNameValidationService.cs
diff --git a/src/NzbDrone.Core/packages.config b/src/NzbDrone.Core/packages.config
index b7a2989eef..6d9d2ffaef 100644
--- a/src/NzbDrone.Core/packages.config
+++ b/src/NzbDrone.Core/packages.config
@@ -9,5 +9,5 @@
   <package id="NLog" version="2.1.0" targetFramework="net40" />
   <package id="Prowlin" version="0.9.4456.26422" targetFramework="net40" />
   <package id="RestSharp" version="105.0.1" targetFramework="net40" />
-  <package id="valueinjecter" version="2.3.3" targetFramework="net40" />
+  <package id="ValueInjecter" version="2.3.3" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/NzbDrone.Host/NzbDrone.Host.csproj b/src/NzbDrone.Host/NzbDrone.Host.csproj
index 0a0cccb44d..ec96fb3fd4 100644
--- a/src/NzbDrone.Host/NzbDrone.Host.csproj
+++ b/src/NzbDrone.Host/NzbDrone.Host.csproj
@@ -196,7 +196,7 @@
   <PropertyGroup>
     <PostBuildEvent>xcopy /s /y "$(SolutionDir)\Libraries\Sqlite\*.*"   "$(TargetDir)"</PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
index 43a8c21133..7a10d5a572 100644
--- a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
+++ b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
@@ -166,7 +166,7 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <PropertyGroup>
     <PostBuildEvent>xcopy /s /y "$(SolutionDir)\..\_output\NzbDrone.Mono.*"   "$(TargetDir)"
 xcopy /s /y "$(SolutionDir)\..\_output\NzbDrone.Windows.*"   "$(TargetDir)"</PostBuildEvent>
diff --git a/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj
index 5649e5f2d6..feafe090df 100644
--- a/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj
+++ b/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj
@@ -88,7 +88,7 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
index 3500ef1ad0..22ccb8e75c 100644
--- a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
+++ b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj
@@ -118,7 +118,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj b/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj
index 0c445bc4cc..f4bdc7d277 100644
--- a/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj
+++ b/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj
@@ -53,7 +53,7 @@
     <None Include="app.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj
index ae76da9030..10dcd7f174 100644
--- a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj
+++ b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj
@@ -97,7 +97,7 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/NzbDrone.Update/NzbDrone.Update.csproj b/src/NzbDrone.Update/NzbDrone.Update.csproj
index d7b7a53ca4..3ccd76122e 100644
--- a/src/NzbDrone.Update/NzbDrone.Update.csproj
+++ b/src/NzbDrone.Update/NzbDrone.Update.csproj
@@ -78,7 +78,7 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/NzbDrone/NzbDrone.csproj b/src/NzbDrone/NzbDrone.csproj
index 9218c2acc5..fdfa6bd292 100644
--- a/src/NzbDrone/NzbDrone.csproj
+++ b/src/NzbDrone/NzbDrone.csproj
@@ -162,7 +162,7 @@
   <PropertyGroup>
     <PostBuildEvent>xcopy /s /y "$(SolutionDir)\Libraries\Sqlite\*.*"   "$(TargetDir)"</PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj b/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj
index 928fce634e..f63686c587 100644
--- a/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj
+++ b/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj
@@ -73,7 +73,7 @@
   <PropertyGroup>
     <PostBuildEvent>"$(SolutionDir)Libraries\Manifest Tool\mt.exe" -manifest "$(ProjectDir)app.manifest"  –outputresource:"$(TargetDir)$(TargetFileName)";#1</PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj b/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj
index 66adb59350..35c41c2445 100644
--- a/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj
+++ b/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj
@@ -77,7 +77,7 @@
   <PropertyGroup>
     <PostBuildEvent>"$(SolutionDir)Libraries\Manifest Tool\mt.exe" -manifest "$(ProjectDir)app.manifest"  –outputresource:"$(TargetDir)$(TargetFileName)";#1</PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/UI/Shims/jquery.js b/src/UI/Shims/jquery.js
index 4a343c4ff6..19e9019442 100644
--- a/src/UI/Shims/jquery.js
+++ b/src/UI/Shims/jquery.js
@@ -1,11 +1,11 @@
 var jquery = require('../JsLibraries/jquery');
 require('../Instrumentation/StringFormat');
 var spin = require('../jQuery/jquery.spin');
-var ajax = require('../jquery/jquery.ajax');
+var ajax = require('../jQuery/jquery.ajax');
 
 spin.call(jquery);
 ajax.call(jquery);
 
 window.$ = jquery;
 window.jQuery = jquery;
-module.exports = jquery;
\ No newline at end of file
+module.exports = jquery;
diff --git a/src/UI/System/Logs/Logs.less b/src/UI/System/Logs/logs.less
similarity index 100%
rename from src/UI/System/Logs/Logs.less
rename to src/UI/System/Logs/logs.less