From 3c2e7f1aadf3f6e9be7b86d1753d0bf26fd76e8f Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun, 24 Nov 2013 17:30:42 +0000
Subject: Fixed Visual Studio Files

---
 VC2008/CryptoPP.cbp         | 384 +++++++++---------
 VC2008/CryptoPP.vcproj      | 384 +++++++++---------
 VC2008/GenerateBindings.cmd |   2 +-
 VC2008/JsonCpp.cbp          |  26 +-
 VC2008/JsonCpp.vcproj       |  14 +-
 VC2008/Lua.cbp              | 110 +++---
 VC2008/Lua.vcproj           | 110 +++---
 VC2008/MCServer.cbp         | 854 ++++++++++++++++++++--------------------
 VC2008/MCServer.vcproj      | 932 ++++++++++++++++++++++----------------------
 VC2008/ToLua.cbp            |  26 +-
 VC2008/ToLua.vcproj         |  14 +-
 VC2008/expat.cbp            |  36 +-
 VC2008/expat.vcproj         |  36 +-
 VC2008/zlib.cbp             |  52 +--
 VC2008/zlib.vcproj          |  52 +--
 15 files changed, 1510 insertions(+), 1522 deletions(-)

(limited to 'VC2008')

diff --git a/VC2008/CryptoPP.cbp b/VC2008/CryptoPP.cbp
index f9f10e7a7..55b322b92 100644
--- a/VC2008/CryptoPP.cbp
+++ b/VC2008/CryptoPP.cbp
@@ -106,202 +106,202 @@
 				</Compiler>
 			</Target>
 		</Build>
-		<Unit filename="../CryptoPP/Doxyfile" />
-		<Unit filename="../CryptoPP/GNUmakefile" />
-		<Unit filename="../CryptoPP/License.txt" />
-		<Unit filename="../CryptoPP/Readme.txt" />
-		<Unit filename="../CryptoPP/adler32.cpp" />
-		<Unit filename="../CryptoPP/adler32.h" />
-		<Unit filename="../CryptoPP/aes.h" />
-		<Unit filename="../CryptoPP/algebra.cpp" />
-		<Unit filename="../CryptoPP/algebra.h" />
-		<Unit filename="../CryptoPP/algparam.cpp" />
-		<Unit filename="../CryptoPP/algparam.h" />
-		<Unit filename="../CryptoPP/arc4.h" />
-		<Unit filename="../CryptoPP/argnames.h" />
-		<Unit filename="../CryptoPP/asn.cpp" />
-		<Unit filename="../CryptoPP/asn.h" />
-		<Unit filename="../CryptoPP/authenc.cpp" />
-		<Unit filename="../CryptoPP/authenc.h" />
-		<Unit filename="../CryptoPP/base32.cpp" />
-		<Unit filename="../CryptoPP/base32.h" />
-		<Unit filename="../CryptoPP/base64.cpp" />
-		<Unit filename="../CryptoPP/base64.h" />
-		<Unit filename="../CryptoPP/basecode.cpp" />
-		<Unit filename="../CryptoPP/basecode.h" />
-		<Unit filename="../CryptoPP/cbcmac.cpp" />
-		<Unit filename="../CryptoPP/cbcmac.h" />
-		<Unit filename="../CryptoPP/ccm.cpp" />
-		<Unit filename="../CryptoPP/ccm.h" />
-		<Unit filename="../CryptoPP/channels.cpp" />
-		<Unit filename="../CryptoPP/channels.h" />
-		<Unit filename="../CryptoPP/cmac.cpp" />
-		<Unit filename="../CryptoPP/cmac.h" />
-		<Unit filename="../CryptoPP/config.h" />
-		<Unit filename="../CryptoPP/cpu.cpp" />
-		<Unit filename="../CryptoPP/cpu.h" />
-		<Unit filename="../CryptoPP/crc.cpp" />
-		<Unit filename="../CryptoPP/crc.h" />
-		<Unit filename="../CryptoPP/cryptlib.cpp" />
-		<Unit filename="../CryptoPP/cryptlib.h" />
-		<Unit filename="../CryptoPP/default.cpp" />
-		<Unit filename="../CryptoPP/default.h" />
-		<Unit filename="../CryptoPP/des.cpp" />
-		<Unit filename="../CryptoPP/des.h" />
-		<Unit filename="../CryptoPP/dessp.cpp" />
-		<Unit filename="../CryptoPP/dh.cpp" />
-		<Unit filename="../CryptoPP/dh.h" />
-		<Unit filename="../CryptoPP/dh2.cpp" />
-		<Unit filename="../CryptoPP/dh2.h" />
-		<Unit filename="../CryptoPP/dll.cpp" />
-		<Unit filename="../CryptoPP/dmac.h" />
-		<Unit filename="../CryptoPP/dsa.cpp" />
-		<Unit filename="../CryptoPP/dsa.h" />
-		<Unit filename="../CryptoPP/eax.cpp" />
-		<Unit filename="../CryptoPP/eax.h" />
-		<Unit filename="../CryptoPP/ec2n.cpp" />
-		<Unit filename="../CryptoPP/ec2n.h" />
-		<Unit filename="../CryptoPP/eccrypto.cpp">
+		<Unit filename="../lib/cryptopp/Doxyfile" />
+		<Unit filename="../lib/cryptopp/GNUmakefile" />
+		<Unit filename="../lib/cryptopp/License.txt" />
+		<Unit filename="../lib/cryptopp/Readme.txt" />
+		<Unit filename="../lib/cryptopp/adler32.cpp" />
+		<Unit filename="../lib/cryptopp/adler32.h" />
+		<Unit filename="../lib/cryptopp/aes.h" />
+		<Unit filename="../lib/cryptopp/algebra.cpp" />
+		<Unit filename="../lib/cryptopp/algebra.h" />
+		<Unit filename="../lib/cryptopp/algparam.cpp" />
+		<Unit filename="../lib/cryptopp/algparam.h" />
+		<Unit filename="../lib/cryptopp/arc4.h" />
+		<Unit filename="../lib/cryptopp/argnames.h" />
+		<Unit filename="../lib/cryptopp/asn.cpp" />
+		<Unit filename="../lib/cryptopp/asn.h" />
+		<Unit filename="../lib/cryptopp/authenc.cpp" />
+		<Unit filename="../lib/cryptopp/authenc.h" />
+		<Unit filename="../lib/cryptopp/base32.cpp" />
+		<Unit filename="../lib/cryptopp/base32.h" />
+		<Unit filename="../lib/cryptopp/base64.cpp" />
+		<Unit filename="../lib/cryptopp/base64.h" />
+		<Unit filename="../lib/cryptopp/basecode.cpp" />
+		<Unit filename="../lib/cryptopp/basecode.h" />
+		<Unit filename="../lib/cryptopp/cbcmac.cpp" />
+		<Unit filename="../lib/cryptopp/cbcmac.h" />
+		<Unit filename="../lib/cryptopp/ccm.cpp" />
+		<Unit filename="../lib/cryptopp/ccm.h" />
+		<Unit filename="../lib/cryptopp/channels.cpp" />
+		<Unit filename="../lib/cryptopp/channels.h" />
+		<Unit filename="../lib/cryptopp/cmac.cpp" />
+		<Unit filename="../lib/cryptopp/cmac.h" />
+		<Unit filename="../lib/cryptopp/config.h" />
+		<Unit filename="../lib/cryptopp/cpu.cpp" />
+		<Unit filename="../lib/cryptopp/cpu.h" />
+		<Unit filename="../lib/cryptopp/crc.cpp" />
+		<Unit filename="../lib/cryptopp/crc.h" />
+		<Unit filename="../lib/cryptopp/cryptlib.cpp" />
+		<Unit filename="../lib/cryptopp/cryptlib.h" />
+		<Unit filename="../lib/cryptopp/default.cpp" />
+		<Unit filename="../lib/cryptopp/default.h" />
+		<Unit filename="../lib/cryptopp/des.cpp" />
+		<Unit filename="../lib/cryptopp/des.h" />
+		<Unit filename="../lib/cryptopp/dessp.cpp" />
+		<Unit filename="../lib/cryptopp/dh.cpp" />
+		<Unit filename="../lib/cryptopp/dh.h" />
+		<Unit filename="../lib/cryptopp/dh2.cpp" />
+		<Unit filename="../lib/cryptopp/dh2.h" />
+		<Unit filename="../lib/cryptopp/dll.cpp" />
+		<Unit filename="../lib/cryptopp/dmac.h" />
+		<Unit filename="../lib/cryptopp/dsa.cpp" />
+		<Unit filename="../lib/cryptopp/dsa.h" />
+		<Unit filename="../lib/cryptopp/eax.cpp" />
+		<Unit filename="../lib/cryptopp/eax.h" />
+		<Unit filename="../lib/cryptopp/ec2n.cpp" />
+		<Unit filename="../lib/cryptopp/ec2n.h" />
+		<Unit filename="../lib/cryptopp/eccrypto.cpp">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
-		<Unit filename="../CryptoPP/eccrypto.h" />
-		<Unit filename="../CryptoPP/ecp.cpp" />
-		<Unit filename="../CryptoPP/ecp.h" />
-		<Unit filename="../CryptoPP/elgamal.cpp" />
-		<Unit filename="../CryptoPP/elgamal.h" />
-		<Unit filename="../CryptoPP/emsa2.cpp" />
-		<Unit filename="../CryptoPP/emsa2.h" />
-		<Unit filename="../CryptoPP/eprecomp.cpp">
+		<Unit filename="../lib/cryptopp/eccrypto.h" />
+		<Unit filename="../lib/cryptopp/ecp.cpp" />
+		<Unit filename="../lib/cryptopp/ecp.h" />
+		<Unit filename="../lib/cryptopp/elgamal.cpp" />
+		<Unit filename="../lib/cryptopp/elgamal.h" />
+		<Unit filename="../lib/cryptopp/emsa2.cpp" />
+		<Unit filename="../lib/cryptopp/emsa2.h" />
+		<Unit filename="../lib/cryptopp/eprecomp.cpp">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
-		<Unit filename="../CryptoPP/eprecomp.h" />
-		<Unit filename="../CryptoPP/esign.cpp" />
-		<Unit filename="../CryptoPP/esign.h" />
-		<Unit filename="../CryptoPP/files.cpp" />
-		<Unit filename="../CryptoPP/files.h" />
-		<Unit filename="../CryptoPP/filters.cpp" />
-		<Unit filename="../CryptoPP/filters.h" />
-		<Unit filename="../CryptoPP/fips140.cpp" />
-		<Unit filename="../CryptoPP/fips140.h" />
-		<Unit filename="../CryptoPP/fltrimpl.h" />
-		<Unit filename="../CryptoPP/gcm.cpp" />
-		<Unit filename="../CryptoPP/gcm.h" />
-		<Unit filename="../CryptoPP/gf256.cpp" />
-		<Unit filename="../CryptoPP/gf256.h" />
-		<Unit filename="../CryptoPP/gf2_32.cpp" />
-		<Unit filename="../CryptoPP/gf2_32.h" />
-		<Unit filename="../CryptoPP/gf2n.cpp" />
-		<Unit filename="../CryptoPP/gf2n.h" />
-		<Unit filename="../CryptoPP/gfpcrypt.cpp" />
-		<Unit filename="../CryptoPP/gfpcrypt.h" />
-		<Unit filename="../CryptoPP/gzip.h" />
-		<Unit filename="../CryptoPP/hex.cpp" />
-		<Unit filename="../CryptoPP/hex.h" />
-		<Unit filename="../CryptoPP/hmac.cpp" />
-		<Unit filename="../CryptoPP/hmac.h" />
-		<Unit filename="../CryptoPP/hrtimer.cpp" />
-		<Unit filename="../CryptoPP/hrtimer.h" />
-		<Unit filename="../CryptoPP/integer.cpp" />
-		<Unit filename="../CryptoPP/integer.h" />
-		<Unit filename="../CryptoPP/iterhash.cpp" />
-		<Unit filename="../CryptoPP/iterhash.h" />
-		<Unit filename="../CryptoPP/lubyrack.h" />
-		<Unit filename="../CryptoPP/luc.cpp" />
-		<Unit filename="../CryptoPP/luc.h" />
-		<Unit filename="../CryptoPP/md2.cpp" />
-		<Unit filename="../CryptoPP/md2.h" />
-		<Unit filename="../CryptoPP/md4.cpp" />
-		<Unit filename="../CryptoPP/md4.h" />
-		<Unit filename="../CryptoPP/md5.cpp" />
-		<Unit filename="../CryptoPP/md5.h" />
-		<Unit filename="../CryptoPP/mdc.h" />
-		<Unit filename="../CryptoPP/misc.cpp" />
-		<Unit filename="../CryptoPP/misc.h" />
-		<Unit filename="../CryptoPP/modarith.h" />
-		<Unit filename="../CryptoPP/modes.cpp" />
-		<Unit filename="../CryptoPP/modes.h" />
-		<Unit filename="../CryptoPP/modexppc.h" />
-		<Unit filename="../CryptoPP/mqueue.cpp" />
-		<Unit filename="../CryptoPP/mqueue.h" />
-		<Unit filename="../CryptoPP/mqv.cpp" />
-		<Unit filename="../CryptoPP/mqv.h" />
-		<Unit filename="../CryptoPP/nbtheory.cpp" />
-		<Unit filename="../CryptoPP/nbtheory.h" />
-		<Unit filename="../CryptoPP/network.cpp" />
-		<Unit filename="../CryptoPP/network.h" />
-		<Unit filename="../CryptoPP/nr.h" />
-		<Unit filename="../CryptoPP/oaep.cpp" />
-		<Unit filename="../CryptoPP/oaep.h" />
-		<Unit filename="../CryptoPP/oids.h" />
-		<Unit filename="../CryptoPP/osrng.cpp" />
-		<Unit filename="../CryptoPP/osrng.h" />
-		<Unit filename="../CryptoPP/pch.cpp" />
-		<Unit filename="../CryptoPP/pch.h" />
-		<Unit filename="../CryptoPP/pkcspad.cpp" />
-		<Unit filename="../CryptoPP/pkcspad.h" />
-		<Unit filename="../CryptoPP/polynomi.cpp" />
-		<Unit filename="../CryptoPP/polynomi.h" />
-		<Unit filename="../CryptoPP/pssr.cpp" />
-		<Unit filename="../CryptoPP/pssr.h" />
-		<Unit filename="../CryptoPP/pubkey.cpp" />
-		<Unit filename="../CryptoPP/pubkey.h" />
-		<Unit filename="../CryptoPP/pwdbased.h" />
-		<Unit filename="../CryptoPP/queue.cpp" />
-		<Unit filename="../CryptoPP/queue.h" />
-		<Unit filename="../CryptoPP/rabin.cpp" />
-		<Unit filename="../CryptoPP/rabin.h" />
-		<Unit filename="../CryptoPP/randpool.cpp" />
-		<Unit filename="../CryptoPP/randpool.h" />
-		<Unit filename="../CryptoPP/rdtables.cpp" />
-		<Unit filename="../CryptoPP/rijndael.cpp" />
-		<Unit filename="../CryptoPP/rijndael.h" />
-		<Unit filename="../CryptoPP/rng.cpp" />
-		<Unit filename="../CryptoPP/rng.h" />
-		<Unit filename="../CryptoPP/rsa.cpp" />
-		<Unit filename="../CryptoPP/rsa.h" />
-		<Unit filename="../CryptoPP/rw.cpp" />
-		<Unit filename="../CryptoPP/rw.h" />
-		<Unit filename="../CryptoPP/safer.cpp" />
-		<Unit filename="../CryptoPP/safer.h" />
-		<Unit filename="../CryptoPP/seal.cpp" />
-		<Unit filename="../CryptoPP/seal.h" />
-		<Unit filename="../CryptoPP/secblock.h" />
-		<Unit filename="../CryptoPP/seckey.h" />
-		<Unit filename="../CryptoPP/seed.cpp" />
-		<Unit filename="../CryptoPP/seed.h" />
-		<Unit filename="../CryptoPP/sha.cpp" />
-		<Unit filename="../CryptoPP/sha.h" />
-		<Unit filename="../CryptoPP/shacal2.cpp" />
-		<Unit filename="../CryptoPP/shacal2.h" />
-		<Unit filename="../CryptoPP/simple.cpp" />
-		<Unit filename="../CryptoPP/simple.h" />
-		<Unit filename="../CryptoPP/smartptr.h" />
-		<Unit filename="../CryptoPP/socketft.cpp" />
-		<Unit filename="../CryptoPP/socketft.h" />
-		<Unit filename="../CryptoPP/square.cpp" />
-		<Unit filename="../CryptoPP/square.h" />
-		<Unit filename="../CryptoPP/squaretb.cpp" />
-		<Unit filename="../CryptoPP/stdcpp.h" />
-		<Unit filename="../CryptoPP/strciphr.cpp" />
-		<Unit filename="../CryptoPP/strciphr.h" />
-		<Unit filename="../CryptoPP/tea.cpp" />
-		<Unit filename="../CryptoPP/tea.h" />
-		<Unit filename="../CryptoPP/tiger.cpp" />
-		<Unit filename="../CryptoPP/tiger.h" />
-		<Unit filename="../CryptoPP/tigertab.cpp" />
-		<Unit filename="../CryptoPP/trdlocal.cpp" />
-		<Unit filename="../CryptoPP/trdlocal.h" />
-		<Unit filename="../CryptoPP/trunhash.h" />
-		<Unit filename="../CryptoPP/ttmac.cpp" />
-		<Unit filename="../CryptoPP/ttmac.h" />
-		<Unit filename="../CryptoPP/vmac.cpp" />
-		<Unit filename="../CryptoPP/vmac.h" />
-		<Unit filename="../CryptoPP/wait.cpp" />
-		<Unit filename="../CryptoPP/wait.h" />
-		<Unit filename="../CryptoPP/wake.h" />
-		<Unit filename="../CryptoPP/winpipes.cpp" />
-		<Unit filename="../CryptoPP/winpipes.h" />
-		<Unit filename="../CryptoPP/words.h" />
+		<Unit filename="../lib/cryptopp/eprecomp.h" />
+		<Unit filename="../lib/cryptopp/esign.cpp" />
+		<Unit filename="../lib/cryptopp/esign.h" />
+		<Unit filename="../lib/cryptopp/files.cpp" />
+		<Unit filename="../lib/cryptopp/files.h" />
+		<Unit filename="../lib/cryptopp/filters.cpp" />
+		<Unit filename="../lib/cryptopp/filters.h" />
+		<Unit filename="../lib/cryptopp/fips140.cpp" />
+		<Unit filename="../lib/cryptopp/fips140.h" />
+		<Unit filename="../lib/cryptopp/fltrimpl.h" />
+		<Unit filename="../lib/cryptopp/gcm.cpp" />
+		<Unit filename="../lib/cryptopp/gcm.h" />
+		<Unit filename="../lib/cryptopp/gf256.cpp" />
+		<Unit filename="../lib/cryptopp/gf256.h" />
+		<Unit filename="../lib/cryptopp/gf2_32.cpp" />
+		<Unit filename="../lib/cryptopp/gf2_32.h" />
+		<Unit filename="../lib/cryptopp/gf2n.cpp" />
+		<Unit filename="../lib/cryptopp/gf2n.h" />
+		<Unit filename="../lib/cryptopp/gfpcrypt.cpp" />
+		<Unit filename="../lib/cryptopp/gfpcrypt.h" />
+		<Unit filename="../lib/cryptopp/gzip.h" />
+		<Unit filename="../lib/cryptopp/hex.cpp" />
+		<Unit filename="../lib/cryptopp/hex.h" />
+		<Unit filename="../lib/cryptopp/hmac.cpp" />
+		<Unit filename="../lib/cryptopp/hmac.h" />
+		<Unit filename="../lib/cryptopp/hrtimer.cpp" />
+		<Unit filename="../lib/cryptopp/hrtimer.h" />
+		<Unit filename="../lib/cryptopp/integer.cpp" />
+		<Unit filename="../lib/cryptopp/integer.h" />
+		<Unit filename="../lib/cryptopp/iterhash.cpp" />
+		<Unit filename="../lib/cryptopp/iterhash.h" />
+		<Unit filename="../lib/cryptopp/lubyrack.h" />
+		<Unit filename="../lib/cryptopp/luc.cpp" />
+		<Unit filename="../lib/cryptopp/luc.h" />
+		<Unit filename="../lib/cryptopp/md2.cpp" />
+		<Unit filename="../lib/cryptopp/md2.h" />
+		<Unit filename="../lib/cryptopp/md4.cpp" />
+		<Unit filename="../lib/cryptopp/md4.h" />
+		<Unit filename="../lib/cryptopp/md5.cpp" />
+		<Unit filename="../lib/cryptopp/md5.h" />
+		<Unit filename="../lib/cryptopp/mdc.h" />
+		<Unit filename="../lib/cryptopp/misc.cpp" />
+		<Unit filename="../lib/cryptopp/misc.h" />
+		<Unit filename="../lib/cryptopp/modarith.h" />
+		<Unit filename="../lib/cryptopp/modes.cpp" />
+		<Unit filename="../lib/cryptopp/modes.h" />
+		<Unit filename="../lib/cryptopp/modexppc.h" />
+		<Unit filename="../lib/cryptopp/mqueue.cpp" />
+		<Unit filename="../lib/cryptopp/mqueue.h" />
+		<Unit filename="../lib/cryptopp/mqv.cpp" />
+		<Unit filename="../lib/cryptopp/mqv.h" />
+		<Unit filename="../lib/cryptopp/nbtheory.cpp" />
+		<Unit filename="../lib/cryptopp/nbtheory.h" />
+		<Unit filename="../lib/cryptopp/network.cpp" />
+		<Unit filename="../lib/cryptopp/network.h" />
+		<Unit filename="../lib/cryptopp/nr.h" />
+		<Unit filename="../lib/cryptopp/oaep.cpp" />
+		<Unit filename="../lib/cryptopp/oaep.h" />
+		<Unit filename="../lib/cryptopp/oids.h" />
+		<Unit filename="../lib/cryptopp/osrng.cpp" />
+		<Unit filename="../lib/cryptopp/osrng.h" />
+		<Unit filename="../lib/cryptopp/pch.cpp" />
+		<Unit filename="../lib/cryptopp/pch.h" />
+		<Unit filename="../lib/cryptopp/pkcspad.cpp" />
+		<Unit filename="../lib/cryptopp/pkcspad.h" />
+		<Unit filename="../lib/cryptopp/polynomi.cpp" />
+		<Unit filename="../lib/cryptopp/polynomi.h" />
+		<Unit filename="../lib/cryptopp/pssr.cpp" />
+		<Unit filename="../lib/cryptopp/pssr.h" />
+		<Unit filename="../lib/cryptopp/pubkey.cpp" />
+		<Unit filename="../lib/cryptopp/pubkey.h" />
+		<Unit filename="../lib/cryptopp/pwdbased.h" />
+		<Unit filename="../lib/cryptopp/queue.cpp" />
+		<Unit filename="../lib/cryptopp/queue.h" />
+		<Unit filename="../lib/cryptopp/rabin.cpp" />
+		<Unit filename="../lib/cryptopp/rabin.h" />
+		<Unit filename="../lib/cryptopp/randpool.cpp" />
+		<Unit filename="../lib/cryptopp/randpool.h" />
+		<Unit filename="../lib/cryptopp/rdtables.cpp" />
+		<Unit filename="../lib/cryptopp/rijndael.cpp" />
+		<Unit filename="../lib/cryptopp/rijndael.h" />
+		<Unit filename="../lib/cryptopp/rng.cpp" />
+		<Unit filename="../lib/cryptopp/rng.h" />
+		<Unit filename="../lib/cryptopp/rsa.cpp" />
+		<Unit filename="../lib/cryptopp/rsa.h" />
+		<Unit filename="../lib/cryptopp/rw.cpp" />
+		<Unit filename="../lib/cryptopp/rw.h" />
+		<Unit filename="../lib/cryptopp/safer.cpp" />
+		<Unit filename="../lib/cryptopp/safer.h" />
+		<Unit filename="../lib/cryptopp/seal.cpp" />
+		<Unit filename="../lib/cryptopp/seal.h" />
+		<Unit filename="../lib/cryptopp/secblock.h" />
+		<Unit filename="../lib/cryptopp/seckey.h" />
+		<Unit filename="../lib/cryptopp/seed.cpp" />
+		<Unit filename="../lib/cryptopp/seed.h" />
+		<Unit filename="../lib/cryptopp/sha.cpp" />
+		<Unit filename="../lib/cryptopp/sha.h" />
+		<Unit filename="../lib/cryptopp/shacal2.cpp" />
+		<Unit filename="../lib/cryptopp/shacal2.h" />
+		<Unit filename="../lib/cryptopp/simple.cpp" />
+		<Unit filename="../lib/cryptopp/simple.h" />
+		<Unit filename="../lib/cryptopp/smartptr.h" />
+		<Unit filename="../lib/cryptopp/socketft.cpp" />
+		<Unit filename="../lib/cryptopp/socketft.h" />
+		<Unit filename="../lib/cryptopp/square.cpp" />
+		<Unit filename="../lib/cryptopp/square.h" />
+		<Unit filename="../lib/cryptopp/squaretb.cpp" />
+		<Unit filename="../lib/cryptopp/stdcpp.h" />
+		<Unit filename="../lib/cryptopp/strciphr.cpp" />
+		<Unit filename="../lib/cryptopp/strciphr.h" />
+		<Unit filename="../lib/cryptopp/tea.cpp" />
+		<Unit filename="../lib/cryptopp/tea.h" />
+		<Unit filename="../lib/cryptopp/tiger.cpp" />
+		<Unit filename="../lib/cryptopp/tiger.h" />
+		<Unit filename="../lib/cryptopp/tigertab.cpp" />
+		<Unit filename="../lib/cryptopp/trdlocal.cpp" />
+		<Unit filename="../lib/cryptopp/trdlocal.h" />
+		<Unit filename="../lib/cryptopp/trunhash.h" />
+		<Unit filename="../lib/cryptopp/ttmac.cpp" />
+		<Unit filename="../lib/cryptopp/ttmac.h" />
+		<Unit filename="../lib/cryptopp/vmac.cpp" />
+		<Unit filename="../lib/cryptopp/vmac.h" />
+		<Unit filename="../lib/cryptopp/wait.cpp" />
+		<Unit filename="../lib/cryptopp/wait.h" />
+		<Unit filename="../lib/cryptopp/wake.h" />
+		<Unit filename="../lib/cryptopp/winpipes.cpp" />
+		<Unit filename="../lib/cryptopp/winpipes.h" />
+		<Unit filename="../lib/cryptopp/words.h" />
 		<Extensions>
 			<code_completion />
 			<envvars />
