diff --git a/VS2012/Arango Client Library/Arango Client Library.vcxproj b/VS2012/Arango Client Library/Arango Client Library.vcxproj
index a574009538..f482ee920d 100644
--- a/VS2012/Arango Client Library/Arango Client Library.vcxproj	
+++ b/VS2012/Arango Client Library/Arango Client Library.vcxproj	
@@ -168,7 +168,6 @@
   <ItemGroup>
     <ClInclude Include="..\..\lib\SimpleHttpClient\ClientConnection.h" />
     <ClInclude Include="..\..\lib\SimpleHttpClient\GeneralClientConnection.h" />
-    <ClInclude Include="..\..\lib\SimpleHttpClient\SimpleClient.h" />
     <ClInclude Include="..\..\lib\SimpleHttpClient\SimpleHttpClient.h" />
     <ClInclude Include="..\..\lib\SimpleHttpClient\SimpleHttpResult.h" />
     <ClInclude Include="..\..\lib\SimpleHttpClient\SslClientConnection.h" />
@@ -176,7 +175,6 @@
   <ItemGroup>
     <ClCompile Include="..\..\lib\SimpleHttpClient\ClientConnection.cpp" />
     <ClCompile Include="..\..\lib\SimpleHttpClient\GeneralClientConnection.cpp" />
-    <ClCompile Include="..\..\lib\SimpleHttpClient\SimpleClient.cpp" />
     <ClCompile Include="..\..\lib\SimpleHttpClient\SimpleHttpClient.cpp" />
     <ClCompile Include="..\..\lib\SimpleHttpClient\SimpleHttpResult.cpp" />
     <ClCompile Include="..\..\lib\SimpleHttpClient\SslClientConnection.cpp" />
diff --git a/VS2012/Arango Client Library/Arango Client Library.vcxproj.filters b/VS2012/Arango Client Library/Arango Client Library.vcxproj.filters
index 9669e2ea62..da6c1ecf25 100644
--- a/VS2012/Arango Client Library/Arango Client Library.vcxproj.filters	
+++ b/VS2012/Arango Client Library/Arango Client Library.vcxproj.filters	
@@ -20,9 +20,6 @@
     <ClInclude Include="..\..\lib\SimpleHttpClient\GeneralClientConnection.h">
       <Filter>SimpleHttpClient Header</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\lib\SimpleHttpClient\SimpleClient.h">
-      <Filter>SimpleHttpClient Header</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\lib\SimpleHttpClient\SimpleHttpClient.h">
       <Filter>SimpleHttpClient Header</Filter>
     </ClInclude>
@@ -40,9 +37,6 @@
     <ClCompile Include="..\..\lib\SimpleHttpClient\GeneralClientConnection.cpp">
       <Filter>SimpleHttpClient Source</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\lib\SimpleHttpClient\SimpleClient.cpp">
-      <Filter>SimpleHttpClient Source</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\lib\SimpleHttpClient\SimpleHttpClient.cpp">
       <Filter>SimpleHttpClient Source</Filter>
     </ClCompile>
diff --git a/VS2012/Arango Front End Library/Arango Front End Library.vcxproj b/VS2012/Arango Front End Library/Arango Front End Library.vcxproj
index a556fa8326..b3623f42dc 100644
--- a/VS2012/Arango Front End Library/Arango Front End Library.vcxproj	
+++ b/VS2012/Arango Front End Library/Arango Front End Library.vcxproj	
@@ -199,7 +199,6 @@
     <ClInclude Include="..\..\lib\HttpServer\HttpServer.h" />
     <ClInclude Include="..\..\lib\HttpServer\HttpsServer.h" />
     <ClInclude Include="..\..\lib\HttpServer\PathHandler.h" />
-    <ClInclude Include="..\..\lib\HttpServer\RedirectHandler.h" />
     <ClInclude Include="..\..\lib\HttpServer\ServiceUnavailableHandler.h" />
     <ClInclude Include="..\..\lib\Scheduler\ApplicationScheduler.h" />
     <ClInclude Include="..\..\lib\Scheduler\AsyncTask.h" />
