diff --git a/clean.bat b/clean.bat
deleted file mode 100644
index 08e4cc610..000000000
--- a/clean.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-del *.ncb
-del *.ilk
-del *.lib
-del *.exp
-del *.map
-del *.pdb
-del log.txt
-del *.bsc
-del applog.txt
-del *.suo /AH
-del *.user
-del debug\*.* /Q
-del release\*.* /Q
-rd release /Q
-rd debug /Q
-
-cd MCServer
-del MCServer.exe
-del MCServer_debug.exe
-cd ..
-
-cd VC2010
-call clean.bat
-cd ..
\ No newline at end of file
diff --git a/cloc-exclude.txt b/cloc-exclude.txt
index 03c9531a8..c01f3e9c0 100644
--- a/cloc-exclude.txt
+++ b/cloc-exclude.txt
@@ -1,27 +1,13 @@
-CryptoPP
-expat
-jsoncpp-src-0.5.0
-lua-5.1.4
-MemDumpAnalysis/expat
-source/LuaExpat
-source/SQLite
-squirrel_3_0_1_stable
-VC2008/CryptoPP.vcproj
-zlib-1.2.5
-zlib-1.2.7
-source/Bindings.cpp
-source/Bindings.h
-source/LeakFinder.cpp
-source/LeakFinder.h
-source/StackWalker.cpp
-source/StackWalker.h
-BiomeVisualiser/BiomeVisualiser.vcproj
-MemDumpAnalysis/MemDumpAnalysis.vcproj
-ProtoProxy/ProtoProxy.vcproj
-Tests/NoiseTest/NoiseTest.vcproj
-Tools/BlockZapper/BlockZapper.vcproj
-Tools/ToLuaDoxy/ToLuaDoxy.vcproj
+lib
+Tools
+Tests
+src/Bindings.cpp
+src/Bindings.h
+src/LeakFinder.cpp
+src/LeakFinder.h
+src/StackWalker.cpp
+src/StackWalker.h
 VC2008
+VC2013
 Install
-log.xml
-build
\ No newline at end of file
+build
diff --git a/stats.cmd b/stats.cmd
old mode 100644
new mode 100755
index ad49b15aa..967298aab
--- a/stats.cmd
+++ b/stats.cmd
@@ -1 +1 @@
-cloc --by-file-by-lang --exclude-dir=source/SQLite,source/LuaExpat,doxy,tolua..-1.0.93,jsoncpp.*,lua-5.1.4,squirrel_3.* --exclude-list-file=cloc-exclude.txt --xml --xsl=1 --report-file=cloc.xml --ignored=cloc-ignored.txt .
\ No newline at end of file
+cloc --by-file-by-lang --exclude-dir=lib --exclude-list-file=cloc-exclude.txt --xml --xsl=1 --report-file=cloc.xml --ignored=cloc-ignored.txt .
diff --git a/Tests/ConsoleColors/ConsoleColors.cpp b/tests/ConsoleColors/ConsoleColors.cpp
similarity index 100%
rename from Tests/ConsoleColors/ConsoleColors.cpp
rename to tests/ConsoleColors/ConsoleColors.cpp
diff --git a/Tests/NoiseTest/GNUmakefile b/tests/NoiseTest/GNUmakefile
similarity index 100%
rename from Tests/NoiseTest/GNUmakefile
rename to tests/NoiseTest/GNUmakefile
diff --git a/Tests/NoiseTest/NoiseTest.cpp b/tests/NoiseTest/NoiseTest.cpp
similarity index 100%
rename from Tests/NoiseTest/NoiseTest.cpp
rename to tests/NoiseTest/NoiseTest.cpp
diff --git a/Tests/NoiseTest/NoiseTest.sln b/tests/NoiseTest/NoiseTest.sln
similarity index 100%
rename from Tests/NoiseTest/NoiseTest.sln
rename to tests/NoiseTest/NoiseTest.sln
diff --git a/Tests/NoiseTest/NoiseTest.vcproj b/tests/NoiseTest/NoiseTest.vcproj
similarity index 100%
rename from Tests/NoiseTest/NoiseTest.vcproj
rename to tests/NoiseTest/NoiseTest.vcproj