diff --git a/VC2008/CryptoPP.vcproj b/VC2008/CryptoPP.vcproj
index 6c56d3cce..44f5f226c 100644
--- a/VC2008/CryptoPP.vcproj
+++ b/VC2008/CryptoPP.vcproj
@@ -439,7 +439,7 @@
 			Filter=".cpp"
 			>
 			<File
-				RelativePath="..\CryptoPP\adler32.cpp"
+				RelativePath="..\lib\cryptopp\adler32.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -495,7 +495,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\algebra.cpp"
+				RelativePath="..\lib\cryptopp\algebra.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -551,7 +551,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\algparam.cpp"
+				RelativePath="..\lib\cryptopp\algparam.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -607,7 +607,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\asn.cpp"
+				RelativePath="..\lib\cryptopp\asn.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -663,11 +663,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\.\authenc.cpp"
+				RelativePath="..\lib\cryptopp\.\authenc.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\base32.cpp"
+				RelativePath="..\lib\cryptopp\base32.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -723,7 +723,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\base64.cpp"
+				RelativePath="..\lib\cryptopp\base64.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -779,7 +779,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\basecode.cpp"
+				RelativePath="..\lib\cryptopp\basecode.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -835,7 +835,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\cbcmac.cpp"
+				RelativePath="..\lib\cryptopp\cbcmac.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -891,11 +891,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\.\ccm.cpp"
+				RelativePath="..\lib\cryptopp\.\ccm.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\channels.cpp"
+				RelativePath="..\lib\cryptopp\channels.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -951,15 +951,15 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\.\cmac.cpp"
+				RelativePath="..\lib\cryptopp\.\cmac.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\.\cpu.cpp"
+				RelativePath="..\lib\cryptopp\.\cpu.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\crc.cpp"
+				RelativePath="..\lib\cryptopp\crc.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -1015,7 +1015,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\cryptlib.cpp"
+				RelativePath="..\lib\cryptopp\cryptlib.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -1071,7 +1071,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\default.cpp"
+				RelativePath="..\lib\cryptopp\default.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -1127,15 +1127,15 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\des.cpp"
+				RelativePath="..\lib\cryptopp\des.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\dessp.cpp"
+				RelativePath="..\lib\cryptopp\dessp.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\dh.cpp"
+				RelativePath="..\lib\cryptopp\dh.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -1191,7 +1191,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\dh2.cpp"
+				RelativePath="..\lib\cryptopp\dh2.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -1247,7 +1247,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\dll.cpp"
+				RelativePath="..\lib\cryptopp\dll.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -1309,7 +1309,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\dsa.cpp"
+				RelativePath="..\lib\cryptopp\dsa.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -1365,11 +1365,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\.\eax.cpp"
+				RelativePath="..\lib\cryptopp\.\eax.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\ec2n.cpp"
+				RelativePath="..\lib\cryptopp\ec2n.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -1425,7 +1425,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\eccrypto.cpp"
+				RelativePath="..\lib\cryptopp\eccrypto.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -1487,7 +1487,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\ecp.cpp"
+				RelativePath="..\lib\cryptopp\ecp.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -1543,7 +1543,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\elgamal.cpp"
+				RelativePath="..\lib\cryptopp\elgamal.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -1599,11 +1599,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\emsa2.cpp"
+				RelativePath="..\lib\cryptopp\emsa2.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\eprecomp.cpp"
+				RelativePath="..\lib\cryptopp\eprecomp.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -1665,7 +1665,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\esign.cpp"
+				RelativePath="..\lib\cryptopp\esign.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -1721,7 +1721,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\files.cpp"
+				RelativePath="..\lib\cryptopp\files.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -1777,7 +1777,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\filters.cpp"
+				RelativePath="..\lib\cryptopp\filters.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -1833,7 +1833,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\fips140.cpp"
+				RelativePath="..\lib\cryptopp\fips140.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -1889,11 +1889,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\.\gcm.cpp"
+				RelativePath="..\lib\cryptopp\.\gcm.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\gf256.cpp"
+				RelativePath="..\lib\cryptopp\gf256.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -1949,7 +1949,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\gf2_32.cpp"
+				RelativePath="..\lib\cryptopp\gf2_32.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -2005,7 +2005,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\gf2n.cpp"
+				RelativePath="..\lib\cryptopp\gf2n.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -2061,7 +2061,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\gfpcrypt.cpp"
+				RelativePath="..\lib\cryptopp\gfpcrypt.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -2117,7 +2117,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\hex.cpp"
+				RelativePath="..\lib\cryptopp\hex.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -2173,7 +2173,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\hmac.cpp"
+				RelativePath="..\lib\cryptopp\hmac.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -2229,7 +2229,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\hrtimer.cpp"
+				RelativePath="..\lib\cryptopp\hrtimer.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -2285,7 +2285,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\integer.cpp"
+				RelativePath="..\lib\cryptopp\integer.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -2342,7 +2342,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\iterhash.cpp"
+				RelativePath="..\lib\cryptopp\iterhash.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -2404,7 +2404,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\luc.cpp"
+				RelativePath="..\lib\cryptopp\luc.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -2460,7 +2460,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\md2.cpp"
+				RelativePath="..\lib\cryptopp\md2.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -2516,7 +2516,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\md4.cpp"
+				RelativePath="..\lib\cryptopp\md4.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -2572,7 +2572,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\md5.cpp"
+				RelativePath="..\lib\cryptopp\md5.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -2628,7 +2628,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\misc.cpp"
+				RelativePath="..\lib\cryptopp\misc.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -2684,7 +2684,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\modes.cpp"
+				RelativePath="..\lib\cryptopp\modes.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -2740,7 +2740,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\mqueue.cpp"
+				RelativePath="..\lib\cryptopp\mqueue.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -2796,7 +2796,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\mqv.cpp"
+				RelativePath="..\lib\cryptopp\mqv.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -2852,7 +2852,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\nbtheory.cpp"
+				RelativePath="..\lib\cryptopp\nbtheory.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -2908,7 +2908,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\network.cpp"
+				RelativePath="..\lib\cryptopp\network.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -2964,7 +2964,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\oaep.cpp"
+				RelativePath="..\lib\cryptopp\oaep.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -3020,7 +3020,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\osrng.cpp"
+				RelativePath="..\lib\cryptopp\osrng.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -3076,7 +3076,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\pch.cpp"
+				RelativePath="..\lib\cryptopp\pch.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -3138,7 +3138,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\pkcspad.cpp"
+				RelativePath="..\lib\cryptopp\pkcspad.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -3194,7 +3194,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\polynomi.cpp"
+				RelativePath="..\lib\cryptopp\polynomi.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -3250,11 +3250,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\pssr.cpp"
+				RelativePath="..\lib\cryptopp\pssr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\pubkey.cpp"
+				RelativePath="..\lib\cryptopp\pubkey.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -3310,7 +3310,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\queue.cpp"
+				RelativePath="..\lib\cryptopp\queue.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -3366,7 +3366,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\rabin.cpp"
+				RelativePath="..\lib\cryptopp\rabin.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -3422,7 +3422,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\randpool.cpp"
+				RelativePath="..\lib\cryptopp\randpool.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -3478,7 +3478,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\rdtables.cpp"
+				RelativePath="..\lib\cryptopp\rdtables.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -3534,7 +3534,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\rijndael.cpp"
+				RelativePath="..\lib\cryptopp\rijndael.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -3590,7 +3590,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\rng.cpp"
+				RelativePath="..\lib\cryptopp\rng.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -3646,7 +3646,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\rsa.cpp"
+				RelativePath="..\lib\cryptopp\rsa.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -3702,7 +3702,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\rw.cpp"
+				RelativePath="..\lib\cryptopp\rw.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -3758,7 +3758,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\safer.cpp"
+				RelativePath="..\lib\cryptopp\safer.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -3814,7 +3814,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\seal.cpp"
+				RelativePath="..\lib\cryptopp\seal.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -3870,11 +3870,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\.\seed.cpp"
+				RelativePath="..\lib\cryptopp\.\seed.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\sha.cpp"
+				RelativePath="..\lib\cryptopp\sha.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -3930,7 +3930,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\shacal2.cpp"
+				RelativePath="..\lib\cryptopp\shacal2.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -3986,7 +3986,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\simple.cpp"
+				RelativePath="..\lib\cryptopp\simple.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -4042,7 +4042,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\socketft.cpp"
+				RelativePath="..\lib\cryptopp\socketft.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -4098,7 +4098,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\square.cpp"
+				RelativePath="..\lib\cryptopp\square.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -4154,7 +4154,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\squaretb.cpp"
+				RelativePath="..\lib\cryptopp\squaretb.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -4210,7 +4210,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\strciphr.cpp"
+				RelativePath="..\lib\cryptopp\strciphr.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -4266,7 +4266,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\tea.cpp"
+				RelativePath="..\lib\cryptopp\tea.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -4322,7 +4322,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\tiger.cpp"
+				RelativePath="..\lib\cryptopp\tiger.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -4378,7 +4378,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\tigertab.cpp"
+				RelativePath="..\lib\cryptopp\tigertab.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -4434,7 +4434,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\trdlocal.cpp"
+				RelativePath="..\lib\cryptopp\trdlocal.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -4490,7 +4490,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\ttmac.cpp"
+				RelativePath="..\lib\cryptopp\ttmac.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -4546,11 +4546,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\.\vmac.cpp"
+				RelativePath="..\lib\cryptopp\.\vmac.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\wait.cpp"
+				RelativePath="..\lib\cryptopp\wait.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -4606,7 +4606,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\winpipes.cpp"
+				RelativePath="..\lib\cryptopp\winpipes.cpp"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -4667,411 +4667,411 @@
 			Filter=".;.h"
 			>
 			<File
-				RelativePath="..\CryptoPP\adler32.h"
+				RelativePath="..\lib\cryptopp\adler32.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\aes.h"
+				RelativePath="..\lib\cryptopp\aes.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\algebra.h"
+				RelativePath="..\lib\cryptopp\algebra.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\algparam.h"
+				RelativePath="..\lib\cryptopp\algparam.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\arc4.h"
+				RelativePath="..\lib\cryptopp\arc4.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\argnames.h"
+				RelativePath="..\lib\cryptopp\argnames.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\asn.h"
+				RelativePath="..\lib\cryptopp\asn.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\.\authenc.h"
+				RelativePath="..\lib\cryptopp\.\authenc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\base32.h"
+				RelativePath="..\lib\cryptopp\base32.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\base64.h"
+				RelativePath="..\lib\cryptopp\base64.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\basecode.h"
+				RelativePath="..\lib\cryptopp\basecode.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\cbcmac.h"
+				RelativePath="..\lib\cryptopp\cbcmac.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\.\ccm.h"
+				RelativePath="..\lib\cryptopp\.\ccm.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\channels.h"
+				RelativePath="..\lib\cryptopp\channels.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\.\cmac.h"
+				RelativePath="..\lib\cryptopp\.\cmac.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\config.h"
+				RelativePath="..\lib\cryptopp\config.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\.\cpu.h"
+				RelativePath="..\lib\cryptopp\.\cpu.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\crc.h"
+				RelativePath="..\lib\cryptopp\crc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\cryptlib.h"
+				RelativePath="..\lib\cryptopp\cryptlib.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\default.h"
+				RelativePath="..\lib\cryptopp\default.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\des.h"
+				RelativePath="..\lib\cryptopp\des.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\dh.h"
+				RelativePath="..\lib\cryptopp\dh.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\dh2.h"
+				RelativePath="..\lib\cryptopp\dh2.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\dmac.h"
+				RelativePath="..\lib\cryptopp\dmac.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\dsa.h"
+				RelativePath="..\lib\cryptopp\dsa.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\.\eax.h"
+				RelativePath="..\lib\cryptopp\.\eax.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\ec2n.h"
+				RelativePath="..\lib\cryptopp\ec2n.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\eccrypto.h"
+				RelativePath="..\lib\cryptopp\eccrypto.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\ecp.h"
+				RelativePath="..\lib\cryptopp\ecp.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\elgamal.h"
+				RelativePath="..\lib\cryptopp\elgamal.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\emsa2.h"
+				RelativePath="..\lib\cryptopp\emsa2.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\eprecomp.h"
+				RelativePath="..\lib\cryptopp\eprecomp.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\esign.h"
+				RelativePath="..\lib\cryptopp\esign.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\files.h"
+				RelativePath="..\lib\cryptopp\files.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\filters.h"
+				RelativePath="..\lib\cryptopp\filters.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\fips140.h"
+				RelativePath="..\lib\cryptopp\fips140.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\fltrimpl.h"
+				RelativePath="..\lib\cryptopp\fltrimpl.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\.\gcm.h"
+				RelativePath="..\lib\cryptopp\.\gcm.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\gf256.h"
+				RelativePath="..\lib\cryptopp\gf256.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\gf2_32.h"
+				RelativePath="..\lib\cryptopp\gf2_32.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\gf2n.h"
+				RelativePath="..\lib\cryptopp\gf2n.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\gfpcrypt.h"
+				RelativePath="..\lib\cryptopp\gfpcrypt.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\gzip.h"
+				RelativePath="..\lib\cryptopp\gzip.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\hex.h"
+				RelativePath="..\lib\cryptopp\hex.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\hmac.h"
+				RelativePath="..\lib\cryptopp\hmac.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\hrtimer.h"
+				RelativePath="..\lib\cryptopp\hrtimer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\integer.h"
+				RelativePath="..\lib\cryptopp\integer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\iterhash.h"
+				RelativePath="..\lib\cryptopp\iterhash.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\lubyrack.h"
+				RelativePath="..\lib\cryptopp\lubyrack.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\luc.h"
+				RelativePath="..\lib\cryptopp\luc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\md2.h"
+				RelativePath="..\lib\cryptopp\md2.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\md4.h"
+				RelativePath="..\lib\cryptopp\md4.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\md5.h"
+				RelativePath="..\lib\cryptopp\md5.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\mdc.h"
+				RelativePath="..\lib\cryptopp\mdc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\misc.h"
+				RelativePath="..\lib\cryptopp\misc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\modarith.h"
+				RelativePath="..\lib\cryptopp\modarith.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\modes.h"
+				RelativePath="..\lib\cryptopp\modes.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\modexppc.h"
+				RelativePath="..\lib\cryptopp\modexppc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\mqueue.h"
+				RelativePath="..\lib\cryptopp\mqueue.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\mqv.h"
+				RelativePath="..\lib\cryptopp\mqv.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\nbtheory.h"
+				RelativePath="..\lib\cryptopp\nbtheory.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\network.h"
+				RelativePath="..\lib\cryptopp\network.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\nr.h"
+				RelativePath="..\lib\cryptopp\nr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\oaep.h"
+				RelativePath="..\lib\cryptopp\oaep.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\oids.h"
+				RelativePath="..\lib\cryptopp\oids.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\osrng.h"
+				RelativePath="..\lib\cryptopp\osrng.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\pch.h"
+				RelativePath="..\lib\cryptopp\pch.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\pkcspad.h"
+				RelativePath="..\lib\cryptopp\pkcspad.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\polynomi.h"
+				RelativePath="..\lib\cryptopp\polynomi.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\pssr.h"
+				RelativePath="..\lib\cryptopp\pssr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\pubkey.h"
+				RelativePath="..\lib\cryptopp\pubkey.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\pwdbased.h"
+				RelativePath="..\lib\cryptopp\pwdbased.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\queue.h"
+				RelativePath="..\lib\cryptopp\queue.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\rabin.h"
+				RelativePath="..\lib\cryptopp\rabin.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\randpool.h"
+				RelativePath="..\lib\cryptopp\randpool.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\rijndael.h"
+				RelativePath="..\lib\cryptopp\rijndael.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\rng.h"
+				RelativePath="..\lib\cryptopp\rng.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\rsa.h"
+				RelativePath="..\lib\cryptopp\rsa.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\rw.h"
+				RelativePath="..\lib\cryptopp\rw.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\safer.h"
+				RelativePath="..\lib\cryptopp\safer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\seal.h"
+				RelativePath="..\lib\cryptopp\seal.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\secblock.h"
+				RelativePath="..\lib\cryptopp\secblock.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\seckey.h"
+				RelativePath="..\lib\cryptopp\seckey.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\.\seed.h"
+				RelativePath="..\lib\cryptopp\.\seed.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\sha.h"
+				RelativePath="..\lib\cryptopp\sha.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\shacal2.h"
+				RelativePath="..\lib\cryptopp\shacal2.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\simple.h"
+				RelativePath="..\lib\cryptopp\simple.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\smartptr.h"
+				RelativePath="..\lib\cryptopp\smartptr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\socketft.h"
+				RelativePath="..\lib\cryptopp\socketft.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\square.h"
+				RelativePath="..\lib\cryptopp\square.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\.\stdcpp.h"
+				RelativePath="..\lib\cryptopp\.\stdcpp.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\strciphr.h"
+				RelativePath="..\lib\cryptopp\strciphr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\tea.h"
+				RelativePath="..\lib\cryptopp\tea.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\tiger.h"
+				RelativePath="..\lib\cryptopp\tiger.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\trdlocal.h"
+				RelativePath="..\lib\cryptopp\trdlocal.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\trunhash.h"
+				RelativePath="..\lib\cryptopp\trunhash.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\ttmac.h"
+				RelativePath="..\lib\cryptopp\ttmac.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\.\vmac.h"
+				RelativePath="..\lib\cryptopp\.\vmac.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\wait.h"
+				RelativePath="..\lib\cryptopp\wait.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\wake.h"
+				RelativePath="..\lib\cryptopp\wake.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\winpipes.h"
+				RelativePath="..\lib\cryptopp\winpipes.h"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\words.h"
+				RelativePath="..\lib\cryptopp\words.h"
 				>
 			</File>
 		</Filter>
@@ -5079,19 +5079,19 @@
 			Name="Miscellaneous"
 			>
 			<File
-				RelativePath="..\CryptoPP\Doxyfile"
+				RelativePath="..\lib\cryptopp\Doxyfile"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\GNUmakefile"
+				RelativePath="..\lib\cryptopp\GNUmakefile"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\.\License.txt"
+				RelativePath="..\lib\cryptopp\.\License.txt"
 				>
 			</File>
 			<File
-				RelativePath="..\CryptoPP\.\Readme.txt"
+				RelativePath="..\lib\cryptopp\.\Readme.txt"
 				>
 			</File>
 		</Filter>
diff --git a/VC2008/GenerateBindings.cmd b/VC2008/GenerateBindings.cmd
index ac470234f..1ee0f3bf0 100644
--- a/VC2008/GenerateBindings.cmd
+++ b/VC2008/GenerateBindings.cmd
@@ -1,3 +1,3 @@
 set ALLTOLUA_WAIT=N
-cd ..\source
+cd ..\src
 AllToLua.bat
\ No newline at end of file
diff --git a/VC2008/JsonCpp.cbp b/VC2008/JsonCpp.cbp
index 35aa6ea81..f4826b2f1 100644
--- a/VC2008/JsonCpp.cbp
+++ b/VC2008/JsonCpp.cbp
@@ -20,10 +20,10 @@
 					<Add option="-W" />
 					<Add option="-g" />
 					<Add option="-O0" />
-					<Add directory="../jsoncpp-src-0.5.0/include" />
+					<Add directory="../lib/jsoncpp/include" />
 				</Compiler>
 				<ResourceCompiler>
-					<Add directory="../jsoncpp-src-0.5.0/include" />
+					<Add directory="../lib/jsoncpp/include" />
 				</ResourceCompiler>
 			</Target>
 			<Target title="Release Win32">
@@ -39,10 +39,10 @@
 					<Add option="-D_LIB" />
 					<Add option="-W" />
 					<Add option="-O2" />
-					<Add directory="../jsoncpp-src-0.5.0/include" />
+					<Add directory="../lib/jsoncpp/include" />
 				</Compiler>
 				<ResourceCompiler>
-					<Add directory="../jsoncpp-src-0.5.0/include" />
+					<Add directory="../lib/jsoncpp/include" />
 				</ResourceCompiler>
 			</Target>
 			<Target title="Release profiled Win32">
@@ -58,20 +58,20 @@
 					<Add option="-D_LIB" />
 					<Add option="-W" />
 					<Add option="-O2" />
-					<Add directory="../jsoncpp-src-0.5.0/include" />
+					<Add directory="../lib/jsoncpp/include" />
 				</Compiler>
 				<ResourceCompiler>
-					<Add directory="../jsoncpp-src-0.5.0/include" />
+					<Add directory="../lib/jsoncpp/include" />
 				</ResourceCompiler>
 			</Target>
 		</Build>
-		<Unit filename="../jsoncpp-src-0.5.0/src/lib_json/json_batchallocator.h" />
-		<Unit filename="../jsoncpp-src-0.5.0/src/lib_json/json_internalarray.inl" />
-		<Unit filename="../jsoncpp-src-0.5.0/src/lib_json/json_internalmap.inl" />
-		<Unit filename="../jsoncpp-src-0.5.0/src/lib_json/json_reader.cpp" />
-		<Unit filename="../jsoncpp-src-0.5.0/src/lib_json/json_value.cpp" />
-		<Unit filename="../jsoncpp-src-0.5.0/src/lib_json/json_valueiterator.inl" />
-		<Unit filename="../jsoncpp-src-0.5.0/src/lib_json/json_writer.cpp" />
+		<Unit filename="../lib/jsoncpp/src/lib_json/json_batchallocator.h" />
+		<Unit filename="../lib/jsoncpp/src/lib_json/json_internalarray.inl" />
+		<Unit filename="../lib/jsoncpp/src/lib_json/json_internalmap.inl" />
+		<Unit filename="../lib/jsoncpp/src/lib_json/json_reader.cpp" />
+		<Unit filename="../lib/jsoncpp/src/lib_json/json_value.cpp" />
+		<Unit filename="../lib/jsoncpp/src/lib_json/json_valueiterator.inl" />
+		<Unit filename="../lib/jsoncpp/src/lib_json/json_writer.cpp" />
 		<Extensions>
 			<code_completion />
 			<envvars />
diff --git a/VC2008/JsonCpp.vcproj b/VC2008/JsonCpp.vcproj
index 5fa1ec685..577507d50 100644
--- a/VC2008/JsonCpp.vcproj
+++ b/VC2008/JsonCpp.vcproj
@@ -276,31 +276,31 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_batchallocator.h"
+				RelativePath="../lib/jsoncpp\src\lib_json\json_batchallocator.h"
 				>
 			</File>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_internalarray.inl"
+				RelativePath="../lib/jsoncpp\src\lib_json\json_internalarray.inl"
 				>
 			</File>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_internalmap.inl"
+				RelativePath="../lib/jsoncpp\src\lib_json\json_internalmap.inl"
 				>
 			</File>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_reader.cpp"
+				RelativePath="..\lib\jsoncpp\src\lib_json\json_reader.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_value.cpp"
+				RelativePath="../lib/jsoncpp\src\lib_json\json_value.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_valueiterator.inl"
+				RelativePath="../lib/jsoncpp\src\lib_json\json_valueiterator.inl"
 				>
 			</File>
 			<File
-				RelativePath="..\jsoncpp-src-0.5.0\src\lib_json\json_writer.cpp"
+				RelativePath="../lib/jsoncpp\src\lib_json\json_writer.cpp"
 				>
 			</File>
 		</Filter>
diff --git a/VC2008/Lua.cbp b/VC2008/Lua.cbp
index 208bf42f4..33353656a 100644
--- a/VC2008/Lua.cbp
+++ b/VC2008/Lua.cbp
@@ -56,123 +56,123 @@
 				</Compiler>
 			</Target>
 		</Build>
-		<Unit filename="../lua-5.1.4/src/lapi.c">
+		<Unit filename="../lib/lua/src/lapi.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lapi.h" />
-		<Unit filename="../lua-5.1.4/src/lauxlib.c">
+		<Unit filename="../lib/lua/src/lapi.h" />
+		<Unit filename="../lib/lua/src/lauxlib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lauxlib.h" />
-		<Unit filename="../lua-5.1.4/src/lbaselib.c">
+		<Unit filename="../lib/lua/src/lauxlib.h" />
+		<Unit filename="../lib/lua/src/lbaselib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lcode.c">
+		<Unit filename="../lib/lua/src/lcode.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lcode.h" />
-		<Unit filename="../lua-5.1.4/src/ldblib.c">
+		<Unit filename="../lib/lua/src/lcode.h" />
+		<Unit filename="../lib/lua/src/ldblib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/ldebug.c">
+		<Unit filename="../lib/lua/src/ldebug.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/ldebug.h" />
-		<Unit filename="../lua-5.1.4/src/ldo.c">
+		<Unit filename="../lib/lua/src/ldebug.h" />
+		<Unit filename="../lib/lua/src/ldo.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/ldo.h" />
-		<Unit filename="../lua-5.1.4/src/ldump.c">
+		<Unit filename="../lib/lua/src/ldo.h" />
+		<Unit filename="../lib/lua/src/ldump.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lfunc.c">
+		<Unit filename="../lib/lua/src/lfunc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lfunc.h" />
-		<Unit filename="../lua-5.1.4/src/lgc.c">
+		<Unit filename="../lib/lua/src/lfunc.h" />
+		<Unit filename="../lib/lua/src/lgc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lgc.h" />
-		<Unit filename="../lua-5.1.4/src/linit.c">
+		<Unit filename="../lib/lua/src/lgc.h" />
+		<Unit filename="../lib/lua/src/linit.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/liolib.c">
+		<Unit filename="../lib/lua/src/liolib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/llex.c">
+		<Unit filename="../lib/lua/src/llex.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/llex.h" />
-		<Unit filename="../lua-5.1.4/src/llimits.h" />
-		<Unit filename="../lua-5.1.4/src/lmathlib.c">
+		<Unit filename="../lib/lua/src/llex.h" />
+		<Unit filename="../lib/lua/src/llimits.h" />
+		<Unit filename="../lib/lua/src/lmathlib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lmem.c">
+		<Unit filename="../lib/lua/src/lmem.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lmem.h" />
-		<Unit filename="../lua-5.1.4/src/loadlib.c">
+		<Unit filename="../lib/lua/src/lmem.h" />
+		<Unit filename="../lib/lua/src/loadlib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lobject.c">
+		<Unit filename="../lib/lua/src/lobject.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lobject.h" />
-		<Unit filename="../lua-5.1.4/src/lopcodes.c">
+		<Unit filename="../lib/lua/src/lobject.h" />
+		<Unit filename="../lib/lua/src/lopcodes.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lopcodes.h" />
-		<Unit filename="../lua-5.1.4/src/loslib.c">
+		<Unit filename="../lib/lua/src/lopcodes.h" />
+		<Unit filename="../lib/lua/src/loslib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lparser.c">
+		<Unit filename="../lib/lua/src/lparser.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lparser.h" />
-		<Unit filename="../lua-5.1.4/src/lstate.c">
+		<Unit filename="../lib/lua/src/lparser.h" />
+		<Unit filename="../lib/lua/src/lstate.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lstate.h" />
-		<Unit filename="../lua-5.1.4/src/lstring.c">
+		<Unit filename="../lib/lua/src/lstate.h" />
+		<Unit filename="../lib/lua/src/lstring.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lstring.h" />
-		<Unit filename="../lua-5.1.4/src/lstrlib.c">
+		<Unit filename="../lib/lua/src/lstring.h" />
+		<Unit filename="../lib/lua/src/lstrlib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/ltable.c">
+		<Unit filename="../lib/lua/src/ltable.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/ltable.h" />
-		<Unit filename="../lua-5.1.4/src/ltablib.c">
+		<Unit filename="../lib/lua/src/ltable.h" />
+		<Unit filename="../lib/lua/src/ltablib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/ltm.c">
+		<Unit filename="../lib/lua/src/ltm.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/ltm.h" />
-		<Unit filename="../lua-5.1.4/src/lua.c">
+		<Unit filename="../lib/lua/src/ltm.h" />
+		<Unit filename="../lib/lua/src/lua.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lua.h" />
-		<Unit filename="../lua-5.1.4/src/luac.c">
+		<Unit filename="../lib/lua/src/lua.h" />
+		<Unit filename="../lib/lua/src/luac.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/luaconf.h" />
-		<Unit filename="../lua-5.1.4/src/lualib.h" />
-		<Unit filename="../lua-5.1.4/src/lundump.c">
+		<Unit filename="../lib/lua/src/luaconf.h" />
+		<Unit filename="../lib/lua/src/lualib.h" />
+		<Unit filename="../lib/lua/src/lundump.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lundump.h" />
-		<Unit filename="../lua-5.1.4/src/lvm.c">
+		<Unit filename="../lib/lua/src/lundump.h" />
+		<Unit filename="../lib/lua/src/lvm.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lvm.h" />
-		<Unit filename="../lua-5.1.4/src/lzio.c">
+		<Unit filename="../lib/lua/src/lvm.h" />
+		<Unit filename="../lib/lua/src/lzio.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../lua-5.1.4/src/lzio.h" />
-		<Unit filename="../lua-5.1.4/src/print.c">
+		<Unit filename="../lib/lua/src/lzio.h" />
+		<Unit filename="../lib/lua/src/print.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Extensions>
diff --git a/VC2008/Lua.vcproj b/VC2008/Lua.vcproj
index cb063c53e..a21dadc66 100644
--- a/VC2008/Lua.vcproj
+++ b/VC2008/Lua.vcproj
@@ -272,224 +272,224 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\lua-5.1.4\src\lapi.c"
+				RelativePath="..\lib\lua\src\lapi.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lauxlib.c"
+				RelativePath="..\lib\lua\src\lauxlib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lbaselib.c"
+				RelativePath="..\lib\lua\src\lbaselib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lcode.c"
+				RelativePath="..\lib\lua\src\lcode.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\ldblib.c"
+				RelativePath="..\lib\lua\src\ldblib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\ldebug.c"
+				RelativePath="..\lib\lua\src\ldebug.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\ldo.c"
+				RelativePath="..\lib\lua\src\ldo.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\ldump.c"
+				RelativePath="..\lib\lua\src\ldump.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lfunc.c"
+				RelativePath="..\lib\luaO\src\lfunc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lgc.c"
+				RelativePath="..\lib\lua\src\lgc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\linit.c"
+				RelativePath="..\lib\lua\src\linit.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\liolib.c"
+				RelativePath="..\lib\lua\src\liolib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\llex.c"
+				RelativePath="..\lib\lua\src\llex.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lmathlib.c"
+				RelativePath="..\lib\lua\src\lmathlib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lmem.c"
+				RelativePath="..\lib\lua\src\lmem.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\loadlib.c"
+				RelativePath="..\lib\lua\src\loadlib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lobject.c"
+				RelativePath="..\lib\lua\src\lobject.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lopcodes.c"
+				RelativePath="..\lib\lua\src\lopcodes.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\loslib.c"
+				RelativePath="..\lib\lua\src\loslib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lparser.c"
+				RelativePath="..\lib\lua\src\lparser.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lstate.c"
+				RelativePath="..\lib\lua\src\lstate.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lstring.c"
+				RelativePath="..\lib\lua\src\lstring.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lstrlib.c"
+				RelativePath="..\lib\lua\src\lstrlib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\ltable.c"
+				RelativePath="..\lib\lua\src\ltable.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\ltablib.c"
+				RelativePath="..\lib\lua\src\ltablib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\ltm.c"
+				RelativePath="..\lib\lua\src\ltm.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lua.c"
+				RelativePath="..\lib\lua\src\lua.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\luac.c"
+				RelativePath="..\lib\lua\src\luac.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lundump.c"
+				RelativePath="..\lib\lua\src\lundump.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lvm.c"
+				RelativePath="..\lib\lua\src\lvm.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\lzio.c"
+				RelativePath="..\lib\lua\src\lzio.c"
 				>
 			</File>
 			<File
-				RelativePath="..\lua-5.1.4\src\print.c"
+				RelativePath="..\lib\lua\src\print.c"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\lua-5.1.4\src\lapi.h"
+			RelativePath="..\lib\lua\src\lapi.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lauxlib.h"
+			RelativePath="..\lib\lua\src\lauxlib.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lcode.h"
+			RelativePath="..\lib\lua\src\lcode.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\ldebug.h"
+			RelativePath="..\lib\lua\src\ldebug.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\ldo.h"
+			RelativePath="..\lib\lua\src\ldo.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lfunc.h"
+			RelativePath="..\lib\lua\src\lfunc.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lgc.h"
+			RelativePath="..\lib\lua\src\lgc.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\llex.h"
+			RelativePath="..\lib\lua\src\llex.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\llimits.h"
+			RelativePath="..\lib\lua\src\llimits.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lmem.h"
+			RelativePath="..\lib\lua\src\lmem.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lobject.h"
+			RelativePath="..\lib\lua\src\lobject.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lopcodes.h"
+			RelativePath="..\lib\lua\src\lopcodes.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lparser.h"
+			RelativePath="..\lib\lua\src\lparser.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lstate.h"
+			RelativePath="..\lib\lua\src\lstate.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lstring.h"
+			RelativePath="..\lib\lua\src\lstring.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\ltable.h"
+			RelativePath="..\lib\lua\src\ltable.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\ltm.h"
+			RelativePath="..\lib\lua\src\ltm.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lua.h"
+			RelativePath="..\lib\lua\src\lua.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\luaconf.h"
+			RelativePath="..\lib\lua\src\luaconf.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lualib.h"
+			RelativePath="..\lib\lua\src\lualib.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lundump.h"
+			RelativePath="..\lib\lua\src\lundump.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lvm.h"
+			RelativePath="..\lib\lua\src\lvm.h"
 			>
 		</File>
 		<File
-			RelativePath="..\lua-5.1.4\src\lzio.h"
+			RelativePath="..\lib\lua\src\lzio.h"
 			>
 		</File>
 	</Files>
diff --git a/VC2008/MCServer.cbp b/VC2008/MCServer.cbp
index c44a1a445..1758f6410 100644
--- a/VC2008/MCServer.cbp
+++ b/VC2008/MCServer.cbp
@@ -60,26 +60,20 @@
 					<Add option="-DXML_STATIC" />
 					<Add option="-W" />
 					<Add option="-O3" />
-					<Add directory="../zlib-1.2.7" />
-					<Add directory="../jsoncpp-src-0.5.0/include" />
-					<Add directory="../lua-5.1.4/src" />
-					<Add directory="../tolua++-1.0.93/include" />
-					<Add directory="../squirrel_3_0_1_stable/include" />
-					<Add directory="../squirrel_3_0_1_stable" />
-					<Add directory="../squirrel_3_0_1_stable/sqrat" />
+					<Add directory="../lib/zlib" />
+					<Add directory="../lib/jsoncpp/include" />
+					<Add directory="../lib/lua/src" />
+					<Add directory="../lib/tolua++/include" />
 					<Add directory=".." />
-					<Add directory="../expat" />
+					<Add directory="../lib/expat" />
 				</Compiler>
 				<ResourceCompiler>
-					<Add directory="../zlib-1.2.7" />
-					<Add directory="../jsoncpp-src-0.5.0/include" />
-					<Add directory="../lua-5.1.4/src" />
-					<Add directory="../tolua++-1.0.93/include" />
-					<Add directory="../squirrel_3_0_1_stable/include" />
-					<Add directory="../squirrel_3_0_1_stable" />
-					<Add directory="../squirrel_3_0_1_stable/sqrat" />
+					<Add directory="../lib/zlib" />
+					<Add directory="../lib/jsoncpp/include" />
+					<Add directory="../lib/lua/src" />
+					<Add directory="../lib/tolua++/include" />
 					<Add directory=".." />
-					<Add directory="../expat" />
+					<Add directory="../lib/expat" />
 				</ResourceCompiler>
 				<Linker>
 					<Add library="ws2_32" />
@@ -100,26 +94,20 @@
 					<Add option="-DXML_STATIC" />
 					<Add option="-W" />
 					<Add option="-O3" />
-					<Add directory="../zlib-1.2.7" />
-					<Add directory="../jsoncpp-src-0.5.0/include" />
-					<Add directory="../lua-5.1.4/src" />
-					<Add directory="../tolua++-1.0.93/include" />
-					<Add directory="../squirrel_3_0_1_stable/include" />
-					<Add directory="../squirrel_3_0_1_stable" />
-					<Add directory="../squirrel_3_0_1_stable/sqrat" />
+					<Add directory="../lib/zlib" />
+					<Add directory="../lib/jsoncpp/include" />
+					<Add directory="../lib/lua/src" />
+					<Add directory="../lib/tolua++/include" />
 					<Add directory=".." />
-					<Add directory="../expat" />
+					<Add directory="../lib/expat" />
 				</Compiler>
 				<ResourceCompiler>
-					<Add directory="../zlib-1.2.7" />
-					<Add directory="../jsoncpp-src-0.5.0/include" />
-					<Add directory="../lua-5.1.4/src" />
-					<Add directory="../tolua++-1.0.93/include" />
-					<Add directory="../squirrel_3_0_1_stable/include" />
-					<Add directory="../squirrel_3_0_1_stable" />
-					<Add directory="../squirrel_3_0_1_stable/sqrat" />
+					<Add directory="../lib/zlib" />
+					<Add directory="../lib/jsoncpp/include" />
+					<Add directory="../lib/lua/src" />
+					<Add directory="../lib/tolua++/include" />
 					<Add directory=".." />
-					<Add directory="../expat" />
+					<Add directory="../lib/expat" />
 				</ResourceCompiler>
 				<Linker>
 					<Add library="ws2_32" />
@@ -130,7 +118,7 @@
 		</Build>
 		<Compiler>
 			<Add option="-fpermissive" />
-			<Add directory="../source" />
+			<Add directory="../src" />
 		</Compiler>
 		<Unit filename="../Android/jni/Android.mk">
 			<Option target="&lt;{~None~}&gt;" />
@@ -193,414 +181,414 @@
 		<Unit filename="../MCServer/webadmin.ini" />
 		<Unit filename="../iniFile/iniFile.cpp" />
 		<Unit filename="../iniFile/iniFile.h" />