@@ -233,7 +232,6 @@
     <ClCompile Include="..\..\lib\HttpServer\HttpHandler.cpp" />
     <ClCompile Include="..\..\lib\HttpServer\HttpHandlerFactory.cpp" />
     <ClCompile Include="..\..\lib\HttpServer\PathHandler.cpp" />
-    <ClCompile Include="..\..\lib\HttpServer\RedirectHandler.cpp" />
     <ClCompile Include="..\..\lib\HttpServer\ServiceUnavailableHandler.cpp" />
     <ClCompile Include="..\..\lib\Scheduler\ApplicationScheduler.cpp" />
     <ClCompile Include="..\..\lib\Scheduler\AsyncTask.cpp" />
diff --git a/VS2012/Arango Front End Library/Arango Front End Library.vcxproj.filters b/VS2012/Arango Front End Library/Arango Front End Library.vcxproj.filters
index 3d0176d2b7..b4981d2431 100644
--- a/VS2012/Arango Front End Library/Arango Front End Library.vcxproj.filters	
+++ b/VS2012/Arango Front End Library/Arango Front End Library.vcxproj.filters	
@@ -110,9 +110,6 @@
     <ClInclude Include="..\..\lib\HttpServer\PathHandler.h">
       <Filter>Http Server Header</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\lib\HttpServer\RedirectHandler.h">
-      <Filter>Http Server Header</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\lib\HttpServer\ServiceUnavailableHandler.h">
       <Filter>Http Server Header</Filter>
     </ClInclude>
@@ -238,9 +235,6 @@
     <ClCompile Include="..\..\lib\HttpServer\PathHandler.cpp">
       <Filter>Http Server Source</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\lib\HttpServer\RedirectHandler.cpp">
-      <Filter>Http Server Source</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\lib\HttpServer\ServiceUnavailableHandler.cpp">
       <Filter>Http Server Source</Filter>
     </ClCompile>
diff --git a/VS2012/Arango V8 Library/Arango V8 Library.vcxproj b/VS2012/Arango V8 Library/Arango V8 Library.vcxproj
index ee47bcbed3..87e8784c86 100644
--- a/VS2012/Arango V8 Library/Arango V8 Library.vcxproj	
+++ b/VS2012/Arango V8 Library/Arango V8 Library.vcxproj	
@@ -168,7 +168,6 @@
   <ItemGroup>
     <ClCompile Include="..\..\lib\SimpleHttpClient\ClientConnection.cpp" />
     <ClCompile Include="..\..\lib\SimpleHttpClient\GeneralClientConnection.cpp" />
-    <ClCompile Include="..\..\lib\SimpleHttpClient\SimpleClient.cpp" />
     <ClCompile Include="..\..\lib\SimpleHttpClient\SimpleHttpClient.cpp" />
     <ClCompile Include="..\..\lib\SimpleHttpClient\SimpleHttpResult.cpp" />
     <ClCompile Include="..\..\lib\SimpleHttpClient\SslClientConnection.cpp" />
@@ -185,7 +184,6 @@
   <ItemGroup>
     <ClInclude Include="..\..\lib\SimpleHttpClient\ClientConnection.h" />
     <ClInclude Include="..\..\lib\SimpleHttpClient\GeneralClientConnection.h" />
-    <ClInclude Include="..\..\lib\SimpleHttpClient\SimpleClient.h" />
     <ClInclude Include="..\..\lib\SimpleHttpClient\SimpleHttpClient.h" />
     <ClInclude Include="..\..\lib\SimpleHttpClient\SimpleHttpResult.h" />
     <ClInclude Include="..\..\lib\SimpleHttpClient\SslClientConnection.h" />
diff --git a/VS2012/Arango V8 Library/Arango V8 Library.vcxproj.filters b/VS2012/Arango V8 Library/Arango V8 Library.vcxproj.filters
index 6009076879..8ddc6c002d 100644
--- a/VS2012/Arango V8 Library/Arango V8 Library.vcxproj.filters	
+++ b/VS2012/Arango V8 Library/Arango V8 Library.vcxproj.filters	
@@ -51,9 +51,6 @@
     <ClCompile Include="..\..\lib\SimpleHttpClient\GeneralClientConnection.cpp">
       <Filter>SimpleHttpClient Source</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\lib\SimpleHttpClient\SimpleClient.cpp">
-      <Filter>SimpleHttpClient Source</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\lib\SimpleHttpClient\SimpleHttpClient.cpp">
       <Filter>SimpleHttpClient Source</Filter>
     </ClCompile>
@@ -98,9 +95,6 @@
     <ClInclude Include="..\..\lib\SimpleHttpClient\GeneralClientConnection.h">
       <Filter>SimpleHttpClient Header</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\lib\SimpleHttpClient\SimpleClient.h">
-      <Filter>SimpleHttpClient Header</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\lib\SimpleHttpClient\SimpleHttpClient.h">
       <Filter>SimpleHttpClient Header</Filter>
     </ClInclude>
diff --git a/VS2012/Arangod Binary/Arangod Binary.vcxproj b/VS2012/Arangod Binary/Arangod Binary.vcxproj
index 67f646f282..4ec0746b91 100644
--- a/VS2012/Arangod Binary/Arangod Binary.vcxproj	
+++ b/VS2012/Arangod Binary/Arangod Binary.vcxproj	
@@ -84,13 +84,13 @@
     <LinkIncremental>false</LinkIncremental>
     <TargetName>arangod32</TargetName>
     <LibraryPath>$(SolutionDir)Release;$(LibraryPath)</LibraryPath>
-    <OutDir>c:\local2\arango-triagens\dev\</OutDir>
+    <OutDir>$(OutDir)\Exe</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <TargetName>arangod64</TargetName>
     <LibraryPath>$(SolutionDir)x64\Release;$(LibraryPath)</LibraryPath>
