4 files changed, 47 insertions, 39 deletions

diff --git a/Tools/BiomeVisualiser/BiomeCache.h b/Tools/BiomeVisualiser/BiomeCache.h
index bf1503d4c..da4d6c761 100644
--- a/Tools/BiomeVisualiser/BiomeCache.h
+++ b/Tools/BiomeVisualiser/BiomeCache.h
@@ -17,7 +17,7 @@ While the area is being filled, requests for biomes may already come, such reque
 
 
 #include "BiomeSource.h"
-#include "../source/OSSupport/IsThread.h"
+#include "../src/OSSupport/IsThread.h"
 
 
 
diff --git a/Tools/BiomeVisualiser/BiomeViewWnd.cpp b/Tools/BiomeVisualiser/BiomeViewWnd.cpp
index 7d4db58c0..0658e3810 100644
--- a/Tools/BiomeVisualiser/BiomeViewWnd.cpp
+++ b/Tools/BiomeVisualiser/BiomeViewWnd.cpp
@@ -7,7 +7,7 @@
 #include "BiomeViewWnd.h"
 #include "BiomeCache.h"
 #include "GeneratorBiomeSource.h"
-#include "../iniFile/iniFile.h"
+#include "iniFile/iniFile.h"
 
 
 
diff --git a/Tools/BiomeVisualiser/BiomeVisualiser.vcproj b/Tools/BiomeVisualiser/BiomeVisualiser.vcproj
index 2616313a2..e42870b13 100644
--- a/Tools/BiomeVisualiser/BiomeVisualiser.vcproj
+++ b/Tools/BiomeVisualiser/BiomeVisualiser.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../source"
+				AdditionalIncludeDirectories="../../src;../../lib"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -119,7 +119,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="../../source"
+				AdditionalIncludeDirectories="../../src;../../lib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -199,7 +199,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="../../source"
+				AdditionalIncludeDirectories="../../src;../../lib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -324,35 +324,35 @@
 				Name="Shared"
 				>
 				<File
-					RelativePath="..\..\source\BlockID.cpp"
+					RelativePath="..\..\src\BlockID.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\source\BlockID.h"
+					RelativePath="..\..\src\BlockID.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\source\ChunkDef.h"
+					RelativePath="..\..\src\ChunkDef.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\WorldStorage\FastNBT.cpp"
+					RelativePath="..\..\src\WorldStorage\FastNBT.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\source\WorldStorage\FastNBT.h"
+					RelativePath="..\..\src\WorldStorage\FastNBT.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\source\Globals.cpp"
+					RelativePath="..\..\src\Globals.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -380,86 +380,94 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\source\Globals.h"
+					RelativePath="..\..\src\Globals.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\source\Item.h"
+					RelativePath="..\..\src\Item.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\MCLogger.cpp"
+					RelativePath="..\..\src\MCLogger.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\source\MCLogger.h"
+					RelativePath="..\..\src\MCLogger.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\source\Noise.cpp"
+					RelativePath="..\..\src\Noise.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\source\Noise.h"
+					RelativePath="..\..\src\Noise.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\source\Noise.inc"
+					RelativePath="..\..\src\Noise.inc"
 					>
 				</File>
 				<File
-					RelativePath="..\..\source\StringUtils.cpp"
+					RelativePath="..\..\src\StringUtils.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\source\StringUtils.h"
+					RelativePath="..\..\src\StringUtils.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\VoronoiMap.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\VoronoiMap.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\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\IsThread.cpp"
+						RelativePath="..\..\src\OSSupport\IsThread.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\..\source\OSSupport\IsThread.h"
+						RelativePath="..\..\src\OSSupport\IsThread.h"
 						>
 					</File>
 					<File
-						RelativePath="..\..\source\OSSupport\Sleep.h"
+						RelativePath="..\..\src\OSSupport\Sleep.h"
 						>
 					</File>
 				</Filter>
@@ -467,15 +475,15 @@
 					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\ComposableGenerator.h"
+						RelativePath="..\..\src\Generating\ComposableGenerator.h"
 						>
 					</File>
 				</Filter>
@@ -483,11 +491,11 @@
 					Name="iniFile"
 					>
 					<File
-						RelativePath="..\..\iniFile\iniFile.cpp"
+						RelativePath="..\..\lib\iniFile\iniFile.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\..\iniFile\iniFile.h"
+						RelativePath="..\..\lib\iniFile\iniFile.h"
 						>
 					</File>
 				</Filter>
diff --git a/Tools/BiomeVisualiser/GeneratorBiomeSource.h b/Tools/BiomeVisualiser/GeneratorBiomeSource.h
index 0b47e5f93..751aed245 100644
--- a/Tools/BiomeVisualiser/GeneratorBiomeSource.h
+++ b/Tools/BiomeVisualiser/GeneratorBiomeSource.h
@@ -3,7 +3,7 @@
 
 // Declares the cGeneratorBiomeSource that adapts a cBiomeGen into a cBiomeSource
 
-#include "../source/Generating/BioGen.h"
+#include "../src/Generating/BioGen.h"
 #include "BiomeSource.h"