-		<Unit filename="../source/AllToLua.pkg">
+		<Unit filename="../src/AllToLua.pkg">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
-		<Unit filename="../source/Authenticator.cpp" />
-		<Unit filename="../source/Authenticator.h" />
-		<Unit filename="../source/Bindings.cpp" />
-		<Unit filename="../source/Bindings.h" />
-		<Unit filename="../source/BlockArea.cpp" />
-		<Unit filename="../source/BlockArea.h" />
-		<Unit filename="../source/BlockEntity.h" />
-		<Unit filename="../source/BlockEntityWithItems.h" />
-		<Unit filename="../source/BlockID.cpp" />
-		<Unit filename="../source/BlockID.h" />
-		<Unit filename="../source/Blocks/BlockBed.cpp" />
-		<Unit filename="../source/Blocks/BlockBed.h" />
-		<Unit filename="../source/Blocks/BlockBrewingStand.h" />
-		<Unit filename="../source/Blocks/BlockCactus.h" />
-		<Unit filename="../source/Blocks/BlockCauldron.h" />
-		<Unit filename="../source/Blocks/BlockChest.h" />
-		<Unit filename="../source/Blocks/BlockCloth.h" />
-		<Unit filename="../source/Blocks/BlockCobWeb.h" />
-		<Unit filename="../source/Blocks/BlockCrops.h" />
-		<Unit filename="../source/Blocks/BlockDirt.h" />
-		<Unit filename="../source/Blocks/BlockDispenser.h" />
-		<Unit filename="../source/Blocks/BlockDoor.cpp" />
-		<Unit filename="../source/Blocks/BlockDoor.h" />
-		<Unit filename="../source/Blocks/BlockEnderchest.h" />
-		<Unit filename="../source/Blocks/BlockEntity.h" />
-		<Unit filename="../source/Blocks/BlockFarmland.h" />
-		<Unit filename="../source/Blocks/BlockFenceGate.h" />
-		<Unit filename="../source/Blocks/BlockFire.h" />
-		<Unit filename="../source/Blocks/BlockFlower.h" />
-		<Unit filename="../source/Blocks/BlockFlowerPot.h" />
-		<Unit filename="../source/Blocks/BlockFluid.h" />
-		<Unit filename="../source/Blocks/BlockFurnace.h" />
-		<Unit filename="../source/Blocks/BlockGlass.h" />
-		<Unit filename="../source/Blocks/BlockGlowstone.h" />
-		<Unit filename="../source/Blocks/BlockGravel.h" />
-		<Unit filename="../source/Blocks/BlockHandler.cpp" />
-		<Unit filename="../source/Blocks/BlockHandler.h" />
-		<Unit filename="../source/Blocks/BlockIce.h" />
-		<Unit filename="../source/Blocks/BlockLadder.h" />
-		<Unit filename="../source/Blocks/BlockLeaves.h" />
-		<Unit filename="../source/Blocks/BlockLever.cpp" />
-		<Unit filename="../source/Blocks/BlockLever.h" />
-		<Unit filename="../source/Blocks/BlockMelon.h" />
-		<Unit filename="../source/Blocks/BlockMushroom.h" />
-		<Unit filename="../source/Blocks/BlockMycelium.h" />
-		<Unit filename="../source/Blocks/BlockNote.h" />
-		<Unit filename="../source/Blocks/BlockOre.h" />
-		<Unit filename="../source/Blocks/BlockPiston.cpp" />
-		<Unit filename="../source/Blocks/BlockPiston.h" />
-		<Unit filename="../source/Blocks/BlockRail.h" />
-		<Unit filename="../source/Blocks/BlockRedstone.cpp" />
-		<Unit filename="../source/Blocks/BlockRedstone.h" />
-		<Unit filename="../source/Blocks/BlockRedstoneOre.h" />
-		<Unit filename="../source/Blocks/BlockRedstoneRepeater.cpp" />
-		<Unit filename="../source/Blocks/BlockRedstoneRepeater.h" />
-		<Unit filename="../source/Blocks/BlockRedstoneTorch.h" />
-		<Unit filename="../source/Blocks/BlockSand.h" />
-		<Unit filename="../source/Blocks/BlockSapling.h" />
-		<Unit filename="../source/Blocks/BlockSign.h" />
-		<Unit filename="../source/Blocks/BlockSlab.h" />
-		<Unit filename="../source/Blocks/BlockSnow.h" />
-		<Unit filename="../source/Blocks/BlockStairs.h" />
-		<Unit filename="../source/Blocks/BlockStems.h" />
-		<Unit filename="../source/Blocks/BlockStone.h" />
-		<Unit filename="../source/Blocks/BlockSugarcane.h" />
-		<Unit filename="../source/Blocks/BlockTNT.h" />
-		<Unit filename="../source/Blocks/BlockTallGrass.h" />
-		<Unit filename="../source/Blocks/BlockTorch.h" />
-		<Unit filename="../source/Blocks/BlockVine.h" />
-		<Unit filename="../source/Blocks/BlockWood.h" />
-		<Unit filename="../source/Blocks/BlockWorkbench.h" />
-		<Unit filename="../source/ByteBuffer.cpp" />
-		<Unit filename="../source/ByteBuffer.h" />
-		<Unit filename="../source/ChatColor.cpp" />
-		<Unit filename="../source/ChatColor.h" />
-		<Unit filename="../source/ChestEntity.cpp" />
-		<Unit filename="../source/ChestEntity.h" />
-		<Unit filename="../source/Chunk.cpp" />
-		<Unit filename="../source/Chunk.h" />
-		<Unit filename="../source/Chunk.inl.h" />
-		<Unit filename="../source/ChunkDef.h" />
-		<Unit filename="../source/ChunkMap.cpp" />
-		<Unit filename="../source/ChunkMap.h" />
-		<Unit filename="../source/ChunkSender.cpp" />
-		<Unit filename="../source/ChunkSender.h" />
-		<Unit filename="../source/ClientHandle.cpp" />
-		<Unit filename="../source/ClientHandle.h" />
-		<Unit filename="../source/CraftingRecipes.cpp" />
-		<Unit filename="../source/CraftingRecipes.h" />
-		<Unit filename="../source/Cuboid.cpp" />
-		<Unit filename="../source/Cuboid.h" />
-		<Unit filename="../source/Defines.h" />
-		<Unit filename="../source/DispenserEntity.cpp" />
-		<Unit filename="../source/DispenserEntity.h" />
-		<Unit filename="../source/Doors.h" />
-		<Unit filename="../source/DropperEntity.h" />
-		<Unit filename="../source/Endianness.h" />
-		<Unit filename="../source/Entity.cpp" />
-		<Unit filename="../source/Entity.h" />
-		<Unit filename="../source/FallingBlock.cpp" />
-		<Unit filename="../source/FallingBlock.h" />
-		<Unit filename="../source/FurnaceEntity.cpp" />
-		<Unit filename="../source/FurnaceEntity.h" />
-		<Unit filename="../source/FurnaceRecipe.cpp" />
-		<Unit filename="../source/FurnaceRecipe.h" />
-		<Unit filename="../source/Generating/BioGen.cpp" />
-		<Unit filename="../source/Generating/BioGen.h" />
-		<Unit filename="../source/Generating/Caves.cpp" />
-		<Unit filename="../source/Generating/Caves.h" />
-		<Unit filename="../source/Generating/ChunkDesc.cpp" />
-		<Unit filename="../source/Generating/ChunkDesc.h" />
-		<Unit filename="../source/Generating/ChunkGenerator.cpp" />
-		<Unit filename="../source/Generating/ChunkGenerator.h" />
-		<Unit filename="../source/Generating/CompoGen.cpp" />
-		<Unit filename="../source/Generating/CompoGen.h" />
-		<Unit filename="../source/Generating/ComposableGenerator.cpp" />
-		<Unit filename="../source/Generating/ComposableGenerator.h" />
-		<Unit filename="../source/Generating/DistortedHeightmap.cpp" />
-		<Unit filename="../source/Generating/DistortedHeightmap.h" />
-		<Unit filename="../source/Generating/FinishGen.cpp" />
-		<Unit filename="../source/Generating/FinishGen.h" />
-		<Unit filename="../source/Generating/HeiGen.cpp" />
-		<Unit filename="../source/Generating/HeiGen.h" />
-		<Unit filename="../source/Generating/MineShafts.cpp" />
-		<Unit filename="../source/Generating/MineShafts.h" />
-		<Unit filename="../source/Generating/Noise3DGenerator.cpp" />
-		<Unit filename="../source/Generating/Noise3DGenerator.h" />
-		<Unit filename="../source/Generating/Ravines.cpp" />
-		<Unit filename="../source/Generating/Ravines.h" />
-		<Unit filename="../source/Generating/StructGen.cpp" />
-		<Unit filename="../source/Generating/StructGen.h" />
-		<Unit filename="../source/Generating/Trees.cpp" />
-		<Unit filename="../source/Generating/Trees.h" />
-		<Unit filename="../source/Globals.cpp" />
-		<Unit filename="../source/Globals.h" />
-		<Unit filename="../source/Group.cpp" />
-		<Unit filename="../source/Group.h" />
-		<Unit filename="../source/GroupManager.cpp" />
-		<Unit filename="../source/GroupManager.h" />
-		<Unit filename="../source/Inventory.cpp" />
-		<Unit filename="../source/Inventory.h" />
-		<Unit filename="../source/Item.cpp" />
-		<Unit filename="../source/Item.h" />
-		<Unit filename="../source/ItemGrid.cpp" />
-		<Unit filename="../source/ItemGrid.h" />
-		<Unit filename="../source/Items/ItemBed.h" />
-		<Unit filename="../source/Items/ItemBrewingStand.h" />
-		<Unit filename="../source/Items/ItemBucket.h" />
-		<Unit filename="../source/Items/ItemCauldron.h" />
-		<Unit filename="../source/Items/ItemCloth.h" />
-		<Unit filename="../source/Items/ItemDoor.h" />
-		<Unit filename="../source/Items/ItemDye.h" />
-		<Unit filename="../source/Items/ItemFlowerPot.h" />
-		<Unit filename="../source/Items/ItemFood.h" />
-		<Unit filename="../source/Items/ItemHandler.cpp" />
-		<Unit filename="../source/Items/ItemHandler.h" />
-		<Unit filename="../source/Items/ItemHoe.h" />
-		<Unit filename="../source/Items/ItemLeaves.h" />
-		<Unit filename="../source/Items/ItemLighter.h" />
-		<Unit filename="../source/Items/ItemMinecart.h" />
-		<Unit filename="../source/Items/ItemPickaxe.h" />
-		<Unit filename="../source/Items/ItemRedstoneDust.h" />
-		<Unit filename="../source/Items/ItemRedstoneRepeater.h" />
-		<Unit filename="../source/Items/ItemSapling.h" />
-		<Unit filename="../source/Items/ItemSeeds.h" />
-		<Unit filename="../source/Items/ItemShears.h" />
-		<Unit filename="../source/Items/ItemShovel.h" />
-		<Unit filename="../source/Items/ItemSign.h" />
-		<Unit filename="../source/Items/ItemSlab.h" />
-		<Unit filename="../source/Items/ItemSpawnEgg.h" />
-		<Unit filename="../source/Items/ItemSugarcane.h" />
-		<Unit filename="../source/Items/ItemSword.h" />
-		<Unit filename="../source/Items/ItemWood.h" />
-		<Unit filename="../source/JukeboxEntity.cpp" />
-		<Unit filename="../source/JukeboxEntity.h" />
-		<Unit filename="../source/Ladder.h" />
-		<Unit filename="../source/LeakFinder.h" />
-		<Unit filename="../source/LightingThread.cpp" />
-		<Unit filename="../source/LightingThread.h" />
-		<Unit filename="../source/LinearInterpolation.cpp" />
-		<Unit filename="../source/LinearInterpolation.h" />
-		<Unit filename="../source/LinearUpscale.h" />
-		<Unit filename="../source/Log.cpp" />
-		<Unit filename="../source/Log.h" />
-		<Unit filename="../source/LuaExpat/lxplib.c">
+		<Unit filename="../src/Authenticator.cpp" />
+		<Unit filename="../src/Authenticator.h" />
+		<Unit filename="../src/Bindings.cpp" />
+		<Unit filename="../src/Bindings.h" />
+		<Unit filename="../src/BlockArea.cpp" />
+		<Unit filename="../src/BlockArea.h" />
+		<Unit filename="../src/BlockEntity.h" />
+		<Unit filename="../src/BlockEntityWithItems.h" />
+		<Unit filename="../src/BlockID.cpp" />
+		<Unit filename="../src/BlockID.h" />
+		<Unit filename="../src/Blocks/BlockBed.cpp" />
+		<Unit filename="../src/Blocks/BlockBed.h" />
+		<Unit filename="../src/Blocks/BlockBrewingStand.h" />
+		<Unit filename="../src/Blocks/BlockCactus.h" />
+		<Unit filename="../src/Blocks/BlockCauldron.h" />
+		<Unit filename="../src/Blocks/BlockChest.h" />
+		<Unit filename="../src/Blocks/BlockCloth.h" />
+		<Unit filename="../src/Blocks/BlockCobWeb.h" />
+		<Unit filename="../src/Blocks/BlockCrops.h" />
+		<Unit filename="../src/Blocks/BlockDirt.h" />
+		<Unit filename="../src/Blocks/BlockDispenser.h" />
+		<Unit filename="../src/Blocks/BlockDoor.cpp" />
+		<Unit filename="../src/Blocks/BlockDoor.h" />
+		<Unit filename="../src/Blocks/BlockEnderchest.h" />
+		<Unit filename="../src/Blocks/BlockEntity.h" />
+		<Unit filename="../src/Blocks/BlockFarmland.h" />
+		<Unit filename="../src/Blocks/BlockFenceGate.h" />
+		<Unit filename="../src/Blocks/BlockFire.h" />
+		<Unit filename="../src/Blocks/BlockFlower.h" />
+		<Unit filename="../src/Blocks/BlockFlowerPot.h" />
+		<Unit filename="../src/Blocks/BlockFluid.h" />
+		<Unit filename="../src/Blocks/BlockFurnace.h" />
+		<Unit filename="../src/Blocks/BlockGlass.h" />
+		<Unit filename="../src/Blocks/BlockGlowstone.h" />
+		<Unit filename="../src/Blocks/BlockGravel.h" />
+		<Unit filename="../src/Blocks/BlockHandler.cpp" />
+		<Unit filename="../src/Blocks/BlockHandler.h" />
+		<Unit filename="../src/Blocks/BlockIce.h" />
+		<Unit filename="../src/Blocks/BlockLadder.h" />
+		<Unit filename="../src/Blocks/BlockLeaves.h" />
+		<Unit filename="../src/Blocks/BlockLever.cpp" />
+		<Unit filename="../src/Blocks/BlockLever.h" />
+		<Unit filename="../src/Blocks/BlockMelon.h" />
+		<Unit filename="../src/Blocks/BlockMushroom.h" />
+		<Unit filename="../src/Blocks/BlockMycelium.h" />
+		<Unit filename="../src/Blocks/BlockNote.h" />
+		<Unit filename="../src/Blocks/BlockOre.h" />
+		<Unit filename="../src/Blocks/BlockPiston.cpp" />
+		<Unit filename="../src/Blocks/BlockPiston.h" />
+		<Unit filename="../src/Blocks/BlockRail.h" />
+		<Unit filename="../src/Blocks/BlockRedstone.cpp" />
+		<Unit filename="../src/Blocks/BlockRedstone.h" />
+		<Unit filename="../src/Blocks/BlockRedstoneOre.h" />
+		<Unit filename="../src/Blocks/BlockRedstoneRepeater.cpp" />
+		<Unit filename="../src/Blocks/BlockRedstoneRepeater.h" />
+		<Unit filename="../src/Blocks/BlockRedstoneTorch.h" />
+		<Unit filename="../src/Blocks/BlockSand.h" />
+		<Unit filename="../src/Blocks/BlockSapling.h" />
+		<Unit filename="../src/Blocks/BlockSign.h" />
+		<Unit filename="../src/Blocks/BlockSlab.h" />
+		<Unit filename="../src/Blocks/BlockSnow.h" />
+		<Unit filename="../src/Blocks/BlockStairs.h" />
+		<Unit filename="../src/Blocks/BlockStems.h" />
+		<Unit filename="../src/Blocks/BlockStone.h" />
+		<Unit filename="../src/Blocks/BlockSugarcane.h" />
+		<Unit filename="../src/Blocks/BlockTNT.h" />
+		<Unit filename="../src/Blocks/BlockTallGrass.h" />
+		<Unit filename="../src/Blocks/BlockTorch.h" />
+		<Unit filename="../src/Blocks/BlockVine.h" />
+		<Unit filename="../src/Blocks/BlockWood.h" />
+		<Unit filename="../src/Blocks/BlockWorkbench.h" />
+		<Unit filename="../src/ByteBuffer.cpp" />
+		<Unit filename="../src/ByteBuffer.h" />
+		<Unit filename="../src/ChatColor.cpp" />
+		<Unit filename="../src/ChatColor.h" />
+		<Unit filename="../src/ChestEntity.cpp" />
+		<Unit filename="../src/ChestEntity.h" />
+		<Unit filename="../src/Chunk.cpp" />
+		<Unit filename="../src/Chunk.h" />
+		<Unit filename="../src/Chunk.inl.h" />
+		<Unit filename="../src/ChunkDef.h" />
+		<Unit filename="../src/ChunkMap.cpp" />
+		<Unit filename="../src/ChunkMap.h" />
+		<Unit filename="../src/ChunkSender.cpp" />
+		<Unit filename="../src/ChunkSender.h" />
+		<Unit filename="../src/ClientHandle.cpp" />
+		<Unit filename="../src/ClientHandle.h" />
+		<Unit filename="../src/CraftingRecipes.cpp" />
+		<Unit filename="../src/CraftingRecipes.h" />
+		<Unit filename="../src/Cuboid.cpp" />
+		<Unit filename="../src/Cuboid.h" />
+		<Unit filename="../src/Defines.h" />
+		<Unit filename="../src/DispenserEntity.cpp" />
+		<Unit filename="../src/DispenserEntity.h" />
+		<Unit filename="../src/Doors.h" />
+		<Unit filename="../src/DropperEntity.h" />
+		<Unit filename="../src/Endianness.h" />
+		<Unit filename="../src/Entity.cpp" />
+		<Unit filename="../src/Entity.h" />
+		<Unit filename="../src/FallingBlock.cpp" />
+		<Unit filename="../src/FallingBlock.h" />
+		<Unit filename="../src/FurnaceEntity.cpp" />
+		<Unit filename="../src/FurnaceEntity.h" />
+		<Unit filename="../src/FurnaceRecipe.cpp" />
+		<Unit filename="../src/FurnaceRecipe.h" />
+		<Unit filename="../src/Generating/BioGen.cpp" />
+		<Unit filename="../src/Generating/BioGen.h" />
+		<Unit filename="../src/Generating/Caves.cpp" />
+		<Unit filename="../src/Generating/Caves.h" />
+		<Unit filename="../src/Generating/ChunkDesc.cpp" />
+		<Unit filename="../src/Generating/ChunkDesc.h" />
+		<Unit filename="../src/Generating/ChunkGenerator.cpp" />
+		<Unit filename="../src/Generating/ChunkGenerator.h" />
+		<Unit filename="../src/Generating/CompoGen.cpp" />
+		<Unit filename="../src/Generating/CompoGen.h" />
+		<Unit filename="../src/Generating/ComposableGenerator.cpp" />
+		<Unit filename="../src/Generating/ComposableGenerator.h" />
+		<Unit filename="../src/Generating/DistortedHeightmap.cpp" />
+		<Unit filename="../src/Generating/DistortedHeightmap.h" />
+		<Unit filename="../src/Generating/FinishGen.cpp" />
+		<Unit filename="../src/Generating/FinishGen.h" />
+		<Unit filename="../src/Generating/HeiGen.cpp" />
+		<Unit filename="../src/Generating/HeiGen.h" />
+		<Unit filename="../src/Generating/MineShafts.cpp" />
+		<Unit filename="../src/Generating/MineShafts.h" />
+		<Unit filename="../src/Generating/Noise3DGenerator.cpp" />
+		<Unit filename="../src/Generating/Noise3DGenerator.h" />
+		<Unit filename="../src/Generating/Ravines.cpp" />
+		<Unit filename="../src/Generating/Ravines.h" />
+		<Unit filename="../src/Generating/StructGen.cpp" />
+		<Unit filename="../src/Generating/StructGen.h" />
+		<Unit filename="../src/Generating/Trees.cpp" />
+		<Unit filename="../src/Generating/Trees.h" />
+		<Unit filename="../src/Globals.cpp" />
+		<Unit filename="../src/Globals.h" />
+		<Unit filename="../src/Group.cpp" />
+		<Unit filename="../src/Group.h" />
+		<Unit filename="../src/GroupManager.cpp" />
+		<Unit filename="../src/GroupManager.h" />
+		<Unit filename="../src/Inventory.cpp" />
+		<Unit filename="../src/Inventory.h" />
+		<Unit filename="../src/Item.cpp" />
+		<Unit filename="../src/Item.h" />
+		<Unit filename="../src/ItemGrid.cpp" />
+		<Unit filename="../src/ItemGrid.h" />
+		<Unit filename="../src/Items/ItemBed.h" />
+		<Unit filename="../src/Items/ItemBrewingStand.h" />
+		<Unit filename="../src/Items/ItemBucket.h" />
+		<Unit filename="../src/Items/ItemCauldron.h" />
+		<Unit filename="../src/Items/ItemCloth.h" />
+		<Unit filename="../src/Items/ItemDoor.h" />
+		<Unit filename="../src/Items/ItemDye.h" />
+		<Unit filename="../src/Items/ItemFlowerPot.h" />
+		<Unit filename="../src/Items/ItemFood.h" />
+		<Unit filename="../src/Items/ItemHandler.cpp" />
+		<Unit filename="../src/Items/ItemHandler.h" />
+		<Unit filename="../src/Items/ItemHoe.h" />
+		<Unit filename="../src/Items/ItemLeaves.h" />
+		<Unit filename="../src/Items/ItemLighter.h" />
+		<Unit filename="../src/Items/ItemMinecart.h" />
+		<Unit filename="../src/Items/ItemPickaxe.h" />
+		<Unit filename="../src/Items/ItemRedstoneDust.h" />
+		<Unit filename="../src/Items/ItemRedstoneRepeater.h" />
+		<Unit filename="../src/Items/ItemSapling.h" />
+		<Unit filename="../src/Items/ItemSeeds.h" />
+		<Unit filename="../src/Items/ItemShears.h" />
+		<Unit filename="../src/Items/ItemShovel.h" />
+		<Unit filename="../src/Items/ItemSign.h" />
+		<Unit filename="../src/Items/ItemSlab.h" />
+		<Unit filename="../src/Items/ItemSpawnEgg.h" />
+		<Unit filename="../src/Items/ItemSugarcane.h" />
+		<Unit filename="../src/Items/ItemSword.h" />
+		<Unit filename="../src/Items/ItemWood.h" />
+		<Unit filename="../src/JukeboxEntity.cpp" />
+		<Unit filename="../src/JukeboxEntity.h" />
+		<Unit filename="../src/Ladder.h" />
+		<Unit filename="../src/LeakFinder.h" />
+		<Unit filename="../src/LightingThread.cpp" />
+		<Unit filename="../src/LightingThread.h" />
+		<Unit filename="../src/LinearInterpolation.cpp" />
+		<Unit filename="../src/LinearInterpolation.h" />
+		<Unit filename="../src/LinearUpscale.h" />
+		<Unit filename="../src/Log.cpp" />
+		<Unit filename="../src/Log.h" />
+		<Unit filename="../src/LuaExpat/lxplib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../source/LuaExpat/lxplib.h" />
-		<Unit filename="../source/LuaFunctions.h" />
-		<Unit filename="../source/MCLogger.cpp" />
-		<Unit filename="../source/MCLogger.h" />
-		<Unit filename="../source/ManualBindings.cpp" />
-		<Unit filename="../source/ManualBindings.h" />
-		<Unit filename="../source/Matrix4f.cpp" />
-		<Unit filename="../source/Matrix4f.h" />
-		<Unit filename="../source/MemoryLeak.h" />
-		<Unit filename="../source/MersenneTwister.h" />
-		<Unit filename="../source/Minecart.cpp" />
-		<Unit filename="../source/Minecart.h" />
-		<Unit filename="../source/Mobs/AggressiveMonster.cpp" />
-		<Unit filename="../source/Mobs/AggressiveMonster.h" />
-		<Unit filename="../source/Mobs/Bat.h" />
-		<Unit filename="../source/Mobs/Blaze.cpp" />
-		<Unit filename="../source/Mobs/Blaze.h" />
-		<Unit filename="../source/Mobs/Cavespider.cpp" />
-		<Unit filename="../source/Mobs/Cavespider.h" />
-		<Unit filename="../source/Mobs/Chicken.cpp" />
-		<Unit filename="../source/Mobs/Chicken.h" />
-		<Unit filename="../source/Mobs/Cow.cpp" />
-		<Unit filename="../source/Mobs/Cow.h" />
-		<Unit filename="../source/Mobs/Creeper.cpp" />
-		<Unit filename="../source/Mobs/Creeper.h" />
-		<Unit filename="../source/Mobs/Enderman.cpp" />
-		<Unit filename="../source/Mobs/Enderman.h" />
-		<Unit filename="../source/Mobs/Ghast.cpp" />
-		<Unit filename="../source/Mobs/Ghast.h" />
-		<Unit filename="../source/Mobs/Magmacube.cpp" />
-		<Unit filename="../source/Mobs/Magmacube.h" />
-		<Unit filename="../source/Mobs/Monster.cpp" />
-		<Unit filename="../source/Mobs/Monster.h" />
-		<Unit filename="../source/Mobs/Mooshroom.cpp" />
-		<Unit filename="../source/Mobs/Mooshroom.h" />
-		<Unit filename="../source/Mobs/Ocelot.h" />
-		<Unit filename="../source/Mobs/PassiveAggressiveMonster.cpp" />
-		<Unit filename="../source/Mobs/PassiveAggressiveMonster.h" />
-		<Unit filename="../source/Mobs/PassiveMonster.cpp" />
-		<Unit filename="../source/Mobs/PassiveMonster.h" />
-		<Unit filename="../source/Mobs/Pig.cpp" />
-		<Unit filename="../source/Mobs/Pig.h" />
-		<Unit filename="../source/Mobs/Sheep.cpp" />
-		<Unit filename="../source/Mobs/Sheep.h" />
-		<Unit filename="../source/Mobs/Silverfish.h" />
-		<Unit filename="../source/Mobs/Skeleton.cpp" />
-		<Unit filename="../source/Mobs/Skeleton.h" />
-		<Unit filename="../source/Mobs/Slime.cpp" />
-		<Unit filename="../source/Mobs/Slime.h" />
-		<Unit filename="../source/Mobs/Spider.cpp" />
-		<Unit filename="../source/Mobs/Spider.h" />
-		<Unit filename="../source/Mobs/Squid.cpp" />
-		<Unit filename="../source/Mobs/Squid.h" />
-		<Unit filename="../source/Mobs/Villager.cpp" />
-		<Unit filename="../source/Mobs/Villager.h" />
-		<Unit filename="../source/Mobs/Witch.cpp" />
-		<Unit filename="../source/Mobs/Witch.h" />
-		<Unit filename="../source/Mobs/Wolf.h" />
-		<Unit filename="../source/Mobs/Zombie.cpp" />
-		<Unit filename="../source/Mobs/Zombie.h" />
-		<Unit filename="../source/Mobs/Zombiepigman.cpp" />
-		<Unit filename="../source/Mobs/Zombiepigman.h" />
-		<Unit filename="../source/MonsterConfig.cpp" />
-		<Unit filename="../source/MonsterConfig.h" />
-		<Unit filename="../source/Noise.cpp" />
-		<Unit filename="../source/Noise.h" />
-		<Unit filename="../source/NoteEntity.cpp" />
-		<Unit filename="../source/NoteEntity.h" />
-		<Unit filename="../source/OSSupport/BlockingTCPLink.cpp" />
-		<Unit filename="../source/OSSupport/BlockingTCPLink.h" />
-		<Unit filename="../source/OSSupport/CriticalSection.cpp" />
-		<Unit filename="../source/OSSupport/CriticalSection.h" />
-		<Unit filename="../source/OSSupport/Event.cpp" />
-		<Unit filename="../source/OSSupport/Event.h" />
-		<Unit filename="../source/OSSupport/File.cpp" />
-		<Unit filename="../source/OSSupport/File.h" />
-		<Unit filename="../source/OSSupport/GZipFile.cpp" />
-		<Unit filename="../source/OSSupport/GZipFile.h" />
-		<Unit filename="../source/OSSupport/IsThread.cpp" />
-		<Unit filename="../source/OSSupport/IsThread.h" />
-		<Unit filename="../source/OSSupport/ListenThread.cpp" />
-		<Unit filename="../source/OSSupport/ListenThread.h" />
-		<Unit filename="../source/OSSupport/MakeDir.cpp" />
-		<Unit filename="../source/OSSupport/MakeDir.h" />
-		<Unit filename="../source/OSSupport/Semaphore.cpp" />
-		<Unit filename="../source/OSSupport/Semaphore.h" />
-		<Unit filename="../source/OSSupport/Sleep.cpp" />
-		<Unit filename="../source/OSSupport/Sleep.h" />
-		<Unit filename="../source/OSSupport/Socket.cpp" />
-		<Unit filename="../source/OSSupport/Socket.h" />
-		<Unit filename="../source/OSSupport/SocketThreads.cpp" />
-		<Unit filename="../source/OSSupport/SocketThreads.h" />
-		<Unit filename="../source/OSSupport/Thread.cpp" />
-		<Unit filename="../source/OSSupport/Thread.h" />
-		<Unit filename="../source/OSSupport/Timer.cpp" />
-		<Unit filename="../source/OSSupport/Timer.h" />
-		<Unit filename="../source/Pawn.cpp" />
-		<Unit filename="../source/Pawn.h" />
-		<Unit filename="../source/Pickup.cpp" />
-		<Unit filename="../source/Pickup.h" />
-		<Unit filename="../source/Piston.cpp" />
-		<Unit filename="../source/Piston.h" />
-		<Unit filename="../source/Player.cpp" />
-		<Unit filename="../source/Player.h" />
-		<Unit filename="../source/Plugin.cpp" />
-		<Unit filename="../source/Plugin.h" />
-		<Unit filename="../source/PluginManager.cpp" />
-		<Unit filename="../source/PluginManager.h" />
-		<Unit filename="../source/Plugin_NewLua.cpp" />
-		<Unit filename="../source/Plugin_NewLua.h" />
-		<Unit filename="../source/Plugin_Squirrel.cpp" />
-		<Unit filename="../source/Plugin_Squirrel.h" />
-		<Unit filename="../source/ProbabDistrib.cpp" />
-		<Unit filename="../source/ProbabDistrib.h" />
-		<Unit filename="../source/Protocol/ChunkDataSerializer.cpp" />
-		<Unit filename="../source/Protocol/ChunkDataSerializer.h" />
-		<Unit filename="../source/Protocol/Protocol.h" />
-		<Unit filename="../source/Protocol/Protocol125.cpp" />
-		<Unit filename="../source/Protocol/Protocol125.h" />
-		<Unit filename="../source/Protocol/Protocol132.cpp" />
-		<Unit filename="../source/Protocol/Protocol132.h" />
-		<Unit filename="../source/Protocol/Protocol14x.cpp" />
-		<Unit filename="../source/Protocol/Protocol14x.h" />
-		<Unit filename="../source/Protocol/Protocol15x.cpp" />
-		<Unit filename="../source/Protocol/Protocol15x.h" />
-		<Unit filename="../source/Protocol/ProtocolRecognizer.cpp" />
-		<Unit filename="../source/Protocol/ProtocolRecognizer.h" />
-		<Unit filename="../source/ReferenceManager.cpp" />
-		<Unit filename="../source/ReferenceManager.h" />
-		<Unit filename="../source/Root.cpp" />
-		<Unit filename="../source/Root.h" />
-		<Unit filename="../source/SQLite/lsqlite3.c">
+		<Unit filename="../src/LuaExpat/lxplib.h" />
+		<Unit filename="../src/LuaFunctions.h" />
+		<Unit filename="../src/MCLogger.cpp" />
+		<Unit filename="../src/MCLogger.h" />
+		<Unit filename="../src/ManualBindings.cpp" />
+		<Unit filename="../src/ManualBindings.h" />
+		<Unit filename="../src/Matrix4f.cpp" />
+		<Unit filename="../src/Matrix4f.h" />
+		<Unit filename="../src/MemoryLeak.h" />
+		<Unit filename="../src/MersenneTwister.h" />
+		<Unit filename="../src/Minecart.cpp" />
+		<Unit filename="../src/Minecart.h" />
+		<Unit filename="../src/Mobs/AggressiveMonster.cpp" />
+		<Unit filename="../src/Mobs/AggressiveMonster.h" />
+		<Unit filename="../src/Mobs/Bat.h" />
+		<Unit filename="../src/Mobs/Blaze.cpp" />
+		<Unit filename="../src/Mobs/Blaze.h" />
+		<Unit filename="../src/Mobs/Cavespider.cpp" />
+		<Unit filename="../src/Mobs/Cavespider.h" />
+		<Unit filename="../src/Mobs/Chicken.cpp" />
+		<Unit filename="../src/Mobs/Chicken.h" />
+		<Unit filename="../src/Mobs/Cow.cpp" />
+		<Unit filename="../src/Mobs/Cow.h" />
+		<Unit filename="../src/Mobs/Creeper.cpp" />
+		<Unit filename="../src/Mobs/Creeper.h" />
+		<Unit filename="../src/Mobs/Enderman.cpp" />
+		<Unit filename="../src/Mobs/Enderman.h" />
+		<Unit filename="../src/Mobs/Ghast.cpp" />
+		<Unit filename="../src/Mobs/Ghast.h" />
+		<Unit filename="../src/Mobs/Magmacube.cpp" />
+		<Unit filename="../src/Mobs/Magmacube.h" />
+		<Unit filename="../src/Mobs/Monster.cpp" />
+		<Unit filename="../src/Mobs/Monster.h" />
+		<Unit filename="../src/Mobs/Mooshroom.cpp" />
+		<Unit filename="../src/Mobs/Mooshroom.h" />
+		<Unit filename="../src/Mobs/Ocelot.h" />
+		<Unit filename="../src/Mobs/PassiveAggressiveMonster.cpp" />
+		<Unit filename="../src/Mobs/PassiveAggressiveMonster.h" />
+		<Unit filename="../src/Mobs/PassiveMonster.cpp" />
+		<Unit filename="../src/Mobs/PassiveMonster.h" />
+		<Unit filename="../src/Mobs/Pig.cpp" />
+		<Unit filename="../src/Mobs/Pig.h" />
+		<Unit filename="../src/Mobs/Sheep.cpp" />
+		<Unit filename="../src/Mobs/Sheep.h" />
+		<Unit filename="../src/Mobs/Silverfish.h" />
+		<Unit filename="../src/Mobs/Skeleton.cpp" />
+		<Unit filename="../src/Mobs/Skeleton.h" />
+		<Unit filename="../src/Mobs/Slime.cpp" />
+		<Unit filename="../src/Mobs/Slime.h" />
+		<Unit filename="../src/Mobs/Spider.cpp" />
+		<Unit filename="../src/Mobs/Spider.h" />
+		<Unit filename="../src/Mobs/Squid.cpp" />
+		<Unit filename="../src/Mobs/Squid.h" />
+		<Unit filename="../src/Mobs/Villager.cpp" />
+		<Unit filename="../src/Mobs/Villager.h" />
+		<Unit filename="../src/Mobs/Witch.cpp" />
+		<Unit filename="../src/Mobs/Witch.h" />
+		<Unit filename="../src/Mobs/Wolf.h" />
+		<Unit filename="../src/Mobs/Zombie.cpp" />
+		<Unit filename="../src/Mobs/Zombie.h" />
+		<Unit filename="../src/Mobs/Zombiepigman.cpp" />
+		<Unit filename="../src/Mobs/Zombiepigman.h" />
+		<Unit filename="../src/MonsterConfig.cpp" />
+		<Unit filename="../src/MonsterConfig.h" />
+		<Unit filename="../src/Noise.cpp" />
+		<Unit filename="../src/Noise.h" />
+		<Unit filename="../src/NoteEntity.cpp" />
+		<Unit filename="../src/NoteEntity.h" />
+		<Unit filename="../src/OSSupport/BlockingTCPLink.cpp" />
+		<Unit filename="../src/OSSupport/BlockingTCPLink.h" />
+		<Unit filename="../src/OSSupport/CriticalSection.cpp" />
+		<Unit filename="../src/OSSupport/CriticalSection.h" />
+		<Unit filename="../src/OSSupport/Event.cpp" />
+		<Unit filename="../src/OSSupport/Event.h" />
+		<Unit filename="../src/OSSupport/File.cpp" />
+		<Unit filename="../src/OSSupport/File.h" />
+		<Unit filename="../src/OSSupport/GZipFile.cpp" />
+		<Unit filename="../src/OSSupport/GZipFile.h" />
+		<Unit filename="../src/OSSupport/IsThread.cpp" />
+		<Unit filename="../src/OSSupport/IsThread.h" />
+		<Unit filename="../src/OSSupport/ListenThread.cpp" />
+		<Unit filename="../src/OSSupport/ListenThread.h" />
+		<Unit filename="../src/OSSupport/MakeDir.cpp" />
+		<Unit filename="../src/OSSupport/MakeDir.h" />
+		<Unit filename="../src/OSSupport/Semaphore.cpp" />
+		<Unit filename="../src/OSSupport/Semaphore.h" />
+		<Unit filename="../src/OSSupport/Sleep.cpp" />
+		<Unit filename="../src/OSSupport/Sleep.h" />
+		<Unit filename="../src/OSSupport/Socket.cpp" />
+		<Unit filename="../src/OSSupport/Socket.h" />
+		<Unit filename="../src/OSSupport/SocketThreads.cpp" />
+		<Unit filename="../src/OSSupport/SocketThreads.h" />
+		<Unit filename="../src/OSSupport/Thread.cpp" />
+		<Unit filename="../src/OSSupport/Thread.h" />
+		<Unit filename="../src/OSSupport/Timer.cpp" />
+		<Unit filename="../src/OSSupport/Timer.h" />
+		<Unit filename="../src/Pawn.cpp" />
+		<Unit filename="../src/Pawn.h" />
+		<Unit filename="../src/Pickup.cpp" />
+		<Unit filename="../src/Pickup.h" />
+		<Unit filename="../src/Piston.cpp" />
+		<Unit filename="../src/Piston.h" />
+		<Unit filename="../src/Player.cpp" />
+		<Unit filename="../src/Player.h" />
+		<Unit filename="../src/Plugin.cpp" />
+		<Unit filename="../src/Plugin.h" />
+		<Unit filename="../src/PluginManager.cpp" />
+		<Unit filename="../src/PluginManager.h" />
+		<Unit filename="../src/Plugin_NewLua.cpp" />
+		<Unit filename="../src/Plugin_NewLua.h" />
+		<Unit filename="../src/Plugin_Squirrel.cpp" />
+		<Unit filename="../src/Plugin_Squirrel.h" />
+		<Unit filename="../src/ProbabDistrib.cpp" />
+		<Unit filename="../src/ProbabDistrib.h" />
+		<Unit filename="../src/Protocol/ChunkDataSerializer.cpp" />
+		<Unit filename="../src/Protocol/ChunkDataSerializer.h" />
+		<Unit filename="../src/Protocol/Protocol.h" />
+		<Unit filename="../src/Protocol/Protocol125.cpp" />
+		<Unit filename="../src/Protocol/Protocol125.h" />
+		<Unit filename="../src/Protocol/Protocol132.cpp" />
+		<Unit filename="../src/Protocol/Protocol132.h" />
+		<Unit filename="../src/Protocol/Protocol14x.cpp" />
+		<Unit filename="../src/Protocol/Protocol14x.h" />
+		<Unit filename="../src/Protocol/Protocol15x.cpp" />
+		<Unit filename="../src/Protocol/Protocol15x.h" />
+		<Unit filename="../src/Protocol/ProtocolRecognizer.cpp" />
+		<Unit filename="../src/Protocol/ProtocolRecognizer.h" />
+		<Unit filename="../src/ReferenceManager.cpp" />
+		<Unit filename="../src/ReferenceManager.h" />
+		<Unit filename="../src/Root.cpp" />
+		<Unit filename="../src/Root.h" />
+		<Unit filename="../src/SQLite/lsqlite3.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../source/SQLite/sqlite3.c">
+		<Unit filename="../src/SQLite/sqlite3.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../source/SQLite/sqlite3.h" />
-		<Unit filename="../source/SQLite/urls.txt" />
-		<Unit filename="../source/Server.cpp" />
-		<Unit filename="../source/Server.h" />
-		<Unit filename="../source/Sign.h" />
-		<Unit filename="../source/SignEntity.cpp" />
-		<Unit filename="../source/SignEntity.h" />
-		<Unit filename="../source/Simulator/DelayedFluidSimulator.cpp" />
-		<Unit filename="../source/Simulator/DelayedFluidSimulator.h" />
-		<Unit filename="../source/Simulator/FireSimulator.cpp" />
-		<Unit filename="../source/Simulator/FireSimulator.h" />
-		<Unit filename="../source/Simulator/FloodyFluidSimulator.cpp" />
-		<Unit filename="../source/Simulator/FloodyFluidSimulator.h" />
-		<Unit filename="../source/Simulator/FluidSimulator.cpp" />
-		<Unit filename="../source/Simulator/FluidSimulator.h" />
-		<Unit filename="../source/Simulator/NoopFluidSimulator.h" />
-		<Unit filename="../source/Simulator/RedstoneSimulator.cpp" />
-		<Unit filename="../source/Simulator/RedstoneSimulator.h" />
-		<Unit filename="../source/Simulator/SandSimulator.cpp" />
-		<Unit filename="../source/Simulator/SandSimulator.h" />
-		<Unit filename="../source/Simulator/Simulator.cpp" />
-		<Unit filename="../source/Simulator/Simulator.h" />
-		<Unit filename="../source/Simulator/SimulatorManager.cpp" />
-		<Unit filename="../source/Simulator/SimulatorManager.h" />
-		<Unit filename="../source/Simulator/VaporizeFluidSimulator.cpp" />
-		<Unit filename="../source/Simulator/VaporizeFluidSimulator.h" />
-		<Unit filename="../source/SquirrelCommandBinder.cpp" />
-		<Unit filename="../source/SquirrelCommandBinder.h" />
-		<Unit filename="../source/StackWalker.h" />
-		<Unit filename="../source/Stairs.h" />
-		<Unit filename="../source/StringCompression.cpp" />
-		<Unit filename="../source/StringCompression.h" />
-		<Unit filename="../source/StringMap.cpp" />
-		<Unit filename="../source/StringMap.h" />
-		<Unit filename="../source/StringUtils.cpp" />
-		<Unit filename="../source/StringUtils.h" />
-		<Unit filename="../source/TNTEntity.cpp" />
-		<Unit filename="../source/TNTEntity.h" />
-		<Unit filename="../source/Torch.h" />
-		<Unit filename="../source/Tracer.cpp" />
-		<Unit filename="../source/Tracer.h" />
-		<Unit filename="../source/UI/SlotArea.cpp" />
-		<Unit filename="../source/UI/SlotArea.h" />
-		<Unit filename="../source/UI/Window.cpp" />
-		<Unit filename="../source/UI/Window.h" />
-		<Unit filename="../source/UI/WindowOwner.h" />
-		<Unit filename="../source/Vector3d.cpp" />
-		<Unit filename="../source/Vector3d.h" />
-		<Unit filename="../source/Vector3f.cpp" />
-		<Unit filename="../source/Vector3f.h" />
-		<Unit filename="../source/Vector3i.cpp" />
-		<Unit filename="../source/Vector3i.h" />
-		<Unit filename="../source/Vine.h" />
-		<Unit filename="../source/WebAdmin.cpp" />
-		<Unit filename="../source/WebAdmin.h" />
-		<Unit filename="../source/WebPlugin.cpp" />
-		<Unit filename="../source/WebPlugin.h" />
-		<Unit filename="../source/World.cpp" />
-		<Unit filename="../source/World.h" />
-		<Unit filename="../source/WorldStorage/FastNBT.cpp" />
-		<Unit filename="../source/WorldStorage/FastNBT.h" />
-		<Unit filename="../source/WorldStorage/NBTChunkSerializer.cpp" />
-		<Unit filename="../source/WorldStorage/NBTChunkSerializer.h" />
-		<Unit filename="../source/WorldStorage/WSSAnvil.cpp" />
-		<Unit filename="../source/WorldStorage/WSSAnvil.h" />
-		<Unit filename="../source/WorldStorage/WSSCompact.cpp" />
-		<Unit filename="../source/WorldStorage/WSSCompact.h" />
-		<Unit filename="../source/WorldStorage/WorldStorage.cpp" />
-		<Unit filename="../source/WorldStorage/WorldStorage.h" />
-		<Unit filename="../source/main.cpp" />
-		<Unit filename="../source/md5/md5.cpp" />
-		<Unit filename="../source/md5/md5.h" />
-		<Unit filename="../source/squirrelbindings/SquirrelArray.h" />
-		<Unit filename="../source/squirrelbindings/SquirrelBaseClass.h" />
-		<Unit filename="../source/squirrelbindings/SquirrelBindings.cpp" />
-		<Unit filename="../source/squirrelbindings/SquirrelBindings.h" />
-		<Unit filename="../source/squirrelbindings/SquirrelFunctions.cpp" />
-		<Unit filename="../source/squirrelbindings/SquirrelFunctions.h" />
-		<Unit filename="../source/squirrelbindings/SquirrelObject.h" />
-		<Unit filename="../source/tolua++.h" />
-		<Unit filename="../source/tolua_base.h" />
+		<Unit filename="../src/SQLite/sqlite3.h" />
+		<Unit filename="../src/SQLite/urls.txt" />
+		<Unit filename="../src/Server.cpp" />
+		<Unit filename="../src/Server.h" />
+		<Unit filename="../src/Sign.h" />
+		<Unit filename="../src/SignEntity.cpp" />
+		<Unit filename="../src/SignEntity.h" />
+		<Unit filename="../src/Simulator/DelayedFluidSimulator.cpp" />
+		<Unit filename="../src/Simulator/DelayedFluidSimulator.h" />
+		<Unit filename="../src/Simulator/FireSimulator.cpp" />
+		<Unit filename="../src/Simulator/FireSimulator.h" />
+		<Unit filename="../src/Simulator/FloodyFluidSimulator.cpp" />
+		<Unit filename="../src/Simulator/FloodyFluidSimulator.h" />
+		<Unit filename="../src/Simulator/FluidSimulator.cpp" />
+		<Unit filename="../src/Simulator/FluidSimulator.h" />
+		<Unit filename="../src/Simulator/NoopFluidSimulator.h" />
+		<Unit filename="../src/Simulator/RedstoneSimulator.cpp" />
+		<Unit filename="../src/Simulator/RedstoneSimulator.h" />
+		<Unit filename="../src/Simulator/SandSimulator.cpp" />
+		<Unit filename="../src/Simulator/SandSimulator.h" />
+		<Unit filename="../src/Simulator/Simulator.cpp" />
+		<Unit filename="../src/Simulator/Simulator.h" />
+		<Unit filename="../src/Simulator/SimulatorManager.cpp" />
+		<Unit filename="../src/Simulator/SimulatorManager.h" />
+		<Unit filename="../src/Simulator/VaporizeFluidSimulator.cpp" />
+		<Unit filename="../src/Simulator/VaporizeFluidSimulator.h" />
+		<Unit filename="../src/SquirrelCommandBinder.cpp" />
+		<Unit filename="../src/SquirrelCommandBinder.h" />
+		<Unit filename="../src/StackWalker.h" />
+		<Unit filename="../src/Stairs.h" />
+		<Unit filename="../src/StringCompression.cpp" />
+		<Unit filename="../src/StringCompression.h" />
+		<Unit filename="../src/StringMap.cpp" />
+		<Unit filename="../src/StringMap.h" />
+		<Unit filename="../src/StringUtils.cpp" />
+		<Unit filename="../src/StringUtils.h" />
+		<Unit filename="../src/TNTEntity.cpp" />
+		<Unit filename="../src/TNTEntity.h" />
+		<Unit filename="../src/Torch.h" />
+		<Unit filename="../src/Tracer.cpp" />
+		<Unit filename="../src/Tracer.h" />
+		<Unit filename="../src/UI/SlotArea.cpp" />
+		<Unit filename="../src/UI/SlotArea.h" />
+		<Unit filename="../src/UI/Window.cpp" />
+		<Unit filename="../src/UI/Window.h" />
+		<Unit filename="../src/UI/WindowOwner.h" />
+		<Unit filename="../src/Vector3d.cpp" />
+		<Unit filename="../src/Vector3d.h" />
+		<Unit filename="../src/Vector3f.cpp" />
+		<Unit filename="../src/Vector3f.h" />
+		<Unit filename="../src/Vector3i.cpp" />
+		<Unit filename="../src/Vector3i.h" />
+		<Unit filename="../src/Vine.h" />
+		<Unit filename="../src/WebAdmin.cpp" />
+		<Unit filename="../src/WebAdmin.h" />
+		<Unit filename="../src/WebPlugin.cpp" />
+		<Unit filename="../src/WebPlugin.h" />
+		<Unit filename="../src/World.cpp" />
+		<Unit filename="../src/World.h" />
+		<Unit filename="../src/WorldStorage/FastNBT.cpp" />
+		<Unit filename="../src/WorldStorage/FastNBT.h" />
+		<Unit filename="../src/WorldStorage/NBTChunkSerializer.cpp" />
+		<Unit filename="../src/WorldStorage/NBTChunkSerializer.h" />
+		<Unit filename="../src/WorldStorage/WSSAnvil.cpp" />
+		<Unit filename="../src/WorldStorage/WSSAnvil.h" />
+		<Unit filename="../src/WorldStorage/WSSCompact.cpp" />
+		<Unit filename="../src/WorldStorage/WSSCompact.h" />
+		<Unit filename="../src/WorldStorage/WorldStorage.cpp" />
+		<Unit filename="../src/WorldStorage/WorldStorage.h" />
+		<Unit filename="../src/main.cpp" />
+		<Unit filename="../src/md5/md5.cpp" />
+		<Unit filename="../src/md5/md5.h" />
+		<Unit filename="../src/squirrelbindings/SquirrelArray.h" />
+		<Unit filename="../src/squirrelbindings/SquirrelBaseClass.h" />
+		<Unit filename="../src/squirrelbindings/SquirrelBindings.cpp" />
+		<Unit filename="../src/squirrelbindings/SquirrelBindings.h" />
+		<Unit filename="../src/squirrelbindings/SquirrelFunctions.cpp" />
+		<Unit filename="../src/squirrelbindings/SquirrelFunctions.h" />
+		<Unit filename="../src/squirrelbindings/SquirrelObject.h" />
+		<Unit filename="../src/tolua++.h" />
+		<Unit filename="../src/tolua_base.h" />
 		<Unit filename="../webadmin/template.html" />
 		<Unit filename="MCServer.rc">
 			<Option compilerVar="WINDRES" />
diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index 93a34d90a..1b710e1e4 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
@@ -359,163 +359,163 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\source\Authenticator.cpp"
+				RelativePath="..\src\Authenticator.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Authenticator.h"
+				RelativePath="..\src\Authenticator.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\BlockArea.cpp"
+				RelativePath="..\src\BlockArea.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\BlockArea.h"
+				RelativePath="..\src\BlockArea.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\BlockID.cpp"
+				RelativePath="..\src\BlockID.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\BlockID.h"
+				RelativePath="..\src\BlockID.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\BlockTracer.h"
+				RelativePath="..\src\BlockTracer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\BoundingBox.cpp"
+				RelativePath="..\src\BoundingBox.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\BoundingBox.h"
+				RelativePath="..\src\BoundingBox.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\ByteBuffer.cpp"
+				RelativePath="..\src\ByteBuffer.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\ByteBuffer.h"
+				RelativePath="..\src\ByteBuffer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\ChatColor.cpp"
+				RelativePath="..\src\ChatColor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\ChatColor.h"
+				RelativePath="..\src\ChatColor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Chunk.cpp"
+				RelativePath="..\src\Chunk.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Chunk.h"
+				RelativePath="..\src\Chunk.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Chunk.inl.h"
+				RelativePath="..\src\Chunk.inl.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\ChunkDef.h"
+				RelativePath="..\src\ChunkDef.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\ChunkMap.cpp"
+				RelativePath="..\src\ChunkMap.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\ChunkMap.h"
+				RelativePath="..\src\ChunkMap.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\ChunkSender.cpp"
+				RelativePath="..\src\ChunkSender.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\ChunkSender.h"
+				RelativePath="..\src\ChunkSender.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\ClientHandle.cpp"
+				RelativePath="..\src\ClientHandle.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\ClientHandle.h"
+				RelativePath="..\src\ClientHandle.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\CommandOutput.cpp"
+				RelativePath="..\src\CommandOutput.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\CommandOutput.h"
+				RelativePath="..\src\CommandOutput.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\CraftingRecipes.cpp"
+				RelativePath="..\src\CraftingRecipes.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\CraftingRecipes.h"
+				RelativePath="..\src\CraftingRecipes.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Cuboid.cpp"
+				RelativePath="..\src\Cuboid.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Cuboid.h"
+				RelativePath="..\src\Cuboid.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\DeadlockDetect.cpp"
+				RelativePath="..\src\DeadlockDetect.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\DeadlockDetect.h"
+				RelativePath="..\src\DeadlockDetect.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Defines.h"
+				RelativePath="..\src\Defines.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Enchantments.cpp"
+				RelativePath="..\src\Enchantments.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Enchantments.h"
+				RelativePath="..\src\Enchantments.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Endianness.h"
+				RelativePath="..\src\Endianness.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\FastRandom.cpp"
+				RelativePath="..\src\FastRandom.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\FastRandom.h"
+				RelativePath="..\src\FastRandom.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\FurnaceRecipe.cpp"
+				RelativePath="..\src\FurnaceRecipe.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\FurnaceRecipe.h"
+				RelativePath="..\src\FurnaceRecipe.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Globals.cpp"
+				RelativePath="..\src\Globals.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -551,55 +551,55 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\source\Globals.h"
+				RelativePath="..\src\Globals.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Group.cpp"
+				RelativePath="..\src\Group.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Group.h"
+				RelativePath="..\src\Group.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\GroupManager.cpp"
+				RelativePath="..\src\GroupManager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\GroupManager.h"
+				RelativePath="..\src\GroupManager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Inventory.cpp"
+				RelativePath="..\src\Inventory.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Inventory.h"
+				RelativePath="..\src\Inventory.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Item.cpp"
+				RelativePath="..\src\Item.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Item.h"
+				RelativePath="..\src\Item.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\ItemGrid.cpp"
+				RelativePath="..\src\ItemGrid.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\ItemGrid.h"
+				RelativePath="..\src\ItemGrid.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Ladder.h"
+				RelativePath="..\src\Ladder.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\LeakFinder.cpp"
+				RelativePath="..\src\LeakFinder.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -639,115 +639,115 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\source\LeakFinder.h"
+				RelativePath="..\src\LeakFinder.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\LightingThread.cpp"
+				RelativePath="..\src\LightingThread.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\LightingThread.h"
+				RelativePath="..\src\LightingThread.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\LinearInterpolation.cpp"
+				RelativePath="..\src\LinearInterpolation.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\LinearInterpolation.h"
+				RelativePath="..\src\LinearInterpolation.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\LinearUpscale.h"
+				RelativePath="..\src\LinearUpscale.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\LineBlockTracer.cpp"
+				RelativePath="..\src\LineBlockTracer.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\LineBlockTracer.h"
+				RelativePath="..\src\LineBlockTracer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Log.cpp"
+				RelativePath="..\src\Log.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Log.h"
+				RelativePath="..\src\Log.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\main.cpp"
+				RelativePath="..\src\main.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Matrix4f.cpp"
+				RelativePath="..\src\Matrix4f.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Matrix4f.h"
+				RelativePath="..\src\Matrix4f.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\MCLogger.cpp"
+				RelativePath="..\src\MCLogger.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\MCLogger.h"
+				RelativePath="..\src\MCLogger.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\MemoryLeak.h"
+				RelativePath="..\src\MemoryLeak.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\MersenneTwister.h"
+				RelativePath="..\src\MersenneTwister.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\MobCensus.cpp"
+				RelativePath="..\src\MobCensus.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\MobCensus.h"
+				RelativePath="..\src\MobCensus.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\MobFamilyCollecter.cpp"
+				RelativePath="..\src\MobFamilyCollecter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\MobFamilyCollecter.h"
+				RelativePath="..\src\MobFamilyCollecter.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\MobProximityCounter.cpp"
+				RelativePath="..\src\MobProximityCounter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\MobProximityCounter.h"
+				RelativePath="..\src\MobProximityCounter.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\MobSpawner.cpp"
+				RelativePath="..\src\MobSpawner.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\MobSpawner.h"
+				RelativePath="..\src\MobSpawner.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\MonsterConfig.cpp"
+				RelativePath="..\src\MonsterConfig.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\MonsterConfig.h"
+				RelativePath="..\src\MonsterConfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Noise.cpp"
+				RelativePath="..\src\Noise.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -777,63 +777,63 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\source\Noise.h"
+				RelativePath="..\src\Noise.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Piston.cpp"
+				RelativePath="..\src\Piston.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Piston.h"
+				RelativePath="..\src\Piston.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\ProbabDistrib.cpp"
+				RelativePath="..\src\ProbabDistrib.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\ProbabDistrib.h"
+				RelativePath="..\src\ProbabDistrib.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\RCONServer.cpp"
+				RelativePath="..\src\RCONServer.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\RCONServer.h"
+				RelativePath="..\src\RCONServer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\ReferenceManager.cpp"
+				RelativePath="..\src\ReferenceManager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\ReferenceManager.h"
+				RelativePath="..\src\ReferenceManager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Root.cpp"
+				RelativePath="..\src\Root.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Root.h"
+				RelativePath="..\src\Root.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Server.cpp"
+				RelativePath="..\src\Server.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Server.h"
+				RelativePath="..\src\Server.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Sign.h"
+				RelativePath="..\src\Sign.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\StackWalker.cpp"
+				RelativePath="..\src\StackWalker.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -873,330 +873,330 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\source\StackWalker.h"
+				RelativePath="..\src\StackWalker.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\StringCompression.cpp"
+				RelativePath="..\src\StringCompression.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\StringCompression.h"
+				RelativePath="..\src\StringCompression.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\StringUtils.cpp"
+				RelativePath="..\src\StringUtils.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\StringUtils.h"
+				RelativePath="..\src\StringUtils.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Tracer.cpp"
+				RelativePath="..\src\Tracer.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Tracer.h"
+				RelativePath="..\src\Tracer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Vector3d.cpp"
+				RelativePath="..\src\Vector3d.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Vector3d.h"
+				RelativePath="..\src\Vector3d.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Vector3f.cpp"
+				RelativePath="..\src\Vector3f.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Vector3f.h"
+				RelativePath="..\src\Vector3f.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Vector3i.cpp"
+				RelativePath="..\src\Vector3i.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\Vector3i.h"
+				RelativePath="..\src\Vector3i.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\WebAdmin.cpp"
+				RelativePath="..\src\WebAdmin.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\WebAdmin.h"
+				RelativePath="..\src\WebAdmin.h"
 				>
 			</File>
 			<File