-    <OutDir>c:\local2\arango-triagens\dev\</OutDir>
+    <OutDir>$(OutDir)\Exe</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -151,7 +151,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_ALLOW_KEYWORD_MACROS=1;TRI_HAVE_ICU=1;U_STATIC_IMPLEMENTATION=1;_CRT_SECURE_NO_WARNINGS=1;TRI_MISSING_MEMRCHR=1;FD_SETSIZE=2048;WIN32;TRI_BITS=32;NDEBUG;_CONSOLE;_WIN32;YY_NO_UNISTD_H;USE_READLINE_STATIC=1;USE_REGEX_STATIC=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\3rdParty\VisualStudio\2012-icu\include;$(SolutionDir)..\lib;$(SolutionDir)..;%(AdditionalIncludeDirectories);$(SolutionDir)..\3rdParty\VisualStudio\2012-openssl\x86\include;$(SolutionDir)..\3rdParty\VisualStudio\mygetopt;$(SolutionDir)..\3rdParty\VisualStudio\regex\src;$(SolutionDir)..\3rdParty\VisualStudio\readline;..\..\arangod;..\..\3rdParty\VisualStudio\2012-V8\include;$(SolutionDir)..\3rdParty\VisualStudio\2012-zlib\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\3rdParty\VisualStudio\2012-icu\include;$(SolutionDir)..\lib;$(SolutionDir)..;%(AdditionalIncludeDirectories);$(SolutionDir)..\3rdParty\VisualStudio\2012-openssl\x86\include;$(SolutionDir)..\3rdParty\VisualStudio\mygetopt;$(SolutionDir)..\3rdParty\VisualStudio\regex\src;$(SolutionDir)..\3rdParty\VisualStudio\readline;..\..\arangod;..\..\3rdParty\VisualStudio\2012-V8\include;$(SolutionDir)..\3rdParty\VisualStudio\2012-zlib\1.2.7\include</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>Default</CompileAs>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
@@ -182,7 +182,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_ALLOW_KEYWORD_MACROS=1;TRI_HAVE_ICU=1;U_STATIC_IMPLEMENTATION=1;_CRT_SECURE_NO_WARNINGS=1;TRI_MISSING_MEMRCHR=1;_WIN64;TRI_BITS=64;FD_SETSIZE=2048;WIN32;NDEBUG;_CONSOLE;_WIN32;YY_NO_UNISTD_H;USE_READLINE_STATIC=1;USE_REGEX_STATIC=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\3rdParty\VisualStudio\2012-icu\include;$(SolutionDir)..\lib;$(SolutionDir)..;%(AdditionalIncludeDirectories);$(SolutionDir)..\3rdParty\VisualStudio\2012-openssl\x64\include;$(SolutionDir)..\3rdParty\VisualStudio\mygetopt;$(SolutionDir)..\3rdParty\VisualStudio\regex\src;$(SolutionDir)..\3rdParty\VisualStudio\readline;..\..\3rdParty\VisualStudio\getopt_mb_uni_vc10\src;..\..\3rdParty\VisualStudio\regex-2.7\src;..\..\3rdParty\VisualStudio\readline;..\..\arangod;..\..\3rdParty\VisualStudio\2012-V8\include;$(SolutionDir)..\3rdParty\VisualStudio\2012-zlib\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\3rdParty\VisualStudio\2012-icu\include;$(SolutionDir)..\lib;$(SolutionDir)..;%(AdditionalIncludeDirectories);$(SolutionDir)..\3rdParty\VisualStudio\2012-openssl\x64\include;$(SolutionDir)..\3rdParty\VisualStudio\mygetopt;$(SolutionDir)..\3rdParty\VisualStudio\regex\src;$(SolutionDir)..\3rdParty\VisualStudio\readline;..\..\3rdParty\VisualStudio\getopt_mb_uni_vc10\src;..\..\3rdParty\VisualStudio\regex-2.7\src;..\..\3rdParty\VisualStudio\readline;..\..\arangod;..\..\3rdParty\VisualStudio\2012-V8\include;$(SolutionDir)..\3rdParty\VisualStudio\2012-zlib\1.2.7\include</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>Default</CompileAs>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
diff --git a/VS2012/Arangoimp Binary/Arangoimp Binary.vcxproj b/VS2012/Arangoimp Binary/Arangoimp Binary.vcxproj
index 0565231c7a..a85e63f59f 100644
--- a/VS2012/Arangoimp Binary/Arangoimp Binary.vcxproj	
+++ b/VS2012/Arangoimp Binary/Arangoimp Binary.vcxproj	
@@ -80,13 +80,13 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>c:\local2\arango-triagens\dev\</OutDir>
+    <OutDir>$(OutDir)\Exe</OutDir>
     <TargetName>arangoimp32</TargetName>
     <LibraryPath>$(SolutionDir)Release;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>c:\local2\arango-triagens\dev\</OutDir>
+    <OutDir>$(OutDir)\Exe</OutDir>
     <TargetName>arangoimp64</TargetName>
     <LibraryPath>$(SolutionDir)x64\Release;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
diff --git a/VS2012/Arangosh Binary/Arangosh Binary.vcxproj b/VS2012/Arangosh Binary/Arangosh Binary.vcxproj
index 2856b876d7..aa048fe341 100644
--- a/VS2012/Arangosh Binary/Arangosh Binary.vcxproj	
+++ b/VS2012/Arangosh Binary/Arangosh Binary.vcxproj	
@@ -80,13 +80,13 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>c:\local2\arango-triagens\dev\</OutDir>
+    <OutDir>$(OutDir)\Exe</OutDir>
     <TargetName>arangosh32</TargetName>
     <LibraryPath>$(SolutionDir)Release;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>c:\local2\arango-triagens\dev\</OutDir>
