diff --git a/Tools/MemDumpAnalysis/.gitignore b/Tools/MemDumpAnalysis/.gitignore
new file mode 100644
index 000000000..b4e15dc3c
--- /dev/null
+++ b/Tools/MemDumpAnalysis/.gitignore
@@ -0,0 +1,3 @@
+Debug/
+logs/
+Release/
diff --git a/Tools/MemDumpAnalysis/Globals.h b/Tools/MemDumpAnalysis/Globals.h
index 92d27da2c..d5fc2abfa 100644
--- a/Tools/MemDumpAnalysis/Globals.h
+++ b/Tools/MemDumpAnalysis/Globals.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../../source/Globals.h"
+#include "../../src/Globals.h"
 
 /*
 // System headers:
@@ -23,12 +23,12 @@
 #include <string>
 
 // Common:
-#include "../source/StringUtils.h"
-#include "../source/OSSupport/File.h"
+#include "../src/StringUtils.h"
+#include "../src/OSSupport/File.h"
 */
 
 // Libraries:
-#include "../../expat/expat.h"
+#include "expat/expat.h"
 
 
 
diff --git a/Tools/MemDumpAnalysis/MemDumpAnalysis.vcproj b/Tools/MemDumpAnalysis/MemDumpAnalysis.vcproj
index 345dfa962..8283fd531 100644
--- a/Tools/MemDumpAnalysis/MemDumpAnalysis.vcproj
+++ b/Tools/MemDumpAnalysis/MemDumpAnalysis.vcproj
@@ -41,6 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="../../lib"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;COMPILED_FROM_DSP;XML_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -61,7 +62,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(ProjectDir)\..\MCServer\$(ProjectName)_debug.exe"
+				OutputFile="$(ProjectDir)\..\..\MCServer\$(ProjectName)_debug.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -116,6 +117,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="../../lib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;COMPILED_FROM_DSP;XML_STATIC"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -135,7 +137,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(ProjectDir)\..\MCServer\$(ProjectName).exe"
+				OutputFile="$(ProjectDir)\..\..\MCServer\$(ProjectName).exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -211,47 +213,47 @@
 			Name="expat"
 			>
 			<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"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -271,7 +273,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\expat\xmlrole.c"
+				RelativePath="..\..\lib\expat\xmlrole.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -291,11 +293,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\expat\xmlrole.h"
+				RelativePath="..\..\lib\expat\xmlrole.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\expat\xmltok.c"
+				RelativePath="..\..\lib\expat\xmltok.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -315,11 +317,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\expat\xmltok.h"
+				RelativePath="..\..\lib\expat\xmltok.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\expat\xmltok_impl.c"
+				RelativePath="..\..\lib\expat\xmltok_impl.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -339,11 +341,11 @@
 				</FileConfiguration>
 			</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"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -373,62 +375,54 @@
 			Name="shared"
 			>
 			<File
-				RelativePath="..\..\source\Log.cpp"
+				RelativePath="..\..\src\Log.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\source\Log.h"
+				RelativePath="..\..\src\Log.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\StringUtils.cpp"
+				RelativePath="..\..\src\StringUtils.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\source\StringUtils.h"
+				RelativePath="..\..\src\StringUtils.h"
 				>
 			</File>
 			<Filter
 				Name="OSSupport"
 				>
 				<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\File.cpp"
+					RelativePath="..\..\src\OSSupport\File.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\source\OSSupport\File.h"
+					RelativePath="..\..\src\OSSupport\File.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\source\OSSupport\IsThread.cpp"
+					RelativePath="..\..\src\OSSupport\IsThread.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\source\OSSupport\IsThread.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\OSSupport\MakeDir.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\OSSupport\MakeDir.h"
+					RelativePath="..\..\src\OSSupport\IsThread.h"
 					>
 				</File>
 			</Filter>