-				RelativePath="..\source\World.cpp"
+				RelativePath="..\src\World.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\source\World.h"
+				RelativePath="..\src\World.h"
 				>
 			</File>
 			<Filter
 				Name="Mobs"
 				>
 				<File
-					RelativePath="..\source\Mobs\AggressiveMonster.cpp"
+					RelativePath="..\src\Mobs\AggressiveMonster.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\AggressiveMonster.h"
+					RelativePath="..\src\Mobs\AggressiveMonster.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Bat.cpp"
+					RelativePath="..\src\Mobs\Bat.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Bat.h"
+					RelativePath="..\src\Mobs\Bat.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Blaze.cpp"
+					RelativePath="..\src\Mobs\Blaze.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Blaze.h"
+					RelativePath="..\src\Mobs\Blaze.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Cavespider.cpp"
+					RelativePath="..\src\Mobs\Cavespider.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Cavespider.h"
+					RelativePath="..\src\Mobs\Cavespider.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Chicken.cpp"
+					RelativePath="..\src\Mobs\Chicken.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Chicken.h"
+					RelativePath="..\src\Mobs\Chicken.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Cow.cpp"
+					RelativePath="..\src\Mobs\Cow.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Cow.h"
+					RelativePath="..\src\Mobs\Cow.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Creeper.cpp"
+					RelativePath="..\src\Mobs\Creeper.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Creeper.h"
+					RelativePath="..\src\Mobs\Creeper.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\EnderDragon.cpp"
+					RelativePath="..\src\Mobs\EnderDragon.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\EnderDragon.h"
+					RelativePath="..\src\Mobs\EnderDragon.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Enderman.cpp"
+					RelativePath="..\src\Mobs\Enderman.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Enderman.h"
+					RelativePath="..\src\Mobs\Enderman.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Ghast.cpp"
+					RelativePath="..\src\Mobs\Ghast.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Ghast.h"
+					RelativePath="..\src\Mobs\Ghast.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Giant.cpp"
+					RelativePath="..\src\Mobs\Giant.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Giant.h"
+					RelativePath="..\src\Mobs\Giant.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Horse.cpp"
+					RelativePath="..\src\Mobs\Horse.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Horse.h"
+					RelativePath="..\src\Mobs\Horse.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\IronGolem.cpp"
+					RelativePath="..\src\Mobs\IronGolem.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\IronGolem.h"
+					RelativePath="..\src\Mobs\IronGolem.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\MagmaCube.cpp"
+					RelativePath="..\src\Mobs\MagmaCube.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\MagmaCube.h"
+					RelativePath="..\src\Mobs\MagmaCube.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Monster.cpp"
+					RelativePath="..\src\Mobs\Monster.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Monster.h"
+					RelativePath="..\src\Mobs\Monster.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Mooshroom.cpp"
+					RelativePath="..\src\Mobs\Mooshroom.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Mooshroom.h"
+					RelativePath="..\src\Mobs\Mooshroom.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Ocelot.h"
+					RelativePath="..\src\Mobs\Ocelot.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\PassiveAggressiveMonster.cpp"
+					RelativePath="..\src\Mobs\PassiveAggressiveMonster.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\PassiveAggressiveMonster.h"
+					RelativePath="..\src\Mobs\PassiveAggressiveMonster.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\PassiveMonster.cpp"
+					RelativePath="..\src\Mobs\PassiveMonster.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\PassiveMonster.h"
+					RelativePath="..\src\Mobs\PassiveMonster.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Pig.cpp"
+					RelativePath="..\src\Mobs\Pig.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Pig.h"
+					RelativePath="..\src\Mobs\Pig.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Sheep.cpp"
+					RelativePath="..\src\Mobs\Sheep.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Sheep.h"
+					RelativePath="..\src\Mobs\Sheep.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Silverfish.h"
+					RelativePath="..\src\Mobs\Silverfish.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Skeleton.cpp"
+					RelativePath="..\src\Mobs\Skeleton.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Skeleton.h"
+					RelativePath="..\src\Mobs\Skeleton.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Slime.cpp"
+					RelativePath="..\src\Mobs\Slime.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Slime.h"
+					RelativePath="..\src\Mobs\Slime.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\SnowGolem.cpp"
+					RelativePath="..\src\Mobs\SnowGolem.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\SnowGolem.h"
+					RelativePath="..\src\Mobs\SnowGolem.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Spider.cpp"
+					RelativePath="..\src\Mobs\Spider.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Spider.h"
+					RelativePath="..\src\Mobs\Spider.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Squid.cpp"
+					RelativePath="..\src\Mobs\Squid.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Squid.h"
+					RelativePath="..\src\Mobs\Squid.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Villager.cpp"
+					RelativePath="..\src\Mobs\Villager.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Villager.h"
+					RelativePath="..\src\Mobs\Villager.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Witch.cpp"
+					RelativePath="..\src\Mobs\Witch.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Witch.h"
+					RelativePath="..\src\Mobs\Witch.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Wither.cpp"
+					RelativePath="..\src\Mobs\Wither.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Wither.h"
+					RelativePath="..\src\Mobs\Wither.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Wolf.cpp"
+					RelativePath="..\src\Mobs\Wolf.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Wolf.h"
+					RelativePath="..\src\Mobs\Wolf.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Zombie.cpp"
+					RelativePath="..\src\Mobs\Zombie.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\Zombie.h"
+					RelativePath="..\src\Mobs\Zombie.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\ZombiePigman.cpp"
+					RelativePath="..\src\Mobs\ZombiePigman.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Mobs\ZombiePigman.h"
+					RelativePath="..\src\Mobs\ZombiePigman.h"
 					>
 				</File>
 			</Filter>