+    <OutDir>$(OutDir)\Exe</OutDir>
     <TargetName>arangosh64</TargetName>
     <LibraryPath>$(SolutionDir)x64\Release;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
@@ -145,7 +145,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_ALLOW_KEYWORD_MACROS=1;TRI_HAVE_ICU=1;U_STATIC_IMPLEMENTATION=1;_CRT_SECURE_NO_WARNINGS=1;FD_SETSIZE=2048;WIN32;TRI_BITS=32;NDEBUG;_CONSOLE;_WIN32;YY_NO_UNISTD_H;USE_READLINE_STATIC=1;USE_REGEX_STATIC=1;TRI_MISSING_MEMRCHR=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\3rdParty\VisualStudio\2012-icu\include;$(SolutionDir)..\arangosh;$(SolutionDir)..\lib;$(SolutionDir)..;%(AdditionalIncludeDirectories);$(SolutionDir)..\3rdParty\VisualStudio\2012-openssl\x86\include;$(SolutionDir)..\3rdParty\VisualStudio\mygetopt;$(SolutionDir)..\3rdParty\VisualStudio\regex\src;$(SolutionDir)..\3rdParty\VisualStudio\readline;..\..\arangod;..\..\3rdParty\VisualStudio\2012-V8\include;$(SolutionDir)..\3rdParty\VisualStudio\2012-zlib\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\3rdParty\VisualStudio\2012-icu\include;$(SolutionDir)..\arangosh;$(SolutionDir)..\lib;$(SolutionDir)..;%(AdditionalIncludeDirectories);$(SolutionDir)..\3rdParty\VisualStudio\2012-openssl\x86\include;$(SolutionDir)..\3rdParty\VisualStudio\mygetopt;$(SolutionDir)..\3rdParty\VisualStudio\regex\src;$(SolutionDir)..\3rdParty\VisualStudio\readline;..\..\arangod;..\..\3rdParty\VisualStudio\2012-V8\include;$(SolutionDir)..\3rdParty\VisualStudio\2012-zlib\1.2.7\include</AdditionalIncludeDirectories>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -170,7 +170,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_ALLOW_KEYWORD_MACROS=1;TRI_HAVE_ICU=1;U_STATIC_IMPLEMENTATION=1;_CRT_SECURE_NO_WARNINGS=1;_WIN64;TRI_BITS=64;FD_SETSIZE=2048;WIN32;NDEBUG;_CONSOLE;_WIN32;YY_NO_UNISTD_H;USE_READLINE_STATIC=1;USE_REGEX_STATIC=1;TRI_MISSING_MEMRCHR=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\3rdParty\VisualStudio\icu\include;$(SolutionDir)..\arangosh;$(SolutionDir)..\lib;$(SolutionDir)..;%(AdditionalIncludeDirectories);$(SolutionDir)..\3rdParty\VisualStudio\openssl\x86\include;$(SolutionDir)..\3rdParty\VisualStudio\mygetopt;$(SolutionDir)..\3rdParty\VisualStudio\regex\src;$(SolutionDir)..\3rdParty\VisualStudio\readline;$(SolutionDir)..\arangod;$(SolutionDir)..\3rdParty\VisualStudio\V8\include;$(SolutionDir)..\3rdParty\VisualStudio\zlib\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\3rdParty\VisualStudio\icu\include;$(SolutionDir)..\arangosh;$(SolutionDir)..\lib;$(SolutionDir)..;%(AdditionalIncludeDirectories);$(SolutionDir)..\3rdParty\VisualStudio\openssl\x86\include;$(SolutionDir)..\3rdParty\VisualStudio\mygetopt;$(SolutionDir)..\3rdParty\VisualStudio\regex\src;$(SolutionDir)..\3rdParty\VisualStudio\readline;$(SolutionDir)..\arangod;$(SolutionDir)..\3rdParty\VisualStudio\V8\include;$(SolutionDir)..\3rdParty\VisualStudio\2012-zlib\1.2.7\include</AdditionalIncludeDirectories>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>