author: Tiger Wang <ziwei.tiger@hotmail.co.uk> 2013-11-27 22:35:13 +0100
committer: Tiger Wang <ziwei.tiger@hotmail.co.uk> 2013-11-27 22:35:13 +0100
commit: a6630d32394120a78af56bc612fa3c3449283248 (patch)
tree: 2c791266b0f213cd56961299da8d2258b8f85d8e /VC2013
parent: Fixed spawn point being generally in an ocean (diff)
parent: Voronoi-related biomegens use the new cVoronoiMap class. (diff)
download: cuberite-a6630d32394120a78af56bc612fa3c3449283248.tar
cuberite-a6630d32394120a78af56bc612fa3c3449283248.tar.gz
cuberite-a6630d32394120a78af56bc612fa3c3449283248.tar.bz2
cuberite-a6630d32394120a78af56bc612fa3c3449283248.tar.lz
cuberite-a6630d32394120a78af56bc612fa3c3449283248.tar.xz
cuberite-a6630d32394120a78af56bc612fa3c3449283248.tar.zst
cuberite-a6630d32394120a78af56bc612fa3c3449283248.zip
18 files changed, 1592 insertions, 1913 deletions
diff --git a/VC2013/.gitignore b/VC2013/.gitignore
index 9d46443bd..8e2fd484d 100644
--- a/VC2013/.gitignore
+++ b/VC2013/.gitignore
@@ -8,3 +8,4 @@ ipch/**
 *.suo
 *.obj
 *.sdf
+*.opensdf
+\ No newline at end of file
diff --git a/VC2013/CryptoPP.vcxproj b/VC2013/CryptoPP.vcxproj
index 0d7ef9774..7355ab64b 100644
--- a/VC2013/CryptoPP.vcxproj
+++ b/VC2013/CryptoPP.vcxproj
@@ -289,97 +289,97 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\CryptoPP\adler32.cpp">
+    <ClCompile Include="..\lib\cryptopp\adler32.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\algebra.cpp">
+    <ClCompile Include="..\lib\cryptopp\algebra.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\algparam.cpp">
+    <ClCompile Include="..\lib\cryptopp\algparam.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\asn.cpp">
+    <ClCompile Include="..\lib\cryptopp\asn.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\authenc.cpp" />
-    <ClCompile Include="..\CryptoPP\base32.cpp">
+    <ClCompile Include="..\lib\cryptopp\authenc.cpp" />
+    <ClCompile Include="..\lib\cryptopp\base32.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\base64.cpp">
+    <ClCompile Include="..\lib\cryptopp\base64.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\basecode.cpp">
+    <ClCompile Include="..\lib\cryptopp\basecode.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\cbcmac.cpp">
+    <ClCompile Include="..\lib\cryptopp\cbcmac.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\ccm.cpp" />
-    <ClCompile Include="..\CryptoPP\channels.cpp">
+    <ClCompile Include="..\lib\cryptopp\ccm.cpp" />
+    <ClCompile Include="..\lib\cryptopp\channels.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\cmac.cpp" />
-    <ClCompile Include="..\CryptoPP\cpu.cpp" />
-    <ClCompile Include="..\CryptoPP\crc.cpp">
+    <ClCompile Include="..\lib\cryptopp\cmac.cpp" />
+    <ClCompile Include="..\lib\cryptopp\cpu.cpp" />
+    <ClCompile Include="..\lib\cryptopp\crc.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\cryptlib.cpp">
+    <ClCompile Include="..\lib\cryptopp\cryptlib.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\default.cpp">
+    <ClCompile Include="..\lib\cryptopp\default.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\des.cpp" />
-    <ClCompile Include="..\CryptoPP\dessp.cpp" />
-    <ClCompile Include="..\CryptoPP\dh.cpp">
+    <ClCompile Include="..\lib\cryptopp\des.cpp" />
+    <ClCompile Include="..\lib\cryptopp\dessp.cpp" />
+    <ClCompile Include="..\lib\cryptopp\dh.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\dh2.cpp">
+    <ClCompile Include="..\lib\cryptopp\dh2.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\dll.cpp">
+    <ClCompile Include="..\lib\cryptopp\dll.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">
       </PrecompiledHeader>
@@ -397,20 +397,20 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\dsa.cpp">
+    <ClCompile Include="..\lib\cryptopp\dsa.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\eax.cpp" />
-    <ClCompile Include="..\CryptoPP\ec2n.cpp">
+    <ClCompile Include="..\lib\cryptopp\eax.cpp" />
+    <ClCompile Include="..\lib\cryptopp\ec2n.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\eccrypto.cpp">
+    <ClCompile Include="..\lib\cryptopp\eccrypto.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">true</ExcludedFromBuild>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">true</ExcludedFromBuild>
@@ -422,20 +422,20 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\ecp.cpp">
+    <ClCompile Include="..\lib\cryptopp\ecp.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\elgamal.cpp">
+    <ClCompile Include="..\lib\cryptopp\elgamal.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\emsa2.cpp" />
-    <ClCompile Include="..\CryptoPP\eprecomp.cpp">
+    <ClCompile Include="..\lib\cryptopp\emsa2.cpp" />
+    <ClCompile Include="..\lib\cryptopp\eprecomp.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">true</ExcludedFromBuild>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">true</ExcludedFromBuild>
@@ -447,74 +447,74 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\esign.cpp">
+    <ClCompile Include="..\lib\cryptopp\esign.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\files.cpp">
+    <ClCompile Include="..\lib\cryptopp\files.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\filters.cpp">
+    <ClCompile Include="..\lib\cryptopp\filters.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\fips140.cpp">
+    <ClCompile Include="..\lib\cryptopp\fips140.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\gcm.cpp" />
-    <ClCompile Include="..\CryptoPP\gf256.cpp">
+    <ClCompile Include="..\lib\cryptopp\gcm.cpp" />
+    <ClCompile Include="..\lib\cryptopp\gf256.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\gf2_32.cpp">
+    <ClCompile Include="..\lib\cryptopp\gf2_32.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\gf2n.cpp">
+    <ClCompile Include="..\lib\cryptopp\gf2n.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\gfpcrypt.cpp">
+    <ClCompile Include="..\lib\cryptopp\gfpcrypt.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\hex.cpp">
+    <ClCompile Include="..\lib\cryptopp\hex.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\hmac.cpp">
+    <ClCompile Include="..\lib\cryptopp\hmac.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\hrtimer.cpp">
+    <ClCompile Include="..\lib\cryptopp\hrtimer.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\integer.cpp">
+    <ClCompile Include="..\lib\cryptopp\integer.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
@@ -522,7 +522,7 @@
       <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
       </AssemblerListingLocation>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\iterhash.cpp">
+    <ClCompile Include="..\lib\cryptopp\iterhash.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">
       </PrecompiledHeader>
@@ -540,79 +540,79 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\luc.cpp">
+    <ClCompile Include="..\lib\cryptopp\luc.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\md2.cpp">
+    <ClCompile Include="..\lib\cryptopp\md2.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\md4.cpp">
+    <ClCompile Include="..\lib\cryptopp\md4.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\md5.cpp">
+    <ClCompile Include="..\lib\cryptopp\md5.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\misc.cpp">
+    <ClCompile Include="..\lib\cryptopp\misc.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\modes.cpp">
+    <ClCompile Include="..\lib\cryptopp\modes.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\mqueue.cpp">
+    <ClCompile Include="..\lib\cryptopp\mqueue.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\mqv.cpp">
+    <ClCompile Include="..\lib\cryptopp\mqv.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\nbtheory.cpp">
+    <ClCompile Include="..\lib\cryptopp\nbtheory.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\network.cpp">
+    <ClCompile Include="..\lib\cryptopp\network.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\oaep.cpp">
+    <ClCompile Include="..\lib\cryptopp\oaep.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\osrng.cpp">
+    <ClCompile Include="..\lib\cryptopp\osrng.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\pch.cpp">
+    <ClCompile Include="..\lib\cryptopp\pch.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Create</PrecompiledHeader>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
@@ -624,166 +624,166 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\pkcspad.cpp">
+    <ClCompile Include="..\lib\cryptopp\pkcspad.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\polynomi.cpp">
+    <ClCompile Include="..\lib\cryptopp\polynomi.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\pssr.cpp" />
-    <ClCompile Include="..\CryptoPP\pubkey.cpp">
+    <ClCompile Include="..\lib\cryptopp\pssr.cpp" />
+    <ClCompile Include="..\lib\cryptopp\pubkey.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\queue.cpp">
+    <ClCompile Include="..\lib\cryptopp\queue.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rabin.cpp">
+    <ClCompile Include="..\lib\cryptopp\rabin.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\randpool.cpp">
+    <ClCompile Include="..\lib\cryptopp\randpool.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rdtables.cpp">
+    <ClCompile Include="..\lib\cryptopp\rdtables.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rijndael.cpp">
+    <ClCompile Include="..\lib\cryptopp\rijndael.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rng.cpp">
+    <ClCompile Include="..\lib\cryptopp\rng.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rsa.cpp">
+    <ClCompile Include="..\lib\cryptopp\rsa.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rw.cpp">
+    <ClCompile Include="..\lib\cryptopp\rw.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\safer.cpp">
+    <ClCompile Include="..\lib\cryptopp\safer.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\seal.cpp">
+    <ClCompile Include="..\lib\cryptopp\seal.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\seed.cpp" />
-    <ClCompile Include="..\CryptoPP\sha.cpp">
+    <ClCompile Include="..\lib\cryptopp\seed.cpp" />
+    <ClCompile Include="..\lib\cryptopp\sha.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\shacal2.cpp">
+    <ClCompile Include="..\lib\cryptopp\shacal2.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\simple.cpp">
+    <ClCompile Include="..\lib\cryptopp\simple.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\socketft.cpp">
+    <ClCompile Include="..\lib\cryptopp\socketft.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\square.cpp">
+    <ClCompile Include="..\lib\cryptopp\square.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\squaretb.cpp">
+    <ClCompile Include="..\lib\cryptopp\squaretb.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\strciphr.cpp">
+    <ClCompile Include="..\lib\cryptopp\strciphr.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\tea.cpp">
+    <ClCompile Include="..\lib\cryptopp\tea.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\tiger.cpp">
+    <ClCompile Include="..\lib\cryptopp\tiger.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\tigertab.cpp">
+    <ClCompile Include="..\lib\cryptopp\tigertab.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\trdlocal.cpp">
+    <ClCompile Include="..\lib\cryptopp\trdlocal.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\ttmac.cpp">
+    <ClCompile Include="..\lib\cryptopp\ttmac.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\vmac.cpp" />
-    <ClCompile Include="..\CryptoPP\wait.cpp">
+    <ClCompile Include="..\lib\cryptopp\vmac.cpp" />
+    <ClCompile Include="..\lib\cryptopp\wait.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\winpipes.cpp">
+    <ClCompile Include="..\lib\cryptopp\winpipes.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Debug|x64'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DLL-Import Release|x64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
@@ -791,116 +791,116 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\CryptoPP\adler32.h" />
-    <ClInclude Include="..\CryptoPP\aes.h" />
-    <ClInclude Include="..\CryptoPP\algebra.h" />
-    <ClInclude Include="..\CryptoPP\algparam.h" />
-    <ClInclude Include="..\CryptoPP\arc4.h" />
-    <ClInclude Include="..\CryptoPP\argnames.h" />
-    <ClInclude Include="..\CryptoPP\asn.h" />
-    <ClInclude Include="..\CryptoPP\authenc.h" />
-    <ClInclude Include="..\CryptoPP\base32.h" />
-    <ClInclude Include="..\CryptoPP\base64.h" />
-    <ClInclude Include="..\CryptoPP\basecode.h" />
-    <ClInclude Include="..\CryptoPP\cbcmac.h" />
-    <ClInclude Include="..\CryptoPP\ccm.h" />
-    <ClInclude Include="..\CryptoPP\channels.h" />
-    <ClInclude Include="..\CryptoPP\cmac.h" />
-    <ClInclude Include="..\CryptoPP\config.h" />
-    <ClInclude Include="..\CryptoPP\cpu.h" />
-    <ClInclude Include="..\CryptoPP\crc.h" />
-    <ClInclude Include="..\CryptoPP\cryptlib.h" />
-    <ClInclude Include="..\CryptoPP\default.h" />
-    <ClInclude Include="..\CryptoPP\des.h" />
-    <ClInclude Include="..\CryptoPP\dh.h" />
-    <ClInclude Include="..\CryptoPP\dh2.h" />
-    <ClInclude Include="..\CryptoPP\dmac.h" />
-    <ClInclude Include="..\CryptoPP\dsa.h" />
-    <ClInclude Include="..\CryptoPP\eax.h" />
-    <ClInclude Include="..\CryptoPP\ec2n.h" />
-    <ClInclude Include="..\CryptoPP\eccrypto.h" />
-    <ClInclude Include="..\CryptoPP\ecp.h" />
-    <ClInclude Include="..\CryptoPP\elgamal.h" />
-    <ClInclude Include="..\CryptoPP\emsa2.h" />
-    <ClInclude Include="..\CryptoPP\eprecomp.h" />
-    <ClInclude Include="..\CryptoPP\esign.h" />
-    <ClInclude Include="..\CryptoPP\files.h" />
-    <ClInclude Include="..\CryptoPP\filters.h" />
-    <ClInclude Include="..\CryptoPP\fips140.h" />
-    <ClInclude Include="..\CryptoPP\fltrimpl.h" />
-    <ClInclude Include="..\CryptoPP\gcm.h" />
-    <ClInclude Include="..\CryptoPP\gf256.h" />
-    <ClInclude Include="..\CryptoPP\gf2_32.h" />
-    <ClInclude Include="..\CryptoPP\gf2n.h" />
-    <ClInclude Include="..\CryptoPP\gfpcrypt.h" />
-    <ClInclude Include="..\CryptoPP\gzip.h" />
-    <ClInclude Include="..\CryptoPP\hex.h" />
-    <ClInclude Include="..\CryptoPP\hmac.h" />
-    <ClInclude Include="..\CryptoPP\hrtimer.h" />
-    <ClInclude Include="..\CryptoPP\integer.h" />
-    <ClInclude Include="..\CryptoPP\iterhash.h" />
-    <ClInclude Include="..\CryptoPP\lubyrack.h" />
-    <ClInclude Include="..\CryptoPP\luc.h" />
-    <ClInclude Include="..\CryptoPP\md2.h" />
-    <ClInclude Include="..\CryptoPP\md4.h" />
-    <ClInclude Include="..\CryptoPP\md5.h" />
-    <ClInclude Include="..\CryptoPP\mdc.h" />
-    <ClInclude Include="..\CryptoPP\misc.h" />
-    <ClInclude Include="..\CryptoPP\modarith.h" />
-    <ClInclude Include="..\CryptoPP\modes.h" />
-    <ClInclude Include="..\CryptoPP\modexppc.h" />
-    <ClInclude Include="..\CryptoPP\mqueue.h" />
-    <ClInclude Include="..\CryptoPP\mqv.h" />
-    <ClInclude Include="..\CryptoPP\nbtheory.h" />
-    <ClInclude Include="..\CryptoPP\network.h" />
-    <ClInclude Include="..\CryptoPP\nr.h" />
-    <ClInclude Include="..\CryptoPP\oaep.h" />
-    <ClInclude Include="..\CryptoPP\oids.h" />
-    <ClInclude Include="..\CryptoPP\osrng.h" />
-    <ClInclude Include="..\CryptoPP\pch.h" />
-    <ClInclude Include="..\CryptoPP\pkcspad.h" />
-    <ClInclude Include="..\CryptoPP\polynomi.h" />
-    <ClInclude Include="..\CryptoPP\pssr.h" />
-    <ClInclude Include="..\CryptoPP\pubkey.h" />
-    <ClInclude Include="..\CryptoPP\pwdbased.h" />
-    <ClInclude Include="..\CryptoPP\queue.h" />
-    <ClInclude Include="..\CryptoPP\rabin.h" />
-    <ClInclude Include="..\CryptoPP\randpool.h" />
-    <ClInclude Include="..\CryptoPP\rijndael.h" />
-    <ClInclude Include="..\CryptoPP\rng.h" />
-    <ClInclude Include="..\CryptoPP\rsa.h" />
-    <ClInclude Include="..\CryptoPP\rw.h" />
-    <ClInclude Include="..\CryptoPP\safer.h" />
-    <ClInclude Include="..\CryptoPP\seal.h" />
-    <ClInclude Include="..\CryptoPP\secblock.h" />
-    <ClInclude Include="..\CryptoPP\seckey.h" />
-    <ClInclude Include="..\CryptoPP\seed.h" />
-    <ClInclude Include="..\CryptoPP\sha.h" />
-    <ClInclude Include="..\CryptoPP\shacal2.h" />
-    <ClInclude Include="..\CryptoPP\simple.h" />
-    <ClInclude Include="..\CryptoPP\smartptr.h" />
-    <ClInclude Include="..\CryptoPP\socketft.h" />
-    <ClInclude Include="..\CryptoPP\square.h" />
-    <ClInclude Include="..\CryptoPP\stdcpp.h" />
-    <ClInclude Include="..\CryptoPP\strciphr.h" />
-    <ClInclude Include="..\CryptoPP\tea.h" />
-    <ClInclude Include="..\CryptoPP\tiger.h" />
-    <ClInclude Include="..\CryptoPP\trdlocal.h" />
-    <ClInclude Include="..\CryptoPP\trunhash.h" />
-    <ClInclude Include="..\CryptoPP\ttmac.h" />
-    <ClInclude Include="..\CryptoPP\vmac.h" />
-    <ClInclude Include="..\CryptoPP\wait.h" />
-    <ClInclude Include="..\CryptoPP\wake.h" />
-    <ClInclude Include="..\CryptoPP\winpipes.h" />
-    <ClInclude Include="..\CryptoPP\words.h" />
+    <ClInclude Include="..\lib\cryptopp\adler32.h" />
+    <ClInclude Include="..\lib\cryptopp\aes.h" />
+    <ClInclude Include="..\lib\cryptopp\algebra.h" />
+    <ClInclude Include="..\lib\cryptopp\algparam.h" />
+    <ClInclude Include="..\lib\cryptopp\arc4.h" />
+    <ClInclude Include="..\lib\cryptopp\argnames.h" />
+    <ClInclude Include="..\lib\cryptopp\asn.h" />
+    <ClInclude Include="..\lib\cryptopp\authenc.h" />
+    <ClInclude Include="..\lib\cryptopp\base32.h" />
+    <ClInclude Include="..\lib\cryptopp\base64.h" />
+    <ClInclude Include="..\lib\cryptopp\basecode.h" />
+    <ClInclude Include="..\lib\cryptopp\cbcmac.h" />
+    <ClInclude Include="..\lib\cryptopp\ccm.h" />
+    <ClInclude Include="..\lib\cryptopp\channels.h" />
+    <ClInclude Include="..\lib\cryptopp\cmac.h" />
+    <ClInclude Include="..\lib\cryptopp\config.h" />
+    <ClInclude Include="..\lib\cryptopp\cpu.h" />
+    <ClInclude Include="..\lib\cryptopp\crc.h" />
+    <ClInclude Include="..\lib\cryptopp\cryptlib.h" />
+    <ClInclude Include="..\lib\cryptopp\default.h" />
+    <ClInclude Include="..\lib\cryptopp\des.h" />
+    <ClInclude Include="..\lib\cryptopp\dh.h" />
+    <ClInclude Include="..\lib\cryptopp\dh2.h" />
+    <ClInclude Include="..\lib\cryptopp\dmac.h" />
+    <ClInclude Include="..\lib\cryptopp\dsa.h" />
+    <ClInclude Include="..\lib\cryptopp\eax.h" />
+    <ClInclude Include="..\lib\cryptopp\ec2n.h" />
+    <ClInclude Include="..\lib\cryptopp\eccrypto.h" />
+    <ClInclude Include="..\lib\cryptopp\ecp.h" />
+    <ClInclude Include="..\lib\cryptopp\elgamal.h" />
+    <ClInclude Include="..\lib\cryptopp\emsa2.h" />
+    <ClInclude Include="..\lib\cryptopp\eprecomp.h" />
+    <ClInclude Include="..\lib\cryptopp\esign.h" />
+    <ClInclude Include="..\lib\cryptopp\files.h" />
+    <ClInclude Include="..\lib\cryptopp\filters.h" />
+    <ClInclude Include="..\lib\cryptopp\fips140.h" />
+    <ClInclude Include="..\lib\cryptopp\fltrimpl.h" />
+    <ClInclude Include="..\lib\cryptopp\gcm.h" />
+    <ClInclude Include="..\lib\cryptopp\gf256.h" />
+    <ClInclude Include="..\lib\cryptopp\gf2_32.h" />
+    <ClInclude Include="..\lib\cryptopp\gf2n.h" />
+    <ClInclude Include="..\lib\cryptopp\gfpcrypt.h" />
+    <ClInclude Include="..\lib\cryptopp\gzip.h" />
+    <ClInclude Include="..\lib\cryptopp\hex.h" />
+    <ClInclude Include="..\lib\cryptopp\hmac.h" />
+    <ClInclude Include="..\lib\cryptopp\hrtimer.h" />
+    <ClInclude Include="..\lib\cryptopp\integer.h" />
+    <ClInclude Include="..\lib\cryptopp\iterhash.h" />
+    <ClInclude Include="..\lib\cryptopp\lubyrack.h" />
+    <ClInclude Include="..\lib\cryptopp\luc.h" />
+    <ClInclude Include="..\lib\cryptopp\md2.h" />
+    <ClInclude Include="..\lib\cryptopp\md4.h" />
+    <ClInclude Include="..\lib\cryptopp\md5.h" />
+    <ClInclude Include="..\lib\cryptopp\mdc.h" />
+    <ClInclude Include="..\lib\cryptopp\misc.h" />
+    <ClInclude Include="..\lib\cryptopp\modarith.h" />
+    <ClInclude Include="..\lib\cryptopp\modes.h" />
+    <ClInclude Include="..\lib\cryptopp\modexppc.h" />
+    <ClInclude Include="..\lib\cryptopp\mqueue.h" />
+    <ClInclude Include="..\lib\cryptopp\mqv.h" />
+    <ClInclude Include="..\lib\cryptopp\nbtheory.h" />
+    <ClInclude Include="..\lib\cryptopp\network.h" />
+    <ClInclude Include="..\lib\cryptopp\nr.h" />
+    <ClInclude Include="..\lib\cryptopp\oaep.h" />
+    <ClInclude Include="..\lib\cryptopp\oids.h" />
+    <ClInclude Include="..\lib\cryptopp\osrng.h" />
+    <ClInclude Include="..\lib\cryptopp\pch.h" />
+    <ClInclude Include="..\lib\cryptopp\pkcspad.h" />
+    <ClInclude Include="..\lib\cryptopp\polynomi.h" />
+    <ClInclude Include="..\lib\cryptopp\pssr.h" />
+    <ClInclude Include="..\lib\cryptopp\pubkey.h" />
+    <ClInclude Include="..\lib\cryptopp\pwdbased.h" />
+    <ClInclude Include="..\lib\cryptopp\queue.h" />
+    <ClInclude Include="..\lib\cryptopp\rabin.h" />
+    <ClInclude Include="..\lib\cryptopp\randpool.h" />
+    <ClInclude Include="..\lib\cryptopp\rijndael.h" />
+    <ClInclude Include="..\lib\cryptopp\rng.h" />
+    <ClInclude Include="..\lib\cryptopp\rsa.h" />
+    <ClInclude Include="..\lib\cryptopp\rw.h" />
+    <ClInclude Include="..\lib\cryptopp\safer.h" />
+    <ClInclude Include="..\lib\cryptopp\seal.h" />
+    <ClInclude Include="..\lib\cryptopp\secblock.h" />
+    <ClInclude Include="..\lib\cryptopp\seckey.h" />
+    <ClInclude Include="..\lib\cryptopp\seed.h" />
+    <ClInclude Include="..\lib\cryptopp\sha.h" />
+    <ClInclude Include="..\lib\cryptopp\shacal2.h" />
+    <ClInclude Include="..\lib\cryptopp\simple.h" />
+    <ClInclude Include="..\lib\cryptopp\smartptr.h" />
+    <ClInclude Include="..\lib\cryptopp\socketft.h" />
+    <ClInclude Include="..\lib\cryptopp\square.h" />
+    <ClInclude Include="..\lib\cryptopp\stdcpp.h" />
+    <ClInclude Include="..\lib\cryptopp\strciphr.h" />
+    <ClInclude Include="..\lib\cryptopp\tea.h" />
+    <ClInclude Include="..\lib\cryptopp\tiger.h" />
+    <ClInclude Include="..\lib\cryptopp\trdlocal.h" />
+    <ClInclude Include="..\lib\cryptopp\trunhash.h" />
+    <ClInclude Include="..\lib\cryptopp\ttmac.h" />
+    <ClInclude Include="..\lib\cryptopp\vmac.h" />
+    <ClInclude Include="..\lib\cryptopp\wait.h" />
+    <ClInclude Include="..\lib\cryptopp\wake.h" />
+    <ClInclude Include="..\lib\cryptopp\winpipes.h" />
+    <ClInclude Include="..\lib\cryptopp\words.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\CryptoPP\Doxyfile" />
-    <None Include="..\CryptoPP\GNUmakefile" />
+    <None Include="..\lib\cryptopp\Doxyfile" />
+    <None Include="..\lib\cryptopp\GNUmakefile" />
   </ItemGroup>
   <ItemGroup>
-    <Text Include="..\CryptoPP\License.txt" />
-    <Text Include="..\CryptoPP\Readme.txt" />
+    <Text Include="..\lib\cryptopp\License.txt" />
+    <Text Include="..\lib\cryptopp\Readme.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/VC2013/CryptoPP.vcxproj.filters b/VC2013/CryptoPP.vcxproj.filters
index 2a56447c6..793db552c 100644
--- a/VC2013/CryptoPP.vcxproj.filters
+++ b/VC2013/CryptoPP.vcxproj.filters
@@ -2,598 +2,598 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{66d19353-af6a-4f52-9546-f52f44dd13cc}</UniqueIdentifier>
+      <UniqueIdentifier>{21031ece-70f0-4aa6-9069-6947175663ea}</UniqueIdentifier>
       <Extensions>.cpp</Extensions>
     </Filter>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{512ceb0e-67f5-47b1-b19b-59352a5e0785}</UniqueIdentifier>
+      <UniqueIdentifier>{20dd9259-32b4-4f5b-9af8-c689a12627ec}</UniqueIdentifier>
       <Extensions>.;.h</Extensions>
     </Filter>
     <Filter Include="Miscellaneous">
-      <UniqueIdentifier>{b7c7d4fa-281f-482d-be38-d8106878975c}</UniqueIdentifier>
+      <UniqueIdentifier>{9a225122-4fcd-43c9-868a-6caf0dd272ce}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\CryptoPP\adler32.cpp">
+    <ClCompile Include="..\lib\cryptopp\adler32.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\algebra.cpp">
+    <ClCompile Include="..\lib\cryptopp\algebra.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\algparam.cpp">
+    <ClCompile Include="..\lib\cryptopp\algparam.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\asn.cpp">
+    <ClCompile Include="..\lib\cryptopp\asn.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\authenc.cpp">
+    <ClCompile Include="..\lib\cryptopp\authenc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\base32.cpp">
+    <ClCompile Include="..\lib\cryptopp\base32.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\base64.cpp">
+    <ClCompile Include="..\lib\cryptopp\base64.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\basecode.cpp">
+    <ClCompile Include="..\lib\cryptopp\basecode.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\cbcmac.cpp">
+    <ClCompile Include="..\lib\cryptopp\cbcmac.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\ccm.cpp">
+    <ClCompile Include="..\lib\cryptopp\ccm.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\channels.cpp">
+    <ClCompile Include="..\lib\cryptopp\channels.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\cmac.cpp">
+    <ClCompile Include="..\lib\cryptopp\cmac.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\cpu.cpp">
+    <ClCompile Include="..\lib\cryptopp\cpu.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\crc.cpp">
+    <ClCompile Include="..\lib\cryptopp\crc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\cryptlib.cpp">
+    <ClCompile Include="..\lib\cryptopp\cryptlib.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\default.cpp">
+    <ClCompile Include="..\lib\cryptopp\default.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\des.cpp">
+    <ClCompile Include="..\lib\cryptopp\des.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\dessp.cpp">
+    <ClCompile Include="..\lib\cryptopp\dessp.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\dh.cpp">
+    <ClCompile Include="..\lib\cryptopp\dh.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\dh2.cpp">
+    <ClCompile Include="..\lib\cryptopp\dh2.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\dll.cpp">
+    <ClCompile Include="..\lib\cryptopp\dll.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\dsa.cpp">
+    <ClCompile Include="..\lib\cryptopp\dsa.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\eax.cpp">
+    <ClCompile Include="..\lib\cryptopp\eax.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\ec2n.cpp">
+    <ClCompile Include="..\lib\cryptopp\ec2n.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\eccrypto.cpp">
+    <ClCompile Include="..\lib\cryptopp\eccrypto.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\ecp.cpp">
+    <ClCompile Include="..\lib\cryptopp\ecp.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\elgamal.cpp">
+    <ClCompile Include="..\lib\cryptopp\elgamal.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\emsa2.cpp">
+    <ClCompile Include="..\lib\cryptopp\emsa2.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\eprecomp.cpp">
+    <ClCompile Include="..\lib\cryptopp\eprecomp.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\esign.cpp">
+    <ClCompile Include="..\lib\cryptopp\esign.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\files.cpp">
+    <ClCompile Include="..\lib\cryptopp\files.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\filters.cpp">
+    <ClCompile Include="..\lib\cryptopp\filters.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\fips140.cpp">
+    <ClCompile Include="..\lib\cryptopp\fips140.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\gcm.cpp">
+    <ClCompile Include="..\lib\cryptopp\gcm.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\gf256.cpp">
+    <ClCompile Include="..\lib\cryptopp\gf256.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\gf2_32.cpp">
+    <ClCompile Include="..\lib\cryptopp\gf2_32.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\gf2n.cpp">
+    <ClCompile Include="..\lib\cryptopp\gf2n.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\gfpcrypt.cpp">
+    <ClCompile Include="..\lib\cryptopp\gfpcrypt.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\hex.cpp">
+    <ClCompile Include="..\lib\cryptopp\hex.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\hmac.cpp">
+    <ClCompile Include="..\lib\cryptopp\hmac.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\hrtimer.cpp">
+    <ClCompile Include="..\lib\cryptopp\hrtimer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\integer.cpp">
+    <ClCompile Include="..\lib\cryptopp\integer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\iterhash.cpp">
+    <ClCompile Include="..\lib\cryptopp\iterhash.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\luc.cpp">
+    <ClCompile Include="..\lib\cryptopp\luc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\md2.cpp">
+    <ClCompile Include="..\lib\cryptopp\md2.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\md4.cpp">
+    <ClCompile Include="..\lib\cryptopp\md4.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\md5.cpp">
+    <ClCompile Include="..\lib\cryptopp\md5.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\misc.cpp">
+    <ClCompile Include="..\lib\cryptopp\misc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\modes.cpp">
+    <ClCompile Include="..\lib\cryptopp\modes.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\mqueue.cpp">
+    <ClCompile Include="..\lib\cryptopp\mqueue.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\mqv.cpp">
+    <ClCompile Include="..\lib\cryptopp\mqv.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\nbtheory.cpp">
+    <ClCompile Include="..\lib\cryptopp\nbtheory.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\network.cpp">
+    <ClCompile Include="..\lib\cryptopp\network.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\oaep.cpp">
+    <ClCompile Include="..\lib\cryptopp\oaep.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\osrng.cpp">
+    <ClCompile Include="..\lib\cryptopp\osrng.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\pch.cpp">
+    <ClCompile Include="..\lib\cryptopp\pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\pkcspad.cpp">
+    <ClCompile Include="..\lib\cryptopp\pkcspad.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\polynomi.cpp">
+    <ClCompile Include="..\lib\cryptopp\polynomi.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\pssr.cpp">
+    <ClCompile Include="..\lib\cryptopp\pssr.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\pubkey.cpp">
+    <ClCompile Include="..\lib\cryptopp\pubkey.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\queue.cpp">
+    <ClCompile Include="..\lib\cryptopp\queue.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rabin.cpp">
+    <ClCompile Include="..\lib\cryptopp\rabin.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\randpool.cpp">
+    <ClCompile Include="..\lib\cryptopp\randpool.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rdtables.cpp">
+    <ClCompile Include="..\lib\cryptopp\rdtables.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rijndael.cpp">
+    <ClCompile Include="..\lib\cryptopp\rijndael.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rng.cpp">
+    <ClCompile Include="..\lib\cryptopp\rng.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rsa.cpp">
+    <ClCompile Include="..\lib\cryptopp\rsa.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\rw.cpp">
+    <ClCompile Include="..\lib\cryptopp\rw.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\safer.cpp">
+    <ClCompile Include="..\lib\cryptopp\safer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\seal.cpp">
+    <ClCompile Include="..\lib\cryptopp\seal.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\seed.cpp">
+    <ClCompile Include="..\lib\cryptopp\seed.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\sha.cpp">
+    <ClCompile Include="..\lib\cryptopp\sha.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\shacal2.cpp">
+    <ClCompile Include="..\lib\cryptopp\shacal2.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\simple.cpp">
+    <ClCompile Include="..\lib\cryptopp\simple.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\socketft.cpp">
+    <ClCompile Include="..\lib\cryptopp\socketft.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\square.cpp">
+    <ClCompile Include="..\lib\cryptopp\square.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\squaretb.cpp">
+    <ClCompile Include="..\lib\cryptopp\squaretb.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\strciphr.cpp">
+    <ClCompile Include="..\lib\cryptopp\strciphr.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\tea.cpp">
+    <ClCompile Include="..\lib\cryptopp\tea.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\tiger.cpp">
+    <ClCompile Include="..\lib\cryptopp\tiger.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\tigertab.cpp">
+    <ClCompile Include="..\lib\cryptopp\tigertab.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\trdlocal.cpp">
+    <ClCompile Include="..\lib\cryptopp\trdlocal.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\ttmac.cpp">
+    <ClCompile Include="..\lib\cryptopp\ttmac.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\vmac.cpp">
+    <ClCompile Include="..\lib\cryptopp\vmac.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\wait.cpp">
+    <ClCompile Include="..\lib\cryptopp\wait.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CryptoPP\winpipes.cpp">
+    <ClCompile Include="..\lib\cryptopp\winpipes.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\CryptoPP\adler32.h">
+    <ClInclude Include="..\lib\cryptopp\adler32.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\aes.h">
+    <ClInclude Include="..\lib\cryptopp\aes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\algebra.h">
+    <ClInclude Include="..\lib\cryptopp\algebra.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\algparam.h">
+    <ClInclude Include="..\lib\cryptopp\algparam.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\arc4.h">
+    <ClInclude Include="..\lib\cryptopp\arc4.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\argnames.h">
+    <ClInclude Include="..\lib\cryptopp\argnames.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\asn.h">
+    <ClInclude Include="..\lib\cryptopp\asn.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\authenc.h">
+    <ClInclude Include="..\lib\cryptopp\authenc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\base32.h">
+    <ClInclude Include="..\lib\cryptopp\base32.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\base64.h">
+    <ClInclude Include="..\lib\cryptopp\base64.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\basecode.h">
+    <ClInclude Include="..\lib\cryptopp\basecode.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\cbcmac.h">
+    <ClInclude Include="..\lib\cryptopp\cbcmac.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\ccm.h">
+    <ClInclude Include="..\lib\cryptopp\ccm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\channels.h">
+    <ClInclude Include="..\lib\cryptopp\channels.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\cmac.h">
+    <ClInclude Include="..\lib\cryptopp\cmac.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\config.h">
+    <ClInclude Include="..\lib\cryptopp\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\cpu.h">
+    <ClInclude Include="..\lib\cryptopp\cpu.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\crc.h">
+    <ClInclude Include="..\lib\cryptopp\crc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\cryptlib.h">
+    <ClInclude Include="..\lib\cryptopp\cryptlib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\default.h">
+    <ClInclude Include="..\lib\cryptopp\default.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\des.h">
+    <ClInclude Include="..\lib\cryptopp\des.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\dh.h">
+    <ClInclude Include="..\lib\cryptopp\dh.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\dh2.h">
+    <ClInclude Include="..\lib\cryptopp\dh2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\dmac.h">
+    <ClInclude Include="..\lib\cryptopp\dmac.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\dsa.h">
+    <ClInclude Include="..\lib\cryptopp\dsa.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\eax.h">
+    <ClInclude Include="..\lib\cryptopp\eax.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\ec2n.h">
+    <ClInclude Include="..\lib\cryptopp\ec2n.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\eccrypto.h">
+    <ClInclude Include="..\lib\cryptopp\eccrypto.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\ecp.h">
+    <ClInclude Include="..\lib\cryptopp\ecp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\elgamal.h">
+    <ClInclude Include="..\lib\cryptopp\elgamal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\emsa2.h">
+    <ClInclude Include="..\lib\cryptopp\emsa2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\eprecomp.h">
+    <ClInclude Include="..\lib\cryptopp\eprecomp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\esign.h">
+    <ClInclude Include="..\lib\cryptopp\esign.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\files.h">
+    <ClInclude Include="..\lib\cryptopp\files.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\filters.h">
+    <ClInclude Include="..\lib\cryptopp\filters.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\fips140.h">
+    <ClInclude Include="..\lib\cryptopp\fips140.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\fltrimpl.h">
+    <ClInclude Include="..\lib\cryptopp\fltrimpl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\gcm.h">
+    <ClInclude Include="..\lib\cryptopp\gcm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\gf256.h">
+    <ClInclude Include="..\lib\cryptopp\gf256.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\gf2_32.h">
+    <ClInclude Include="..\lib\cryptopp\gf2_32.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\gf2n.h">
+    <ClInclude Include="..\lib\cryptopp\gf2n.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\gfpcrypt.h">
+    <ClInclude Include="..\lib\cryptopp\gfpcrypt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\gzip.h">
+    <ClInclude Include="..\lib\cryptopp\gzip.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\hex.h">
+    <ClInclude Include="..\lib\cryptopp\hex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\hmac.h">
+    <ClInclude Include="..\lib\cryptopp\hmac.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\hrtimer.h">
+    <ClInclude Include="..\lib\cryptopp\hrtimer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\integer.h">
+    <ClInclude Include="..\lib\cryptopp\integer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\iterhash.h">
+    <ClInclude Include="..\lib\cryptopp\iterhash.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\lubyrack.h">
+    <ClInclude Include="..\lib\cryptopp\lubyrack.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\luc.h">
+    <ClInclude Include="..\lib\cryptopp\luc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\md2.h">
+    <ClInclude Include="..\lib\cryptopp\md2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\md4.h">
+    <ClInclude Include="..\lib\cryptopp\md4.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\md5.h">
+    <ClInclude Include="..\lib\cryptopp\md5.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\mdc.h">
+    <ClInclude Include="..\lib\cryptopp\mdc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\misc.h">
+    <ClInclude Include="..\lib\cryptopp\misc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\modarith.h">
+    <ClInclude Include="..\lib\cryptopp\modarith.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\modes.h">
+    <ClInclude Include="..\lib\cryptopp\modes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\modexppc.h">
+    <ClInclude Include="..\lib\cryptopp\modexppc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\mqueue.h">
+    <ClInclude Include="..\lib\cryptopp\mqueue.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\mqv.h">
+    <ClInclude Include="..\lib\cryptopp\mqv.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\nbtheory.h">
+    <ClInclude Include="..\lib\cryptopp\nbtheory.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\network.h">
+    <ClInclude Include="..\lib\cryptopp\network.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\nr.h">
+    <ClInclude Include="..\lib\cryptopp\nr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\oaep.h">
+    <ClInclude Include="..\lib\cryptopp\oaep.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\oids.h">
+    <ClInclude Include="..\lib\cryptopp\oids.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\osrng.h">
+    <ClInclude Include="..\lib\cryptopp\osrng.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\pch.h">
+    <ClInclude Include="..\lib\cryptopp\pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\pkcspad.h">
+    <ClInclude Include="..\lib\cryptopp\pkcspad.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\polynomi.h">
+    <ClInclude Include="..\lib\cryptopp\polynomi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\pssr.h">
+    <ClInclude Include="..\lib\cryptopp\pssr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\pubkey.h">
+    <ClInclude Include="..\lib\cryptopp\pubkey.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\pwdbased.h">
+    <ClInclude Include="..\lib\cryptopp\pwdbased.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\queue.h">
+    <ClInclude Include="..\lib\cryptopp\queue.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\rabin.h">
+    <ClInclude Include="..\lib\cryptopp\rabin.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\randpool.h">
+    <ClInclude Include="..\lib\cryptopp\randpool.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\rijndael.h">
+    <ClInclude Include="..\lib\cryptopp\rijndael.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\rng.h">
+    <ClInclude Include="..\lib\cryptopp\rng.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\rsa.h">
+    <ClInclude Include="..\lib\cryptopp\rsa.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\rw.h">
+    <ClInclude Include="..\lib\cryptopp\rw.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\safer.h">
+    <ClInclude Include="..\lib\cryptopp\safer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\seal.h">
+    <ClInclude Include="..\lib\cryptopp\seal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\secblock.h">
+    <ClInclude Include="..\lib\cryptopp\secblock.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\seckey.h">
+    <ClInclude Include="..\lib\cryptopp\seckey.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\seed.h">
+    <ClInclude Include="..\lib\cryptopp\seed.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\sha.h">
+    <ClInclude Include="..\lib\cryptopp\sha.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\shacal2.h">
+    <ClInclude Include="..\lib\cryptopp\shacal2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\simple.h">
+    <ClInclude Include="..\lib\cryptopp\simple.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\smartptr.h">
+    <ClInclude Include="..\lib\cryptopp\smartptr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\socketft.h">
+    <ClInclude Include="..\lib\cryptopp\socketft.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\square.h">
+    <ClInclude Include="..\lib\cryptopp\square.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\stdcpp.h">
+    <ClInclude Include="..\lib\cryptopp\stdcpp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\strciphr.h">
+    <ClInclude Include="..\lib\cryptopp\strciphr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\tea.h">
+    <ClInclude Include="..\lib\cryptopp\tea.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\tiger.h">
+    <ClInclude Include="..\lib\cryptopp\tiger.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\trdlocal.h">
+    <ClInclude Include="..\lib\cryptopp\trdlocal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\trunhash.h">
+    <ClInclude Include="..\lib\cryptopp\trunhash.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\ttmac.h">
+    <ClInclude Include="..\lib\cryptopp\ttmac.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\vmac.h">
+    <ClInclude Include="..\lib\cryptopp\vmac.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\wait.h">
+    <ClInclude Include="..\lib\cryptopp\wait.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\wake.h">
+    <ClInclude Include="..\lib\cryptopp\wake.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\winpipes.h">
+    <ClInclude Include="..\lib\cryptopp\winpipes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CryptoPP\words.h">
+    <ClInclude Include="..\lib\cryptopp\words.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\CryptoPP\Doxyfile">
+    <None Include="..\lib\cryptopp\Doxyfile">
       <Filter>Miscellaneous</Filter>
     </None>
-    <None Include="..\CryptoPP\GNUmakefile">
+    <None Include="..\lib\cryptopp\GNUmakefile">
       <Filter>Miscellaneous</Filter>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Text Include="..\CryptoPP\License.txt">
+    <Text Include="..\lib\cryptopp\License.txt">
       <Filter>Miscellaneous</Filter>
     </Text>
-    <Text Include="..\CryptoPP\Readme.txt">
+    <Text Include="..\lib\cryptopp\Readme.txt">
       <Filter>Miscellaneous</Filter>
     </Text>
   </ItemGroup>
diff --git a/VC2013/GenerateBindings.cmd b/VC2013/GenerateBindings.cmd
new file mode 100644
index 000000000..1ee0f3bf0
--- /dev/null
+++ b/VC2013/GenerateBindings.cmd
@@ -0,0 +1,3 @@
+set ALLTOLUA_WAIT=N
+cd ..\src
+AllToLua.bat
+\ No newline at end of file
diff --git a/VC2013/JsonCpp.vcxproj b/VC2013/JsonCpp.vcxproj
index c1490d4bb..f1dd1c7b5 100644
--- a/VC2013/JsonCpp.vcxproj
+++ b/VC2013/JsonCpp.vcxproj
@@ -134,17 +134,17 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\jsoncpp-src-0.5.0\src\lib_json\json_batchallocator.h" />
+    <ClInclude Include="..\lib\jsoncpp\src\lib_json\json_batchallocator.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\jsoncpp-src-0.5.0\src\lib_json\json_internalarray.inl" />
-    <None Include="..\jsoncpp-src-0.5.0\src\lib_json\json_internalmap.inl" />
-    <None Include="..\jsoncpp-src-0.5.0\src\lib_json\json_valueiterator.inl" />
+    <None Include="..\lib\jsoncpp\src\lib_json\json_internalarray.inl" />
+    <None Include="..\lib\jsoncpp\src\lib_json\json_internalmap.inl" />
+    <None Include="..\lib\jsoncpp\src\lib_json\json_valueiterator.inl" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\jsoncpp-src-0.5.0\src\lib_json\json_reader.cpp" />
-    <ClCompile Include="..\jsoncpp-src-0.5.0\src\lib_json\json_value.cpp" />
-    <ClCompile Include="..\jsoncpp-src-0.5.0\src\lib_json\json_writer.cpp" />
+    <ClCompile Include="..\lib\jsoncpp\src\lib_json\json_reader.cpp" />
+    <ClCompile Include="..\lib\jsoncpp\src\lib_json\json_value.cpp" />
+    <ClCompile Include="..\lib\jsoncpp\src\lib_json\json_writer.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/VC2013/JsonCpp.vcxproj.filters b/VC2013/JsonCpp.vcxproj.filters
index cf8ea5d00..b46dae3fd 100644
--- a/VC2013/JsonCpp.vcxproj.filters
+++ b/VC2013/JsonCpp.vcxproj.filters
@@ -7,29 +7,29 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\jsoncpp-src-0.5.0\src\lib_json\json_batchallocator.h">
+    <ClInclude Include="..\lib\jsoncpp\src\lib_json\json_batchallocator.h">
       <Filter>Source Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\jsoncpp-src-0.5.0\src\lib_json\json_internalarray.inl">
+    <None Include="..\lib\jsoncpp\src\lib_json\json_internalarray.inl">
       <Filter>Source Files</Filter>
     </None>
-    <None Include="..\jsoncpp-src-0.5.0\src\lib_json\json_internalmap.inl">
+    <None Include="..\lib\jsoncpp\src\lib_json\json_internalmap.inl">
       <Filter>Source Files</Filter>
     </None>
-    <None Include="..\jsoncpp-src-0.5.0\src\lib_json\json_valueiterator.inl">
+    <None Include="..\lib\jsoncpp\src\lib_json\json_valueiterator.inl">
       <Filter>Source Files</Filter>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\jsoncpp-src-0.5.0\src\lib_json\json_reader.cpp">
+    <ClCompile Include="..\lib\jsoncpp\src\lib_json\json_reader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\jsoncpp-src-0.5.0\src\lib_json\json_value.cpp">
+    <ClCompile Include="..\lib\jsoncpp\src\lib_json\json_value.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\jsoncpp-src-0.5.0\src\lib_json\json_writer.cpp">
+    <ClCompile Include="..\lib\jsoncpp\src\lib_json\json_writer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/VC2013/Lua.vcxproj b/VC2013/Lua.vcxproj
index 453ccb984..2488aa6aa 100644
--- a/VC2013/Lua.vcxproj
+++ b/VC2013/Lua.vcxproj
@@ -130,63 +130,63 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\lua-5.1.4\src\lapi.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lauxlib.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lbaselib.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lcode.c" />
-    <ClCompile Include="..\lua-5.1.4\src\ldblib.c" />
-    <ClCompile Include="..\lua-5.1.4\src\ldebug.c" />
-    <ClCompile Include="..\lua-5.1.4\src\ldo.c" />
-    <ClCompile Include="..\lua-5.1.4\src\ldump.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lfunc.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lgc.c" />
-    <ClCompile Include="..\lua-5.1.4\src\linit.c" />
-    <ClCompile Include="..\lua-5.1.4\src\liolib.c" />
-    <ClCompile Include="..\lua-5.1.4\src\llex.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lmathlib.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lmem.c" />
-    <ClCompile Include="..\lua-5.1.4\src\loadlib.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lobject.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lopcodes.c" />
-    <ClCompile Include="..\lua-5.1.4\src\loslib.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lparser.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lstate.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lstring.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lstrlib.c" />
-    <ClCompile Include="..\lua-5.1.4\src\ltable.c" />
-    <ClCompile Include="..\lua-5.1.4\src\ltablib.c" />
-    <ClCompile Include="..\lua-5.1.4\src\ltm.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lua.c" />
-    <ClCompile Include="..\lua-5.1.4\src\luac.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lundump.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lvm.c" />
-    <ClCompile Include="..\lua-5.1.4\src\lzio.c" />
-    <ClCompile Include="..\lua-5.1.4\src\print.c" />
+    <ClCompile Include="..\lib\lua\src\lapi.c" />
+    <ClCompile Include="..\lib\lua\src\lauxlib.c" />
+    <ClCompile Include="..\lib\lua\src\lbaselib.c" />
+    <ClCompile Include="..\lib\lua\src\lcode.c" />
+    <ClCompile Include="..\lib\lua\src\ldblib.c" />
+    <ClCompile Include="..\lib\lua\src\ldebug.c" />
+    <ClCompile Include="..\lib\lua\src\ldo.c" />
+    <ClCompile Include="..\lib\lua\src\ldump.c" />
+    <ClCompile Include="..\lib\lua\src\lfunc.c" />
+    <ClCompile Include="..\lib\lua\src\lgc.c" />
+    <ClCompile Include="..\lib\lua\src\linit.c" />
+    <ClCompile Include="..\lib\lua\src\liolib.c" />
+    <ClCompile Include="..\lib\lua\src\llex.c" />
+    <ClCompile Include="..\lib\lua\src\lmathlib.c" />
+    <ClCompile Include="..\lib\lua\src\lmem.c" />
+    <ClCompile Include="..\lib\lua\src\loadlib.c" />
+    <ClCompile Include="..\lib\lua\src\lobject.c" />
+    <ClCompile Include="..\lib\lua\src\lopcodes.c" />
+    <ClCompile Include="..\lib\lua\src\loslib.c" />
+    <ClCompile Include="..\lib\lua\src\lparser.c" />
+    <ClCompile Include="..\lib\lua\src\lstate.c" />
+    <ClCompile Include="..\lib\lua\src\lstring.c" />
+    <ClCompile Include="..\lib\lua\src\lstrlib.c" />
+    <ClCompile Include="..\lib\lua\src\ltable.c" />
+    <ClCompile Include="..\lib\lua\src\ltablib.c" />
+    <ClCompile Include="..\lib\lua\src\ltm.c" />
+    <ClCompile Include="..\lib\lua\src\lua.c" />
+    <ClCompile Include="..\lib\lua\src\luac.c" />
+    <ClCompile Include="..\lib\lua\src\lundump.c" />
+    <ClCompile Include="..\lib\lua\src\lvm.c" />
+    <ClCompile Include="..\lib\lua\src\lzio.c" />
+    <ClCompile Include="..\lib\lua\src\print.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\lua-5.1.4\src\lapi.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lauxlib.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lcode.h" />
-    <ClInclude Include="..\lua-5.1.4\src\ldebug.h" />
-    <ClInclude Include="..\lua-5.1.4\src\ldo.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lfunc.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lgc.h" />
-    <ClInclude Include="..\lua-5.1.4\src\llex.h" />
-    <ClInclude Include="..\lua-5.1.4\src\llimits.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lmem.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lobject.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lopcodes.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lparser.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lstate.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lstring.h" />
-    <ClInclude Include="..\lua-5.1.4\src\ltable.h" />
-    <ClInclude Include="..\lua-5.1.4\src\ltm.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lua.h" />
-    <ClInclude Include="..\lua-5.1.4\src\luaconf.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lualib.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lundump.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lvm.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lzio.h" />
+    <ClInclude Include="..\lib\lua\src\lapi.h" />
+    <ClInclude Include="..\lib\lua\src\lauxlib.h" />
+    <ClInclude Include="..\lib\lua\src\lcode.h" />
+    <ClInclude Include="..\lib\lua\src\ldebug.h" />
+    <ClInclude Include="..\lib\lua\src\ldo.h" />
+    <ClInclude Include="..\lib\lua\src\lfunc.h" />
+    <ClInclude Include="..\lib\lua\src\lgc.h" />
+    <ClInclude Include="..\lib\lua\src\llex.h" />
+    <ClInclude Include="..\lib\lua\src\llimits.h" />
+    <ClInclude Include="..\lib\lua\src\lmem.h" />
+    <ClInclude Include="..\lib\lua\src\lobject.h" />
+    <ClInclude Include="..\lib\lua\src\lopcodes.h" />
+    <ClInclude Include="..\lib\lua\src\lparser.h" />
+    <ClInclude Include="..\lib\lua\src\lstate.h" />
+    <ClInclude Include="..\lib\lua\src\lstring.h" />
+    <ClInclude Include="..\lib\lua\src\ltable.h" />
+    <ClInclude Include="..\lib\lua\src\ltm.h" />
+    <ClInclude Include="..\lib\lua\src\lua.h" />
+    <ClInclude Include="..\lib\lua\src\luaconf.h" />
+    <ClInclude Include="..\lib\lua\src\lualib.h" />
+    <ClInclude Include="..\lib\lua\src\lundump.h" />
+    <ClInclude Include="..\lib\lua\src\lvm.h" />
+    <ClInclude Include="..\lib\lua\src\lzio.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/VC2013/Lua.vcxproj.filters b/VC2013/Lua.vcxproj.filters
index 0ddb91719..21cc86850 100644
--- a/VC2013/Lua.vcxproj.filters
+++ b/VC2013/Lua.vcxproj.filters
@@ -7,126 +7,126 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\lua-5.1.4\src\lapi.c">
+    <ClCompile Include="..\lib\lua\src\lapi.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lauxlib.c">
+    <ClCompile Include="..\lib\lua\src\lauxlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lbaselib.c">
+    <ClCompile Include="..\lib\lua\src\lbaselib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lcode.c">
+    <ClCompile Include="..\lib\lua\src\lcode.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\ldblib.c">
+    <ClCompile Include="..\lib\lua\src\ldblib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\ldebug.c">
+    <ClCompile Include="..\lib\lua\src\ldebug.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\ldo.c">
+    <ClCompile Include="..\lib\lua\src\ldo.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\ldump.c">
+    <ClCompile Include="..\lib\lua\src\ldump.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lfunc.c">
+    <ClCompile Include="..\lib\lua\src\lfunc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lgc.c">
+    <ClCompile Include="..\lib\lua\src\lgc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\linit.c">
+    <ClCompile Include="..\lib\lua\src\linit.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\liolib.c">
+    <ClCompile Include="..\lib\lua\src\liolib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\llex.c">
+    <ClCompile Include="..\lib\lua\src\llex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lmathlib.c">
+    <ClCompile Include="..\lib\lua\src\lmathlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lmem.c">
+    <ClCompile Include="..\lib\lua\src\lmem.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\loadlib.c">
+    <ClCompile Include="..\lib\lua\src\loadlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lobject.c">
+    <ClCompile Include="..\lib\lua\src\lobject.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lopcodes.c">
+    <ClCompile Include="..\lib\lua\src\lopcodes.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\loslib.c">
+    <ClCompile Include="..\lib\lua\src\loslib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lparser.c">
+    <ClCompile Include="..\lib\lua\src\lparser.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lstate.c">
+    <ClCompile Include="..\lib\lua\src\lstate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lstring.c">
+    <ClCompile Include="..\lib\lua\src\lstring.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lstrlib.c">
+    <ClCompile Include="..\lib\lua\src\lstrlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\ltable.c">
+    <ClCompile Include="..\lib\lua\src\ltable.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\ltablib.c">
+    <ClCompile Include="..\lib\lua\src\ltablib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\ltm.c">
+    <ClCompile Include="..\lib\lua\src\ltm.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lua.c">
+    <ClCompile Include="..\lib\lua\src\lua.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\luac.c">
+    <ClCompile Include="..\lib\lua\src\luac.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lundump.c">
+    <ClCompile Include="..\lib\lua\src\lundump.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lvm.c">
+    <ClCompile Include="..\lib\lua\src\lvm.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\lzio.c">
+    <ClCompile Include="..\lib\lua\src\lzio.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lua-5.1.4\src\print.c">
+    <ClCompile Include="..\lib\lua\src\print.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\lua-5.1.4\src\lapi.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lauxlib.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lcode.h" />
-    <ClInclude Include="..\lua-5.1.4\src\ldebug.h" />
-    <ClInclude Include="..\lua-5.1.4\src\ldo.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lfunc.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lgc.h" />
-    <ClInclude Include="..\lua-5.1.4\src\llex.h" />
-    <ClInclude Include="..\lua-5.1.4\src\llimits.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lmem.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lobject.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lopcodes.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lparser.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lstate.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lstring.h" />
-    <ClInclude Include="..\lua-5.1.4\src\ltable.h" />
-    <ClInclude Include="..\lua-5.1.4\src\ltm.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lua.h" />
-    <ClInclude Include="..\lua-5.1.4\src\luaconf.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lualib.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lundump.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lvm.h" />
-    <ClInclude Include="..\lua-5.1.4\src\lzio.h" />
+    <ClInclude Include="..\lib\lua\src\lapi.h" />
+    <ClInclude Include="..\lib\lua\src\lauxlib.h" />
+    <ClInclude Include="..\lib\lua\src\lcode.h" />
+    <ClInclude Include="..\lib\lua\src\ldebug.h" />
+    <ClInclude Include="..\lib\lua\src\ldo.h" />
+    <ClInclude Include="..\lib\lua\src\lfunc.h" />
+    <ClInclude Include="..\lib\lua\src\lgc.h" />
+    <ClInclude Include="..\lib\lua\src\llex.h" />
+    <ClInclude Include="..\lib\lua\src\llimits.h" />
+    <ClInclude Include="..\lib\lua\src\lmem.h" />
+    <ClInclude Include="..\lib\lua\src\lobject.h" />
+    <ClInclude Include="..\lib\lua\src\lopcodes.h" />
+    <ClInclude Include="..\lib\lua\src\lparser.h" />
+    <ClInclude Include="..\lib\lua\src\lstate.h" />
+    <ClInclude Include="..\lib\lua\src\lstring.h" />
+    <ClInclude Include="..\lib\lua\src\ltable.h" />
+    <ClInclude Include="..\lib\lua\src\ltm.h" />
+    <ClInclude Include="..\lib\lua\src\lua.h" />
+    <ClInclude Include="..\lib\lua\src\luaconf.h" />
+    <ClInclude Include="..\lib\lua\src\lualib.h" />
+    <ClInclude Include="..\lib\lua\src\lundump.h" />
+    <ClInclude Include="..\lib\lua\src\lvm.h" />
+    <ClInclude Include="..\lib\lua\src\lzio.h" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/VC2013/MCServer.ipgset b/VC2013/MCServer.ipgset
deleted file mode 100644
index 16f00e1ca..000000000
--- a/VC2013/MCServer.ipgset
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PerformanceGuideStateManager xmlns:i="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.intel.com">
-  <Checkpoints xmlns:d2p1="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
-  <CompletionStatusMap xmlns:d2p1="http://schemas.microsoft.com/2003/10/Serialization/Arrays">
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>PerformanceGuide</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>Introduction</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>true</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>GettingStarted</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>true</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>GetPerformanceBaseline</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>true</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>CheckPerfBaseline</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>ProfileApp</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>ReviewHotspots</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>UseIntelCompiler</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>SelectFilesForIntelC</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>GetPerformanceProgressWithIntelC</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>CheckPerfProgressIntelC</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>DetermineIntelCompilerOptions</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>GetPerformanceProgressWithNewOptions</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>CheckPerfProgressNewOptions</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>UseGAP</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>ReviewGAPAdvice</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>GetPerformanceProgressWithGAP</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>CheckPerfProgressGAP</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>UsePGO</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>CheckPerfProgressPGO</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>ContinueOptimizations</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>ParallelAmplifier</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>ParallelAdvisor</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>true</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-    <d2p1:KeyValueOfstringStateY1yixN8r>
-      <d2p1:Key>Summary</d2p1:Key>
-      <d2p1:Value>
-        <IsCurrent>false</IsCurrent>
-        <IsDone>false</IsDone>
-        <NextAlwaysEnabled>false</NextAlwaysEnabled>
-        <NextAlwaysFocused>false</NextAlwaysFocused>
-        <ShowDoneStatus>false</ShowDoneStatus>
-      </d2p1:Value>
-    </d2p1:KeyValueOfstringStateY1yixN8r>
-  </CompletionStatusMap>
-  <GapAdvices xmlns:d2p1="http://schemas.datacontract.org/2004/07/Intel.PerformanceGuide" />
-  <GapAnalysisHasBeenRun>false</GapAnalysisHasBeenRun>
-  <Hotspots />
-  <IppMatches />
-  <IppSearchHasBeenRun>false</IppSearchHasBeenRun>
-  <OptionSelectorDialogState xmlns:d2p1="http://schemas.datacontract.org/2004/07/Intel.PerformanceGuide" />
-  <OptionSelectorHasBeenRun>false</OptionSelectorHasBeenRun>
-  <SearchIppDialogState>
-    <Domains>
-      <IppDomainViewModel>
-        <DomainName>Image Color Conversion</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Symmetric Cryptography</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>One-Way Hash Primitives</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Public Key Cryptography</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Image Geometry Transforms</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Image Compression</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Video Coding</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Computer Vision</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Data Integrity</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Digital Signal Processing</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Speech And Telephony Encode/Decode</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Data Compression</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-      <IppDomainViewModel>
-        <DomainName>Audio Coding</DomainName>
-        <isSelected>true</isSelected>
-      </IppDomainViewModel>
-    </Domains>
-    <SearchInComments>true</SearchInComments>
-  </SearchIppDialogState>
-  <UIState>0</UIState>
-  <WorkflowSettings xmlns:d2p1="http://schemas.datacontract.org/2004/07/Intel.PerformanceGuide">
-    <d2p1:CopyFromConfigurationName></d2p1:CopyFromConfigurationName>
-    <d2p1:CreateNewConfiguration>true</d2p1:CreateNewConfiguration>
-    <d2p1:NewConfigurationName></d2p1:NewConfigurationName>
-    <d2p1:UseDebugSettingsToRun>true</d2p1:UseDebugSettingsToRun>
-  </WorkflowSettings>
-</PerformanceGuideStateManager>
-\ No newline at end of file
diff --git a/VC2013/MCServer.sln b/VC2013/MCServer.sln
index d122a0d48..9dcfc802e 100644
--- a/VC2013/MCServer.sln
+++ b/VC2013/MCServer.sln
@@ -1,16 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
+# Visual Studio Express 2013 for Windows Desktop
 VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MCServer", "MCServer.vcxproj", "{32012054-0C96-4C43-AB27-174FF8E72D66}"
-	ProjectSection(ProjectDependencies) = postProject
-		{082E8185-7B3A-4945-8C82-9132341A329D} = {082E8185-7B3A-4945-8C82-9132341A329D}
-		{5FCFAF8D-FF2C-456D-A72C-1D76F913AD96} = {5FCFAF8D-FF2C-456D-A72C-1D76F913AD96}
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}
-		{EEAB54AD-114C-4AB8-8482-0A52D502BD35} = {EEAB54AD-114C-4AB8-8482-0A52D502BD35}
-		{5AAA90B9-946D-4034-83F3-676B06A6E326} = {5AAA90B9-946D-4034-83F3-676B06A6E326}
-		{EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA} = {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcxproj", "{EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}"
 EndProject
diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj
index b69867a99..ecb568e9a 100644
--- a/VC2013/MCServer.vcxproj
+++ b/VC2013/MCServer.vcxproj
@@ -64,7 +64,7 @@
     <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>..\MCServer\</OutDir>
+    <OutDir>Debug\</OutDir>
     <IntDir>Debug\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
@@ -83,9 +83,9 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalOptions>/MP /FS %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include;..;../expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../lib/zlib;../lib/jsoncpp/include;../lib/lua/src;../lib/tolua++/include;..;../lib/expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,13 +94,10 @@
       <PrecompiledHeaderFile>Globals.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(ProjectDir)\..\MCServer\$(ProjectName).exe</OutputFile>
+      <OutputFile>$(ProjectDir)\..\MCServer\$(ProjectName)_debug.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -113,7 +110,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include;..;../expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../lib/zlib;../lib/jsoncpp/include;../lib/lua/src;../lib/tolua++/include;..;../lib/expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -139,7 +136,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include;..;../expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../lib/zlib;../lib/jsoncpp/include;../lib/lua/src;../lib/tolua++/include;..;../lib/expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -163,7 +160,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include;..;../expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../lib/zlib;../lib/jsoncpp/include;../lib/lua/src;../lib/tolua++/include;..;../lib/expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -189,293 +186,293 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource_MCServer.h" />
-    <ClInclude Include="..\source\Authenticator.h" />
-    <ClInclude Include="..\source\BlockArea.h" />
-    <ClInclude Include="..\source\BlockID.h" />
-    <ClInclude Include="..\source\BlockTracer.h" />
-    <ClInclude Include="..\source\BoundingBox.h" />
-    <ClInclude Include="..\source\ByteBuffer.h" />
-    <ClInclude Include="..\source\ChatColor.h" />
-    <ClInclude Include="..\source\Chunk.h" />
-    <ClInclude Include="..\source\Chunk.inl.h" />
-    <ClInclude Include="..\source\ChunkDef.h" />
-    <ClInclude Include="..\source\ChunkMap.h" />
-    <ClInclude Include="..\source\ChunkSender.h" />
-    <ClInclude Include="..\source\ClientHandle.h" />
-    <ClInclude Include="..\source\CommandOutput.h" />
-    <ClInclude Include="..\source\CraftingRecipes.h" />
-    <ClInclude Include="..\source\Cuboid.h" />
-    <ClInclude Include="..\source\DeadlockDetect.h" />
-    <ClInclude Include="..\source\Defines.h" />
-    <ClInclude Include="..\source\Enchantments.h" />
-    <ClInclude Include="..\source\Endianness.h" />
-    <ClInclude Include="..\source\FastRandom.h" />
-    <ClInclude Include="..\source\FurnaceRecipe.h" />
-    <ClInclude Include="..\source\Globals.h" />
-    <ClInclude Include="..\source\Group.h" />
-    <ClInclude Include="..\source\GroupManager.h" />
-    <ClInclude Include="..\source\Inventory.h" />
-    <ClInclude Include="..\source\Item.h" />
-    <ClInclude Include="..\source\ItemGrid.h" />
-    <ClInclude Include="..\source\Ladder.h" />
-    <ClInclude Include="..\source\LeakFinder.h" />
-    <ClInclude Include="..\source\LightingThread.h" />
-    <ClInclude Include="..\source\LinearInterpolation.h" />
-    <ClInclude Include="..\source\LinearUpscale.h" />
-    <ClInclude Include="..\source\LineBlockTracer.h" />
-    <ClInclude Include="..\source\Log.h" />
-    <ClInclude Include="..\source\Matrix4f.h" />
-    <ClInclude Include="..\source\MCLogger.h" />
-    <ClInclude Include="..\source\MemoryLeak.h" />
-    <ClInclude Include="..\source\MersenneTwister.h" />
-    <ClInclude Include="..\source\MobCensus.h" />
-    <ClInclude Include="..\source\MobFamilyCollecter.h" />
-    <ClInclude Include="..\source\MobProximityCounter.h" />
-    <ClInclude Include="..\source\MobSpawner.h" />
-    <ClInclude Include="..\source\MonsterConfig.h" />
-    <ClInclude Include="..\source\Noise.h" />
-    <ClInclude Include="..\source\Piston.h" />
-    <ClInclude Include="..\source\ProbabDistrib.h" />
-    <ClInclude Include="..\source\RCONServer.h" />
-    <ClInclude Include="..\source\ReferenceManager.h" />
-    <ClInclude Include="..\source\Root.h" />
-    <ClInclude Include="..\source\Server.h" />
-    <ClInclude Include="..\source\Sign.h" />
-    <ClInclude Include="..\source\StackWalker.h" />
-    <ClInclude Include="..\source\StringCompression.h" />
-    <ClInclude Include="..\source\StringUtils.h" />
-    <ClInclude Include="..\source\Tracer.h" />
-    <ClInclude Include="..\source\Vector3d.h" />
-    <ClInclude Include="..\source\Vector3f.h" />
-    <ClInclude Include="..\source\Vector3i.h" />
-    <ClInclude Include="..\source\WebAdmin.h" />
-    <ClInclude Include="..\source\World.h" />
-    <ClInclude Include="..\source\Mobs\AggressiveMonster.h" />
-    <ClInclude Include="..\source\Mobs\Bat.h" />
-    <ClInclude Include="..\source\Mobs\Blaze.h" />
-    <ClInclude Include="..\source\Mobs\Cavespider.h" />
-    <ClInclude Include="..\source\Mobs\Chicken.h" />
-    <ClInclude Include="..\source\Mobs\Cow.h" />
-    <ClInclude Include="..\source\Mobs\Creeper.h" />
-    <ClInclude Include="..\source\Mobs\EnderDragon.h" />
-    <ClInclude Include="..\source\Mobs\Enderman.h" />
-    <ClInclude Include="..\source\Mobs\Ghast.h" />
-    <ClInclude Include="..\source\Mobs\Giant.h" />
-    <ClInclude Include="..\source\Mobs\Horse.h" />
-    <ClInclude Include="..\source\Mobs\IronGolem.h" />
-    <ClInclude Include="..\source\Mobs\MagmaCube.h" />
-    <ClInclude Include="..\source\Mobs\Monster.h" />
-    <ClInclude Include="..\source\Mobs\Mooshroom.h" />
-    <ClInclude Include="..\source\Mobs\Ocelot.h" />
-    <ClInclude Include="..\source\Mobs\PassiveAggressiveMonster.h" />
-    <ClInclude Include="..\source\Mobs\PassiveMonster.h" />
-    <ClInclude Include="..\source\Mobs\Pig.h" />
-    <ClInclude Include="..\source\Mobs\Sheep.h" />
-    <ClInclude Include="..\source\Mobs\Silverfish.h" />
-    <ClInclude Include="..\source\Mobs\Skeleton.h" />
-    <ClInclude Include="..\source\Mobs\Slime.h" />
-    <ClInclude Include="..\source\Mobs\SnowGolem.h" />
-    <ClInclude Include="..\source\Mobs\Spider.h" />
-    <ClInclude Include="..\source\Mobs\Squid.h" />
-    <ClInclude Include="..\source\Mobs\Villager.h" />
-    <ClInclude Include="..\source\Mobs\Witch.h" />
-    <ClInclude Include="..\source\Mobs\Wither.h" />
-    <ClInclude Include="..\source\Mobs\Wolf.h" />
-    <ClInclude Include="..\source\Mobs\Zombie.h" />
-    <ClInclude Include="..\source\Mobs\ZombiePigman.h" />
-    <ClInclude Include="..\source\Entities\Boat.h" />
-    <ClInclude Include="..\source\Entities\Entity.h" />
-    <ClInclude Include="..\source\Entities\FallingBlock.h" />
-    <ClInclude Include="..\source\Entities\Minecart.h" />
-    <ClInclude Include="..\source\Entities\Pawn.h" />
-    <ClInclude Include="..\source\Entities\Pickup.h" />
-    <ClInclude Include="..\source\Entities\Player.h" />
-    <ClInclude Include="..\source\Entities\ProjectileEntity.h" />
-    <ClInclude Include="..\source\Entities\TNTEntity.h" />
-    <ClInclude Include="..\source\UI\SlotArea.h" />
-    <ClInclude Include="..\source\UI\Window.h" />
-    <ClInclude Include="..\source\UI\WindowOwner.h" />
-    <ClInclude Include="..\source\Simulator\DelayedFluidSimulator.h" />
-    <ClInclude Include="..\source\Simulator\FireSimulator.h" />
-    <ClInclude Include="..\source\Simulator\FloodyFluidSimulator.h" />
-    <ClInclude Include="..\source\Simulator\FluidSimulator.h" />
-    <ClInclude Include="..\source\Simulator\NoopFluidSimulator.h" />
-    <ClInclude Include="..\source\Simulator\RedstoneSimulator.h" />
-    <ClInclude Include="..\source\Simulator\SandSimulator.h" />
-    <ClInclude Include="..\source\Simulator\Simulator.h" />
-    <ClInclude Include="..\source\Simulator\SimulatorManager.h" />
-    <ClInclude Include="..\source\Simulator\VaporizeFluidSimulator.h" />
-    <ClInclude Include="..\source\OSSupport\BlockingTCPLink.h" />
-    <ClInclude Include="..\source\OSSupport\CriticalSection.h" />
-    <ClInclude Include="..\source\OSSupport\Event.h" />
-    <ClInclude Include="..\source\OSSupport\File.h" />
-    <ClInclude Include="..\source\OSSupport\GZipFile.h" />
-    <ClInclude Include="..\source\OSSupport\IsThread.h" />
-    <ClInclude Include="..\source\OSSupport\ListenThread.h" />
-    <ClInclude Include="..\source\OSSupport\Semaphore.h" />
-    <ClInclude Include="..\source\OSSupport\Sleep.h" />
-    <ClInclude Include="..\source\OSSupport\Socket.h" />
-    <ClInclude Include="..\source\OSSupport\SocketThreads.h" />
-    <ClInclude Include="..\source\OSSupport\Thread.h" />
-    <ClInclude Include="..\source\OSSupport\Timer.h" />
+    <ClInclude Include="..\src\Authenticator.h" />
+    <ClInclude Include="..\src\BlockArea.h" />
+    <ClInclude Include="..\src\BlockID.h" />
+    <ClInclude Include="..\src\BlockTracer.h" />
+    <ClInclude Include="..\src\BoundingBox.h" />
+    <ClInclude Include="..\src\ByteBuffer.h" />
+    <ClInclude Include="..\src\ChatColor.h" />
+    <ClInclude Include="..\src\Chunk.h" />
+    <ClInclude Include="..\src\Chunk.inl.h" />
+    <ClInclude Include="..\src\ChunkDef.h" />
+    <ClInclude Include="..\src\ChunkMap.h" />
+    <ClInclude Include="..\src\ChunkSender.h" />
+    <ClInclude Include="..\src\ClientHandle.h" />
+    <ClInclude Include="..\src\CommandOutput.h" />
+    <ClInclude Include="..\src\CraftingRecipes.h" />
+    <ClInclude Include="..\src\Cuboid.h" />
+    <ClInclude Include="..\src\DeadlockDetect.h" />
+    <ClInclude Include="..\src\Defines.h" />
+    <ClInclude Include="..\src\Enchantments.h" />
+    <ClInclude Include="..\src\Endianness.h" />
+    <ClInclude Include="..\src\FastRandom.h" />
+    <ClInclude Include="..\src\FurnaceRecipe.h" />
+    <ClInclude Include="..\src\Globals.h" />
+    <ClInclude Include="..\src\Group.h" />
+    <ClInclude Include="..\src\GroupManager.h" />
+    <ClInclude Include="..\src\Inventory.h" />
+    <ClInclude Include="..\src\Item.h" />
+    <ClInclude Include="..\src\ItemGrid.h" />
+    <ClInclude Include="..\src\Ladder.h" />
+    <ClInclude Include="..\src\LeakFinder.h" />
+    <ClInclude Include="..\src\LightingThread.h" />
+    <ClInclude Include="..\src\LinearInterpolation.h" />
+    <ClInclude Include="..\src\LinearUpscale.h" />
+    <ClInclude Include="..\src\LineBlockTracer.h" />
+    <ClInclude Include="..\src\Log.h" />
+    <ClInclude Include="..\src\Matrix4f.h" />
+    <ClInclude Include="..\src\MCLogger.h" />
+    <ClInclude Include="..\src\MemoryLeak.h" />
+    <ClInclude Include="..\src\MersenneTwister.h" />
+    <ClInclude Include="..\src\MobCensus.h" />
+    <ClInclude Include="..\src\MobFamilyCollecter.h" />
+    <ClInclude Include="..\src\MobProximityCounter.h" />
+    <ClInclude Include="..\src\MobSpawner.h" />
+    <ClInclude Include="..\src\MonsterConfig.h" />
+    <ClInclude Include="..\src\Noise.h" />
+    <ClInclude Include="..\src\Piston.h" />
+    <ClInclude Include="..\src\ProbabDistrib.h" />
+    <ClInclude Include="..\src\RCONServer.h" />
+    <ClInclude Include="..\src\ReferenceManager.h" />
+    <ClInclude Include="..\src\Root.h" />
+    <ClInclude Include="..\src\Server.h" />
+    <ClInclude Include="..\src\Sign.h" />
+    <ClInclude Include="..\src\StackWalker.h" />
+    <ClInclude Include="..\src\StringCompression.h" />
+    <ClInclude Include="..\src\StringUtils.h" />
+    <ClInclude Include="..\src\Tracer.h" />
+    <ClInclude Include="..\src\Vector3d.h" />
+    <ClInclude Include="..\src\Vector3f.h" />
+    <ClInclude Include="..\src\Vector3i.h" />
+    <ClInclude Include="..\src\WebAdmin.h" />
+    <ClInclude Include="..\src\World.h" />
+    <ClInclude Include="..\src\Mobs\AggressiveMonster.h" />
+    <ClInclude Include="..\src\Mobs\Bat.h" />
+    <ClInclude Include="..\src\Mobs\Blaze.h" />
+    <ClInclude Include="..\src\Mobs\Cavespider.h" />
+    <ClInclude Include="..\src\Mobs\Chicken.h" />
+    <ClInclude Include="..\src\Mobs\Cow.h" />
+    <ClInclude Include="..\src\Mobs\Creeper.h" />
+    <ClInclude Include="..\src\Mobs\EnderDragon.h" />
+    <ClInclude Include="..\src\Mobs\Enderman.h" />
+    <ClInclude Include="..\src\Mobs\Ghast.h" />
+    <ClInclude Include="..\src\Mobs\Giant.h" />
+    <ClInclude Include="..\src\Mobs\Horse.h" />
+    <ClInclude Include="..\src\Mobs\IronGolem.h" />
+    <ClInclude Include="..\src\Mobs\MagmaCube.h" />
+    <ClInclude Include="..\src\Mobs\Monster.h" />
+    <ClInclude Include="..\src\Mobs\Mooshroom.h" />
+    <ClInclude Include="..\src\Mobs\Ocelot.h" />
+    <ClInclude Include="..\src\Mobs\PassiveAggressiveMonster.h" />
+    <ClInclude Include="..\src\Mobs\PassiveMonster.h" />
+    <ClInclude Include="..\src\Mobs\Pig.h" />
+    <ClInclude Include="..\src\Mobs\Sheep.h" />
+    <ClInclude Include="..\src\Mobs\Silverfish.h" />
+    <ClInclude Include="..\src\Mobs\Skeleton.h" />
+    <ClInclude Include="..\src\Mobs\Slime.h" />
+    <ClInclude Include="..\src\Mobs\SnowGolem.h" />
+    <ClInclude Include="..\src\Mobs\Spider.h" />
+    <ClInclude Include="..\src\Mobs\Squid.h" />
+    <ClInclude Include="..\src\Mobs\Villager.h" />
+    <ClInclude Include="..\src\Mobs\Witch.h" />
+    <ClInclude Include="..\src\Mobs\Wither.h" />
+    <ClInclude Include="..\src\Mobs\Wolf.h" />
+    <ClInclude Include="..\src\Mobs\Zombie.h" />
+    <ClInclude Include="..\src\Mobs\ZombiePigman.h" />
+    <ClInclude Include="..\src\Entities\Boat.h" />
+    <ClInclude Include="..\src\Entities\Entity.h" />
+    <ClInclude Include="..\src\Entities\FallingBlock.h" />
+    <ClInclude Include="..\src\Entities\Minecart.h" />
+    <ClInclude Include="..\src\Entities\Pawn.h" />
+    <ClInclude Include="..\src\Entities\Pickup.h" />
+    <ClInclude Include="..\src\Entities\Player.h" />
+    <ClInclude Include="..\src\Entities\ProjectileEntity.h" />
+    <ClInclude Include="..\src\Entities\TNTEntity.h" />
+    <ClInclude Include="..\src\UI\SlotArea.h" />
+    <ClInclude Include="..\src\UI\Window.h" />
+    <ClInclude Include="..\src\UI\WindowOwner.h" />
+    <ClInclude Include="..\src\Simulator\DelayedFluidSimulator.h" />
+    <ClInclude Include="..\src\Simulator\FireSimulator.h" />
+    <ClInclude Include="..\src\Simulator\FloodyFluidSimulator.h" />
+    <ClInclude Include="..\src\Simulator\FluidSimulator.h" />
+    <ClInclude Include="..\src\Simulator\NoopFluidSimulator.h" />
+    <ClInclude Include="..\src\Simulator\RedstoneSimulator.h" />
+    <ClInclude Include="..\src\Simulator\SandSimulator.h" />
+    <ClInclude Include="..\src\Simulator\Simulator.h" />
+    <ClInclude Include="..\src\Simulator\SimulatorManager.h" />
+    <ClInclude Include="..\src\Simulator\VaporizeFluidSimulator.h" />
+    <ClInclude Include="..\src\OSSupport\BlockingTCPLink.h" />
+    <ClInclude Include="..\src\OSSupport\CriticalSection.h" />
+    <ClInclude Include="..\src\OSSupport\Event.h" />
+    <ClInclude Include="..\src\OSSupport\File.h" />
+    <ClInclude Include="..\src\OSSupport\GZipFile.h" />
+    <ClInclude Include="..\src\OSSupport\IsThread.h" />
+    <ClInclude Include="..\src\OSSupport\ListenThread.h" />
+    <ClInclude Include="..\src\OSSupport\Semaphore.h" />
+    <ClInclude Include="..\src\OSSupport\Sleep.h" />
+    <ClInclude Include="..\src\OSSupport\Socket.h" />
+    <ClInclude Include="..\src\OSSupport\SocketThreads.h" />
+    <ClInclude Include="..\src\OSSupport\Thread.h" />
+    <ClInclude Include="..\src\OSSupport\Timer.h" />
     <CustomBuild Include="..\Android\jni\ToJava.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release profiled|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </CustomBuild>
-    <ClInclude Include="..\source\Bindings.h" />
-    <ClInclude Include="..\source\LuaFunctions.h" />
-    <ClInclude Include="..\source\LuaState.h" />
-    <ClInclude Include="..\source\LuaWindow.h" />
-    <ClInclude Include="..\source\ManualBindings.h" />
-    <ClInclude Include="..\source\Plugin.h" />
-    <ClInclude Include="..\source\PluginLua.h" />
-    <ClInclude Include="..\source\PluginManager.h" />
-    <ClInclude Include="..\source\tolua++.h" />
-    <ClInclude Include="..\source\tolua_base.h" />
-    <ClInclude Include="..\source\WebPlugin.h" />
-    <ClInclude Include="..\iniFile\iniFile.h" />
-    <ClInclude Include="..\source\md5\md5.h" />
-    <ClInclude Include="..\source\WorldStorage\FastNBT.h" />
-    <ClInclude Include="..\source\WorldStorage\NBTChunkSerializer.h" />
-    <ClInclude Include="..\source\WorldStorage\WorldStorage.h" />
-    <ClInclude Include="..\source\WorldStorage\WSSAnvil.h" />
-    <ClInclude Include="..\source\WorldStorage\WSSCompact.h" />
-    <ClInclude Include="..\source\Generating\BioGen.h" />
-    <ClInclude Include="..\source\Generating\Caves.h" />
-    <ClInclude Include="..\source\Generating\ChunkDesc.h" />
-    <ClInclude Include="..\source\Generating\ChunkGenerator.h" />
-    <ClInclude Include="..\source\Generating\CompoGen.h" />
-    <ClInclude Include="..\source\Generating\ComposableGenerator.h" />
-    <ClInclude Include="..\source\Generating\DistortedHeightmap.h" />
-    <ClInclude Include="..\source\Generating\EndGen.h" />
-    <ClInclude Include="..\source\Generating\FinishGen.h" />
-    <ClInclude Include="..\source\Generating\HeiGen.h" />
-    <ClInclude Include="..\source\Generating\MineShafts.h" />
-    <ClInclude Include="..\source\Generating\Noise3DGenerator.h" />
-    <ClInclude Include="..\source\Generating\Ravines.h" />
-    <ClInclude Include="..\source\Generating\StructGen.h" />
-    <ClInclude Include="..\source\Generating\Trees.h" />
-    <ClInclude Include="..\source\blocks\BlockBed.h" />
-    <ClInclude Include="..\source\Blocks\BlockBrewingStand.h" />
-    <ClInclude Include="..\source\Blocks\BlockButton.h" />
-    <ClInclude Include="..\source\blocks\BlockCactus.h" />
-    <ClInclude Include="..\source\Blocks\BlockCarpet.h" />
-    <ClInclude Include="..\source\Blocks\BlockCauldron.h" />
-    <ClInclude Include="..\source\blocks\BlockChest.h" />
-    <ClInclude Include="..\source\blocks\BlockCloth.h" />
-    <ClInclude Include="..\source\Blocks\BlockCobWeb.h" />
-    <ClInclude Include="..\source\Blocks\BlockComparator.h" />
-    <ClInclude Include="..\source\blocks\BlockCrops.h" />
-    <ClInclude Include="..\source\Blocks\BlockDeadBush.h" />
-    <ClInclude Include="..\source\blocks\BlockDirt.h" />
-    <ClInclude Include="..\source\blocks\BlockDoor.h" />
-    <ClInclude Include="..\source\blocks\BlockDropSpenser.h" />
-    <ClInclude Include="..\source\Blocks\BlockEnderchest.h" />
-    <ClInclude Include="..\source\blocks\BlockEntity.h" />
-    <ClInclude Include="..\source\Blocks\BlockFarmland.h" />
-    <ClInclude Include="..\source\Blocks\BlockFenceGate.h" />
-    <ClInclude Include="..\source\blocks\BlockFire.h" />
-    <ClInclude Include="..\source\blocks\BlockFlower.h" />
-    <ClInclude Include="..\source\Blocks\BlockFlowerPot.h" />
-    <ClInclude Include="..\source\blocks\BlockFluid.h" />
-    <ClInclude Include="..\source\blocks\BlockFurnace.h" />
-    <ClInclude Include="..\source\Blocks\BlockGlass.h" />
-    <ClInclude Include="..\source\blocks\BlockGlowstone.h" />
-    <ClInclude Include="..\source\blocks\BlockGravel.h" />
-    <ClInclude Include="..\source\blocks\BlockHandler.h" />
-    <ClInclude Include="..\source\Blocks\BlockHopper.h" />
-    <ClInclude Include="..\source\blocks\BlockIce.h" />
-    <ClInclude Include="..\source\blocks\BlockLadder.h" />
-    <ClInclude Include="..\source\blocks\BlockLeaves.h" />
-    <ClInclude Include="..\source\Blocks\BlockLever.h" />
-    <ClInclude Include="..\source\blocks\BlockMelon.h" />
-    <ClInclude Include="..\source\blocks\BlockMushroom.h" />
-    <ClInclude Include="..\source\Blocks\BlockMycelium.h" />
-    <ClInclude Include="..\source\blocks\BlockNote.h" />
-    <ClInclude Include="..\source\blocks\BlockOre.h" />
-    <ClInclude Include="..\source\blocks\BlockPiston.h" />
-    <ClInclude Include="..\source\blocks\BlockPlanks.h" />
-    <ClInclude Include="..\source\blocks\BlockPortal.h" />
-    <ClInclude Include="..\source\Blocks\BlockPumpkin.h" />
-    <ClInclude Include="..\source\Blocks\BlockRail.h" />
-    <ClInclude Include="..\source\blocks\BlockRedstone.h" />
-    <ClInclude Include="..\source\blocks\BlockRedstoneOre.h" />
-    <ClInclude Include="..\source\blocks\BlockRedstoneRepeater.h" />
-    <ClInclude Include="..\source\blocks\BlockRedstoneTorch.h" />
-    <ClInclude Include="..\source\blocks\BlockSand.h" />
-    <ClInclude Include="..\source\blocks\BlockSapling.h" />
-    <ClInclude Include="..\source\blocks\BlockSign.h" />
-    <ClInclude Include="..\source\blocks\BlockSlab.h" />
-    <ClInclude Include="..\source\blocks\BlockSnow.h" />
-    <ClInclude Include="..\source\blocks\BlockStairs.h" />
-    <ClInclude Include="..\source\blocks\BlockStems.h" />
-    <ClInclude Include="..\source\blocks\BlockStone.h" />
-    <ClInclude Include="..\source\blocks\BlockSugarcane.h" />
-    <ClInclude Include="..\source\blocks\BlockTallGrass.h" />
-    <ClInclude Include="..\source\blocks\BlockTorch.h" />
-    <ClInclude Include="..\source\blocks\BlockVine.h" />
-    <ClInclude Include="..\source\blocks\BlockWood.h" />
-    <ClInclude Include="..\source\blocks\BlockWorkbench.h" />
-    <ClInclude Include="..\source\items\ItemBed.h" />
-    <ClInclude Include="..\source\Items\ItemBoat.h" />
-    <ClInclude Include="..\source\Items\ItemBow.h" />
-    <ClInclude Include="..\source\Items\ItemBrewingStand.h" />
-    <ClInclude Include="..\source\items\ItemBucket.h" />
-    <ClInclude Include="..\source\Items\ItemCauldron.h" />
-    <ClInclude Include="..\source\items\ItemCloth.h" />
-    <ClInclude Include="..\source\Items\ItemComparator.h" />
-    <ClInclude Include="..\source\items\ItemDoor.h" />
-    <ClInclude Include="..\source\items\ItemDye.h" />
-    <ClInclude Include="..\source\Items\ItemFlowerPot.h" />
-    <ClInclude Include="..\source\items\ItemFood.h" />
-    <ClInclude Include="..\source\items\ItemHandler.h" />
-    <ClInclude Include="..\source\items\ItemHoe.h" />
-    <ClInclude Include="..\source\items\ItemLeaves.h" />
-    <ClInclude Include="..\source\items\ItemLighter.h" />
-    <ClInclude Include="..\source\Items\ItemMinecart.h" />
-    <ClInclude Include="..\source\items\ItemPickaxe.h" />
-    <ClInclude Include="..\source\items\ItemRedstoneDust.h" />
-    <ClInclude Include="..\source\items\ItemRedstoneRepeater.h" />
-    <ClInclude Include="..\source\items\ItemSapling.h" />
-    <ClInclude Include="..\source\items\ItemSeeds.h" />
-    <ClInclude Include="..\source\items\ItemShears.h" />
-    <ClInclude Include="..\source\items\ItemShovel.h" />
-    <ClInclude Include="..\source\items\ItemSign.h" />
-    <ClInclude Include="..\source\Items\ItemSpawnEgg.h" />
-    <ClInclude Include="..\source\items\ItemSugarcane.h" />
-    <ClInclude Include="..\source\items\ItemSword.h" />
-    <ClInclude Include="..\source\Items\ItemThrowable.h" />
-    <ClInclude Include="..\source\Protocol\ChunkDataSerializer.h" />
-    <ClInclude Include="..\source\Protocol\Protocol.h" />
-    <ClInclude Include="..\source\Protocol\Protocol125.h" />
-    <ClInclude Include="..\source\Protocol\Protocol132.h" />
-    <ClInclude Include="..\source\Protocol\Protocol14x.h" />
-    <ClInclude Include="..\source\Protocol\Protocol15x.h" />
-    <ClInclude Include="..\source\Protocol\Protocol16x.h" />
-    <ClInclude Include="..\source\Protocol\Protocol17x.h" />
-    <ClInclude Include="..\source\Protocol\ProtocolRecognizer.h" />
-    <ClInclude Include="..\source\sqlite\sqlite3.h" />
-    <ClInclude Include="..\source\LuaExpat\lxplib.h" />
-    <ClInclude Include="..\source\BlockEntities\BlockEntity.h" />
-    <ClInclude Include="..\source\BlockEntities\BlockEntityWithItems.h" />
-    <ClInclude Include="..\source\BlockEntities\ChestEntity.h" />
-    <ClInclude Include="..\source\BlockEntities\DispenserEntity.h" />
-    <ClInclude Include="..\source\BlockEntities\DropperEntity.h" />
-    <ClInclude Include="..\source\BlockEntities\DropSpenserEntity.h" />
-    <ClInclude Include="..\source\BlockEntities\FurnaceEntity.h" />
-    <ClInclude Include="..\source\BlockEntities\HopperEntity.h" />
-    <ClInclude Include="..\source\BlockEntities\JukeboxEntity.h" />
-    <ClInclude Include="..\source\BlockEntities\NoteEntity.h" />
-    <ClInclude Include="..\source\BlockEntities\SignEntity.h" />
-    <ClInclude Include="..\source\HTTPServer\EnvelopeParser.h" />
-    <ClInclude Include="..\source\HTTPServer\HTTPConnection.h" />
-    <ClInclude Include="..\source\HTTPServer\HTTPFormParser.h" />
-    <ClInclude Include="..\source\HTTPServer\HTTPMessage.h" />
-    <ClInclude Include="..\source\HTTPServer\HTTPServer.h" />
-    <ClInclude Include="..\source\HTTPServer\MultipartParser.h" />
-    <ClInclude Include="..\source\HTTPServer\NameValueParser.h" />
+    <ClInclude Include="..\src\Bindings.h" />
+    <ClInclude Include="..\src\LuaFunctions.h" />
+    <ClInclude Include="..\src\LuaState.h" />
+    <ClInclude Include="..\src\LuaWindow.h" />
+    <ClInclude Include="..\src\ManualBindings.h" />
+    <ClInclude Include="..\src\Plugin.h" />
+    <ClInclude Include="..\src\PluginLua.h" />
+    <ClInclude Include="..\src\PluginManager.h" />
+    <ClInclude Include="..\src\tolua++.h" />
+    <ClInclude Include="..\src\tolua_base.h" />
+    <ClInclude Include="..\src\WebPlugin.h" />
+    <ClInclude Include="..\lib\inifile\iniFile.h" />
+    <ClInclude Include="..\lib\md5\md5.h" />
+    <ClInclude Include="..\src\WorldStorage\FastNBT.h" />
+    <ClInclude Include="..\src\WorldStorage\NBTChunkSerializer.h" />
+    <ClInclude Include="..\src\WorldStorage\WorldStorage.h" />
+    <ClInclude Include="..\src\WorldStorage\WSSAnvil.h" />
+    <ClInclude Include="..\src\WorldStorage\WSSCompact.h" />
+    <ClInclude Include="..\src\Generating\BioGen.h" />
+    <ClInclude Include="..\src\Generating\Caves.h" />
+    <ClInclude Include="..\src\Generating\ChunkDesc.h" />
+    <ClInclude Include="..\src\Generating\ChunkGenerator.h" />
+    <ClInclude Include="..\src\Generating\CompoGen.h" />
+    <ClInclude Include="..\src\Generating\ComposableGenerator.h" />
+    <ClInclude Include="..\src\Generating\DistortedHeightmap.h" />
+    <ClInclude Include="..\src\Generating\EndGen.h" />
+    <ClInclude Include="..\src\Generating\FinishGen.h" />
+    <ClInclude Include="..\src\Generating\HeiGen.h" />
+    <ClInclude Include="..\src\Generating\MineShafts.h" />
+    <ClInclude Include="..\src\Generating\Noise3DGenerator.h" />
+    <ClInclude Include="..\src\Generating\Ravines.h" />
+    <ClInclude Include="..\src\Generating\StructGen.h" />
+    <ClInclude Include="..\src\Generating\Trees.h" />
+    <ClInclude Include="..\src\blocks\BlockBed.h" />
+    <ClInclude Include="..\src\Blocks\BlockBrewingStand.h" />
+    <ClInclude Include="..\src\Blocks\BlockButton.h" />
+    <ClInclude Include="..\src\blocks\BlockCactus.h" />
+    <ClInclude Include="..\src\Blocks\BlockCarpet.h" />
+    <ClInclude Include="..\src\Blocks\BlockCauldron.h" />
+    <ClInclude Include="..\src\blocks\BlockChest.h" />
+    <ClInclude Include="..\src\blocks\BlockCloth.h" />
+    <ClInclude Include="..\src\Blocks\BlockCobWeb.h" />
+    <ClInclude Include="..\src\Blocks\BlockComparator.h" />
+    <ClInclude Include="..\src\blocks\BlockCrops.h" />
+    <ClInclude Include="..\src\Blocks\BlockDeadBush.h" />
+    <ClInclude Include="..\src\blocks\BlockDirt.h" />
+    <ClInclude Include="..\src\blocks\BlockDoor.h" />
+    <ClInclude Include="..\src\blocks\BlockDropSpenser.h" />
+    <ClInclude Include="..\src\Blocks\BlockEnderchest.h" />
+    <ClInclude Include="..\src\blocks\BlockEntity.h" />
+    <ClInclude Include="..\src\Blocks\BlockFarmland.h" />
+    <ClInclude Include="..\src\Blocks\BlockFenceGate.h" />
+    <ClInclude Include="..\src\blocks\BlockFire.h" />
+    <ClInclude Include="..\src\blocks\BlockFlower.h" />
+    <ClInclude Include="..\src\Blocks\BlockFlowerPot.h" />
+    <ClInclude Include="..\src\blocks\BlockFluid.h" />
+    <ClInclude Include="..\src\blocks\BlockFurnace.h" />
+    <ClInclude Include="..\src\Blocks\BlockGlass.h" />
+    <ClInclude Include="..\src\blocks\BlockGlowstone.h" />
+    <ClInclude Include="..\src\blocks\BlockGravel.h" />
+    <ClInclude Include="..\src\blocks\BlockHandler.h" />
+    <ClInclude Include="..\src\Blocks\BlockHopper.h" />
+    <ClInclude Include="..\src\blocks\BlockIce.h" />
+    <ClInclude Include="..\src\blocks\BlockLadder.h" />
+    <ClInclude Include="..\src\blocks\BlockLeaves.h" />
+    <ClInclude Include="..\src\Blocks\BlockLever.h" />
+    <ClInclude Include="..\src\blocks\BlockMelon.h" />
+    <ClInclude Include="..\src\blocks\BlockMushroom.h" />
+    <ClInclude Include="..\src\Blocks\BlockMycelium.h" />
+    <ClInclude Include="..\src\blocks\BlockNote.h" />
+    <ClInclude Include="..\src\blocks\BlockOre.h" />
+    <ClInclude Include="..\src\blocks\BlockPiston.h" />
+    <ClInclude Include="..\src\blocks\BlockPlanks.h" />
+    <ClInclude Include="..\src\blocks\BlockPortal.h" />
+    <ClInclude Include="..\src\Blocks\BlockPumpkin.h" />
+    <ClInclude Include="..\src\Blocks\BlockRail.h" />
+    <ClInclude Include="..\src\blocks\BlockRedstone.h" />
+    <ClInclude Include="..\src\blocks\BlockRedstoneOre.h" />
+    <ClInclude Include="..\src\blocks\BlockRedstoneRepeater.h" />
+    <ClInclude Include="..\src\blocks\BlockRedstoneTorch.h" />
+    <ClInclude Include="..\src\blocks\BlockSand.h" />
+    <ClInclude Include="..\src\blocks\BlockSapling.h" />
+    <ClInclude Include="..\src\blocks\BlockSign.h" />
+    <ClInclude Include="..\src\blocks\BlockSlab.h" />
+    <ClInclude Include="..\src\blocks\BlockSnow.h" />
+    <ClInclude Include="..\src\blocks\BlockStairs.h" />
+    <ClInclude Include="..\src\blocks\BlockStems.h" />
+    <ClInclude Include="..\src\blocks\BlockStone.h" />
+    <ClInclude Include="..\src\blocks\BlockSugarcane.h" />
+    <ClInclude Include="..\src\blocks\BlockTallGrass.h" />
+    <ClInclude Include="..\src\blocks\BlockTorch.h" />
+    <ClInclude Include="..\src\blocks\BlockVine.h" />
+    <ClInclude Include="..\src\blocks\BlockWood.h" />
+    <ClInclude Include="..\src\blocks\BlockWorkbench.h" />
+    <ClInclude Include="..\src\items\ItemBed.h" />
+    <ClInclude Include="..\src\Items\ItemBoat.h" />
+    <ClInclude Include="..\src\Items\ItemBow.h" />
+    <ClInclude Include="..\src\Items\ItemBrewingStand.h" />
+    <ClInclude Include="..\src\items\ItemBucket.h" />
+    <ClInclude Include="..\src\Items\ItemCauldron.h" />
+    <ClInclude Include="..\src\items\ItemCloth.h" />
+    <ClInclude Include="..\src\Items\ItemComparator.h" />
+    <ClInclude Include="..\src\items\ItemDoor.h" />
+    <ClInclude Include="..\src\items\ItemDye.h" />
+    <ClInclude Include="..\src\Items\ItemFlowerPot.h" />
+    <ClInclude Include="..\src\items\ItemFood.h" />
+    <ClInclude Include="..\src\items\ItemHandler.h" />
+    <ClInclude Include="..\src\items\ItemHoe.h" />
+    <ClInclude Include="..\src\items\ItemLeaves.h" />
+    <ClInclude Include="..\src\items\ItemLighter.h" />
+    <ClInclude Include="..\src\Items\ItemMinecart.h" />
+    <ClInclude Include="..\src\items\ItemPickaxe.h" />
+    <ClInclude Include="..\src\items\ItemRedstoneDust.h" />
+    <ClInclude Include="..\src\items\ItemRedstoneRepeater.h" />
+    <ClInclude Include="..\src\items\ItemSapling.h" />
+    <ClInclude Include="..\src\items\ItemSeeds.h" />
+    <ClInclude Include="..\src\items\ItemShears.h" />
+    <ClInclude Include="..\src\items\ItemShovel.h" />
+    <ClInclude Include="..\src\items\ItemSign.h" />
+    <ClInclude Include="..\src\Items\ItemSpawnEgg.h" />
+    <ClInclude Include="..\src\items\ItemSugarcane.h" />
+    <ClInclude Include="..\src\items\ItemSword.h" />
+    <ClInclude Include="..\src\Items\ItemThrowable.h" />
+    <ClInclude Include="..\src\Protocol\ChunkDataSerializer.h" />
+    <ClInclude Include="..\src\Protocol\Protocol.h" />
+    <ClInclude Include="..\src\Protocol\Protocol125.h" />
+    <ClInclude Include="..\src\Protocol\Protocol132.h" />
+    <ClInclude Include="..\src\Protocol\Protocol14x.h" />
+    <ClInclude Include="..\src\Protocol\Protocol15x.h" />
+    <ClInclude Include="..\src\Protocol\Protocol16x.h" />
+    <ClInclude Include="..\src\Protocol\Protocol17x.h" />
+    <ClInclude Include="..\src\Protocol\ProtocolRecognizer.h" />
+    <ClInclude Include="..\lib\sqlite\sqlite3.h" />
+    <ClInclude Include="..\lib\luaexpat\lxplib.h" />
+    <ClInclude Include="..\src\BlockEntities\BlockEntity.h" />
+    <ClInclude Include="..\src\BlockEntities\BlockEntityWithItems.h" />
+    <ClInclude Include="..\src\BlockEntities\ChestEntity.h" />
+    <ClInclude Include="..\src\BlockEntities\DispenserEntity.h" />
+    <ClInclude Include="..\src\BlockEntities\DropperEntity.h" />
+    <ClInclude Include="..\src\BlockEntities\DropSpenserEntity.h" />
+    <ClInclude Include="..\src\BlockEntities\FurnaceEntity.h" />
+    <ClInclude Include="..\src\BlockEntities\HopperEntity.h" />
+    <ClInclude Include="..\src\BlockEntities\JukeboxEntity.h" />
+    <ClInclude Include="..\src\BlockEntities\NoteEntity.h" />
+    <ClInclude Include="..\src\BlockEntities\SignEntity.h" />
+    <ClInclude Include="..\src\HTTPServer\EnvelopeParser.h" />
+    <ClInclude Include="..\src\HTTPServer\HTTPConnection.h" />
+    <ClInclude Include="..\src\HTTPServer\HTTPFormParser.h" />
+    <ClInclude Include="..\src\HTTPServer\HTTPMessage.h" />
+    <ClInclude Include="..\src\HTTPServer\HTTPServer.h" />
+    <ClInclude Include="..\src\HTTPServer\MultipartParser.h" />
+    <ClInclude Include="..\src\HTTPServer\NameValueParser.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\webadmin\template.html" />
@@ -491,26 +488,26 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release profiled|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </CustomBuild>
-    <CustomBuild Include="..\source\AllToLua.pkg">
+    <CustomBuild Include="..\src\AllToLua.pkg">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">true</ExcludedFromBuild>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">GenerateBindings.cmd
 </Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">cTorch.h;cStairs.h;cLadder.h;../iniFile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">cTorch.h;cStairs.h;cLadder.h;../lib/inifile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">Bindings.cpp;%(Outputs)</Outputs>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">GenerateBindings.cmd
 </Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cTorch.h;cStairs.h;cLadder.h;../iniFile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cTorch.h;cStairs.h;cLadder.h;../lib/inifile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Bindings.cpp;%(Outputs)</Outputs>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release profiled|Win32'">true</ExcludedFromBuild>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release profiled|Win32'">GenerateBindings.cmd
 </Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release profiled|Win32'">cTorch.h;cStairs.h;cLadder.h;../iniFile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release profiled|Win32'">cTorch.h;cStairs.h;cLadder.h;../lib/inifile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release profiled|Win32'">Bindings.cpp;%(Outputs)</Outputs>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">GenerateBindings.cmd
 </Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cTorch.h;cStairs.h;cLadder.h;../iniFile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cTorch.h;cStairs.h;cLadder.h;../lib/inifile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs)</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Bindings.cpp;%(Outputs)</Outputs>
     </CustomBuild>
     <None Include="..\MCServer\groups.ini" />
@@ -566,36 +563,35 @@
     <None Include="..\MCServer\Plugins\APIDump\main.lua" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\source\Authenticator.cpp" />
-    <ClCompile Include="..\source\BlockArea.cpp" />
-    <ClCompile Include="..\source\BlockEntities\BlockEntity.cpp" />
-    <ClCompile Include="..\source\BlockID.cpp" />
-    <ClCompile Include="..\source\BoundingBox.cpp" />
-    <ClCompile Include="..\source\ByteBuffer.cpp" />
-    <ClCompile Include="..\source\ChatColor.cpp" />
-    <ClCompile Include="..\source\Chunk.cpp" />
-    <ClCompile Include="..\source\ChunkMap.cpp" />
-    <ClCompile Include="..\source\ChunkSender.cpp" />
-    <ClCompile Include="..\source\ClientHandle.cpp" />
-    <ClCompile Include="..\source\CommandOutput.cpp" />
-    <ClCompile Include="..\source\CraftingRecipes.cpp" />
-    <ClCompile Include="..\source\Cuboid.cpp" />
-    <ClCompile Include="..\source\DeadlockDetect.cpp" />
-    <ClCompile Include="..\source\Enchantments.cpp" />
-    <ClCompile Include="..\source\FastRandom.cpp" />
-    <ClCompile Include="..\source\FurnaceRecipe.cpp" />
-    <ClCompile Include="..\source\Globals.cpp">
+    <ClCompile Include="..\src\Authenticator.cpp" />
+    <ClCompile Include="..\src\BlockArea.cpp" />
+    <ClCompile Include="..\src\BlockID.cpp" />
+    <ClCompile Include="..\src\BoundingBox.cpp" />
+    <ClCompile Include="..\src\ByteBuffer.cpp" />
+    <ClCompile Include="..\src\ChatColor.cpp" />
+    <ClCompile Include="..\src\Chunk.cpp" />
+    <ClCompile Include="..\src\ChunkMap.cpp" />
+    <ClCompile Include="..\src\ChunkSender.cpp" />
+    <ClCompile Include="..\src\ClientHandle.cpp" />
+    <ClCompile Include="..\src\CommandOutput.cpp" />
+    <ClCompile Include="..\src\CraftingRecipes.cpp" />
+    <ClCompile Include="..\src\Cuboid.cpp" />
+    <ClCompile Include="..\src\DeadlockDetect.cpp" />
+    <ClCompile Include="..\src\Enchantments.cpp" />
+    <ClCompile Include="..\src\FastRandom.cpp" />
+    <ClCompile Include="..\src\FurnaceRecipe.cpp" />
+    <ClCompile Include="..\src\Globals.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release profiled|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\source\Group.cpp" />
-    <ClCompile Include="..\source\GroupManager.cpp" />
-    <ClCompile Include="..\source\Inventory.cpp" />
-    <ClCompile Include="..\source\Item.cpp" />
-    <ClCompile Include="..\source\ItemGrid.cpp" />
-    <ClCompile Include="..\source\LeakFinder.cpp">
+    <ClCompile Include="..\src\Group.cpp" />
+    <ClCompile Include="..\src\GroupManager.cpp" />
+    <ClCompile Include="..\src\Inventory.cpp" />
+    <ClCompile Include="..\src\Item.cpp" />
+    <ClCompile Include="..\src\ItemGrid.cpp" />
+    <ClCompile Include="..\src\LeakFinder.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">
       </PrecompiledHeader>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">Level3</WarningLevel>
@@ -609,19 +605,19 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\source\LightingThread.cpp" />
-    <ClCompile Include="..\source\LinearInterpolation.cpp" />
-    <ClCompile Include="..\source\LineBlockTracer.cpp" />
-    <ClCompile Include="..\source\Log.cpp" />
-    <ClCompile Include="..\source\main.cpp" />
-    <ClCompile Include="..\source\Matrix4f.cpp" />
-    <ClCompile Include="..\source\MCLogger.cpp" />
-    <ClCompile Include="..\source\MobCensus.cpp" />
-    <ClCompile Include="..\source\MobFamilyCollecter.cpp" />
-    <ClCompile Include="..\source\MobProximityCounter.cpp" />
-    <ClCompile Include="..\source\MobSpawner.cpp" />
-    <ClCompile Include="..\source\MonsterConfig.cpp" />
-    <ClCompile Include="..\source\Noise.cpp">
+    <ClCompile Include="..\src\LightingThread.cpp" />
+    <ClCompile Include="..\src\LinearInterpolation.cpp" />
+    <ClCompile Include="..\src\LineBlockTracer.cpp" />
+    <ClCompile Include="..\src\Log.cpp" />
+    <ClCompile Include="..\src\main.cpp" />
+    <ClCompile Include="..\src\Matrix4f.cpp" />
+    <ClCompile Include="..\src\MCLogger.cpp" />
+    <ClCompile Include="..\src\MobCensus.cpp" />
+    <ClCompile Include="..\src\MobFamilyCollecter.cpp" />
+    <ClCompile Include="..\src\MobProximityCounter.cpp" />
+    <ClCompile Include="..\src\MobSpawner.cpp" />
+    <ClCompile Include="..\src\MonsterConfig.cpp" />
+    <ClCompile Include="..\src\Noise.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">MaxSpeed</Optimization>
       <IntrinsicFunctions Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">true</IntrinsicFunctions>
       <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">Speed</FavorSizeOrSpeed>
@@ -637,13 +633,13 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\source\Piston.cpp" />
-    <ClCompile Include="..\source\ProbabDistrib.cpp" />
-    <ClCompile Include="..\source\RCONServer.cpp" />
-    <ClCompile Include="..\source\ReferenceManager.cpp" />
-    <ClCompile Include="..\source\Root.cpp" />
-    <ClCompile Include="..\source\Server.cpp" />
-    <ClCompile Include="..\source\StackWalker.cpp">
+    <ClCompile Include="..\src\Piston.cpp" />
+    <ClCompile Include="..\src\ProbabDistrib.cpp" />
+    <ClCompile Include="..\src\RCONServer.cpp" />
+    <ClCompile Include="..\src\ReferenceManager.cpp" />
+    <ClCompile Include="..\src\Root.cpp" />
+    <ClCompile Include="..\src\Server.cpp" />
+    <ClCompile Include="..\src\StackWalker.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">
       </PrecompiledHeader>
       <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">Level3</WarningLevel>
@@ -657,78 +653,78 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\source\StringCompression.cpp" />
-    <ClCompile Include="..\source\StringUtils.cpp" />
-    <ClCompile Include="..\source\Tracer.cpp" />
-    <ClCompile Include="..\source\Vector3d.cpp" />
-    <ClCompile Include="..\source\Vector3f.cpp" />
-    <ClCompile Include="..\source\Vector3i.cpp" />
-    <ClCompile Include="..\source\WebAdmin.cpp" />
-    <ClCompile Include="..\source\World.cpp" />
-    <ClCompile Include="..\source\Mobs\AggressiveMonster.cpp" />
-    <ClCompile Include="..\source\Mobs\Bat.cpp" />
-    <ClCompile Include="..\source\Mobs\Blaze.cpp" />
-    <ClCompile Include="..\source\Mobs\Cavespider.cpp" />
-    <ClCompile Include="..\source\Mobs\Chicken.cpp" />
-    <ClCompile Include="..\source\Mobs\Cow.cpp" />
-    <ClCompile Include="..\source\Mobs\Creeper.cpp" />
-    <ClCompile Include="..\source\Mobs\EnderDragon.cpp" />
-    <ClCompile Include="..\source\Mobs\Enderman.cpp" />
-    <ClCompile Include="..\source\Mobs\Ghast.cpp" />
-    <ClCompile Include="..\source\Mobs\Giant.cpp" />
-    <ClCompile Include="..\source\Mobs\Horse.cpp" />
-    <ClCompile Include="..\source\Mobs\IronGolem.cpp" />
-    <ClCompile Include="..\source\Mobs\MagmaCube.cpp" />
-    <ClCompile Include="..\source\Mobs\Monster.cpp" />
-    <ClCompile Include="..\source\Mobs\Mooshroom.cpp" />
-    <ClCompile Include="..\source\Mobs\PassiveAggressiveMonster.cpp" />
-    <ClCompile Include="..\source\Mobs\PassiveMonster.cpp" />
-    <ClCompile Include="..\source\Mobs\Pig.cpp" />
-    <ClCompile Include="..\source\Mobs\Sheep.cpp" />
-    <ClCompile Include="..\source\Mobs\Skeleton.cpp" />
-    <ClCompile Include="..\source\Mobs\Slime.cpp" />
-    <ClCompile Include="..\source\Mobs\SnowGolem.cpp" />
-    <ClCompile Include="..\source\Mobs\Spider.cpp" />
-    <ClCompile Include="..\source\Mobs\Squid.cpp" />
-    <ClCompile Include="..\source\Mobs\Villager.cpp" />
-    <ClCompile Include="..\source\Mobs\Witch.cpp" />
-    <ClCompile Include="..\source\Mobs\Wither.cpp" />
-    <ClCompile Include="..\source\Mobs\Wolf.cpp" />
-    <ClCompile Include="..\source\Mobs\Zombie.cpp" />
-    <ClCompile Include="..\source\Mobs\ZombiePigman.cpp" />
-    <ClCompile Include="..\source\Entities\Boat.cpp" />
-    <ClCompile Include="..\source\Entities\Entity.cpp" />
-    <ClCompile Include="..\source\Entities\FallingBlock.cpp" />
-    <ClCompile Include="..\source\Entities\Minecart.cpp" />
-    <ClCompile Include="..\source\Entities\Pawn.cpp" />
-    <ClCompile Include="..\source\Entities\Pickup.cpp" />
-    <ClCompile Include="..\source\Entities\Player.cpp" />
-    <ClCompile Include="..\source\Entities\ProjectileEntity.cpp" />
-    <ClCompile Include="..\source\Entities\TNTEntity.cpp" />
-    <ClCompile Include="..\source\UI\SlotArea.cpp" />
-    <ClCompile Include="..\source\UI\Window.cpp" />
-    <ClCompile Include="..\source\Simulator\DelayedFluidSimulator.cpp" />
-    <ClCompile Include="..\source\Simulator\FireSimulator.cpp" />
-    <ClCompile Include="..\source\Simulator\FloodyFluidSimulator.cpp" />
-    <ClCompile Include="..\source\Simulator\FluidSimulator.cpp" />
-    <ClCompile Include="..\source\Simulator\RedstoneSimulator.cpp" />
-    <ClCompile Include="..\source\Simulator\SandSimulator.cpp" />
-    <ClCompile Include="..\source\Simulator\Simulator.cpp" />
-    <ClCompile Include="..\source\Simulator\SimulatorManager.cpp" />
-    <ClCompile Include="..\source\Simulator\VaporizeFluidSimulator.cpp" />
-    <ClCompile Include="..\source\OSSupport\BlockingTCPLink.cpp" />
-    <ClCompile Include="..\source\OSSupport\CriticalSection.cpp" />
-    <ClCompile Include="..\source\OSSupport\Event.cpp" />
-    <ClCompile Include="..\source\OSSupport\File.cpp" />
-    <ClCompile Include="..\source\OSSupport\GZipFile.cpp" />
-    <ClCompile Include="..\source\OSSupport\IsThread.cpp" />
-    <ClCompile Include="..\source\OSSupport\ListenThread.cpp" />
-    <ClCompile Include="..\source\OSSupport\Semaphore.cpp" />
-    <ClCompile Include="..\source\OSSupport\Sleep.cpp" />
-    <ClCompile Include="..\source\OSSupport\Socket.cpp" />
-    <ClCompile Include="..\source\OSSupport\SocketThreads.cpp" />
-    <ClCompile Include="..\source\OSSupport\Thread.cpp" />
-    <ClCompile Include="..\source\OSSupport\Timer.cpp" />
+    <ClCompile Include="..\src\StringCompression.cpp" />
+    <ClCompile Include="..\src\StringUtils.cpp" />
+    <ClCompile Include="..\src\Tracer.cpp" />
+    <ClCompile Include="..\src\Vector3d.cpp" />
+    <ClCompile Include="..\src\Vector3f.cpp" />
+    <ClCompile Include="..\src\Vector3i.cpp" />
+    <ClCompile Include="..\src\WebAdmin.cpp" />
+    <ClCompile Include="..\src\World.cpp" />
+    <ClCompile Include="..\src\Mobs\AggressiveMonster.cpp" />
+    <ClCompile Include="..\src\Mobs\Bat.cpp" />
+    <ClCompile Include="..\src\Mobs\Blaze.cpp" />
+    <ClCompile Include="..\src\Mobs\Cavespider.cpp" />
+    <ClCompile Include="..\src\Mobs\Chicken.cpp" />
+    <ClCompile Include="..\src\Mobs\Cow.cpp" />
+    <ClCompile Include="..\src\Mobs\Creeper.cpp" />
+    <ClCompile Include="..\src\Mobs\EnderDragon.cpp" />
+    <ClCompile Include="..\src\Mobs\Enderman.cpp" />
+    <ClCompile Include="..\src\Mobs\Ghast.cpp" />
+    <ClCompile Include="..\src\Mobs\Giant.cpp" />
+    <ClCompile Include="..\src\Mobs\Horse.cpp" />
+    <ClCompile Include="..\src\Mobs\IronGolem.cpp" />
+    <ClCompile Include="..\src\Mobs\MagmaCube.cpp" />
+    <ClCompile Include="..\src\Mobs\Monster.cpp" />
+    <ClCompile Include="..\src\Mobs\Mooshroom.cpp" />
+    <ClCompile Include="..\src\Mobs\PassiveAggressiveMonster.cpp" />
+    <ClCompile Include="..\src\Mobs\PassiveMonster.cpp" />
+    <ClCompile Include="..\src\Mobs\Pig.cpp" />
+    <ClCompile Include="..\src\Mobs\Sheep.cpp" />
+    <ClCompile Include="..\src\Mobs\Skeleton.cpp" />
+    <ClCompile Include="..\src\Mobs\Slime.cpp" />
+    <ClCompile Include="..\src\Mobs\SnowGolem.cpp" />
+    <ClCompile Include="..\src\Mobs\Spider.cpp" />
+    <ClCompile Include="..\src\Mobs\Squid.cpp" />
+    <ClCompile Include="..\src\Mobs\Villager.cpp" />
+    <ClCompile Include="..\src\Mobs\Witch.cpp" />
+    <ClCompile Include="..\src\Mobs\Wither.cpp" />
+    <ClCompile Include="..\src\Mobs\Wolf.cpp" />
+    <ClCompile Include="..\src\Mobs\Zombie.cpp" />
+    <ClCompile Include="..\src\Mobs\ZombiePigman.cpp" />
+    <ClCompile Include="..\src\Entities\Boat.cpp" />
+    <ClCompile Include="..\src\Entities\Entity.cpp" />
+    <ClCompile Include="..\src\Entities\FallingBlock.cpp" />
+    <ClCompile Include="..\src\Entities\Minecart.cpp" />
+    <ClCompile Include="..\src\Entities\Pawn.cpp" />
+    <ClCompile Include="..\src\Entities\Pickup.cpp" />
+    <ClCompile Include="..\src\Entities\Player.cpp" />
+    <ClCompile Include="..\src\Entities\ProjectileEntity.cpp" />
+    <ClCompile Include="..\src\Entities\TNTEntity.cpp" />
+    <ClCompile Include="..\src\UI\SlotArea.cpp" />
+    <ClCompile Include="..\src\UI\Window.cpp" />
+    <ClCompile Include="..\src\Simulator\DelayedFluidSimulator.cpp" />
+    <ClCompile Include="..\src\Simulator\FireSimulator.cpp" />
+    <ClCompile Include="..\src\Simulator\FloodyFluidSimulator.cpp" />
+    <ClCompile Include="..\src\Simulator\FluidSimulator.cpp" />
+    <ClCompile Include="..\src\Simulator\RedstoneSimulator.cpp" />
+    <ClCompile Include="..\src\Simulator\SandSimulator.cpp" />
+    <ClCompile Include="..\src\Simulator\Simulator.cpp" />
+    <ClCompile Include="..\src\Simulator\SimulatorManager.cpp" />
+    <ClCompile Include="..\src\Simulator\VaporizeFluidSimulator.cpp" />
+    <ClCompile Include="..\src\OSSupport\BlockingTCPLink.cpp" />
+    <ClCompile Include="..\src\OSSupport\CriticalSection.cpp" />
+    <ClCompile Include="..\src\OSSupport\Event.cpp" />
+    <ClCompile Include="..\src\OSSupport\File.cpp" />
+    <ClCompile Include="..\src\OSSupport\GZipFile.cpp" />
+    <ClCompile Include="..\src\OSSupport\IsThread.cpp" />
+    <ClCompile Include="..\src\OSSupport\ListenThread.cpp" />
+    <ClCompile Include="..\src\OSSupport\Semaphore.cpp" />
+    <ClCompile Include="..\src\OSSupport\Sleep.cpp" />
+    <ClCompile Include="..\src\OSSupport\Socket.cpp" />
+    <ClCompile Include="..\src\OSSupport\SocketThreads.cpp" />
+    <ClCompile Include="..\src\OSSupport\Thread.cpp" />
+    <ClCompile Include="..\src\OSSupport\Timer.cpp" />
     <ClCompile Include="..\Android\jni\app-android.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -741,7 +737,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release profiled|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\source\Bindings.cpp">
+    <ClCompile Include="..\src\Bindings.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">
       </PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -751,15 +747,15 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\source\LuaState.cpp" />
-    <ClCompile Include="..\source\LuaWindow.cpp" />
-    <ClCompile Include="..\source\ManualBindings.cpp" />
-    <ClCompile Include="..\source\Plugin.cpp" />
-    <ClCompile Include="..\source\PluginLua.cpp" />
-    <ClCompile Include="..\source\PluginManager.cpp" />
-    <ClCompile Include="..\source\WebPlugin.cpp" />
-    <ClCompile Include="..\iniFile\iniFile.cpp" />
-    <ClCompile Include="..\source\md5\md5.cpp">
+    <ClCompile Include="..\src\LuaState.cpp" />
+    <ClCompile Include="..\src\LuaWindow.cpp" />
+    <ClCompile Include="..\src\ManualBindings.cpp" />
+    <ClCompile Include="..\src\Plugin.cpp" />
+    <ClCompile Include="..\src\PluginLua.cpp" />
+    <ClCompile Include="..\src\PluginManager.cpp" />
+    <ClCompile Include="..\src\WebPlugin.cpp" />
+    <ClCompile Include="..\lib\inifile\iniFile.cpp" />
+    <ClCompile Include="..\lib\md5\md5.cpp">
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">
       </PrecompiledHeader>
@@ -773,45 +769,45 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\source\WorldStorage\FastNBT.cpp" />
-    <ClCompile Include="..\source\WorldStorage\NBTChunkSerializer.cpp" />
-    <ClCompile Include="..\source\WorldStorage\WorldStorage.cpp" />
-    <ClCompile Include="..\source\WorldStorage\WSSAnvil.cpp" />
-    <ClCompile Include="..\source\WorldStorage\WSSCompact.cpp" />
-    <ClCompile Include="..\source\Generating\BioGen.cpp" />
-    <ClCompile Include="..\source\Generating\Caves.cpp" />
-    <ClCompile Include="..\source\Generating\ChunkDesc.cpp" />
-    <ClCompile Include="..\source\Generating\ChunkGenerator.cpp" />
-    <ClCompile Include="..\source\Generating\CompoGen.cpp" />
-    <ClCompile Include="..\source\Generating\ComposableGenerator.cpp" />
-    <ClCompile Include="..\source\Generating\DistortedHeightmap.cpp" />
-    <ClCompile Include="..\source\Generating\EndGen.cpp" />
-    <ClCompile Include="..\source\Generating\FinishGen.cpp" />
-    <ClCompile Include="..\source\Generating\HeiGen.cpp" />
-    <ClCompile Include="..\source\Generating\MineShafts.cpp" />
-    <ClCompile Include="..\source\Generating\Noise3DGenerator.cpp" />
-    <ClCompile Include="..\source\Generating\Ravines.cpp" />
-    <ClCompile Include="..\source\Generating\StructGen.cpp" />
-    <ClCompile Include="..\source\Generating\Trees.cpp" />
-    <ClCompile Include="..\source\Blocks\BlockBed.cpp" />
-    <ClCompile Include="..\source\Blocks\BlockButton.cpp" />
-    <ClCompile Include="..\source\Blocks\BlockComparator.cpp" />
-    <ClCompile Include="..\source\blocks\BlockDoor.cpp" />
-    <ClCompile Include="..\source\blocks\BlockHandler.cpp" />
-    <ClCompile Include="..\source\Blocks\BlockLever.cpp" />
-    <ClCompile Include="..\source\blocks\BlockPiston.cpp" />
-    <ClCompile Include="..\source\blocks\BlockRedstone.cpp" />
-    <ClCompile Include="..\source\blocks\BlockRedstoneRepeater.cpp" />
-    <ClCompile Include="..\source\items\ItemHandler.cpp" />
-    <ClCompile Include="..\source\Protocol\ChunkDataSerializer.cpp" />
-    <ClCompile Include="..\source\Protocol\Protocol125.cpp" />
-    <ClCompile Include="..\source\Protocol\Protocol132.cpp" />
-    <ClCompile Include="..\source\Protocol\Protocol14x.cpp" />
-    <ClCompile Include="..\source\Protocol\Protocol15x.cpp" />
-    <ClCompile Include="..\source\Protocol\Protocol16x.cpp" />
-    <ClCompile Include="..\source\Protocol\Protocol17x.cpp" />
-    <ClCompile Include="..\source\Protocol\ProtocolRecognizer.cpp" />
-    <ClCompile Include="..\source\sqlite\lsqlite3.c">
+    <ClCompile Include="..\src\WorldStorage\FastNBT.cpp" />
+    <ClCompile Include="..\src\WorldStorage\NBTChunkSerializer.cpp" />
+    <ClCompile Include="..\src\WorldStorage\WorldStorage.cpp" />
+    <ClCompile Include="..\src\WorldStorage\WSSAnvil.cpp" />
+    <ClCompile Include="..\src\WorldStorage\WSSCompact.cpp" />
+    <ClCompile Include="..\src\Generating\BioGen.cpp" />
+    <ClCompile Include="..\src\Generating\Caves.cpp" />
+    <ClCompile Include="..\src\Generating\ChunkDesc.cpp" />
+    <ClCompile Include="..\src\Generating\ChunkGenerator.cpp" />
+    <ClCompile Include="..\src\Generating\CompoGen.cpp" />
+    <ClCompile Include="..\src\Generating\ComposableGenerator.cpp" />
+    <ClCompile Include="..\src\Generating\DistortedHeightmap.cpp" />
+    <ClCompile Include="..\src\Generating\EndGen.cpp" />
+    <ClCompile Include="..\src\Generating\FinishGen.cpp" />
+    <ClCompile Include="..\src\Generating\HeiGen.cpp" />
+    <ClCompile Include="..\src\Generating\MineShafts.cpp" />
+    <ClCompile Include="..\src\Generating\Noise3DGenerator.cpp" />
+    <ClCompile Include="..\src\Generating\Ravines.cpp" />
+    <ClCompile Include="..\src\Generating\StructGen.cpp" />
+    <ClCompile Include="..\src\Generating\Trees.cpp" />
+    <ClCompile Include="..\src\Blocks\BlockBed.cpp" />
+    <ClCompile Include="..\src\Blocks\BlockButton.cpp" />
+    <ClCompile Include="..\src\Blocks\BlockComparator.cpp" />
+    <ClCompile Include="..\src\blocks\BlockDoor.cpp" />
+    <ClCompile Include="..\src\blocks\BlockHandler.cpp" />
+    <ClCompile Include="..\src\Blocks\BlockLever.cpp" />
+    <ClCompile Include="..\src\blocks\BlockPiston.cpp" />
+    <ClCompile Include="..\src\blocks\BlockRedstone.cpp" />
+    <ClCompile Include="..\src\blocks\BlockRedstoneRepeater.cpp" />
+    <ClCompile Include="..\src\items\ItemHandler.cpp" />
+    <ClCompile Include="..\src\Protocol\ChunkDataSerializer.cpp" />
+    <ClCompile Include="..\src\Protocol\Protocol125.cpp" />
+    <ClCompile Include="..\src\Protocol\Protocol132.cpp" />
+    <ClCompile Include="..\src\Protocol\Protocol14x.cpp" />
+    <ClCompile Include="..\src\Protocol\Protocol15x.cpp" />
+    <ClCompile Include="..\src\Protocol\Protocol16x.cpp" />
+    <ClCompile Include="..\src\Protocol\Protocol17x.cpp" />
+    <ClCompile Include="..\src\Protocol\ProtocolRecognizer.cpp" />
+    <ClCompile Include="..\lib\sqlite\lsqlite3.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">
       </PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -821,7 +817,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\source\sqlite\sqlite3.c">
+    <ClCompile Include="..\lib\sqlite\sqlite3.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">
       </PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -831,7 +827,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\source\LuaExpat\lxplib.c">
+    <ClCompile Include="..\lib\luaexpat\lxplib.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">
       </PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -841,26 +837,27 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\source\BlockEntities\ChestEntity.cpp" />
-    <ClCompile Include="..\source\BlockEntities\DispenserEntity.cpp" />
-    <ClCompile Include="..\source\BlockEntities\DropperEntity.cpp" />
-    <ClCompile Include="..\source\BlockEntities\DropSpenserEntity.cpp" />
-    <ClCompile Include="..\source\BlockEntities\FurnaceEntity.cpp" />
-    <ClCompile Include="..\source\BlockEntities\HopperEntity.cpp" />
-    <ClCompile Include="..\source\BlockEntities\JukeboxEntity.cpp" />
-    <ClCompile Include="..\source\BlockEntities\NoteEntity.cpp" />
-    <ClCompile Include="..\source\BlockEntities\SignEntity.cpp" />
-    <ClCompile Include="..\source\HTTPServer\EnvelopeParser.cpp" />
-    <ClCompile Include="..\source\HTTPServer\HTTPConnection.cpp" />
-    <ClCompile Include="..\source\HTTPServer\HTTPFormParser.cpp" />
-    <ClCompile Include="..\source\HTTPServer\HTTPMessage.cpp" />
-    <ClCompile Include="..\source\HTTPServer\HTTPServer.cpp" />
-    <ClCompile Include="..\source\HTTPServer\MultipartParser.cpp" />
-    <ClCompile Include="..\source\HTTPServer\NameValueParser.cpp" />
+    <ClCompile Include="..\src\BlockEntities\BlockEntity.cpp" />
+    <ClCompile Include="..\src\BlockEntities\ChestEntity.cpp" />
+    <ClCompile Include="..\src\BlockEntities\DispenserEntity.cpp" />
+    <ClCompile Include="..\src\BlockEntities\DropperEntity.cpp" />
+    <ClCompile Include="..\src\BlockEntities\DropSpenserEntity.cpp" />
+    <ClCompile Include="..\src\BlockEntities\FurnaceEntity.cpp" />
+    <ClCompile Include="..\src\BlockEntities\HopperEntity.cpp" />
+    <ClCompile Include="..\src\BlockEntities\JukeboxEntity.cpp" />
+    <ClCompile Include="..\src\BlockEntities\NoteEntity.cpp" />
+    <ClCompile Include="..\src\BlockEntities\SignEntity.cpp" />
+    <ClCompile Include="..\src\HTTPServer\EnvelopeParser.cpp" />
+    <ClCompile Include="..\src\HTTPServer\HTTPConnection.cpp" />
+    <ClCompile Include="..\src\HTTPServer\HTTPFormParser.cpp" />
+    <ClCompile Include="..\src\HTTPServer\HTTPMessage.cpp" />
+    <ClCompile Include="..\src\HTTPServer\HTTPServer.cpp" />
+    <ClCompile Include="..\src\HTTPServer\MultipartParser.cpp" />
+    <ClCompile Include="..\src\HTTPServer\NameValueParser.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\MCServer\API.txt" />
-    <Text Include="..\source\sqlite\urls.txt" />
+    <Text Include="..\lib\sqlite\urls.txt" />
     <Text Include="..\MCServer\crafting.txt" />
     <Text Include="..\MCServer\furnace.txt" />
   </ItemGroup>
diff --git a/VC2013/MCServer.vcxproj.filters b/VC2013/MCServer.vcxproj.filters
index 2a752bcdc..c68637ba1 100644
--- a/VC2013/MCServer.vcxproj.filters
+++ b/VC2013/MCServer.vcxproj.filters
@@ -10,73 +10,73 @@
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
     <Filter Include="Source Files\Mobs">
-      <UniqueIdentifier>{74c155c0-0f2d-4d4d-bf75-cc60408854f9}</UniqueIdentifier>
+      <UniqueIdentifier>{0c1dd2bf-04b0-4605-b963-b187e900b4a1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Entities">
-      <UniqueIdentifier>{0e9000fa-a1b6-4899-b0fb-66d8daa8c0e5}</UniqueIdentifier>
+      <UniqueIdentifier>{5c101216-8e22-4ad4-a27d-1572a4d95947}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\UI">
-      <UniqueIdentifier>{a9d61705-26a1-4f89-ab9c-d73286417d25}</UniqueIdentifier>
+      <UniqueIdentifier>{eb7a158f-f532-4db5-9314-fca01f04a38e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Simulator">
-      <UniqueIdentifier>{6f57d9e4-3758-4a17-a3a4-fd8ee5f9e398}</UniqueIdentifier>
+      <UniqueIdentifier>{c378fbaa-2232-4123-a58d-84f2e2e32376}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\OSSupport">
-      <UniqueIdentifier>{b58a4bc8-5be3-438d-8c21-bc56db2e66d2}</UniqueIdentifier>
+      <UniqueIdentifier>{be34fc66-075c-45f0-a292-e4ace73a5726}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\OSSupport\Android Specific">
-      <UniqueIdentifier>{6f4125b6-47ff-4de0-8294-839dab538b65}</UniqueIdentifier>
+      <UniqueIdentifier>{8dcfacbc-454b-4530-af61-d9db5aebb5bd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Bindings">
-      <UniqueIdentifier>{6fe6ae96-c1aa-4968-b4ef-9d6f8c3f2888}</UniqueIdentifier>
+      <UniqueIdentifier>{3fa4b52a-1b33-4e8c-8e0c-5818dbd5de15}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\External">
-      <UniqueIdentifier>{30704df7-b1ff-4bfc-aedf-afe4afcada3f}</UniqueIdentifier>
+      <UniqueIdentifier>{50cbaa98-dc12-4cc9-9ba6-4e08e885c924}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\WorldStorage">
-      <UniqueIdentifier>{0a54250c-fdb6-4b65-9102-20cd793a9b78}</UniqueIdentifier>
+      <UniqueIdentifier>{889b7953-c303-448a-8cf9-ca624011d131}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Generating">
-      <UniqueIdentifier>{bea06b59-4fed-4e7f-ac87-2e9c0a1b6d27}</UniqueIdentifier>
+      <UniqueIdentifier>{9313323e-633a-4c87-812c-0dda81b2a509}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Blocks">
-      <UniqueIdentifier>{a5a43ccd-e85d-4723-9c8a-3f83c730f597}</UniqueIdentifier>
+      <UniqueIdentifier>{61f1ea93-c0b0-4296-81fa-808116542dc8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Items">
-      <UniqueIdentifier>{b5f65bf0-470c-4c3c-9777-a7f3b79b8166}</UniqueIdentifier>
+      <UniqueIdentifier>{61efdcbf-e2d5-477f-8d67-a81c5ab3d6e6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\Protocol">
-      <UniqueIdentifier>{95e9878e-81c3-4b84-aa1c-d464d2a95883}</UniqueIdentifier>
+      <UniqueIdentifier>{86f6a355-fd04-4ba5-82b0-0fb57897da8d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\SQLite">
-      <UniqueIdentifier>{a67840b7-95ac-447f-9f23-d779aeaf5f49}</UniqueIdentifier>
+      <UniqueIdentifier>{dacfe6a2-94db-4257-8727-0f9a8c70fc8f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\LuaExpat">
-      <UniqueIdentifier>{bee4489c-556e-4eff-876e-b46b16eb33dc}</UniqueIdentifier>
+      <UniqueIdentifier>{b41f78d8-61f8-4476-86cf-d08080418dcb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\BlockEntities">
-      <UniqueIdentifier>{28f497b8-c75d-44e6-8e0c-8617cb56eb37}</UniqueIdentifier>
+      <UniqueIdentifier>{78f41ac0-8ed5-4951-8373-2aed18d9c741}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\HTTPServer">
-      <UniqueIdentifier>{a9725758-b517-4602-a8e1-ffb950215db8}</UniqueIdentifier>
+      <UniqueIdentifier>{fc1463dd-e130-49cb-96cf-ee6755cf2de1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Config files">
-      <UniqueIdentifier>{ab501743-5b5d-449e-8ed7-bc823368a58c}</UniqueIdentifier>
+      <UniqueIdentifier>{a50ba11b-40c8-43ff-aa5b-aac2e4285df0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Plugins">
-      <UniqueIdentifier>{baf72963-ce16-452e-80b2-a653fe04b25a}</UniqueIdentifier>
+      <UniqueIdentifier>{37df6f7f-93ff-4c4a-89cf-77bb6feb215f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Plugins\Core">
-      <UniqueIdentifier>{05040adb-d357-4712-b326-d8cad05f6e40}</UniqueIdentifier>
+      <UniqueIdentifier>{3d8e534e-8cd7-4dc5-9626-a1ce9559c118}</UniqueIdentifier>
     </Filter>
     <Filter Include="Plugins\ChatLog">
-      <UniqueIdentifier>{f2962218-2274-4d13-bd40-ff09c634ae1f}</UniqueIdentifier>
+      <UniqueIdentifier>{4419315f-3ef3-490d-ba0a-df22565b9a02}</UniqueIdentifier>
     </Filter>
     <Filter Include="Plugins\Debuggers">
-      <UniqueIdentifier>{ad918b66-c94a-4c54-ad79-6733424e8083}</UniqueIdentifier>
+      <UniqueIdentifier>{3491f495-c715-4a5b-845e-1638a4ef0127}</UniqueIdentifier>
     </Filter>
     <Filter Include="Plugins\APIDump">
-      <UniqueIdentifier>{7f151cf3-a835-4e77-9c43-0a3d4bd02714}</UniqueIdentifier>
+      <UniqueIdentifier>{4bb6b059-2004-4795-a0e7-d401affb3063}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -93,847 +93,847 @@
     <ClInclude Include="resource_MCServer.h">
       <Filter>Resource Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Authenticator.h">
+    <ClInclude Include="..\src\Authenticator.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\BlockArea.h">
+    <ClInclude Include="..\src\BlockArea.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\BlockID.h">
+    <ClInclude Include="..\src\BlockID.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\BlockTracer.h">
+    <ClInclude Include="..\src\BlockTracer.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\BoundingBox.h">
+    <ClInclude Include="..\src\BoundingBox.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\ByteBuffer.h">
+    <ClInclude Include="..\src\ByteBuffer.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\ChatColor.h">
+    <ClInclude Include="..\src\ChatColor.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Chunk.h">
+    <ClInclude Include="..\src\Chunk.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Chunk.inl.h">
+    <ClInclude Include="..\src\Chunk.inl.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\ChunkDef.h">
+    <ClInclude Include="..\src\ChunkDef.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\ChunkMap.h">
+    <ClInclude Include="..\src\ChunkMap.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\ChunkSender.h">
+    <ClInclude Include="..\src\ChunkSender.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\ClientHandle.h">
+    <ClInclude Include="..\src\ClientHandle.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\CommandOutput.h">
+    <ClInclude Include="..\src\CommandOutput.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\CraftingRecipes.h">
+    <ClInclude Include="..\src\CraftingRecipes.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Cuboid.h">
+    <ClInclude Include="..\src\Cuboid.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\DeadlockDetect.h">
+    <ClInclude Include="..\src\DeadlockDetect.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Defines.h">
+    <ClInclude Include="..\src\Defines.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Enchantments.h">
+    <ClInclude Include="..\src\Enchantments.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Endianness.h">
+    <ClInclude Include="..\src\Endianness.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\FastRandom.h">
+    <ClInclude Include="..\src\FastRandom.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\FurnaceRecipe.h">
+    <ClInclude Include="..\src\FurnaceRecipe.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Globals.h">
+    <ClInclude Include="..\src\Globals.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Group.h">
+    <ClInclude Include="..\src\Group.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\GroupManager.h">
+    <ClInclude Include="..\src\GroupManager.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Inventory.h">
+    <ClInclude Include="..\src\Inventory.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Item.h">
+    <ClInclude Include="..\src\Item.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\ItemGrid.h">
+    <ClInclude Include="..\src\ItemGrid.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Ladder.h">
+    <ClInclude Include="..\src\Ladder.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\LeakFinder.h">
+    <ClInclude Include="..\src\LeakFinder.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\LightingThread.h">
+    <ClInclude Include="..\src\LightingThread.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\LinearInterpolation.h">
+    <ClInclude Include="..\src\LinearInterpolation.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\LinearUpscale.h">
+    <ClInclude Include="..\src\LinearUpscale.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\LineBlockTracer.h">
+    <ClInclude Include="..\src\LineBlockTracer.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Log.h">
+    <ClInclude Include="..\src\Log.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Matrix4f.h">
+    <ClInclude Include="..\src\Matrix4f.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\MCLogger.h">
+    <ClInclude Include="..\src\MCLogger.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\MemoryLeak.h">
+    <ClInclude Include="..\src\MemoryLeak.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\MersenneTwister.h">
+    <ClInclude Include="..\src\MersenneTwister.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\MobCensus.h">
+    <ClInclude Include="..\src\MobCensus.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\MobFamilyCollecter.h">
+    <ClInclude Include="..\src\MobFamilyCollecter.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\MobProximityCounter.h">
+    <ClInclude Include="..\src\MobProximityCounter.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\MobSpawner.h">
+    <ClInclude Include="..\src\MobSpawner.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\MonsterConfig.h">
+    <ClInclude Include="..\src\MonsterConfig.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Noise.h">
+    <ClInclude Include="..\src\Noise.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Piston.h">
+    <ClInclude Include="..\src\Piston.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\ProbabDistrib.h">
+    <ClInclude Include="..\src\ProbabDistrib.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\RCONServer.h">
+    <ClInclude Include="..\src\RCONServer.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\ReferenceManager.h">
+    <ClInclude Include="..\src\ReferenceManager.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Root.h">
+    <ClInclude Include="..\src\Root.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Server.h">
+    <ClInclude Include="..\src\Server.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Sign.h">
+    <ClInclude Include="..\src\Sign.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\StackWalker.h">
+    <ClInclude Include="..\src\StackWalker.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\StringCompression.h">
+    <ClInclude Include="..\src\StringCompression.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\StringUtils.h">
+    <ClInclude Include="..\src\StringUtils.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Tracer.h">
+    <ClInclude Include="..\src\Tracer.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Vector3d.h">
+    <ClInclude Include="..\src\Vector3d.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Vector3f.h">
+    <ClInclude Include="..\src\Vector3f.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Vector3i.h">
+    <ClInclude Include="..\src\Vector3i.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\WebAdmin.h">
+    <ClInclude Include="..\src\WebAdmin.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\World.h">
+    <ClInclude Include="..\src\World.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\AggressiveMonster.h">
+    <ClInclude Include="..\src\Mobs\AggressiveMonster.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Bat.h">
+    <ClInclude Include="..\src\Mobs\Bat.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Blaze.h">
+    <ClInclude Include="..\src\Mobs\Blaze.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Cavespider.h">
+    <ClInclude Include="..\src\Mobs\Cavespider.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Chicken.h">
+    <ClInclude Include="..\src\Mobs\Chicken.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Cow.h">
+    <ClInclude Include="..\src\Mobs\Cow.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Creeper.h">
+    <ClInclude Include="..\src\Mobs\Creeper.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\EnderDragon.h">
+    <ClInclude Include="..\src\Mobs\EnderDragon.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Enderman.h">
+    <ClInclude Include="..\src\Mobs\Enderman.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Ghast.h">
+    <ClInclude Include="..\src\Mobs\Ghast.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Giant.h">
+    <ClInclude Include="..\src\Mobs\Giant.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Horse.h">
+    <ClInclude Include="..\src\Mobs\Horse.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\IronGolem.h">
+    <ClInclude Include="..\src\Mobs\IronGolem.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\MagmaCube.h">
+    <ClInclude Include="..\src\Mobs\MagmaCube.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Monster.h">
+    <ClInclude Include="..\src\Mobs\Monster.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Mooshroom.h">
+    <ClInclude Include="..\src\Mobs\Mooshroom.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Ocelot.h">
+    <ClInclude Include="..\src\Mobs\Ocelot.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\PassiveAggressiveMonster.h">
+    <ClInclude Include="..\src\Mobs\PassiveAggressiveMonster.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\PassiveMonster.h">
+    <ClInclude Include="..\src\Mobs\PassiveMonster.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Pig.h">
+    <ClInclude Include="..\src\Mobs\Pig.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Sheep.h">
+    <ClInclude Include="..\src\Mobs\Sheep.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Silverfish.h">
+    <ClInclude Include="..\src\Mobs\Silverfish.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Skeleton.h">
+    <ClInclude Include="..\src\Mobs\Skeleton.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Slime.h">
+    <ClInclude Include="..\src\Mobs\Slime.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\SnowGolem.h">
+    <ClInclude Include="..\src\Mobs\SnowGolem.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Spider.h">
+    <ClInclude Include="..\src\Mobs\Spider.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Squid.h">
+    <ClInclude Include="..\src\Mobs\Squid.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Villager.h">
+    <ClInclude Include="..\src\Mobs\Villager.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Witch.h">
+    <ClInclude Include="..\src\Mobs\Witch.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Wither.h">
+    <ClInclude Include="..\src\Mobs\Wither.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Wolf.h">
+    <ClInclude Include="..\src\Mobs\Wolf.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\Zombie.h">
+    <ClInclude Include="..\src\Mobs\Zombie.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Mobs\ZombiePigman.h">
+    <ClInclude Include="..\src\Mobs\ZombiePigman.h">
       <Filter>Source Files\Mobs</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Entities\Boat.h">
+    <ClInclude Include="..\src\Entities\Boat.h">
       <Filter>Source Files\Entities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Entities\Entity.h">
+    <ClInclude Include="..\src\Entities\Entity.h">
       <Filter>Source Files\Entities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Entities\FallingBlock.h">
+    <ClInclude Include="..\src\Entities\FallingBlock.h">
       <Filter>Source Files\Entities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Entities\Minecart.h">
+    <ClInclude Include="..\src\Entities\Minecart.h">
       <Filter>Source Files\Entities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Entities\Pawn.h">
+    <ClInclude Include="..\src\Entities\Pawn.h">
       <Filter>Source Files\Entities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Entities\Pickup.h">
+    <ClInclude Include="..\src\Entities\Pickup.h">
       <Filter>Source Files\Entities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Entities\Player.h">
+    <ClInclude Include="..\src\Entities\Player.h">
       <Filter>Source Files\Entities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Entities\ProjectileEntity.h">
+    <ClInclude Include="..\src\Entities\ProjectileEntity.h">
       <Filter>Source Files\Entities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Entities\TNTEntity.h">
+    <ClInclude Include="..\src\Entities\TNTEntity.h">
       <Filter>Source Files\Entities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\UI\SlotArea.h">
+    <ClInclude Include="..\src\UI\SlotArea.h">
       <Filter>Source Files\UI</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\UI\Window.h">
+    <ClInclude Include="..\src\UI\Window.h">
       <Filter>Source Files\UI</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\UI\WindowOwner.h">
+    <ClInclude Include="..\src\UI\WindowOwner.h">
       <Filter>Source Files\UI</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Simulator\DelayedFluidSimulator.h">
+    <ClInclude Include="..\src\Simulator\DelayedFluidSimulator.h">
       <Filter>Source Files\Simulator</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Simulator\FireSimulator.h">
+    <ClInclude Include="..\src\Simulator\FireSimulator.h">
       <Filter>Source Files\Simulator</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Simulator\FloodyFluidSimulator.h">
+    <ClInclude Include="..\src\Simulator\FloodyFluidSimulator.h">
       <Filter>Source Files\Simulator</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Simulator\FluidSimulator.h">
+    <ClInclude Include="..\src\Simulator\FluidSimulator.h">
       <Filter>Source Files\Simulator</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Simulator\NoopFluidSimulator.h">
+    <ClInclude Include="..\src\Simulator\NoopFluidSimulator.h">
       <Filter>Source Files\Simulator</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Simulator\RedstoneSimulator.h">
+    <ClInclude Include="..\src\Simulator\RedstoneSimulator.h">
       <Filter>Source Files\Simulator</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Simulator\SandSimulator.h">
+    <ClInclude Include="..\src\Simulator\SandSimulator.h">
       <Filter>Source Files\Simulator</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Simulator\Simulator.h">
+    <ClInclude Include="..\src\Simulator\Simulator.h">
       <Filter>Source Files\Simulator</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Simulator\SimulatorManager.h">
+    <ClInclude Include="..\src\Simulator\SimulatorManager.h">
       <Filter>Source Files\Simulator</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Simulator\VaporizeFluidSimulator.h">
+    <ClInclude Include="..\src\Simulator\VaporizeFluidSimulator.h">
       <Filter>Source Files\Simulator</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\OSSupport\BlockingTCPLink.h">
+    <ClInclude Include="..\src\OSSupport\BlockingTCPLink.h">
       <Filter>Source Files\OSSupport</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\OSSupport\CriticalSection.h">
+    <ClInclude Include="..\src\OSSupport\CriticalSection.h">
       <Filter>Source Files\OSSupport</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\OSSupport\Event.h">
+    <ClInclude Include="..\src\OSSupport\Event.h">
       <Filter>Source Files\OSSupport</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\OSSupport\File.h">
+    <ClInclude Include="..\src\OSSupport\File.h">
       <Filter>Source Files\OSSupport</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\OSSupport\GZipFile.h">
+    <ClInclude Include="..\src\OSSupport\GZipFile.h">
       <Filter>Source Files\OSSupport</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\OSSupport\IsThread.h">
+    <ClInclude Include="..\src\OSSupport\IsThread.h">
       <Filter>Source Files\OSSupport</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\OSSupport\ListenThread.h">
+    <ClInclude Include="..\src\OSSupport\ListenThread.h">
       <Filter>Source Files\OSSupport</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\OSSupport\Semaphore.h">
+    <ClInclude Include="..\src\OSSupport\Semaphore.h">
       <Filter>Source Files\OSSupport</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\OSSupport\Sleep.h">
+    <ClInclude Include="..\src\OSSupport\Sleep.h">
       <Filter>Source Files\OSSupport</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\OSSupport\Socket.h">
+    <ClInclude Include="..\src\OSSupport\Socket.h">
       <Filter>Source Files\OSSupport</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\OSSupport\SocketThreads.h">
+    <ClInclude Include="..\src\OSSupport\SocketThreads.h">
       <Filter>Source Files\OSSupport</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\OSSupport\Thread.h">
+    <ClInclude Include="..\src\OSSupport\Thread.h">
       <Filter>Source Files\OSSupport</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\OSSupport\Timer.h">
+    <ClInclude Include="..\src\OSSupport\Timer.h">
       <Filter>Source Files\OSSupport</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Bindings.h">
+    <ClInclude Include="..\src\Bindings.h">
       <Filter>Source Files\Bindings</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\LuaFunctions.h">
+    <ClInclude Include="..\src\LuaFunctions.h">
       <Filter>Source Files\Bindings</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\LuaState.h">
+    <ClInclude Include="..\src\LuaState.h">
       <Filter>Source Files\Bindings</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\LuaWindow.h">
+    <ClInclude Include="..\src\LuaWindow.h">
       <Filter>Source Files\Bindings</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\ManualBindings.h">
+    <ClInclude Include="..\src\ManualBindings.h">
       <Filter>Source Files\Bindings</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Plugin.h">
+    <ClInclude Include="..\src\Plugin.h">
       <Filter>Source Files\Bindings</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\PluginLua.h">
+    <ClInclude Include="..\src\PluginLua.h">
       <Filter>Source Files\Bindings</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\PluginManager.h">
+    <ClInclude Include="..\src\PluginManager.h">
       <Filter>Source Files\Bindings</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\tolua++.h">
+    <ClInclude Include="..\src\tolua++.h">
       <Filter>Source Files\Bindings</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\tolua_base.h">
+    <ClInclude Include="..\src\tolua_base.h">
       <Filter>Source Files\Bindings</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\WebPlugin.h">
+    <ClInclude Include="..\src\WebPlugin.h">
       <Filter>Source Files\Bindings</Filter>
     </ClInclude>
-    <ClInclude Include="..\iniFile\iniFile.h">
+    <ClInclude Include="..\lib\inifile\iniFile.h">
       <Filter>Source Files\External</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\md5\md5.h">
+    <ClInclude Include="..\lib\md5\md5.h">
       <Filter>Source Files\External</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\WorldStorage\FastNBT.h">
+    <ClInclude Include="..\src\WorldStorage\FastNBT.h">
       <Filter>Source Files\WorldStorage</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\WorldStorage\NBTChunkSerializer.h">
+    <ClInclude Include="..\src\WorldStorage\NBTChunkSerializer.h">
       <Filter>Source Files\WorldStorage</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\WorldStorage\WorldStorage.h">
+    <ClInclude Include="..\src\WorldStorage\WorldStorage.h">
       <Filter>Source Files\WorldStorage</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\WorldStorage\WSSAnvil.h">
+    <ClInclude Include="..\src\WorldStorage\WSSAnvil.h">
       <Filter>Source Files\WorldStorage</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\WorldStorage\WSSCompact.h">
+    <ClInclude Include="..\src\WorldStorage\WSSCompact.h">
       <Filter>Source Files\WorldStorage</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Generating\BioGen.h">
+    <ClInclude Include="..\src\Generating\BioGen.h">
       <Filter>Source Files\Generating</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Generating\Caves.h">
+    <ClInclude Include="..\src\Generating\Caves.h">
       <Filter>Source Files\Generating</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Generating\ChunkDesc.h">
+    <ClInclude Include="..\src\Generating\ChunkDesc.h">
       <Filter>Source Files\Generating</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Generating\ChunkGenerator.h">
+    <ClInclude Include="..\src\Generating\ChunkGenerator.h">
       <Filter>Source Files\Generating</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Generating\CompoGen.h">
+    <ClInclude Include="..\src\Generating\CompoGen.h">
       <Filter>Source Files\Generating</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Generating\ComposableGenerator.h">
+    <ClInclude Include="..\src\Generating\ComposableGenerator.h">
       <Filter>Source Files\Generating</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Generating\DistortedHeightmap.h">
+    <ClInclude Include="..\src\Generating\DistortedHeightmap.h">
       <Filter>Source Files\Generating</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Generating\EndGen.h">
+    <ClInclude Include="..\src\Generating\EndGen.h">
       <Filter>Source Files\Generating</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Generating\FinishGen.h">
+    <ClInclude Include="..\src\Generating\FinishGen.h">
       <Filter>Source Files\Generating</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Generating\HeiGen.h">
+    <ClInclude Include="..\src\Generating\HeiGen.h">
       <Filter>Source Files\Generating</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Generating\MineShafts.h">
+    <ClInclude Include="..\src\Generating\MineShafts.h">
       <Filter>Source Files\Generating</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Generating\Noise3DGenerator.h">
+    <ClInclude Include="..\src\Generating\Noise3DGenerator.h">
       <Filter>Source Files\Generating</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Generating\Ravines.h">
+    <ClInclude Include="..\src\Generating\Ravines.h">
       <Filter>Source Files\Generating</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Generating\StructGen.h">
+    <ClInclude Include="..\src\Generating\StructGen.h">
       <Filter>Source Files\Generating</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Generating\Trees.h">
+    <ClInclude Include="..\src\Generating\Trees.h">
       <Filter>Source Files\Generating</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockBed.h">
+    <ClInclude Include="..\src\blocks\BlockBed.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Blocks\BlockBrewingStand.h">
+    <ClInclude Include="..\src\Blocks\BlockBrewingStand.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Blocks\BlockButton.h">
+    <ClInclude Include="..\src\Blocks\BlockButton.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockCactus.h">
+    <ClInclude Include="..\src\blocks\BlockCactus.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Blocks\BlockCarpet.h">
+    <ClInclude Include="..\src\Blocks\BlockCarpet.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Blocks\BlockCauldron.h">
+    <ClInclude Include="..\src\Blocks\BlockCauldron.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockChest.h">
+    <ClInclude Include="..\src\blocks\BlockChest.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockCloth.h">
+    <ClInclude Include="..\src\blocks\BlockCloth.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Blocks\BlockCobWeb.h">
+    <ClInclude Include="..\src\Blocks\BlockCobWeb.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Blocks\BlockComparator.h">
+    <ClInclude Include="..\src\Blocks\BlockComparator.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockCrops.h">
+    <ClInclude Include="..\src\blocks\BlockCrops.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Blocks\BlockDeadBush.h">
+    <ClInclude Include="..\src\Blocks\BlockDeadBush.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockDirt.h">
+    <ClInclude Include="..\src\blocks\BlockDirt.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockDoor.h">
+    <ClInclude Include="..\src\blocks\BlockDoor.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockDropSpenser.h">
+    <ClInclude Include="..\src\blocks\BlockDropSpenser.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Blocks\BlockEnderchest.h">
+    <ClInclude Include="..\src\Blocks\BlockEnderchest.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockEntity.h">
+    <ClInclude Include="..\src\blocks\BlockEntity.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Blocks\BlockFarmland.h">
+    <ClInclude Include="..\src\Blocks\BlockFarmland.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Blocks\BlockFenceGate.h">
+    <ClInclude Include="..\src\Blocks\BlockFenceGate.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockFire.h">
+    <ClInclude Include="..\src\blocks\BlockFire.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockFlower.h">
+    <ClInclude Include="..\src\blocks\BlockFlower.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Blocks\BlockFlowerPot.h">
+    <ClInclude Include="..\src\Blocks\BlockFlowerPot.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockFluid.h">
+    <ClInclude Include="..\src\blocks\BlockFluid.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockFurnace.h">
+    <ClInclude Include="..\src\blocks\BlockFurnace.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Blocks\BlockGlass.h">
+    <ClInclude Include="..\src\Blocks\BlockGlass.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockGlowstone.h">
+    <ClInclude Include="..\src\blocks\BlockGlowstone.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockGravel.h">
+    <ClInclude Include="..\src\blocks\BlockGravel.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockHandler.h">
+    <ClInclude Include="..\src\blocks\BlockHandler.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Blocks\BlockHopper.h">
+    <ClInclude Include="..\src\Blocks\BlockHopper.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockIce.h">
+    <ClInclude Include="..\src\blocks\BlockIce.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockLadder.h">
+    <ClInclude Include="..\src\blocks\BlockLadder.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockLeaves.h">
+    <ClInclude Include="..\src\blocks\BlockLeaves.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Blocks\BlockLever.h">
+    <ClInclude Include="..\src\Blocks\BlockLever.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockMelon.h">
+    <ClInclude Include="..\src\blocks\BlockMelon.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockMushroom.h">
+    <ClInclude Include="..\src\blocks\BlockMushroom.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Blocks\BlockMycelium.h">
+    <ClInclude Include="..\src\Blocks\BlockMycelium.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockNote.h">
+    <ClInclude Include="..\src\blocks\BlockNote.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockOre.h">
+    <ClInclude Include="..\src\blocks\BlockOre.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockPiston.h">
+    <ClInclude Include="..\src\blocks\BlockPiston.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockPlanks.h">
+    <ClInclude Include="..\src\blocks\BlockPlanks.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockPortal.h">
+    <ClInclude Include="..\src\blocks\BlockPortal.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Blocks\BlockPumpkin.h">
+    <ClInclude Include="..\src\Blocks\BlockPumpkin.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Blocks\BlockRail.h">
+    <ClInclude Include="..\src\Blocks\BlockRail.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockRedstone.h">
+    <ClInclude Include="..\src\blocks\BlockRedstone.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockRedstoneOre.h">
+    <ClInclude Include="..\src\blocks\BlockRedstoneOre.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockRedstoneRepeater.h">
+    <ClInclude Include="..\src\blocks\BlockRedstoneRepeater.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockRedstoneTorch.h">
+    <ClInclude Include="..\src\blocks\BlockRedstoneTorch.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockSand.h">
+    <ClInclude Include="..\src\blocks\BlockSand.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockSapling.h">
+    <ClInclude Include="..\src\blocks\BlockSapling.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockSign.h">
+    <ClInclude Include="..\src\blocks\BlockSign.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockSlab.h">
+    <ClInclude Include="..\src\blocks\BlockSlab.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockSnow.h">
+    <ClInclude Include="..\src\blocks\BlockSnow.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockStairs.h">
+    <ClInclude Include="..\src\blocks\BlockStairs.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockStems.h">
+    <ClInclude Include="..\src\blocks\BlockStems.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockStone.h">
+    <ClInclude Include="..\src\blocks\BlockStone.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockSugarcane.h">
+    <ClInclude Include="..\src\blocks\BlockSugarcane.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockTallGrass.h">
+    <ClInclude Include="..\src\blocks\BlockTallGrass.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockTorch.h">
+    <ClInclude Include="..\src\blocks\BlockTorch.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockVine.h">
+    <ClInclude Include="..\src\blocks\BlockVine.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockWood.h">
+    <ClInclude Include="..\src\blocks\BlockWood.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\blocks\BlockWorkbench.h">
+    <ClInclude Include="..\src\blocks\BlockWorkbench.h">
       <Filter>Source Files\Blocks</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemBed.h">
+    <ClInclude Include="..\src\items\ItemBed.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Items\ItemBoat.h">
+    <ClInclude Include="..\src\Items\ItemBoat.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Items\ItemBow.h">
+    <ClInclude Include="..\src\Items\ItemBow.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Items\ItemBrewingStand.h">
+    <ClInclude Include="..\src\Items\ItemBrewingStand.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemBucket.h">
+    <ClInclude Include="..\src\items\ItemBucket.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Items\ItemCauldron.h">
+    <ClInclude Include="..\src\Items\ItemCauldron.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemCloth.h">
+    <ClInclude Include="..\src\items\ItemCloth.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Items\ItemComparator.h">
+    <ClInclude Include="..\src\Items\ItemComparator.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemDoor.h">
+    <ClInclude Include="..\src\items\ItemDoor.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemDye.h">
+    <ClInclude Include="..\src\items\ItemDye.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Items\ItemFlowerPot.h">
+    <ClInclude Include="..\src\Items\ItemFlowerPot.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemFood.h">
+    <ClInclude Include="..\src\items\ItemFood.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemHandler.h">
+    <ClInclude Include="..\src\items\ItemHandler.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemHoe.h">
+    <ClInclude Include="..\src\items\ItemHoe.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemLeaves.h">
+    <ClInclude Include="..\src\items\ItemLeaves.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemLighter.h">
+    <ClInclude Include="..\src\items\ItemLighter.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Items\ItemMinecart.h">
+    <ClInclude Include="..\src\Items\ItemMinecart.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemPickaxe.h">
+    <ClInclude Include="..\src\items\ItemPickaxe.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemRedstoneDust.h">
+    <ClInclude Include="..\src\items\ItemRedstoneDust.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemRedstoneRepeater.h">
+    <ClInclude Include="..\src\items\ItemRedstoneRepeater.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemSapling.h">
+    <ClInclude Include="..\src\items\ItemSapling.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemSeeds.h">
+    <ClInclude Include="..\src\items\ItemSeeds.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemShears.h">
+    <ClInclude Include="..\src\items\ItemShears.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemShovel.h">
+    <ClInclude Include="..\src\items\ItemShovel.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemSign.h">
+    <ClInclude Include="..\src\items\ItemSign.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Items\ItemSpawnEgg.h">
+    <ClInclude Include="..\src\Items\ItemSpawnEgg.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemSugarcane.h">
+    <ClInclude Include="..\src\items\ItemSugarcane.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\items\ItemSword.h">
+    <ClInclude Include="..\src\items\ItemSword.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Items\ItemThrowable.h">
+    <ClInclude Include="..\src\Items\ItemThrowable.h">
       <Filter>Source Files\Items</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Protocol\ChunkDataSerializer.h">
+    <ClInclude Include="..\src\Protocol\ChunkDataSerializer.h">
       <Filter>Source Files\Protocol</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Protocol\Protocol.h">
+    <ClInclude Include="..\src\Protocol\Protocol.h">
       <Filter>Source Files\Protocol</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Protocol\Protocol125.h">
+    <ClInclude Include="..\src\Protocol\Protocol125.h">
       <Filter>Source Files\Protocol</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Protocol\Protocol132.h">
+    <ClInclude Include="..\src\Protocol\Protocol132.h">
       <Filter>Source Files\Protocol</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Protocol\Protocol14x.h">
+    <ClInclude Include="..\src\Protocol\Protocol14x.h">
       <Filter>Source Files\Protocol</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Protocol\Protocol15x.h">
+    <ClInclude Include="..\src\Protocol\Protocol15x.h">
       <Filter>Source Files\Protocol</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Protocol\Protocol16x.h">
+    <ClInclude Include="..\src\Protocol\Protocol16x.h">
       <Filter>Source Files\Protocol</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Protocol\Protocol17x.h">
+    <ClInclude Include="..\src\Protocol\Protocol17x.h">
       <Filter>Source Files\Protocol</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Protocol\ProtocolRecognizer.h">
+    <ClInclude Include="..\src\Protocol\ProtocolRecognizer.h">
       <Filter>Source Files\Protocol</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\sqlite\sqlite3.h">
+    <ClInclude Include="..\lib\sqlite\sqlite3.h">
       <Filter>Source Files\SQLite</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\LuaExpat\lxplib.h">
+    <ClInclude Include="..\lib\luaexpat\lxplib.h">
       <Filter>Source Files\LuaExpat</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\BlockEntities\BlockEntity.h">
+    <ClInclude Include="..\src\BlockEntities\BlockEntity.h">
       <Filter>Source Files\BlockEntities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\BlockEntities\BlockEntityWithItems.h">
+    <ClInclude Include="..\src\BlockEntities\BlockEntityWithItems.h">
       <Filter>Source Files\BlockEntities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\BlockEntities\ChestEntity.h">
+    <ClInclude Include="..\src\BlockEntities\ChestEntity.h">
       <Filter>Source Files\BlockEntities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\BlockEntities\DispenserEntity.h">
+    <ClInclude Include="..\src\BlockEntities\DispenserEntity.h">
       <Filter>Source Files\BlockEntities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\BlockEntities\DropperEntity.h">
+    <ClInclude Include="..\src\BlockEntities\DropperEntity.h">
       <Filter>Source Files\BlockEntities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\BlockEntities\DropSpenserEntity.h">
+    <ClInclude Include="..\src\BlockEntities\DropSpenserEntity.h">
       <Filter>Source Files\BlockEntities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\BlockEntities\FurnaceEntity.h">
+    <ClInclude Include="..\src\BlockEntities\FurnaceEntity.h">
       <Filter>Source Files\BlockEntities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\BlockEntities\HopperEntity.h">
+    <ClInclude Include="..\src\BlockEntities\HopperEntity.h">
       <Filter>Source Files\BlockEntities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\BlockEntities\JukeboxEntity.h">
+    <ClInclude Include="..\src\BlockEntities\JukeboxEntity.h">
       <Filter>Source Files\BlockEntities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\BlockEntities\NoteEntity.h">
+    <ClInclude Include="..\src\BlockEntities\NoteEntity.h">
       <Filter>Source Files\BlockEntities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\BlockEntities\SignEntity.h">
+    <ClInclude Include="..\src\BlockEntities\SignEntity.h">
       <Filter>Source Files\BlockEntities</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\HTTPServer\EnvelopeParser.h">
+    <ClInclude Include="..\src\HTTPServer\EnvelopeParser.h">
       <Filter>Source Files\HTTPServer</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\HTTPServer\HTTPConnection.h">
+    <ClInclude Include="..\src\HTTPServer\HTTPConnection.h">
       <Filter>Source Files\HTTPServer</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\HTTPServer\HTTPFormParser.h">
+    <ClInclude Include="..\src\HTTPServer\HTTPFormParser.h">
       <Filter>Source Files\HTTPServer</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\HTTPServer\HTTPMessage.h">
+    <ClInclude Include="..\src\HTTPServer\HTTPMessage.h">
       <Filter>Source Files\HTTPServer</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\HTTPServer\HTTPServer.h">
+    <ClInclude Include="..\src\HTTPServer\HTTPServer.h">
       <Filter>Source Files\HTTPServer</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\HTTPServer\MultipartParser.h">
+    <ClInclude Include="..\src\HTTPServer\MultipartParser.h">
       <Filter>Source Files\HTTPServer</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\HTTPServer\NameValueParser.h">
+    <ClInclude Include="..\src\HTTPServer\NameValueParser.h">
       <Filter>Source Files\HTTPServer</Filter>
     </ClInclude>
   </ItemGroup>
@@ -1096,352 +1096,352 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\source\Authenticator.cpp">
+    <ClCompile Include="..\src\Authenticator.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\BlockArea.cpp">
+    <ClCompile Include="..\src\BlockArea.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\BlockID.cpp">
+    <ClCompile Include="..\src\BlockID.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\BoundingBox.cpp">
+    <ClCompile Include="..\src\BoundingBox.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\ByteBuffer.cpp">
+    <ClCompile Include="..\src\ByteBuffer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\ChatColor.cpp">
+    <ClCompile Include="..\src\ChatColor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Chunk.cpp">
+    <ClCompile Include="..\src\Chunk.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\ChunkMap.cpp">
+    <ClCompile Include="..\src\ChunkMap.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\ChunkSender.cpp">
+    <ClCompile Include="..\src\ChunkSender.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\ClientHandle.cpp">
+    <ClCompile Include="..\src\ClientHandle.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\CommandOutput.cpp">
+    <ClCompile Include="..\src\CommandOutput.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\CraftingRecipes.cpp">
+    <ClCompile Include="..\src\CraftingRecipes.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Cuboid.cpp">
+    <ClCompile Include="..\src\Cuboid.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\DeadlockDetect.cpp">
+    <ClCompile Include="..\src\DeadlockDetect.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Enchantments.cpp">
+    <ClCompile Include="..\src\Enchantments.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\FastRandom.cpp">
+    <ClCompile Include="..\src\FastRandom.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\FurnaceRecipe.cpp">
+    <ClCompile Include="..\src\FurnaceRecipe.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Globals.cpp">
+    <ClCompile Include="..\src\Globals.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Group.cpp">
+    <ClCompile Include="..\src\Group.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\GroupManager.cpp">
+    <ClCompile Include="..\src\GroupManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Inventory.cpp">
+    <ClCompile Include="..\src\Inventory.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Item.cpp">
+    <ClCompile Include="..\src\Item.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\ItemGrid.cpp">
+    <ClCompile Include="..\src\ItemGrid.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\LeakFinder.cpp">
+    <ClCompile Include="..\src\LeakFinder.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\LightingThread.cpp">
+    <ClCompile Include="..\src\LightingThread.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\LinearInterpolation.cpp">
+    <ClCompile Include="..\src\LinearInterpolation.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\LineBlockTracer.cpp">
+    <ClCompile Include="..\src\LineBlockTracer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Log.cpp">
+    <ClCompile Include="..\src\Log.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\main.cpp">
+    <ClCompile Include="..\src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Matrix4f.cpp">
+    <ClCompile Include="..\src\Matrix4f.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\MCLogger.cpp">
+    <ClCompile Include="..\src\MCLogger.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\MobCensus.cpp">
+    <ClCompile Include="..\src\MobCensus.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\MobFamilyCollecter.cpp">
+    <ClCompile Include="..\src\MobFamilyCollecter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\MobProximityCounter.cpp">
+    <ClCompile Include="..\src\MobProximityCounter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\MobSpawner.cpp">
+    <ClCompile Include="..\src\MobSpawner.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\MonsterConfig.cpp">
+    <ClCompile Include="..\src\MonsterConfig.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Noise.cpp">
+    <ClCompile Include="..\src\Noise.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Piston.cpp">
+    <ClCompile Include="..\src\Piston.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\ProbabDistrib.cpp">
+    <ClCompile Include="..\src\ProbabDistrib.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\RCONServer.cpp">
+    <ClCompile Include="..\src\RCONServer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\ReferenceManager.cpp">
+    <ClCompile Include="..\src\ReferenceManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Root.cpp">
+    <ClCompile Include="..\src\Root.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Server.cpp">
+    <ClCompile Include="..\src\Server.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\StackWalker.cpp">
+    <ClCompile Include="..\src\StackWalker.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\StringCompression.cpp">
+    <ClCompile Include="..\src\StringCompression.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\StringUtils.cpp">
+    <ClCompile Include="..\src\StringUtils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Tracer.cpp">
+    <ClCompile Include="..\src\Tracer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Vector3d.cpp">
+    <ClCompile Include="..\src\Vector3d.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Vector3f.cpp">
+    <ClCompile Include="..\src\Vector3f.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Vector3i.cpp">
+    <ClCompile Include="..\src\Vector3i.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\WebAdmin.cpp">
+    <ClCompile Include="..\src\WebAdmin.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\World.cpp">
+    <ClCompile Include="..\src\World.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\AggressiveMonster.cpp">
+    <ClCompile Include="..\src\Mobs\AggressiveMonster.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Bat.cpp">
+    <ClCompile Include="..\src\Mobs\Bat.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Blaze.cpp">
+    <ClCompile Include="..\src\Mobs\Blaze.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Cavespider.cpp">
+    <ClCompile Include="..\src\Mobs\Cavespider.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Chicken.cpp">
+    <ClCompile Include="..\src\Mobs\Chicken.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Cow.cpp">
+    <ClCompile Include="..\src\Mobs\Cow.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Creeper.cpp">
+    <ClCompile Include="..\src\Mobs\Creeper.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\EnderDragon.cpp">
+    <ClCompile Include="..\src\Mobs\EnderDragon.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Enderman.cpp">
+    <ClCompile Include="..\src\Mobs\Enderman.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Ghast.cpp">
+    <ClCompile Include="..\src\Mobs\Ghast.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Giant.cpp">
+    <ClCompile Include="..\src\Mobs\Giant.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Horse.cpp">
+    <ClCompile Include="..\src\Mobs\Horse.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\IronGolem.cpp">
+    <ClCompile Include="..\src\Mobs\IronGolem.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\MagmaCube.cpp">
+    <ClCompile Include="..\src\Mobs\MagmaCube.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Monster.cpp">
+    <ClCompile Include="..\src\Mobs\Monster.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Mooshroom.cpp">
+    <ClCompile Include="..\src\Mobs\Mooshroom.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\PassiveAggressiveMonster.cpp">
+    <ClCompile Include="..\src\Mobs\PassiveAggressiveMonster.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\PassiveMonster.cpp">
+    <ClCompile Include="..\src\Mobs\PassiveMonster.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Pig.cpp">
+    <ClCompile Include="..\src\Mobs\Pig.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Sheep.cpp">
+    <ClCompile Include="..\src\Mobs\Sheep.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Skeleton.cpp">
+    <ClCompile Include="..\src\Mobs\Skeleton.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Slime.cpp">
+    <ClCompile Include="..\src\Mobs\Slime.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\SnowGolem.cpp">
+    <ClCompile Include="..\src\Mobs\SnowGolem.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Spider.cpp">
+    <ClCompile Include="..\src\Mobs\Spider.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Squid.cpp">
+    <ClCompile Include="..\src\Mobs\Squid.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Villager.cpp">
+    <ClCompile Include="..\src\Mobs\Villager.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Witch.cpp">
+    <ClCompile Include="..\src\Mobs\Witch.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Wither.cpp">
+    <ClCompile Include="..\src\Mobs\Wither.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Wolf.cpp">
+    <ClCompile Include="..\src\Mobs\Wolf.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\Zombie.cpp">
+    <ClCompile Include="..\src\Mobs\Zombie.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Mobs\ZombiePigman.cpp">
+    <ClCompile Include="..\src\Mobs\ZombiePigman.cpp">
       <Filter>Source Files\Mobs</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Entities\Boat.cpp">
+    <ClCompile Include="..\src\Entities\Boat.cpp">
       <Filter>Source Files\Entities</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Entities\Entity.cpp">
+    <ClCompile Include="..\src\Entities\Entity.cpp">
       <Filter>Source Files\Entities</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Entities\FallingBlock.cpp">
+    <ClCompile Include="..\src\Entities\FallingBlock.cpp">
       <Filter>Source Files\Entities</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Entities\Minecart.cpp">
+    <ClCompile Include="..\src\Entities\Minecart.cpp">
       <Filter>Source Files\Entities</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Entities\Pawn.cpp">
+    <ClCompile Include="..\src\Entities\Pawn.cpp">
       <Filter>Source Files\Entities</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Entities\Pickup.cpp">
+    <ClCompile Include="..\src\Entities\Pickup.cpp">
       <Filter>Source Files\Entities</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Entities\Player.cpp">
+    <ClCompile Include="..\src\Entities\Player.cpp">
       <Filter>Source Files\Entities</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Entities\ProjectileEntity.cpp">
+    <ClCompile Include="..\src\Entities\ProjectileEntity.cpp">
       <Filter>Source Files\Entities</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Entities\TNTEntity.cpp">
+    <ClCompile Include="..\src\Entities\TNTEntity.cpp">
       <Filter>Source Files\Entities</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\UI\SlotArea.cpp">
+    <ClCompile Include="..\src\UI\SlotArea.cpp">
       <Filter>Source Files\UI</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\UI\Window.cpp">
+    <ClCompile Include="..\src\UI\Window.cpp">
       <Filter>Source Files\UI</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Simulator\DelayedFluidSimulator.cpp">
+    <ClCompile Include="..\src\Simulator\DelayedFluidSimulator.cpp">
       <Filter>Source Files\Simulator</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Simulator\FireSimulator.cpp">
+    <ClCompile Include="..\src\Simulator\FireSimulator.cpp">
       <Filter>Source Files\Simulator</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Simulator\FloodyFluidSimulator.cpp">
+    <ClCompile Include="..\src\Simulator\FloodyFluidSimulator.cpp">
       <Filter>Source Files\Simulator</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Simulator\FluidSimulator.cpp">
+    <ClCompile Include="..\src\Simulator\FluidSimulator.cpp">
       <Filter>Source Files\Simulator</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Simulator\RedstoneSimulator.cpp">
+    <ClCompile Include="..\src\Simulator\RedstoneSimulator.cpp">
       <Filter>Source Files\Simulator</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Simulator\SandSimulator.cpp">
+    <ClCompile Include="..\src\Simulator\SandSimulator.cpp">
       <Filter>Source Files\Simulator</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Simulator\Simulator.cpp">
+    <ClCompile Include="..\src\Simulator\Simulator.cpp">
       <Filter>Source Files\Simulator</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Simulator\SimulatorManager.cpp">
+    <ClCompile Include="..\src\Simulator\SimulatorManager.cpp">
       <Filter>Source Files\Simulator</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Simulator\VaporizeFluidSimulator.cpp">
+    <ClCompile Include="..\src\Simulator\VaporizeFluidSimulator.cpp">
       <Filter>Source Files\Simulator</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\OSSupport\BlockingTCPLink.cpp">
+    <ClCompile Include="..\src\OSSupport\BlockingTCPLink.cpp">
       <Filter>Source Files\OSSupport</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\OSSupport\CriticalSection.cpp">
+    <ClCompile Include="..\src\OSSupport\CriticalSection.cpp">
       <Filter>Source Files\OSSupport</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\OSSupport\Event.cpp">
+    <ClCompile Include="..\src\OSSupport\Event.cpp">
       <Filter>Source Files\OSSupport</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\OSSupport\File.cpp">
+    <ClCompile Include="..\src\OSSupport\File.cpp">
       <Filter>Source Files\OSSupport</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\OSSupport\GZipFile.cpp">
+    <ClCompile Include="..\src\OSSupport\GZipFile.cpp">
       <Filter>Source Files\OSSupport</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\OSSupport\IsThread.cpp">
+    <ClCompile Include="..\src\OSSupport\IsThread.cpp">
       <Filter>Source Files\OSSupport</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\OSSupport\ListenThread.cpp">
+    <ClCompile Include="..\src\OSSupport\ListenThread.cpp">
       <Filter>Source Files\OSSupport</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\OSSupport\Semaphore.cpp">
+    <ClCompile Include="..\src\OSSupport\Semaphore.cpp">
       <Filter>Source Files\OSSupport</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\OSSupport\Sleep.cpp">
+    <ClCompile Include="..\src\OSSupport\Sleep.cpp">
       <Filter>Source Files\OSSupport</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\OSSupport\Socket.cpp">
+    <ClCompile Include="..\src\OSSupport\Socket.cpp">
       <Filter>Source Files\OSSupport</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\OSSupport\SocketThreads.cpp">
+    <ClCompile Include="..\src\OSSupport\SocketThreads.cpp">
       <Filter>Source Files\OSSupport</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\OSSupport\Thread.cpp">
+    <ClCompile Include="..\src\OSSupport\Thread.cpp">
       <Filter>Source Files\OSSupport</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\OSSupport\Timer.cpp">
+    <ClCompile Include="..\src\OSSupport\Timer.cpp">
       <Filter>Source Files\OSSupport</Filter>
     </ClCompile>
     <ClCompile Include="..\Android\jni\app-android.cpp">
@@ -1450,205 +1450,208 @@
     <ClCompile Include="..\Android\jni\ToJava.cpp">
       <Filter>Source Files\OSSupport\Android Specific</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Bindings.cpp">
+    <ClCompile Include="..\src\Bindings.cpp">
       <Filter>Source Files\Bindings</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\LuaState.cpp">
+    <ClCompile Include="..\src\LuaState.cpp">
       <Filter>Source Files\Bindings</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\LuaWindow.cpp">
+    <ClCompile Include="..\src\LuaWindow.cpp">
       <Filter>Source Files\Bindings</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\ManualBindings.cpp">
+    <ClCompile Include="..\src\ManualBindings.cpp">
       <Filter>Source Files\Bindings</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Plugin.cpp">
+    <ClCompile Include="..\src\Plugin.cpp">
       <Filter>Source Files\Bindings</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\PluginLua.cpp">
+    <ClCompile Include="..\src\PluginLua.cpp">
       <Filter>Source Files\Bindings</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\PluginManager.cpp">
+    <ClCompile Include="..\src\PluginManager.cpp">
       <Filter>Source Files\Bindings</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\WebPlugin.cpp">
+    <ClCompile Include="..\src\WebPlugin.cpp">
       <Filter>Source Files\Bindings</Filter>
     </ClCompile>
-    <ClCompile Include="..\iniFile\iniFile.cpp">
+    <ClCompile Include="..\lib\inifile\iniFile.cpp">
       <Filter>Source Files\External</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\md5\md5.cpp">
+    <ClCompile Include="..\lib\md5\md5.cpp">
       <Filter>Source Files\External</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\WorldStorage\FastNBT.cpp">
+    <ClCompile Include="..\src\WorldStorage\FastNBT.cpp">
       <Filter>Source Files\WorldStorage</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\WorldStorage\NBTChunkSerializer.cpp">
+    <ClCompile Include="..\src\WorldStorage\NBTChunkSerializer.cpp">
       <Filter>Source Files\WorldStorage</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\WorldStorage\WorldStorage.cpp">
+    <ClCompile Include="..\src\WorldStorage\WorldStorage.cpp">
       <Filter>Source Files\WorldStorage</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\WorldStorage\WSSAnvil.cpp">
+    <ClCompile Include="..\src\WorldStorage\WSSAnvil.cpp">
       <Filter>Source Files\WorldStorage</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\WorldStorage\WSSCompact.cpp">
+    <ClCompile Include="..\src\WorldStorage\WSSCompact.cpp">
       <Filter>Source Files\WorldStorage</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Generating\BioGen.cpp">
+    <ClCompile Include="..\src\Generating\BioGen.cpp">
       <Filter>Source Files\Generating</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Generating\Caves.cpp">
+    <ClCompile Include="..\src\Generating\Caves.cpp">
       <Filter>Source Files\Generating</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Generating\ChunkDesc.cpp">
+    <ClCompile Include="..\src\Generating\ChunkDesc.cpp">
       <Filter>Source Files\Generating</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Generating\ChunkGenerator.cpp">
+    <ClCompile Include="..\src\Generating\ChunkGenerator.cpp">
       <Filter>Source Files\Generating</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Generating\CompoGen.cpp">
+    <ClCompile Include="..\src\Generating\CompoGen.cpp">
       <Filter>Source Files\Generating</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Generating\ComposableGenerator.cpp">
+    <ClCompile Include="..\src\Generating\ComposableGenerator.cpp">
       <Filter>Source Files\Generating</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Generating\DistortedHeightmap.cpp">
+    <ClCompile Include="..\src\Generating\DistortedHeightmap.cpp">
       <Filter>Source Files\Generating</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Generating\EndGen.cpp">
+    <ClCompile Include="..\src\Generating\EndGen.cpp">
       <Filter>Source Files\Generating</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Generating\FinishGen.cpp">
+    <ClCompile Include="..\src\Generating\FinishGen.cpp">
       <Filter>Source Files\Generating</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Generating\HeiGen.cpp">
+    <ClCompile Include="..\src\Generating\HeiGen.cpp">
       <Filter>Source Files\Generating</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Generating\MineShafts.cpp">
+    <ClCompile Include="..\src\Generating\MineShafts.cpp">
       <Filter>Source Files\Generating</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Generating\Noise3DGenerator.cpp">
+    <ClCompile Include="..\src\Generating\Noise3DGenerator.cpp">
       <Filter>Source Files\Generating</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Generating\Ravines.cpp">
+    <ClCompile Include="..\src\Generating\Ravines.cpp">
       <Filter>Source Files\Generating</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Generating\StructGen.cpp">
+    <ClCompile Include="..\src\Generating\StructGen.cpp">
       <Filter>Source Files\Generating</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Generating\Trees.cpp">
+    <ClCompile Include="..\src\Generating\Trees.cpp">
       <Filter>Source Files\Generating</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Blocks\BlockBed.cpp">
+    <ClCompile Include="..\src\Blocks\BlockBed.cpp">
       <Filter>Source Files\Blocks</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Blocks\BlockButton.cpp">
+    <ClCompile Include="..\src\Blocks\BlockButton.cpp">
       <Filter>Source Files\Blocks</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Blocks\BlockComparator.cpp">
+    <ClCompile Include="..\src\Blocks\BlockComparator.cpp">
       <Filter>Source Files\Blocks</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\blocks\BlockDoor.cpp">
+    <ClCompile Include="..\src\blocks\BlockDoor.cpp">
       <Filter>Source Files\Blocks</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\blocks\BlockHandler.cpp">
+    <ClCompile Include="..\src\blocks\BlockHandler.cpp">
       <Filter>Source Files\Blocks</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Blocks\BlockLever.cpp">
+    <ClCompile Include="..\src\Blocks\BlockLever.cpp">
       <Filter>Source Files\Blocks</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\blocks\BlockPiston.cpp">
+    <ClCompile Include="..\src\blocks\BlockPiston.cpp">
       <Filter>Source Files\Blocks</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\blocks\BlockRedstone.cpp">
+    <ClCompile Include="..\src\blocks\BlockRedstone.cpp">
       <Filter>Source Files\Blocks</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\blocks\BlockRedstoneRepeater.cpp">
+    <ClCompile Include="..\src\blocks\BlockRedstoneRepeater.cpp">
       <Filter>Source Files\Blocks</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\items\ItemHandler.cpp">
+    <ClCompile Include="..\src\items\ItemHandler.cpp">
       <Filter>Source Files\Items</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Protocol\ChunkDataSerializer.cpp">
+    <ClCompile Include="..\src\Protocol\ChunkDataSerializer.cpp">
       <Filter>Source Files\Protocol</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Protocol\Protocol125.cpp">
+    <ClCompile Include="..\src\Protocol\Protocol125.cpp">
       <Filter>Source Files\Protocol</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Protocol\Protocol132.cpp">
+    <ClCompile Include="..\src\Protocol\Protocol132.cpp">
       <Filter>Source Files\Protocol</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Protocol\Protocol14x.cpp">
+    <ClCompile Include="..\src\Protocol\Protocol14x.cpp">
       <Filter>Source Files\Protocol</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Protocol\Protocol15x.cpp">
+    <ClCompile Include="..\src\Protocol\Protocol15x.cpp">
       <Filter>Source Files\Protocol</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Protocol\Protocol16x.cpp">
+    <ClCompile Include="..\src\Protocol\Protocol16x.cpp">
       <Filter>Source Files\Protocol</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Protocol\Protocol17x.cpp">
+    <ClCompile Include="..\src\Protocol\Protocol17x.cpp">
       <Filter>Source Files\Protocol</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\Protocol\ProtocolRecognizer.cpp">
+    <ClCompile Include="..\src\Protocol\ProtocolRecognizer.cpp">
       <Filter>Source Files\Protocol</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\sqlite\lsqlite3.c">
+    <ClCompile Include="..\lib\sqlite\lsqlite3.c">
       <Filter>Source Files\SQLite</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\sqlite\sqlite3.c">
+    <ClCompile Include="..\lib\sqlite\sqlite3.c">
       <Filter>Source Files\SQLite</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\LuaExpat\lxplib.c">
+    <ClCompile Include="..\lib\luaexpat\lxplib.c">
       <Filter>Source Files\LuaExpat</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\BlockEntities\ChestEntity.cpp">
+    <ClCompile Include="..\src\BlockEntities\BlockEntity.cpp">
       <Filter>Source Files\BlockEntities</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\BlockEntities\DispenserEntity.cpp">
+    <ClCompile Include="..\src\BlockEntities\ChestEntity.cpp">
       <Filter>Source Files\BlockEntities</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\BlockEntities\DropperEntity.cpp">
+    <ClCompile Include="..\src\BlockEntities\DispenserEntity.cpp">
       <Filter>Source Files\BlockEntities</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\BlockEntities\DropSpenserEntity.cpp">
+    <ClCompile Include="..\src\BlockEntities\DropperEntity.cpp">
       <Filter>Source Files\BlockEntities</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\BlockEntities\FurnaceEntity.cpp">
+    <ClCompile Include="..\src\BlockEntities\DropSpenserEntity.cpp">
       <Filter>Source Files\BlockEntities</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\BlockEntities\HopperEntity.cpp">
+    <ClCompile Include="..\src\BlockEntities\FurnaceEntity.cpp">
       <Filter>Source Files\BlockEntities</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\BlockEntities\JukeboxEntity.cpp">
+    <ClCompile Include="..\src\BlockEntities\HopperEntity.cpp">
       <Filter>Source Files\BlockEntities</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\BlockEntities\NoteEntity.cpp">
+    <ClCompile Include="..\src\BlockEntities\JukeboxEntity.cpp">
       <Filter>Source Files\BlockEntities</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\BlockEntities\SignEntity.cpp">
+    <ClCompile Include="..\src\BlockEntities\NoteEntity.cpp">
       <Filter>Source Files\BlockEntities</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\HTTPServer\EnvelopeParser.cpp">
+    <ClCompile Include="..\src\BlockEntities\SignEntity.cpp">
+      <Filter>Source Files\BlockEntities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\HTTPServer\EnvelopeParser.cpp">
       <Filter>Source Files\HTTPServer</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\HTTPServer\HTTPConnection.cpp">
+    <ClCompile Include="..\src\HTTPServer\HTTPConnection.cpp">
       <Filter>Source Files\HTTPServer</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\HTTPServer\HTTPFormParser.cpp">
+    <ClCompile Include="..\src\HTTPServer\HTTPFormParser.cpp">
       <Filter>Source Files\HTTPServer</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\HTTPServer\HTTPMessage.cpp">
+    <ClCompile Include="..\src\HTTPServer\HTTPMessage.cpp">
       <Filter>Source Files\HTTPServer</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\HTTPServer\HTTPServer.cpp">
+    <ClCompile Include="..\src\HTTPServer\HTTPServer.cpp">
       <Filter>Source Files\HTTPServer</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\HTTPServer\MultipartParser.cpp">
+    <ClCompile Include="..\src\HTTPServer\MultipartParser.cpp">
       <Filter>Source Files\HTTPServer</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\HTTPServer\NameValueParser.cpp">
+    <ClCompile Include="..\src\HTTPServer\NameValueParser.cpp">
       <Filter>Source Files\HTTPServer</Filter>
     </ClCompile>
     <ClCompile Include="..\source\BlockEntities\BlockEntity.cpp">
@@ -1659,7 +1662,7 @@
     <Text Include="..\MCServer\API.txt">
       <Filter>Source Files\Bindings</Filter>
     </Text>
-    <Text Include="..\source\sqlite\urls.txt">
+    <Text Include="..\lib\sqlite\urls.txt">
       <Filter>Source Files\SQLite</Filter>
     </Text>
     <Text Include="..\MCServer\crafting.txt">
@@ -1679,7 +1682,7 @@
     <CustomBuild Include="..\Android\jni\ToJava.h">
       <Filter>Source Files\OSSupport\Android Specific</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\source\AllToLua.pkg">
+    <CustomBuild Include="..\src\AllToLua.pkg">
       <Filter>Source Files\Bindings</Filter>
     </CustomBuild>
   </ItemGroup>
diff --git a/VC2013/ToLua.vcxproj b/VC2013/ToLua.vcxproj
index cd032d3b3..c798af657 100644
--- a/VC2013/ToLua.vcxproj
+++ b/VC2013/ToLua.vcxproj
@@ -84,7 +84,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../tolua++-1.0.93/include;../lua-5.1.4/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../lib/tolua++/include;../lib/lua/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -98,7 +98,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../tolua++-1.0.93/include;../lua-5.1.4/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../lib/tolua++/include;../lib/lua/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -111,7 +111,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../tolua++-1.0.93/include;../lua-5.1.4/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../lib/tolua++/include;../lib/lua/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -123,7 +123,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug profiled|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../tolua++-1.0.93/include;../lua-5.1.4/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../lib/tolua++/include;../lib/lua/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -134,15 +134,15 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\tolua++-1.0.93\src\bin\tolua.c" />
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_event.c" />
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_is.c" />
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_map.c" />
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_push.c" />
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_to.c" />
+    <ClCompile Include="..\lib\tolua++\src\bin\tolua.c" />
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_event.c" />
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_is.c" />
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_map.c" />
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_push.c" />
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_to.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\tolua++-1.0.93\src\lib\tolua_event.h" />
+    <ClInclude Include="..\lib\tolua++\src\lib\tolua_event.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/VC2013/ToLua.vcxproj.filters b/VC2013/ToLua.vcxproj.filters
index 719b59c0d..5d104d7d0 100644
--- a/VC2013/ToLua.vcxproj.filters
+++ b/VC2013/ToLua.vcxproj.filters
@@ -7,27 +7,27 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\tolua++-1.0.93\src\bin\tolua.c">
+    <ClCompile Include="..\lib\tolua++\src\bin\tolua.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_event.c">
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_event.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_is.c">
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_is.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_map.c">
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_map.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_push.c">
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_push.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\tolua++-1.0.93\src\lib\tolua_to.c">
+    <ClCompile Include="..\lib\tolua++\src\lib\tolua_to.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\tolua++-1.0.93\src\lib\tolua_event.h">
+    <ClInclude Include="..\lib\tolua++\src\lib\tolua_event.h">
       <Filter>Source Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/VC2013/expat.vcxproj b/VC2013/expat.vcxproj
index 3049b972a..388bf6158 100644
--- a/VC2013/expat.vcxproj
+++ b/VC2013/expat.vcxproj
@@ -73,26 +73,26 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\expat\ascii.h" />
-    <ClInclude Include="..\expat\asciitab.h" />
-    <ClInclude Include="..\expat\expat.h" />
-    <ClInclude Include="..\expat\expat_external.h" />
-    <ClInclude Include="..\expat\iasciitab.h" />
-    <ClInclude Include="..\expat\internal.h" />
-    <ClInclude Include="..\expat\latin1tab.h" />
-    <ClInclude Include="..\expat\nametab.h" />
-    <ClInclude Include="..\expat\utf8tab.h" />
-    <ClInclude Include="..\expat\winconfig.h" />
-    <ClInclude Include="..\expat\xmlrole.h" />
-    <ClInclude Include="..\expat\xmltok.h" />
-    <ClInclude Include="..\expat\xmltok_impl.h" />
+    <ClInclude Include="..\lib\expat\ascii.h" />
+    <ClInclude Include="..\lib\expat\asciitab.h" />
+    <ClInclude Include="..\lib\expat\expat.h" />
+    <ClInclude Include="..\lib\expat\expat_external.h" />
+    <ClInclude Include="..\lib\expat\iasciitab.h" />
+    <ClInclude Include="..\lib\expat\internal.h" />
+    <ClInclude Include="..\lib\expat\latin1tab.h" />
+    <ClInclude Include="..\lib\expat\nametab.h" />
+    <ClInclude Include="..\lib\expat\utf8tab.h" />
+    <ClInclude Include="..\lib\expat\winconfig.h" />
+    <ClInclude Include="..\lib\expat\xmlrole.h" />
+    <ClInclude Include="..\lib\expat\xmltok.h" />
+    <ClInclude Include="..\lib\expat\xmltok_impl.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\expat\xmlparse.c" />
-    <ClCompile Include="..\expat\xmlrole.c" />
-    <ClCompile Include="..\expat\xmltok.c" />
-    <ClCompile Include="..\expat\xmltok_impl.c" />
-    <ClCompile Include="..\expat\xmltok_ns.c" />
+    <ClCompile Include="..\lib\expat\xmlparse.c" />
+    <ClCompile Include="..\lib\expat\xmlrole.c" />
+    <ClCompile Include="..\lib\expat\xmltok.c" />
+    <ClCompile Include="..\lib\expat\xmltok_impl.c" />
+    <ClCompile Include="..\lib\expat\xmltok_ns.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/VC2013/expat.vcxproj.filters b/VC2013/expat.vcxproj.filters
index 34cf0b3b6..4cb4220c9 100644
--- a/VC2013/expat.vcxproj.filters
+++ b/VC2013/expat.vcxproj.filters
@@ -7,60 +7,60 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\expat\ascii.h">
+    <ClInclude Include="..\lib\expat\ascii.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\asciitab.h">
+    <ClInclude Include="..\lib\expat\asciitab.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\expat.h">
+    <ClInclude Include="..\lib\expat\expat.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\expat_external.h">
+    <ClInclude Include="..\lib\expat\expat_external.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\iasciitab.h">
+    <ClInclude Include="..\lib\expat\iasciitab.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\internal.h">
+    <ClInclude Include="..\lib\expat\internal.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\latin1tab.h">
+    <ClInclude Include="..\lib\expat\latin1tab.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\nametab.h">
+    <ClInclude Include="..\lib\expat\nametab.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\utf8tab.h">
+    <ClInclude Include="..\lib\expat\utf8tab.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\winconfig.h">
+    <ClInclude Include="..\lib\expat\winconfig.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\xmlrole.h">
+    <ClInclude Include="..\lib\expat\xmlrole.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\xmltok.h">
+    <ClInclude Include="..\lib\expat\xmltok.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\expat\xmltok_impl.h">
+    <ClInclude Include="..\lib\expat\xmltok_impl.h">
       <Filter>Source Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\expat\xmlparse.c">
+    <ClCompile Include="..\lib\expat\xmlparse.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\expat\xmlrole.c">
+    <ClCompile Include="..\lib\expat\xmlrole.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\expat\xmltok.c">
+    <ClCompile Include="..\lib\expat\xmltok.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\expat\xmltok_impl.c">
+    <ClCompile Include="..\lib\expat\xmltok_impl.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\expat\xmltok_ns.c">
+    <ClCompile Include="..\lib\expat\xmltok_ns.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/VC2013/zlib.vcxproj b/VC2013/zlib.vcxproj
index d00064bf2..3aeacf329 100644
--- a/VC2013/zlib.vcxproj
+++ b/VC2013/zlib.vcxproj
@@ -134,34 +134,34 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\zlib-1.2.7\adler32.c" />
-    <ClCompile Include="..\zlib-1.2.7\compress.c" />
-    <ClCompile Include="..\zlib-1.2.7\crc32.c" />
-    <ClCompile Include="..\zlib-1.2.7\deflate.c" />
-    <ClCompile Include="..\zlib-1.2.7\gzclose.c" />
-    <ClCompile Include="..\zlib-1.2.7\gzlib.c" />
-    <ClCompile Include="..\zlib-1.2.7\gzread.c" />
-    <ClCompile Include="..\zlib-1.2.7\gzwrite.c" />
-    <ClCompile Include="..\zlib-1.2.7\infback.c" />
-    <ClCompile Include="..\zlib-1.2.7\inffast.c" />
-    <ClCompile Include="..\zlib-1.2.7\inflate.c" />
-    <ClCompile Include="..\zlib-1.2.7\inftrees.c" />
-    <ClCompile Include="..\zlib-1.2.7\trees.c" />
-    <ClCompile Include="..\zlib-1.2.7\uncompr.c" />
-    <ClCompile Include="..\zlib-1.2.7\zutil.c" />
+    <ClCompile Include="..\lib\zlib\adler32.c" />
+    <ClCompile Include="..\lib\zlib\compress.c" />
+    <ClCompile Include="..\lib\zlib\crc32.c" />
+    <ClCompile Include="..\lib\zlib\deflate.c" />
+    <ClCompile Include="..\lib\zlib\gzclose.c" />
+    <ClCompile Include="..\lib\zlib\gzlib.c" />
+    <ClCompile Include="..\lib\zlib\gzread.c" />
+    <ClCompile Include="..\lib\zlib\gzwrite.c" />
+    <ClCompile Include="..\lib\zlib\infback.c" />
+    <ClCompile Include="..\lib\zlib\inffast.c" />
+    <ClCompile Include="..\lib\zlib\inflate.c" />
+    <ClCompile Include="..\lib\zlib\inftrees.c" />
+    <ClCompile Include="..\lib\zlib\trees.c" />
+    <ClCompile Include="..\lib\zlib\uncompr.c" />
+    <ClCompile Include="..\lib\zlib\zutil.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\zlib-1.2.7\crc32.h" />
-    <ClInclude Include="..\zlib-1.2.7\deflate.h" />
-    <ClInclude Include="..\zlib-1.2.7\gzguts.h" />
-    <ClInclude Include="..\zlib-1.2.7\inffast.h" />
-    <ClInclude Include="..\zlib-1.2.7\inffixed.h" />
-    <ClInclude Include="..\zlib-1.2.7\inflate.h" />
-    <ClInclude Include="..\zlib-1.2.7\inftrees.h" />
-    <ClInclude Include="..\zlib-1.2.7\trees.h" />
-    <ClInclude Include="..\zlib-1.2.7\zconf.h" />
-    <ClInclude Include="..\zlib-1.2.7\zlib.h" />
-    <ClInclude Include="..\zlib-1.2.7\zutil.h" />
+    <ClInclude Include="..\lib\zlib\crc32.h" />
+    <ClInclude Include="..\lib\zlib\deflate.h" />
+    <ClInclude Include="..\lib\zlib\gzguts.h" />
+    <ClInclude Include="..\lib\zlib\inffast.h" />
+    <ClInclude Include="..\lib\zlib\inffixed.h" />
+    <ClInclude Include="..\lib\zlib\inflate.h" />
+    <ClInclude Include="..\lib\zlib\inftrees.h" />
+    <ClInclude Include="..\lib\zlib\trees.h" />
+    <ClInclude Include="..\lib\zlib\zconf.h" />
+    <ClInclude Include="..\lib\zlib\zlib.h" />
+    <ClInclude Include="..\lib\zlib\zutil.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/VC2013/zlib.vcxproj.filters b/VC2013/zlib.vcxproj.filters
index 73223e924..192806a9f 100644
--- a/VC2013/zlib.vcxproj.filters
+++ b/VC2013/zlib.vcxproj.filters
@@ -7,84 +7,84 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\zlib-1.2.7\adler32.c">
+    <ClCompile Include="..\lib\zlib\adler32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\compress.c">
+    <ClCompile Include="..\lib\zlib\compress.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\crc32.c">
+    <ClCompile Include="..\lib\zlib\crc32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\deflate.c">
+    <ClCompile Include="..\lib\zlib\deflate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\gzclose.c">
+    <ClCompile Include="..\lib\zlib\gzclose.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\gzlib.c">
+    <ClCompile Include="..\lib\zlib\gzlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\gzread.c">
+    <ClCompile Include="..\lib\zlib\gzread.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\gzwrite.c">
+    <ClCompile Include="..\lib\zlib\gzwrite.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\infback.c">
+    <ClCompile Include="..\lib\zlib\infback.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\inffast.c">
+    <ClCompile Include="..\lib\zlib\inffast.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\inflate.c">
+    <ClCompile Include="..\lib\zlib\inflate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\inftrees.c">
+    <ClCompile Include="..\lib\zlib\inftrees.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\trees.c">
+    <ClCompile Include="..\lib\zlib\trees.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\uncompr.c">
+    <ClCompile Include="..\lib\zlib\uncompr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\zlib-1.2.7\zutil.c">
+    <ClCompile Include="..\lib\zlib\zutil.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\zlib-1.2.7\crc32.h">
+    <ClInclude Include="..\lib\zlib\crc32.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\deflate.h">
+    <ClInclude Include="..\lib\zlib\deflate.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\gzguts.h">
+    <ClInclude Include="..\lib\zlib\gzguts.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\inffast.h">
+    <ClInclude Include="..\lib\zlib\inffast.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\inffixed.h">
+    <ClInclude Include="..\lib\zlib\inffixed.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\inflate.h">
+    <ClInclude Include="..\lib\zlib\inflate.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\inftrees.h">
+    <ClInclude Include="..\lib\zlib\inftrees.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\trees.h">
+    <ClInclude Include="..\lib\zlib\trees.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\zconf.h">
+    <ClInclude Include="..\lib\zlib\zconf.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\zlib.h">
+    <ClInclude Include="..\lib\zlib\zlib.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\zlib-1.2.7\zutil.h">
+    <ClInclude Include="..\lib\zlib\zutil.h">
       <Filter>Source Files</Filter>
     </ClInclude>
   </ItemGroup>
author	Tiger Wang <ziwei.tiger@hotmail.co.uk>	2013-11-27 22:35:13 +0100
committer	Tiger Wang <ziwei.tiger@hotmail.co.uk>	2013-11-27 22:35:13 +0100
commit	a6630d32394120a78af56bc612fa3c3449283248 (patch)
tree	2c791266b0f213cd56961299da8d2258b8f85d8e /VC2013
parent	Fixed spawn point being generally in an ocean (diff)
parent	Voronoi-related biomegens use the new cVoronoiMap class. (diff)
download	cuberite-a6630d32394120a78af56bc612fa3c3449283248.tar cuberite-a6630d32394120a78af56bc612fa3c3449283248.tar.gz cuberite-a6630d32394120a78af56bc612fa3c3449283248.tar.bz2 cuberite-a6630d32394120a78af56bc612fa3c3449283248.tar.lz cuberite-a6630d32394120a78af56bc612fa3c3449283248.tar.xz cuberite-a6630d32394120a78af56bc612fa3c3449283248.tar.zst cuberite-a6630d32394120a78af56bc612fa3c3449283248.zip