@@ -1204,75 +1204,75 @@
 				Name="Entities"
 				>
 				<File
-					RelativePath="..\source\Entities\Boat.cpp"
+					RelativePath="..\src\Entities\Boat.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Entities\Boat.h"
+					RelativePath="..\src\Entities\Boat.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Entities\Entity.cpp"
+					RelativePath="..\src\Entities\Entity.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Entities\Entity.h"
+					RelativePath="..\src\Entities\Entity.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Entities\FallingBlock.cpp"
+					RelativePath="..\src\Entities\FallingBlock.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Entities\FallingBlock.h"
+					RelativePath="..\src\Entities\FallingBlock.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Entities\Minecart.cpp"
+					RelativePath="..\src\Entities\Minecart.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Entities\Minecart.h"
+					RelativePath="..\src\Entities\Minecart.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Entities\Pawn.cpp"
+					RelativePath="..\src\Entities\Pawn.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Entities\Pawn.h"
+					RelativePath="..\src\Entities\Pawn.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Entities\Pickup.cpp"
+					RelativePath="..\src\Entities\Pickup.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Entities\Pickup.h"
+					RelativePath="..\src\Entities\Pickup.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Entities\Player.cpp"
+					RelativePath="..\src\Entities\Player.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Entities\Player.h"
+					RelativePath="..\src\Entities\Player.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Entities\ProjectileEntity.cpp"
+					RelativePath="..\src\Entities\ProjectileEntity.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Entities\ProjectileEntity.h"
+					RelativePath="..\src\Entities\ProjectileEntity.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Entities\TNTEntity.cpp"
+					RelativePath="..\src\Entities\TNTEntity.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Entities\TNTEntity.h"
+					RelativePath="..\src\Entities\TNTEntity.h"
 					>
 				</File>
 			</Filter>
@@ -1280,23 +1280,23 @@
 				Name="UI"
 				>
 				<File
-					RelativePath="..\source\UI\SlotArea.cpp"
+					RelativePath="..\src\UI\SlotArea.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\UI\SlotArea.h"
+					RelativePath="..\src\UI\SlotArea.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\UI\Window.cpp"
+					RelativePath="..\src\UI\Window.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\UI\Window.h"
+					RelativePath="..\src\UI\Window.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\UI\WindowOwner.h"
+					RelativePath="..\src\UI\WindowOwner.h"
 					>
 				</File>
 			</Filter>
@@ -1304,79 +1304,79 @@
 				Name="Simulator"
 				>
 				<File
-					RelativePath="..\source\Simulator\DelayedFluidSimulator.cpp"
+					RelativePath="..\src\Simulator\DelayedFluidSimulator.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Simulator\DelayedFluidSimulator.h"
+					RelativePath="..\src\Simulator\DelayedFluidSimulator.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Simulator\FireSimulator.cpp"
+					RelativePath="..\src\Simulator\FireSimulator.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Simulator\FireSimulator.h"
+					RelativePath="..\src\Simulator\FireSimulator.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Simulator\FloodyFluidSimulator.cpp"
+					RelativePath="..\src\Simulator\FloodyFluidSimulator.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Simulator\FloodyFluidSimulator.h"
+					RelativePath="..\src\Simulator\FloodyFluidSimulator.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Simulator\FluidSimulator.cpp"
+					RelativePath="..\src\Simulator\FluidSimulator.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Simulator\FluidSimulator.h"
+					RelativePath="..\src\Simulator\FluidSimulator.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Simulator\NoopFluidSimulator.h"
+					RelativePath="..\src\Simulator\NoopFluidSimulator.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Simulator\RedstoneSimulator.cpp"
+					RelativePath="..\src\Simulator\RedstoneSimulator.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Simulator\RedstoneSimulator.h"
+					RelativePath="..\src\Simulator\RedstoneSimulator.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Simulator\SandSimulator.cpp"
+					RelativePath="..\src\Simulator\SandSimulator.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Simulator\SandSimulator.h"
+					RelativePath="..\src\Simulator\SandSimulator.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Simulator\Simulator.cpp"
+					RelativePath="..\src\Simulator\Simulator.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Simulator\Simulator.h"
+					RelativePath="..\src\Simulator\Simulator.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Simulator\SimulatorManager.cpp"
+					RelativePath="..\src\Simulator\SimulatorManager.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Simulator\SimulatorManager.h"
+					RelativePath="..\src\Simulator\SimulatorManager.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Simulator\VaporizeFluidSimulator.cpp"
+					RelativePath="..\src\Simulator\VaporizeFluidSimulator.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Simulator\VaporizeFluidSimulator.h"
+					RelativePath="..\src\Simulator\VaporizeFluidSimulator.h"
 					>
 				</File>
 			</Filter>
@@ -1384,107 +1384,107 @@
 				Name="OSSupport"
 				>
 				<File
-					RelativePath="..\source\OSSupport\BlockingTCPLink.cpp"
+					RelativePath="..\src\OSSupport\BlockingTCPLink.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\BlockingTCPLink.h"
+					RelativePath="..\src\OSSupport\BlockingTCPLink.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\CriticalSection.cpp"
+					RelativePath="..\src\OSSupport\CriticalSection.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\CriticalSection.h"
+					RelativePath="..\src\OSSupport\CriticalSection.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\Event.cpp"
+					RelativePath="..\src\OSSupport\Event.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\Event.h"
+					RelativePath="..\src\OSSupport\Event.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\File.cpp"
+					RelativePath="..\src\OSSupport\File.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\File.h"
+					RelativePath="..\src\OSSupport\File.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\GZipFile.cpp"
+					RelativePath="..\src\OSSupport\GZipFile.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\GZipFile.h"
+					RelativePath="..\src\OSSupport\GZipFile.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\IsThread.cpp"
+					RelativePath="..\src\OSSupport\IsThread.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\IsThread.h"
+					RelativePath="..\src\OSSupport\IsThread.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\ListenThread.cpp"
+					RelativePath="..\src\OSSupport\ListenThread.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\ListenThread.h"
+					RelativePath="..\src\OSSupport\ListenThread.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\Semaphore.cpp"
+					RelativePath="..\src\OSSupport\Semaphore.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\Semaphore.h"
+					RelativePath="..\src\OSSupport\Semaphore.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\Sleep.cpp"
+					RelativePath="..\src\OSSupport\Sleep.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\Sleep.h"
+					RelativePath="..\src\OSSupport\Sleep.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\Socket.cpp"
+					RelativePath="..\src\OSSupport\Socket.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\Socket.h"
+					RelativePath="..\src\OSSupport\Socket.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\SocketThreads.cpp"
+					RelativePath="..\src\OSSupport\SocketThreads.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\SocketThreads.h"
+					RelativePath="..\src\OSSupport\SocketThreads.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\Thread.cpp"
+					RelativePath="..\src\OSSupport\Thread.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\Thread.h"
+					RelativePath="..\src\OSSupport\Thread.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\Timer.cpp"
+					RelativePath="..\src\OSSupport\Timer.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\OSSupport\Timer.h"
+					RelativePath="..\src\OSSupport\Timer.h"
 					>
 				</File>
 				<Filter
@@ -1676,7 +1676,7 @@
 				Name="Bindings"
 				>
 				<File
-					RelativePath="..\source\AllToLua.pkg"
+					RelativePath="..\src\AllToLua.pkg"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1728,7 +1728,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\source\Bindings.cpp"
+					RelativePath="..\src\Bindings.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1764,75 +1764,75 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\source\Bindings.h"
+					RelativePath="..\src\Bindings.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\LuaFunctions.h"
+					RelativePath="..\src\LuaFunctions.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\LuaState.cpp"
+					RelativePath="..\src\LuaState.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\LuaState.h"
+					RelativePath="..\src\LuaState.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\LuaWindow.cpp"
+					RelativePath="..\src\LuaWindow.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\LuaWindow.h"
+					RelativePath="..\src\LuaWindow.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\ManualBindings.cpp"
+					RelativePath="..\src\ManualBindings.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\ManualBindings.h"
+					RelativePath="..\src\ManualBindings.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Plugin.cpp"
+					RelativePath="..\src\Plugin.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Plugin.h"
+					RelativePath="..\src\Plugin.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\PluginLua.cpp"
+					RelativePath="..\src\PluginLua.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\PluginLua.h"
+					RelativePath="..\src\PluginLua.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\PluginManager.cpp"
+					RelativePath="..\src\PluginManager.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\PluginManager.h"
+					RelativePath="..\src\PluginManager.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\tolua++.h"
+					RelativePath="..\src\tolua++.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\tolua_base.h"
+					RelativePath="..\src\tolua_base.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\WebPlugin.cpp"
+					RelativePath="..\src\WebPlugin.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\WebPlugin.h"
+					RelativePath="..\src\WebPlugin.h"
 					>
 				</File>
 			</Filter>
@@ -1848,7 +1848,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\source\md5\md5.cpp"
+					RelativePath="..\src\md5\md5.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1888,7 +1888,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\source\md5\md5.h"
+					RelativePath="..\src\md5\md5.h"
 					>
 				</File>
 			</Filter>
@@ -1896,43 +1896,43 @@
 				Name="WorldStorage"
 				>
 				<File
-					RelativePath="..\source\WorldStorage\FastNBT.cpp"
+					RelativePath="..\src\WorldStorage\FastNBT.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\WorldStorage\FastNBT.h"
+					RelativePath="..\src\WorldStorage\FastNBT.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\WorldStorage\NBTChunkSerializer.cpp"
+					RelativePath="..\src\WorldStorage\NBTChunkSerializer.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\WorldStorage\NBTChunkSerializer.h"
+					RelativePath="..\src\WorldStorage\NBTChunkSerializer.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\WorldStorage\WorldStorage.cpp"
+					RelativePath="..\src\WorldStorage\WorldStorage.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\WorldStorage\WorldStorage.h"
+					RelativePath="..\src\WorldStorage\WorldStorage.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\WorldStorage\WSSAnvil.cpp"
+					RelativePath="..\src\WorldStorage\WSSAnvil.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\WorldStorage\WSSAnvil.h"
+					RelativePath="..\src\WorldStorage\WSSAnvil.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\WorldStorage\WSSCompact.cpp"
+					RelativePath="..\src\WorldStorage\WSSCompact.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\WorldStorage\WSSCompact.h"
+					RelativePath="..\src\WorldStorage\WSSCompact.h"
 					>
 				</File>
 			</Filter>
@@ -1940,123 +1940,123 @@
 				Name="Generating"
 				>
 				<File
-					RelativePath="..\source\Generating\BioGen.cpp"
+					RelativePath="..\src\Generating\BioGen.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\BioGen.h"
+					RelativePath="..\src\Generating\BioGen.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\Caves.cpp"
+					RelativePath="..\src\Generating\Caves.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\Caves.h"
+					RelativePath="..\src\Generating\Caves.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\ChunkDesc.cpp"
+					RelativePath="..\src\Generating\ChunkDesc.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\ChunkDesc.h"
+					RelativePath="..\src\Generating\ChunkDesc.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\ChunkGenerator.cpp"
+					RelativePath="..\src\Generating\ChunkGenerator.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\ChunkGenerator.h"
+					RelativePath="..\src\Generating\ChunkGenerator.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\CompoGen.cpp"
+					RelativePath="..\src\Generating\CompoGen.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\CompoGen.h"
+					RelativePath="..\src\Generating\CompoGen.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\ComposableGenerator.cpp"
+					RelativePath="..\src\Generating\ComposableGenerator.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\ComposableGenerator.h"
+					RelativePath="..\src\Generating\ComposableGenerator.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\DistortedHeightmap.cpp"
+					RelativePath="..\src\Generating\DistortedHeightmap.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\DistortedHeightmap.h"
+					RelativePath="..\src\Generating\DistortedHeightmap.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\EndGen.cpp"
+					RelativePath="..\src\Generating\EndGen.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\EndGen.h"
+					RelativePath="..\src\Generating\EndGen.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\FinishGen.cpp"
+					RelativePath="..\src\Generating\FinishGen.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\FinishGen.h"
+					RelativePath="..\src\Generating\FinishGen.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\HeiGen.cpp"
+					RelativePath="..\src\Generating\HeiGen.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\HeiGen.h"
+					RelativePath="..\src\Generating\HeiGen.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\MineShafts.cpp"
+					RelativePath="..\src\Generating\MineShafts.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\MineShafts.h"
+					RelativePath="..\src\Generating\MineShafts.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\Noise3DGenerator.cpp"
+					RelativePath="..\src\Generating\Noise3DGenerator.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\Noise3DGenerator.h"
+					RelativePath="..\src\Generating\Noise3DGenerator.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\Ravines.cpp"
+					RelativePath="..\src\Generating\Ravines.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\Ravines.h"
+					RelativePath="..\src\Generating\Ravines.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\StructGen.cpp"
+					RelativePath="..\src\Generating\StructGen.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\StructGen.h"
+					RelativePath="..\src\Generating\StructGen.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\Trees.cpp"
+					RelativePath="..\src\Generating\Trees.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Generating\Trees.h"
+					RelativePath="..\src\Generating\Trees.h"
 					>
 				</File>
 			</Filter>
@@ -2064,283 +2064,283 @@
 				Name="Blocks"
 				>
 				<File
-					RelativePath="..\source\Blocks\BlockBed.cpp"
+					RelativePath="..\src\Blocks\BlockBed.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockBed.h"
+					RelativePath="..\src\blocks\BlockBed.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockBrewingStand.h"
+					RelativePath="..\src\Blocks\BlockBrewingStand.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockButton.cpp"
+					RelativePath="..\src\Blocks\BlockButton.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockButton.h"
+					RelativePath="..\src\Blocks\BlockButton.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockCactus.h"
+					RelativePath="..\src\blocks\BlockCactus.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockCarpet.h"
+					RelativePath="..\src\Blocks\BlockCarpet.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockCauldron.h"
+					RelativePath="..\src\Blocks\BlockCauldron.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockChest.h"
+					RelativePath="..\src\blocks\BlockChest.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockCloth.h"
+					RelativePath="..\src\blocks\BlockCloth.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockCobWeb.h"
+					RelativePath="..\src\Blocks\BlockCobWeb.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockComparator.cpp"
+					RelativePath="..\src\Blocks\BlockComparator.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockComparator.h"
+					RelativePath="..\src\Blocks\BlockComparator.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockCrops.h"
+					RelativePath="..\src\blocks\BlockCrops.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockDeadBush.h"
+					RelativePath="..\src\Blocks\BlockDeadBush.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockDirt.h"
+					RelativePath="..\src\blocks\BlockDirt.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockDoor.cpp"
+					RelativePath="..\src\blocks\BlockDoor.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockDoor.h"
+					RelativePath="..\src\blocks\BlockDoor.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockDropSpenser.h"
+					RelativePath="..\src\blocks\BlockDropSpenser.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockEnderchest.h"
+					RelativePath="..\src\Blocks\BlockEnderchest.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockEntity.h"
+					RelativePath="..\src\blocks\BlockEntity.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockFarmland.h"
+					RelativePath="..\src\Blocks\BlockFarmland.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockFenceGate.h"
+					RelativePath="..\src\Blocks\BlockFenceGate.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockFire.h"
+					RelativePath="..\src\blocks\BlockFire.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockFlower.h"
+					RelativePath="..\src\blocks\BlockFlower.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockFlowerPot.h"
+					RelativePath="..\src\Blocks\BlockFlowerPot.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockFluid.h"
+					RelativePath="..\src\blocks\BlockFluid.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockFurnace.h"
+					RelativePath="..\src\blocks\BlockFurnace.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockGlass.h"
+					RelativePath="..\src\Blocks\BlockGlass.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockGlowstone.h"
+					RelativePath="..\src\blocks\BlockGlowstone.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockGravel.h"
+					RelativePath="..\src\blocks\BlockGravel.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockHandler.cpp"
+					RelativePath="..\src\blocks\BlockHandler.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockHandler.h"
+					RelativePath="..\src\blocks\BlockHandler.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockHopper.h"
+					RelativePath="..\src\Blocks\BlockHopper.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockIce.h"
+					RelativePath="..\src\blocks\BlockIce.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockLadder.h"
+					RelativePath="..\src\blocks\BlockLadder.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockLeaves.h"
+					RelativePath="..\src\blocks\BlockLeaves.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockLever.cpp"
+					RelativePath="..\src\Blocks\BlockLever.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockLever.h"
+					RelativePath="..\src\Blocks\BlockLever.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockMelon.h"
+					RelativePath="..\src\blocks\BlockMelon.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockMushroom.h"
+					RelativePath="..\src\blocks\BlockMushroom.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockMycelium.h"
+					RelativePath="..\src\Blocks\BlockMycelium.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockNote.h"
+					RelativePath="..\src\blocks\BlockNote.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockOre.h"
+					RelativePath="..\src\blocks\BlockOre.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockPiston.cpp"
+					RelativePath="..\src\blocks\BlockPiston.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockPiston.h"
+					RelativePath="..\src\blocks\BlockPiston.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockPlanks.h"
+					RelativePath="..\src\blocks\BlockPlanks.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockPortal.h"
+					RelativePath="..\src\blocks\BlockPortal.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockPumpkin.h"
+					RelativePath="..\src\Blocks\BlockPumpkin.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Blocks\BlockRail.h"
+					RelativePath="..\src\Blocks\BlockRail.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockRedstone.cpp"
+					RelativePath="..\src\blocks\BlockRedstone.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockRedstone.h"
+					RelativePath="..\src\blocks\BlockRedstone.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockRedstoneOre.h"
+					RelativePath="..\src\blocks\BlockRedstoneOre.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockRedstoneRepeater.cpp"
+					RelativePath="..\src\blocks\BlockRedstoneRepeater.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockRedstoneRepeater.h"
+					RelativePath="..\src\blocks\BlockRedstoneRepeater.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockRedstoneTorch.h"
+					RelativePath="..\src\blocks\BlockRedstoneTorch.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockSand.h"
+					RelativePath="..\src\blocks\BlockSand.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockSapling.h"
+					RelativePath="..\src\blocks\BlockSapling.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockSign.h"
+					RelativePath="..\src\blocks\BlockSign.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockSlab.h"
+					RelativePath="..\src\blocks\BlockSlab.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockSnow.h"
+					RelativePath="..\src\blocks\BlockSnow.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockStairs.h"
+					RelativePath="..\src\blocks\BlockStairs.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockStems.h"
+					RelativePath="..\src\blocks\BlockStems.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockStone.h"
+					RelativePath="..\src\blocks\BlockStone.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockSugarcane.h"
+					RelativePath="..\src\blocks\BlockSugarcane.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockTallGrass.h"
+					RelativePath="..\src\blocks\BlockTallGrass.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockTorch.h"
+					RelativePath="..\src\blocks\BlockTorch.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockVine.h"
+					RelativePath="..\src\blocks\BlockVine.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockWood.h"
+					RelativePath="..\src\blocks\BlockWood.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\blocks\BlockWorkbench.h"
+					RelativePath="..\src\blocks\BlockWorkbench.h"
 					>
 				</File>
 			</Filter>
@@ -2348,123 +2348,123 @@
 				Name="Items"
 				>
 				<File
-					RelativePath="..\source\items\ItemBed.h"
+					RelativePath="..\src\items\ItemBed.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Items\ItemBoat.h"
+					RelativePath="..\src\Items\ItemBoat.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Items\ItemBow.h"
+					RelativePath="..\src\Items\ItemBow.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Items\ItemBrewingStand.h"
+					RelativePath="..\src\Items\ItemBrewingStand.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemBucket.h"
+					RelativePath="..\src\items\ItemBucket.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Items\ItemCauldron.h"
+					RelativePath="..\src\Items\ItemCauldron.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemCloth.h"
+					RelativePath="..\src\items\ItemCloth.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Items\ItemComparator.h"
+					RelativePath="..\src\Items\ItemComparator.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemDoor.h"
+					RelativePath="..\src\items\ItemDoor.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemDye.h"
+					RelativePath="..\src\items\ItemDye.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Items\ItemFlowerPot.h"
+					RelativePath="..\src\Items\ItemFlowerPot.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemFood.h"
+					RelativePath="..\src\items\ItemFood.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemHandler.cpp"
+					RelativePath="..\src\items\ItemHandler.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemHandler.h"
+					RelativePath="..\src\items\ItemHandler.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemHoe.h"
+					RelativePath="..\src\items\ItemHoe.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemLeaves.h"
+					RelativePath="..\src\items\ItemLeaves.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemLighter.h"
+					RelativePath="..\src\items\ItemLighter.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Items\ItemMinecart.h"
+					RelativePath="..\src\Items\ItemMinecart.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemPickaxe.h"
+					RelativePath="..\src\items\ItemPickaxe.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemRedstoneDust.h"
+					RelativePath="..\src\items\ItemRedstoneDust.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemRedstoneRepeater.h"
+					RelativePath="..\src\items\ItemRedstoneRepeater.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemSapling.h"
+					RelativePath="..\src\items\ItemSapling.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemSeeds.h"
+					RelativePath="..\src\items\ItemSeeds.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemShears.h"
+					RelativePath="..\src\items\ItemShears.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemShovel.h"
+					RelativePath="..\src\items\ItemShovel.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemSign.h"
+					RelativePath="..\src\items\ItemSign.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Items\ItemSpawnEgg.h"
+					RelativePath="..\src\Items\ItemSpawnEgg.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemSugarcane.h"
+					RelativePath="..\src\items\ItemSugarcane.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\items\ItemSword.h"
+					RelativePath="..\src\items\ItemSword.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Items\ItemThrowable.h"
+					RelativePath="..\src\Items\ItemThrowable.h"
 					>
 				</File>
 			</Filter>
@@ -2472,71 +2472,71 @@
 				Name="Protocol"
 				>
 				<File
-					RelativePath="..\source\Protocol\ChunkDataSerializer.cpp"
+					RelativePath="..\src\Protocol\ChunkDataSerializer.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Protocol\ChunkDataSerializer.h"
+					RelativePath="..\src\Protocol\ChunkDataSerializer.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Protocol\Protocol.h"
+					RelativePath="..\src\Protocol\Protocol.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Protocol\Protocol125.cpp"
+					RelativePath="..\src\Protocol\Protocol125.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Protocol\Protocol125.h"
+					RelativePath="..\src\Protocol\Protocol125.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Protocol\Protocol132.cpp"
+					RelativePath="..\src\Protocol\Protocol132.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Protocol\Protocol132.h"
+					RelativePath="..\src\Protocol\Protocol132.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Protocol\Protocol14x.cpp"
+					RelativePath="..\src\Protocol\Protocol14x.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Protocol\Protocol14x.h"
+					RelativePath="..\src\Protocol\Protocol14x.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Protocol\Protocol15x.cpp"
+					RelativePath="..\src\Protocol\Protocol15x.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Protocol\Protocol15x.h"
+					RelativePath="..\src\Protocol\Protocol15x.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Protocol\Protocol16x.cpp"
+					RelativePath="..\src\Protocol\Protocol16x.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Protocol\Protocol16x.h"
+					RelativePath="..\src\Protocol\Protocol16x.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Protocol\Protocol17x.cpp"
+					RelativePath="..\src\Protocol\Protocol17x.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Protocol\Protocol17x.h"
+					RelativePath="..\src\Protocol\Protocol17x.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Protocol\ProtocolRecognizer.cpp"
+					RelativePath="..\src\Protocol\ProtocolRecognizer.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Protocol\ProtocolRecognizer.h"
+					RelativePath="..\src\Protocol\ProtocolRecognizer.h"
 					>
 				</File>
 			</Filter>
@@ -2544,7 +2544,7 @@
 				Name="SQLite"
 				>
 				<File
-					RelativePath="..\source\sqlite\lsqlite3.c"
+					RelativePath="..\src\sqlite\lsqlite3.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -2580,7 +2580,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\source\sqlite\sqlite3.c"
+					RelativePath="..\src\sqlite\sqlite3.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -2616,11 +2616,11 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\source\sqlite\sqlite3.h"
+					RelativePath="..\src\sqlite\sqlite3.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\sqlite\urls.txt"
+					RelativePath="..\src\sqlite\urls.txt"
 					>
 				</File>
 			</Filter>
@@ -2628,7 +2628,7 @@
 				Name="LuaExpat"
 				>
 				<File
-					RelativePath="..\source\LuaExpat\lxplib.c"
+					RelativePath="..\src\LuaExpat\lxplib.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -2664,7 +2664,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\source\LuaExpat\lxplib.h"
+					RelativePath="..\src\LuaExpat\lxplib.h"
 					>
 				</File>
 			</Filter>
@@ -2672,87 +2672,87 @@
 				Name="BlockEntities"
 				>
 				<File
-					RelativePath="..\source\BlockEntities\BlockEntity.cpp"
+					RelativePath="..\src\BlockEntities\BlockEntity.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\BlockEntity.h"
+					RelativePath="..\src\BlockEntities\BlockEntity.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\BlockEntityWithItems.h"
+					RelativePath="..\src\BlockEntities\BlockEntityWithItems.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\ChestEntity.cpp"
+					RelativePath="..\src\BlockEntities\ChestEntity.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\ChestEntity.h"
+					RelativePath="..\src\BlockEntities\ChestEntity.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\DispenserEntity.cpp"
+					RelativePath="..\src\BlockEntities\DispenserEntity.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\DispenserEntity.h"
+					RelativePath="..\src\BlockEntities\DispenserEntity.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\DropperEntity.cpp"
+					RelativePath="..\src\BlockEntities\DropperEntity.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\DropperEntity.h"
+					RelativePath="..\src\BlockEntities\DropperEntity.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\DropSpenserEntity.cpp"
+					RelativePath="..\src\BlockEntities\DropSpenserEntity.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\DropSpenserEntity.h"
+					RelativePath="..\src\BlockEntities\DropSpenserEntity.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\FurnaceEntity.cpp"
+					RelativePath="..\src\BlockEntities\FurnaceEntity.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\FurnaceEntity.h"
+					RelativePath="..\src\BlockEntities\FurnaceEntity.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\HopperEntity.cpp"
+					RelativePath="..\src\BlockEntities\HopperEntity.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\HopperEntity.h"
+					RelativePath="..\src\BlockEntities\HopperEntity.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\JukeboxEntity.cpp"
+					RelativePath="..\src\BlockEntities\JukeboxEntity.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\JukeboxEntity.h"
+					RelativePath="..\src\BlockEntities\JukeboxEntity.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\NoteEntity.cpp"
+					RelativePath="..\src\BlockEntities\NoteEntity.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\NoteEntity.h"
+					RelativePath="..\src\BlockEntities\NoteEntity.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\SignEntity.cpp"
+					RelativePath="..\src\BlockEntities\SignEntity.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\BlockEntities\SignEntity.h"
+					RelativePath="..\src\BlockEntities\SignEntity.h"
 					>
 				</File>
 			</Filter>
@@ -2760,59 +2760,59 @@
 				Name="HTTPServer"
 				>
 				<File
-					RelativePath="..\source\HTTPServer\EnvelopeParser.cpp"
+					RelativePath="..\src\HTTPServer\EnvelopeParser.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\HTTPServer\EnvelopeParser.h"
+					RelativePath="..\src\HTTPServer\EnvelopeParser.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\HTTPServer\HTTPConnection.cpp"
+					RelativePath="..\src\HTTPServer\HTTPConnection.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\HTTPServer\HTTPConnection.h"
+					RelativePath="..\src\HTTPServer\HTTPConnection.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\HTTPServer\HTTPFormParser.cpp"
+					RelativePath="..\src\HTTPServer\HTTPFormParser.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\HTTPServer\HTTPFormParser.h"
+					RelativePath="..\src\HTTPServer\HTTPFormParser.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\HTTPServer\HTTPMessage.cpp"
+					RelativePath="..\src\HTTPServer\HTTPMessage.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\HTTPServer\HTTPMessage.h"
+					RelativePath="..\src\HTTPServer\HTTPMessage.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\HTTPServer\HTTPServer.cpp"
+					RelativePath="..\src\HTTPServer\HTTPServer.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\HTTPServer\HTTPServer.h"
+					RelativePath="..\src\HTTPServer\HTTPServer.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\HTTPServer\MultipartParser.cpp"
+					RelativePath="..\src\HTTPServer\MultipartParser.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\HTTPServer\MultipartParser.h"
+					RelativePath="..\src\HTTPServer\MultipartParser.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\HTTPServer\NameValueParser.cpp"
+					RelativePath="..\src\HTTPServer\NameValueParser.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\HTTPServer\NameValueParser.h"
+					RelativePath="..\src\HTTPServer\NameValueParser.h"
 					>
 				</File>
 			</Filter>
diff --git a/VC2008/ToLua.cbp b/VC2008/ToLua.cbp
index f22bfda4a..2466a9503 100644
--- a/VC2008/ToLua.cbp
+++ b/VC2008/ToLua.cbp
@@ -21,11 +21,11 @@
 					<Add option="-W" />
 					<Add option="-g" />
 					<Add option="-O0" />
-					<Add directory="../tolua++-1.0.93/include" />
+					<Add directory="../lib/tolua++/include" />
 					<Add directory="../lua-5.1.4/src" />
 				</Compiler>
 				<ResourceCompiler>
-					<Add directory="../tolua++-1.0.93/include" />
+					<Add directory="../lib/tolua++/include" />
 					<Add directory="../lua-5.1.4/src" />
 				</ResourceCompiler>
 			</Target>
@@ -43,11 +43,11 @@
 					<Add option="-D_CRT_SECURE_NO_WARNINGS" />
 					<Add option="-W" />
 					<Add option="-O2" />
-					<Add directory="../tolua++-1.0.93/include" />
+					<Add directory="../lib/tolua++/include" />
 					<Add directory="../lua-5.1.4/src" />
 				</Compiler>
 				<ResourceCompiler>
-					<Add directory="../tolua++-1.0.93/include" />
+					<Add directory="../lib/tolua++/include" />
 					<Add directory="../lua-5.1.4/src" />
 				</ResourceCompiler>
 			</Target>
@@ -65,32 +65,32 @@
 					<Add option="-D_CRT_SECURE_NO_WARNINGS" />
 					<Add option="-W" />
 					<Add option="-O2" />
-					<Add directory="../tolua++-1.0.93/include" />
+					<Add directory="../lib/tolua++/include" />
 					<Add directory="../lua-5.1.4/src" />
 				</Compiler>
 				<ResourceCompiler>
-					<Add directory="../tolua++-1.0.93/include" />
+					<Add directory="../lib/tolua++/include" />
 					<Add directory="../lua-5.1.4/src" />
 				</ResourceCompiler>
 			</Target>
 		</Build>
-		<Unit filename="../tolua++-1.0.93/src/bin/tolua.c">
+		<Unit filename="../lib/tolua++/src/bin/tolua.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../tolua++-1.0.93/src/lib/tolua_event.c">
+		<Unit filename="../lib/tolua++/src/lib/tolua_event.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../tolua++-1.0.93/src/lib/tolua_event.h" />
-		<Unit filename="../tolua++-1.0.93/src/lib/tolua_is.c">
+		<Unit filename="../lib/tolua++/src/lib/tolua_event.h" />
+		<Unit filename="../lib/tolua++/src/lib/tolua_is.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../tolua++-1.0.93/src/lib/tolua_map.c">
+		<Unit filename="../lib/tolua++/src/lib/tolua_map.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../tolua++-1.0.93/src/lib/tolua_push.c">
+		<Unit filename="../lib/tolua++/src/lib/tolua_push.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../tolua++-1.0.93/src/lib/tolua_to.c">
+		<Unit filename="../lib/tolua++/src/lib/tolua_to.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Extensions>
diff --git a/VC2008/ToLua.vcproj b/VC2008/ToLua.vcproj
index dd5cfb217..f174ba528 100644
--- a/VC2008/ToLua.vcproj
+++ b/VC2008/ToLua.vcproj
@@ -276,31 +276,31 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\tolua++-1.0.93\src\bin\tolua.c"
+				RelativePath="..\lib\tolua++\src\bin\tolua.c"
 				>
 			</File>
 			<File
-				RelativePath="..\tolua++-1.0.93\src\lib\tolua_event.c"
+				RelativePath="..\lib\tolua++\src\lib\tolua_event.c"
 				>
 			</File>
 			<File
-				RelativePath="..\tolua++-1.0.93\src\lib\tolua_event.h"
+				RelativePath="..\lib\tolua++\src\lib\tolua_event.h"
 				>
 			</File>
 			<File
-				RelativePath="..\tolua++-1.0.93\src\lib\tolua_is.c"
+				RelativePath="..\lib\tolua++\src\lib\tolua_is.c"
 				>
 			</File>
 			<File
-				RelativePath="..\tolua++-1.0.93\src\lib\tolua_map.c"
+				RelativePath="..\lib\tolua++\src\lib\tolua_map.c"
 				>
 			</File>
 			<File
-				RelativePath="..\tolua++-1.0.93\src\lib\tolua_push.c"
+				RelativePath="..\lib\tolua++\src\lib\tolua_push.c"
 				>
 			</File>
 			<File
-				RelativePath="..\tolua++-1.0.93\src\lib\tolua_to.c"
+				RelativePath="..\lib\tolua++\src\lib\tolua_to.c"
 				>
 			</File>
 		</Filter>
diff --git a/VC2008/expat.cbp b/VC2008/expat.cbp
index 6cd3f6234..6c89eff8d 100644
--- a/VC2008/expat.cbp
+++ b/VC2008/expat.cbp
@@ -40,32 +40,32 @@
 				</Compiler>
 			</Target>
 		</Build>
-		<Unit filename="../expat/ascii.h" />
-		<Unit filename="../expat/asciitab.h" />
-		<Unit filename="../expat/expat.h" />
-		<Unit filename="../expat/expat_external.h" />
-		<Unit filename="../expat/iasciitab.h" />
-		<Unit filename="../expat/internal.h" />
-		<Unit filename="../expat/latin1tab.h" />
-		<Unit filename="../expat/nametab.h" />
-		<Unit filename="../expat/utf8tab.h" />
-		<Unit filename="../expat/winconfig.h" />
-		<Unit filename="../expat/xmlparse.c">
+		<Unit filename="../lib/expat/ascii.h" />
+		<Unit filename="../lib/expat/asciitab.h" />
+		<Unit filename="../lib/expat/expat.h" />
+		<Unit filename="../lib/expat/expat_external.h" />
+		<Unit filename="../lib/expat/iasciitab.h" />
+		<Unit filename="../lib/expat/internal.h" />
+		<Unit filename="../lib/expat/latin1tab.h" />
+		<Unit filename="../lib/expat/nametab.h" />
+		<Unit filename="../lib/expat/utf8tab.h" />
+		<Unit filename="../lib/expat/winconfig.h" />
+		<Unit filename="../lib/expat/xmlparse.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../expat/xmlrole.c">
+		<Unit filename="../lib/expat/xmlrole.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../expat/xmlrole.h" />
-		<Unit filename="../expat/xmltok.c">
+		<Unit filename="../lib/expat/xmlrole.h" />
+		<Unit filename="../lib/expat/xmltok.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../expat/xmltok.h" />
-		<Unit filename="../expat/xmltok_impl.c">
+		<Unit filename="../lib/expat/xmltok.h" />
+		<Unit filename="../lib/expat/xmltok_impl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../expat/xmltok_impl.h" />
-		<Unit filename="../expat/xmltok_ns.c">
+		<Unit filename="../lib/expat/xmltok_impl.h" />
+		<Unit filename="../lib/expat/xmltok_ns.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Extensions>
diff --git a/VC2008/expat.vcproj b/VC2008/expat.vcproj
index 148fd0cad..a02549192 100644
--- a/VC2008/expat.vcproj
+++ b/VC2008/expat.vcproj
@@ -149,75 +149,75 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\expat\ascii.h"
+				RelativePath="..\lib\expat\ascii.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\asciitab.h"
+				RelativePath="..\lib\expat\asciitab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\expat.h"
+				RelativePath="..\lib\expat\expat.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\expat_external.h"
+				RelativePath="..\lib\expat\expat_external.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\iasciitab.h"
+				RelativePath="..\lib\expat\iasciitab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\internal.h"
+				RelativePath="..\lib\expat\internal.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\latin1tab.h"
+				RelativePath="..\lib\expat\latin1tab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\nametab.h"
+				RelativePath="..\lib\expat\nametab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\utf8tab.h"
+				RelativePath="..\lib\expat\utf8tab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\winconfig.h"
+				RelativePath="..\lib\expat\winconfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\xmlparse.c"
+				RelativePath="..\lib\expat\xmlparse.c"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\xmlrole.c"
+				RelativePath="..\lib\expat\xmlrole.c"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\xmlrole.h"
+				RelativePath="..\lib\expat\xmlrole.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\xmltok.c"
+				RelativePath="..\lib\expat\xmltok.c"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\xmltok.h"
+				RelativePath="..\lib\expat\xmltok.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\xmltok_impl.c"
+				RelativePath="..\lib\expat\xmltok_impl.c"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\xmltok_impl.h"
+				RelativePath="..\lib\expat\xmltok_impl.h"
 				>
 			</File>
 			<File
-				RelativePath="..\expat\xmltok_ns.c"
+				RelativePath="..\lib\expat\xmltok_ns.c"
 				>
 			</File>
 		</Filter>
diff --git a/VC2008/zlib.cbp b/VC2008/zlib.cbp
index 2b7d759da..1d24c24ce 100644
--- a/VC2008/zlib.cbp
+++ b/VC2008/zlib.cbp
@@ -56,62 +56,62 @@
 				</Compiler>
 			</Target>
 		</Build>
-		<Unit filename="../zlib-1.2.7/adler32.c">
+		<Unit filename="../lib/zlib/adler32.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/compress.c">
+		<Unit filename="../lib/zlib/compress.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/crc32.c">
+		<Unit filename="../lib/zlib/crc32.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/crc32.h" />
-		<Unit filename="../zlib-1.2.7/deflate.c">
+		<Unit filename="../lib/zlib/crc32.h" />
+		<Unit filename="../lib/zlib/deflate.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/deflate.h" />
-		<Unit filename="../zlib-1.2.7/gzclose.c">
+		<Unit filename="../lib/zlib/deflate.h" />
+		<Unit filename="../lib/zlib/gzclose.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/gzguts.h" />
-		<Unit filename="../zlib-1.2.7/gzlib.c">
+		<Unit filename="../lib/zlib/gzguts.h" />
+		<Unit filename="../lib/zlib/gzlib.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/gzread.c">
+		<Unit filename="../lib/zlib/gzread.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/gzwrite.c">
+		<Unit filename="../lib/zlib/gzwrite.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/infback.c">
+		<Unit filename="../lib/zlib/infback.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/inffast.c">
+		<Unit filename="../lib/zlib/inffast.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/inffast.h" />
-		<Unit filename="../zlib-1.2.7/inffixed.h" />
-		<Unit filename="../zlib-1.2.7/inflate.c">
+		<Unit filename="../lib/zlib/inffast.h" />
+		<Unit filename="../lib/zlib/inffixed.h" />
+		<Unit filename="../lib/zlib/inflate.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/inflate.h" />
-		<Unit filename="../zlib-1.2.7/inftrees.c">
+		<Unit filename="../lib/zlib/inflate.h" />
+		<Unit filename="../lib/zlib/inftrees.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/inftrees.h" />
-		<Unit filename="../zlib-1.2.7/trees.c">
+		<Unit filename="../lib/zlib/inftrees.h" />
+		<Unit filename="../lib/zlib/trees.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/trees.h" />
-		<Unit filename="../zlib-1.2.7/uncompr.c">
+		<Unit filename="../lib/zlib/trees.h" />
+		<Unit filename="../lib/zlib/uncompr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/zconf.h" />
-		<Unit filename="../zlib-1.2.7/zlib.h" />
-		<Unit filename="../zlib-1.2.7/zutil.c">
+		<Unit filename="../lib/zlib/zconf.h" />
+		<Unit filename="../lib/zlib/zlib.h" />
+		<Unit filename="../lib/zlib/zutil.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../zlib-1.2.7/zutil.h" />
+		<Unit filename="../lib/zlib/zutil.h" />
 		<Extensions>
 			<code_completion />
 			<envvars />
diff --git a/VC2008/zlib.vcproj b/VC2008/zlib.vcproj
index 6858b5610..1e07afc4c 100644
--- a/VC2008/zlib.vcproj
+++ b/VC2008/zlib.vcproj
@@ -276,107 +276,107 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\zlib-1.2.7\adler32.c"
+				RelativePath="..\lib\zlib\adler32.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\compress.c"
+				RelativePath="..\lib\zlib\compress.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\crc32.c"
+				RelativePath="..\lib\zlib\crc32.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\crc32.h"
+				RelativePath="..\lib\zlib\crc32.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\deflate.c"
+				RelativePath="..\lib\zlib\deflate.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\deflate.h"
+				RelativePath="..\lib\zlib\deflate.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\gzclose.c"
+				RelativePath="..\lib\zlib\gzclose.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\gzguts.h"
+				RelativePath="..\lib\zlib\gzguts.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\gzlib.c"
+				RelativePath="..\lib\zlib\gzlib.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\gzread.c"
+				RelativePath="..\lib\zlib\gzread.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\gzwrite.c"
+				RelativePath="..\lib\zlib\gzwrite.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\infback.c"
+				RelativePath="..\lib\zlib\infback.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\inffast.c"
+				RelativePath="..\lib\zlib\inffast.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\inffast.h"
+				RelativePath="..\lib\zlib\inffast.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\inffixed.h"
+				RelativePath="..\lib\zlib\inffixed.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\inflate.c"
+				RelativePath="..\lib\zlib\inflate.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\inflate.h"
+				RelativePath="..\lib\zlib\inflate.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\inftrees.c"
+				RelativePath="..\lib\zlib\inftrees.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\inftrees.h"
+				RelativePath="..\lib\zlib\inftrees.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\trees.c"
+				RelativePath="..\lib\zlib\trees.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\trees.h"
+				RelativePath="..\lib\zlib\trees.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\uncompr.c"
+				RelativePath="..\lib\zlib\uncompr.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\zconf.h"
+				RelativePath="..\lib\zlib\zconf.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\zlib.h"
+				RelativePath="..\lib\zlib\zlib.h"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\zutil.c"
+				RelativePath="..\lib\zlib\zutil.c"
 				>
 			</File>
 			<File
-				RelativePath="..\zlib-1.2.7\zutil.h"
+				RelativePath="..\lib\zlib\zutil.h"
 				>
 			</File>
 		</Filter>
-- 
cgit v1.2.3