diff --git a/SimpleDLNA/FormMain.cs b/SimpleDLNA/FormMain.cs
index 5c9043e2..f2a23206 100644
--- a/SimpleDLNA/FormMain.cs
+++ b/SimpleDLNA/FormMain.cs
@@ -37,7 +37,7 @@ public partial class FormMain : Form, IAppender
 
 #if DEBUG
     private readonly FileInfo logFile =
-      new FileInfo(Path.Combine(cacheDir, "sdlna.dbg.log"));
+      new FileInfo(Path.Combine(CacheDir, "sdlna.dbg.log"));
 #else
     private readonly FileInfo logFile =
       new FileInfo(Path.Combine(CacheDir, "sdlna.log"));
diff --git a/SimpleDLNA/SimpleDLNA.csproj b/SimpleDLNA/SimpleDLNA.csproj
index 5246e611..aaced777 100644
--- a/SimpleDLNA/SimpleDLNA.csproj
+++ b/SimpleDLNA/SimpleDLNA.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -72,6 +72,9 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>sdlna.key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+  <PropertyGroup>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
diff --git a/SimpleDLNA/StartUpUtilities.cs b/SimpleDLNA/StartupUtilities.cs
similarity index 100%
rename from SimpleDLNA/StartUpUtilities.cs
rename to SimpleDLNA/StartupUtilities.cs
diff --git a/server/Http/HttpClient.cs b/server/Http/HttpClient.cs
index cf1628bc..4107c0d4 100644
--- a/server/Http/HttpClient.cs
+++ b/server/Http/HttpClient.cs
@@ -384,7 +384,7 @@ private void SetupResponse()
       }
       catch (HttpStatusException ex) {
 #if DEBUG
-        Warn(String.Format("{0} - Got a {2}: {1}", this, path, ex.Code), ex);
+        Warn(String.Format("{0} - Got a {2}: {1}", this, Path, ex.Code), ex);
 #else
         InfoFormat("{0} - Got a {2}: {1}", this, Path, ex.Code);
 #endif
diff --git a/server/Http/HTTPServer.cs b/server/Http/HttpServer.cs
similarity index 100%
rename from server/Http/HTTPServer.cs
rename to server/Http/HttpServer.cs
diff --git a/server/Properties/Resources.resx b/server/Properties/Resources.resx
index d12268d3..4e2472b8 100644
--- a/server/Properties/Resources.resx
+++ b/server/Properties/Resources.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -119,36 +119,36 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="browse_css" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\browse.css;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\browse.css;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="contentdirectory" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\contentdirectory.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\contentdirectory.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="connectionmanager" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\connectionmanager.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\connectionmanager.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="MSMediaReceiverRegistrar" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\MSMediaReceiverRegistrar.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\MSMediaReceiverRegistrar.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="description" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\description.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;UTF-8</value>
+    <value>..\Resources\description.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;UTF-8</value>
   </data>
   <data name="x_featurelist" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\x_featurelist.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\x_featurelist.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="favicon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\favicon.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\favicon.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="largePNG" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\large.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\large.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="largeJPEG" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\large.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\large.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="smallPNG" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\small.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\small.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="smallJPEG" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\small.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\small.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/server/Types/SubTitle.cs b/server/Types/Subtitle.cs
similarity index 100%
rename from server/Types/SubTitle.cs
rename to server/Types/Subtitle.cs
diff --git a/util/Ffmpeg.cs b/util/FFmpeg.cs
similarity index 100%
rename from util/Ffmpeg.cs
rename to util/FFmpeg.cs
diff --git a/util/util.csproj b/util/util.csproj
index f9c9b3b9..e0abb72b 100644
--- a/util/util.csproj
+++ b/util/util.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -71,7 +71,7 @@
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Data" />
-    <Reference Include="System.XML" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs">