diff --git a/PseuWoW_VC90.sln b/PseuWoW_VC90.sln
index 99e7b89..f01f9d4 100644
--- a/PseuWoW_VC90.sln
+++ b/PseuWoW_VC90.sln
@@ -18,7 +18,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "src\shared_VC90.v
 		{262199E8-EEDF-4700-A1D1-E9CC901CF480} = {262199E8-EEDF-4700-A1D1-E9CC901CF480}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StuffExtract", "src\tools\stuffextract_VC90.vcproj", "{4887EDFB-1FE5-425C-8A6E-E4F57C252581}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StuffExtract", "src\tools\stuffextract_VC90.vcproj", "{F14CA928-E505-41F1-BE45-CCF6B85547D2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
 		{F548FC51-24A4-45FF-A381-BEBC39F18270} = {F548FC51-24A4-45FF-A381-BEBC39F18270}
@@ -32,7 +32,12 @@ Global
 		Relase - Fast FPU|Win32 = Relase - Fast FPU|Win32
 		Release - Fast FPU DebugInfo|Win32 = Release - Fast FPU DebugInfo|Win32
 		Release - Fast FPU|Win32 = Release - Fast FPU|Win32
+		Release - No console|Win32 = Release - No console|Win32
+		Release noconsole|Win32 = Release noconsole|Win32
 		Release|Win32 = Release|Win32
+		Static lib - Debug|Win32 = Static lib - Debug|Win32
+		Static lib - Release - Fast FPU|Win32 = Static lib - Release - Fast FPU|Win32
+		Static lib - Release|Win32 = Static lib - Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -43,8 +48,18 @@ Global
 		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Release - Fast FPU DebugInfo|Win32.Build.0 = Release|Win32
 		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Release - Fast FPU|Win32.ActiveCfg = Release|Win32
 		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Release - Fast FPU|Win32.Build.0 = Release|Win32
+		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Release - No console|Win32.ActiveCfg = Release noconsole|Win32
+		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Release - No console|Win32.Build.0 = Release noconsole|Win32
+		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Release noconsole|Win32.ActiveCfg = Release noconsole|Win32
+		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Release noconsole|Win32.Build.0 = Release noconsole|Win32
 		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Release|Win32.ActiveCfg = Release|Win32
 		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Release|Win32.Build.0 = Release|Win32
+		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Static lib - Debug|Win32.ActiveCfg = Debug|Win32
+		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Static lib - Debug|Win32.Build.0 = Debug|Win32
+		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Static lib - Release - Fast FPU|Win32.ActiveCfg = Release|Win32
+		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Static lib - Release - Fast FPU|Win32.Build.0 = Release|Win32
+		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Static lib - Release|Win32.ActiveCfg = Release|Win32
+		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Static lib - Release|Win32.Build.0 = Release|Win32
 		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32
 		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Relase - Fast FPU|Win32.ActiveCfg = Release|Win32
@@ -53,8 +68,18 @@ Global
 		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release - Fast FPU DebugInfo|Win32.Build.0 = Release|Win32
 		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release - Fast FPU|Win32.ActiveCfg = Release|Win32
 		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release - Fast FPU|Win32.Build.0 = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release - No console|Win32.ActiveCfg = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release - No console|Win32.Build.0 = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release noconsole|Win32.ActiveCfg = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release noconsole|Win32.Build.0 = Release|Win32
 		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
 		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Static lib - Debug|Win32.ActiveCfg = Debug|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Static lib - Debug|Win32.Build.0 = Debug|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Static lib - Release - Fast FPU|Win32.ActiveCfg = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Static lib - Release - Fast FPU|Win32.Build.0 = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Static lib - Release|Win32.ActiveCfg = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Static lib - Release|Win32.Build.0 = Release|Win32
 		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Debug|Win32.ActiveCfg = Debug|Win32
 		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Debug|Win32.Build.0 = Debug|Win32
 		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Relase - Fast FPU|Win32.ActiveCfg = Release|Win32
@@ -63,8 +88,18 @@ Global
 		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Release - Fast FPU DebugInfo|Win32.Build.0 = Release|Win32
 		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Release - Fast FPU|Win32.ActiveCfg = Release|Win32
 		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Release - Fast FPU|Win32.Build.0 = Release|Win32
+		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Release - No console|Win32.ActiveCfg = Release|Win32
+		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Release - No console|Win32.Build.0 = Release|Win32
+		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Release noconsole|Win32.ActiveCfg = Release|Win32
+		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Release noconsole|Win32.Build.0 = Release|Win32
 		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Release|Win32.ActiveCfg = Release|Win32
 		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Release|Win32.Build.0 = Release|Win32
+		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Static lib - Debug|Win32.ActiveCfg = Debug|Win32
+		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Static lib - Debug|Win32.Build.0 = Debug|Win32
+		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Static lib - Release - Fast FPU|Win32.ActiveCfg = Release|Win32
+		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Static lib - Release - Fast FPU|Win32.Build.0 = Release|Win32
+		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Static lib - Release|Win32.ActiveCfg = Release|Win32
+		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Static lib - Release|Win32.Build.0 = Release|Win32
 		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Debug|Win32.Build.0 = Debug|Win32
 		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Relase - Fast FPU|Win32.ActiveCfg = Release|Win32
@@ -73,13 +108,29 @@ Global
 		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Release - Fast FPU DebugInfo|Win32.Build.0 = Release|Win32
 		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Release - Fast FPU|Win32.ActiveCfg = Release|Win32
 		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Release - Fast FPU|Win32.Build.0 = Release|Win32
+		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Release - No console|Win32.ActiveCfg = Release|Win32
+		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Release - No console|Win32.Build.0 = Release|Win32
+		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Release noconsole|Win32.ActiveCfg = Release|Win32
+		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Release noconsole|Win32.Build.0 = Release|Win32
 		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Release|Win32.ActiveCfg = Release|Win32
 		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Release|Win32.Build.0 = Release|Win32
-		{4887EDFB-1FE5-425C-8A6E-E4F57C252581}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4887EDFB-1FE5-425C-8A6E-E4F57C252581}.Relase - Fast FPU|Win32.ActiveCfg = Release|Win32
-		{4887EDFB-1FE5-425C-8A6E-E4F57C252581}.Release - Fast FPU DebugInfo|Win32.ActiveCfg = Release|Win32
-		{4887EDFB-1FE5-425C-8A6E-E4F57C252581}.Release - Fast FPU|Win32.ActiveCfg = Release|Win32
-		{4887EDFB-1FE5-425C-8A6E-E4F57C252581}.Release|Win32.ActiveCfg = Release|Win32
+		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Static lib - Debug|Win32.ActiveCfg = Debug|Win32
+		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Static lib - Debug|Win32.Build.0 = Debug|Win32
+		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Static lib - Release - Fast FPU|Win32.ActiveCfg = Release|Win32
+		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Static lib - Release - Fast FPU|Win32.Build.0 = Release|Win32
+		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Static lib - Release|Win32.ActiveCfg = Release|Win32
+		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Static lib - Release|Win32.Build.0 = Release|Win32
+		{F14CA928-E505-41F1-BE45-CCF6B85547D2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F14CA928-E505-41F1-BE45-CCF6B85547D2}.Relase - Fast FPU|Win32.ActiveCfg = Release|Win32
+		{F14CA928-E505-41F1-BE45-CCF6B85547D2}.Release - Fast FPU DebugInfo|Win32.ActiveCfg = Release|Win32
+		{F14CA928-E505-41F1-BE45-CCF6B85547D2}.Release - Fast FPU|Win32.ActiveCfg = Release|Win32
+		{F14CA928-E505-41F1-BE45-CCF6B85547D2}.Release - No console|Win32.ActiveCfg = Release|Win32
+		{F14CA928-E505-41F1-BE45-CCF6B85547D2}.Release noconsole|Win32.ActiveCfg = Release|Win32
+		{F14CA928-E505-41F1-BE45-CCF6B85547D2}.Release noconsole|Win32.Build.0 = Release|Win32
+		{F14CA928-E505-41F1-BE45-CCF6B85547D2}.Release|Win32.ActiveCfg = Release|Win32
+		{F14CA928-E505-41F1-BE45-CCF6B85547D2}.Static lib - Debug|Win32.ActiveCfg = Debug|Win32
+		{F14CA928-E505-41F1-BE45-CCF6B85547D2}.Static lib - Release - Fast FPU|Win32.ActiveCfg = Release|Win32
+		{F14CA928-E505-41F1-BE45-CCF6B85547D2}.Static lib - Release|Win32.ActiveCfg = Release|Win32
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Debug|Win32.Build.0 = Debug|Win32
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Relase - Fast FPU|Win32.ActiveCfg = Release - Fast FPU|Win32
@@ -88,8 +139,18 @@ Global
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release - Fast FPU DebugInfo|Win32.Build.0 = Release - Fast FPU|Win32
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release - Fast FPU|Win32.ActiveCfg = Release - Fast FPU|Win32
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release - Fast FPU|Win32.Build.0 = Release - Fast FPU|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release - No console|Win32.ActiveCfg = Release - Fast FPU|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release - No console|Win32.Build.0 = Release - Fast FPU|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release noconsole|Win32.ActiveCfg = Release - Fast FPU|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release noconsole|Win32.Build.0 = Release - Fast FPU|Win32
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release|Win32.ActiveCfg = Release|Win32
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release|Win32.Build.0 = Release|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Static lib - Debug|Win32.ActiveCfg = Static lib - Debug|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Static lib - Debug|Win32.Build.0 = Static lib - Debug|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Static lib - Release - Fast FPU|Win32.ActiveCfg = Static lib - Release - Fast FPU|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Static lib - Release - Fast FPU|Win32.Build.0 = Static lib - Release - Fast FPU|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Static lib - Release|Win32.ActiveCfg = Static lib - Release|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Static lib - Release|Win32.Build.0 = Static lib - Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/bin/stuffextract_svn.exe b/bin/stuffextract_svn.exe
new file mode 100644
index 0000000..af69e8a
Binary files /dev/null and b/bin/stuffextract_svn.exe differ
diff --git a/src/PseuWoW_VC90.vcproj b/src/PseuWoW_VC90.vcproj
index 7798639..72d52c8 100644
--- a/src/PseuWoW_VC90.vcproj
+++ b/src/PseuWoW_VC90.vcproj
@@ -206,6 +206,105 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release noconsole|Win32"
+			OutputDirectory="$(SolutionDir)/bin"
+			IntermediateDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/PseuWoW.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="shared;Client;Client/World;Client/Realm;dep/include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_IRR_STATIC_LIB_"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
+				EnableEnhancedInstructionSet="0"
+				PrecompiledHeaderFile=".\Release/PseuWoW.pch"
+				AssemblerListingLocation="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)/"
+				ObjectFile="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)/"
+				ProgramDataBaseFileName="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="0"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="odbc32.lib odbccp32.lib WS2_32.LIB irrKlang.lib"
+				ShowProgress="0"
+				OutputFile="$(OutDir)/$(InputName)_noconsole.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="$(SolutionDir)\src\dep\lib\static"
+				IgnoreAllDefaultLibraries="false"
+				IgnoreDefaultLibraryNames="libci.lib"
+				AssemblyDebug="0"
+				ProgramDatabaseFile="$(SolutionDir)/temp/$(ProjectName)/Release/PseuWoW.pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				SetChecksum="true"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -282,10 +381,6 @@
 				RelativePath=".\Client\SCPDatabase.h"
 				>
 			</File>
-			<File
-				RelativePath=".\Client\SysDefs.h"
-				>
-			</File>
 			<Filter
 				Name="DefScript"
 				>
@@ -557,19 +652,19 @@
 				Name="GUI"
 				>
 				<File
-					RelativePath=".\Client\GUI\CCursorController.cpp"
+					RelativePath=".\Client\Gui\CCursorController.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\Client\GUI\CCursorController.h"
+					RelativePath=".\Client\Gui\CCursorController.h"
 					>
 				</File>
 				<File
-					RelativePath=".\Client\GUI\CImageLoaderBLP.cpp"
+					RelativePath=".\Client\Gui\CImageLoaderBLP.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\Client\GUI\CImageLoaderBLP.h"
+					RelativePath=".\Client\Gui\CImageLoaderBLP.h"
 					>
 				</File>
 				<File
@@ -580,6 +675,22 @@
 					RelativePath=".\Client\Gui\CM2MeshFileLoader.h"
 					>
 				</File>
+				<File
+					RelativePath=".\Client\Gui\CMDHMemoryReadFile.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Client\Gui\CMDHMemoryReadFile.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Client\GUI\CWMOMeshFileLoader.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Client\GUI\CWMOMeshFileLoader.h"
+					>
+				</File>
 				<File
 					RelativePath=".\Client\Gui\DrawObject.cpp"
 					>
@@ -593,17 +704,25 @@
 					>
 				</File>
 				<File
-                    RelativePath=".\Client\Gui\GUIEventReceiver.h"
-                    >
-				</File>
-				<File
 					RelativePath=".\Client\Gui\DrawObjMgr.h"
 					>
 				</File>
+				<File
+					RelativePath=".\Client\Gui\GUIEventReceiver.h"
+					>
+				</File>
 				<File
 					RelativePath=".\Client\Gui\MCamera.h"
 					>
 				</File>
+				<File
+					RelativePath=".\Client\Gui\MemoryInterface.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Client\Gui\MemoryInterface.h"
+					>
+				</File>
 				<File
 					RelativePath=".\Client\Gui\MInput.h"
 					>
@@ -621,15 +740,15 @@
 					>
 				</File>
 				<File
-                    RelativePath=".\Client\Gui\SceneCharselection.cpp"
-                    >
-				</File>
-				<File
 					RelativePath=".\Client\Gui\Scene.h"
 					>
 				</File>
 				<File
-					RelativePath=".\Client\GUI\SceneData.h"
+					RelativePath=".\Client\Gui\SceneCharselection.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Client\Gui\SceneData.h"
 					>
 				</File>
 				<File
@@ -637,7 +756,7 @@
 					>
 				</File>
 				<File
-					RelativePath=".\Client\GUI\SceneLogin.cpp"
+					RelativePath=".\Client\Gui\SceneLogin.cpp"
 					>
 				</File>
 				<File
@@ -653,11 +772,11 @@
 					>
 				</File>
 				<File
-					RelativePath=".\Client\GUI\SImage.cpp"
+					RelativePath=".\Client\Gui\SImage.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\Client\GUI\SImage.h"
+					RelativePath=".\Client\Gui\SImage.h"
 					>
 				</File>
 				<File
@@ -665,52 +784,66 @@
 					>
 				</File>
 				<File
-					RelativePath=".\Client\Gui\TlTSector.h">
+					RelativePath=".\Client\Gui\TlTSector.h"
+					>
 				</File>
 				<Filter
 					Name="irrklang"
-					Filter="">
+					>
 					<File
-						RelativePath=".\Client\Gui\CIrrKlangAudioStreamLoaderMP3.cpp">
+						RelativePath=".\Client\Gui\CIrrKlangAudioStreamLoaderMP3.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\Client\Gui\CIrrKlangAudioStreamLoaderMP3.h">
+						RelativePath=".\Client\Gui\CIrrKlangAudioStreamLoaderMP3.h"
+						>
 					</File>
 					<File
-						RelativePath=".\Client\Gui\CIrrKlangAudioStreamMP3.cpp">
+						RelativePath=".\Client\Gui\CIrrKlangAudioStreamMP3.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\Client\Gui\CIrrKlangAudioStreamMP3.h">
+						RelativePath=".\Client\Gui\CIrrKlangAudioStreamMP3.h"
+						>
 					</File>
 					<File
-						RelativePath=".\Client\Gui\ikpMP3.cpp">
+						RelativePath=".\Client\Gui\ikpMP3.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\Client\Gui\irrKlangSceneNode.cpp">
+						RelativePath=".\Client\Gui\irrKlangSceneNode.cpp"
+						>
 					</File>
 					<File
-						RelativePath=".\Client\Gui\irrKlangSceneNode.h">
+						RelativePath=".\Client\Gui\irrKlangSceneNode.h"
+						>
 					</File>
 					<Filter
 						Name="decoder"
-						Filter="">
+						>
 						<File
-							RelativePath=".\Client\Gui\decoder\bits.c">
+							RelativePath=".\Client\Gui\decoder\bits.c"
+							>
 						</File>
 						<File
-							RelativePath=".\Client\Gui\decoder\internal.h">
+							RelativePath=".\Client\Gui\decoder\internal.h"
+							>
 						</File>
 						<File
-							RelativePath=".\Client\Gui\decoder\mpaudec.c">
+							RelativePath=".\Client\Gui\decoder\mpaudec.c"
+							>
 						</File>
 						<File
-							RelativePath=".\Client\Gui\decoder\mpaudec.h">
+							RelativePath=".\Client\Gui\decoder\mpaudec.h"
+							>
 						</File>
 						<File
-							RelativePath=".\Client\Gui\decoder\mpaudectab.h">
+							RelativePath=".\Client\Gui\decoder\mpaudectab.h"
+							>
 						</File>
 						<File
-							RelativePath=".\Client\Gui\decoder\mpegaudio.h">
+							RelativePath=".\Client\Gui\decoder\mpegaudio.h"
+							>
 						</File>
 					</Filter>
 				</Filter>
diff --git a/src/dep/src/irrlicht/Irrlicht9.0.vcproj b/src/dep/src/irrlicht/Irrlicht9.0.vcproj
index 4d87c05..177d341 100644
--- a/src/dep/src/irrlicht/Irrlicht9.0.vcproj
+++ b/src/dep/src/irrlicht/Irrlicht9.0.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="Irrlicht"
 	ProjectGUID="{E08E042A-6C45-411B-92BE-3CC31331019F}"
 	RootNamespace="Irrlicht"
@@ -17,9 +17,9 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\obj\IrrDebug"
-			IntermediateDirectory="..\obj\IrrDebug"
-			ConfigurationType="2"
+			OutputDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
+			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -48,7 +48,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include;zlib"
+				AdditionalIncludeDirectories="..\..\include\zlib;..\..\include\irrlicht;..\..\include\DXSDK\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IRRLICHT_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
@@ -76,27 +76,12 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				UseLibraryDependencyInputs="true"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
-				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames="libci.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\obj\IrrDebug\Irrlicht.pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="..\..\lib\Win32-visualstudio\Irrlicht.lib"
+				Name="VCLibrarianTool"
+				OutputFile="./dep/lib/debug/irrlicht.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -106,18 +91,15 @@
 			<Tool
 				Name="VCFxCopTool"
 			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="obj\IrrRelease"
-			IntermediateDirectory="obj\IrrRelease"
-			ConfigurationType="2"
+			OutputDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
+			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -149,7 +131,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="false"
-				AdditionalIncludeDirectories="..\..\include;zlib"
+				AdditionalIncludeDirectories="..\..\include\zlib;..\..\include\irrlicht;..\..\include\DXSDK\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IRRLICHT_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				ExceptionHandling="0"
@@ -177,25 +159,12 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
-				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="libci.lib"
-				GenerateDebugInformation="false"
-				ProgramDatabaseFile="..\obj\IrrRelease\Irrlicht.pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="..\..\lib\Win32-visualstudio\Irrlicht.lib"
+				Name="VCLibrarianTool"
+				OutputFile="./dep/lib/release/zthread.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -205,18 +174,15 @@
 			<Tool
 				Name="VCFxCopTool"
 			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release - Fast FPU|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
+			OutputDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
+			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -248,24 +214,21 @@
 				Optimization="3"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
+				FavorSizeOrSpeed="0"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\include;zlib"
+				AdditionalIncludeDirectories="..\..\include\zlib;..\..\include\irrlicht;..\..\include\DXSDK\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IRRLICHT_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				ExceptionHandling="0"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="2"
-				FloatingPointModel="2"
 				RuntimeTypeInfo="false"
 				PrecompiledHeaderFile=".\..\obj\IrrRelease/Irrlicht.pch"
-				AssemblerListingLocation=".\..\obj\IrrReleaseFastFPU/"
-				ObjectFile=".\..\obj\IrrReleaseFastFPU/"
-				ProgramDataBaseFileName=".\..\obj\IrrReleaseFastFPU/"
+				AssemblerListingLocation=".\..\obj\IrrRelease/"
+				ObjectFile=".\..\obj\IrrRelease/"
+				ProgramDataBaseFileName=".\..\obj\IrrRelease/"
 				WarningLevel="3"
-				WarnAsError="false"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="0"
 				CallingConvention="1"
@@ -283,28 +246,12 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib winmm.lib"
-				OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="libci.lib"
-				GenerateDebugInformation="false"
-				ProgramDatabaseFile="..\obj\IrrRelease\Irrlicht.pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="..\..\lib\Win32-visualstudio\Irrlicht.lib"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
+				OutputFile="./dep/lib/release/irrlicht_fastfpu.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -314,17 +261,14 @@
 			<Tool
 				Name="VCFxCopTool"
 			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Static lib - Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -354,7 +298,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include;zlib"
+				AdditionalIncludeDirectories="..\..\include\zlib;..\..\include\irrlicht;..\..\include\DXSDK\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_IRR_STATIC_LIB_;_CRT_SECURE_NO_DEPRECATE"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
@@ -362,9 +306,9 @@
 				DisableLanguageExtensions="false"
 				RuntimeTypeInfo="false"
 				PrecompiledHeaderFile=".\..\obj\IrrDebug/Irrlicht.pch"
-				AssemblerListingLocation=".\..\obj\IrrDebugStatic/"
-				ObjectFile=".\..\obj\IrrDebugStatic/"
-				ProgramDataBaseFileName=".\..\obj\IrrDebugStatic/"
+				AssemblerListingLocation=".\..\obj\IrrDebug/"
+				ObjectFile=".\..\obj\IrrDebug/"
+				ProgramDataBaseFileName=".\..\obj\IrrDebug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -404,8 +348,8 @@
 		</Configuration>
 		<Configuration
 			Name="Static lib - Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -438,7 +382,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="false"
-				AdditionalIncludeDirectories="..\..\include;zlib"
+				AdditionalIncludeDirectories="..\..\include\zlib;..\..\include\irrlicht;..\..\include\DXSDK\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_IRR_STATIC_LIB_;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				ExceptionHandling="0"
@@ -446,9 +390,9 @@
 				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\..\obj\IrrRelease/Irrlicht.pch"
-				AssemblerListingLocation=".\..\obj\IrrReleaseStatic/"
-				ObjectFile=".\..\obj\IrrReleaseStatic/"
-				ProgramDataBaseFileName=".\..\obj\IrrReleaseStatic/"
+				AssemblerListingLocation=".\..\obj\IrrRelease/"
+				ObjectFile=".\..\obj\IrrRelease/"
+				ProgramDataBaseFileName=".\..\obj\IrrRelease/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="0"
@@ -488,8 +432,8 @@
 		</Configuration>
 		<Configuration
 			Name="Static lib - Release - Fast FPU|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -524,19 +468,18 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="0"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\include;zlib"
+				AdditionalIncludeDirectories="..\..\include\zlib;..\..\include\irrlicht;..\..\include\DXSDK\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_IRR_STATIC_LIB_;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				ExceptionHandling="0"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
 				RuntimeTypeInfo="false"
 				PrecompiledHeaderFile=".\..\obj\IrrRelease/Irrlicht.pch"
-				AssemblerListingLocation=".\..\obj\IrrReleaseFastFPUStatic/"
-				ObjectFile=".\..\obj\IrrReleaseFastFPUStatic/"
-				ProgramDataBaseFileName=".\..\obj\IrrReleaseFastFPUStatic/"
+				AssemblerListingLocation=".\..\obj\IrrRelease/"
+				ObjectFile=".\..\obj\IrrRelease/"
+				ProgramDataBaseFileName=".\..\obj\IrrRelease/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="0"
@@ -583,15 +526,15 @@
 			Name="include"
 			>
 			<File
-				RelativePath="..\..\include\IEventReceiver.h"
+				RelativePath=".\..\..\include\IEventReceiver.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\ILogger.h"
+				RelativePath=".\..\..\include\ILogger.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\IOSOperator.h"
+				RelativePath=".\..\..\include\IOSOperator.h"
 				>
 			</File>
 			<File
@@ -599,102 +542,98 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\IrrCompileConfig.h"
+				RelativePath=".\..\..\include\IrrCompileConfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\irrlicht.h"
+				RelativePath=".\..\..\include\irrlicht.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\IrrlichtDevice.h"
+				RelativePath=".\..\..\include\IrrlichtDevice.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\irrTypes.h"
+				RelativePath=".\..\..\include\irrTypes.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\ITimer.h"
+				RelativePath=".\..\..\include\ITimer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\Keycodes.h"
+				RelativePath=".\..\..\include\Keycodes.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SIrrCreationParameters.h"
+				RelativePath=".\..\..\include\SIrrCreationParameters.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\SKeyMap.h"
+				RelativePath=".\..\..\include\SKeyMap.h"
 				>
 			</File>
 			<Filter
 				Name="video"
 				>
 				<File
-					RelativePath="..\..\include\EDriverTypes.h"
+					RelativePath=".\..\..\include\EDriverTypes.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGPUProgrammingServices.h"
+					RelativePath=".\..\..\include\IGPUProgrammingServices.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IImage.h"
+					RelativePath=".\..\..\include\IImage.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IImageLoader.h"
+					RelativePath=".\..\..\include\IImageLoader.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IMaterialRenderer.h"
+					RelativePath=".\..\..\include\IMaterialRenderer.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IMaterialRendererServices.h"
+					RelativePath=".\..\..\include\IMaterialRendererServices.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IShaderConstantSetCallBack.h"
+					RelativePath=".\..\..\include\IShaderConstantSetCallBack.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\ITexture.h"
+					RelativePath=".\..\..\include\ITexture.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IVideoDriver.h"
+					RelativePath=".\..\..\include\IVideoDriver.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IVideoModeList.h"
+					RelativePath=".\..\..\include\IVideoModeList.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\S3DVertex.h"
+					RelativePath=".\..\..\include\S3DVertex.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\SColor.h"
+					RelativePath=".\..\..\include\SColor.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\SExposedVideoData.h"
+					RelativePath=".\..\..\include\SExposedVideoData.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\SLight.h"
+					RelativePath=".\..\..\include\SLight.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\SMaterial.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\SMaterialLayer.h"
+					RelativePath=".\..\..\include\SMaterial.h"
 					>
 				</File>
 			</Filter>
@@ -702,27 +641,27 @@
 				Name="core"
 				>
 				<File
-					RelativePath="..\..\include\aabbox3d.h"
+					RelativePath=".\..\..\include\aabbox3d.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\dimension2d.h"
+					RelativePath=".\..\..\include\dimension2d.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\heapsort.h"
+					RelativePath=".\..\..\include\heapsort.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\irrAllocator.h"
+					RelativePath=".\..\..\include\irrAllocator.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\irrArray.h"
+					RelativePath=".\..\..\include\irrArray.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\irrList.h"
+					RelativePath=".\..\..\include\irrList.h"
 					>
 				</File>
 				<File
@@ -730,51 +669,51 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\irrMath.h"
+					RelativePath=".\..\..\include\irrMath.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\irrString.h"
+					RelativePath=".\..\..\include\irrString.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\line2d.h"
+					RelativePath=".\..\..\include\line2d.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\line3d.h"
+					RelativePath=".\..\..\include\line3d.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\matrix4.h"
+					RelativePath=".\..\..\include\matrix4.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\plane3d.h"
+					RelativePath=".\..\..\include\plane3d.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\position2d.h"
+					RelativePath=".\..\..\include\position2d.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\quaternion.h"
+					RelativePath=".\..\..\include\quaternion.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\rect.h"
+					RelativePath=".\..\..\include\rect.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\triangle3d.h"
+					RelativePath=".\..\..\include\triangle3d.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\vector2d.h"
+					RelativePath=".\..\..\include\vector2d.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\vector3d.h"
+					RelativePath=".\..\..\include\vector3d.h"
 					>
 				</File>
 			</Filter>
@@ -782,39 +721,39 @@
 				Name="io"
 				>
 				<File
-					RelativePath="..\..\include\IAttributeExchangingObject.h"
+					RelativePath=".\..\..\include\IAttributeExchangingObject.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IAttributes.h"
+					RelativePath=".\..\..\include\IAttributes.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IFileList.h"
+					RelativePath=".\..\..\include\IFileList.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IFileSystem.h"
+					RelativePath=".\..\..\include\IFileSystem.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IReadFile.H"
+					RelativePath=".\..\..\include\IReadFile.H"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\irrXML.h"
+					RelativePath=".\..\..\include\irrXML.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IWriteFile.h"
+					RelativePath=".\..\..\include\IWriteFile.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IXMLReader.h"
+					RelativePath=".\..\..\include\IXMLReader.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IXMLWriter.h"
+					RelativePath=".\..\..\include\IXMLWriter.h"
 					>
 				</File>
 			</Filter>
@@ -834,67 +773,71 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\ESceneNodeAnimatorTypes.h"
+					RelativePath=".\..\..\include\ESceneNodeAnimatorTypes.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\ESceneNodeTypes.h"
+					RelativePath=".\..\..\include\ESceneNodeTypes.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IAnimatedMesh.h"
+					RelativePath=".\..\..\include\IAnimatedMesh.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IAnimatedMeshMD2.h"
+					RelativePath=".\..\..\include\IAnimatedMeshMD2.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IAnimatedMeshMS3D.h"
+					RelativePath=".\..\..\include\IAnimatedMeshMS3D.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IAnimatedMeshSceneNode.h"
+					RelativePath=".\..\..\include\IAnimatedMeshSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IBillboardSceneNode.h"
+					RelativePath=".\..\..\include\IAnimatedMeshX.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\ICameraSceneNode.h"
+					RelativePath=".\..\..\include\IBillboardSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IDummyTransformationSceneNode.h"
+					RelativePath=".\..\..\include\ICameraSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\ILightSceneNode.h"
+					RelativePath=".\..\..\include\IDummyTransformationSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IMesh.h"
+					RelativePath=".\..\..\include\ILightSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IMeshBuffer.h"
+					RelativePath=".\..\..\include\IMesh.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IMeshCache.h"
+					RelativePath=".\..\..\include\IMeshBuffer.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IMeshLoader.h"
+					RelativePath=".\..\..\include\IMeshCache.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IMeshManipulator.h"
+					RelativePath=".\..\..\include\IMeshLoader.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IMeshSceneNode.h"
+					RelativePath=".\..\..\include\IMeshManipulator.h"
+					>
+				</File>
+				<File
+					RelativePath=".\..\..\include\IMeshSceneNode.h"
 					>
 				</File>
 				<File
@@ -902,103 +845,71 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IMetaTriangleSelector.h"
+					RelativePath=".\..\..\include\IMetaTriangleSelector.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IParticleAffector.h"
+					RelativePath=".\..\..\include\IParticleAffector.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IParticleAnimatedMeshSceneNodeEmitter.h"
+					RelativePath=".\..\..\include\IParticleEmitter.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IParticleAttractionAffector.h"
+					RelativePath=".\..\..\include\IParticleSystemSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IParticleBoxEmitter.h"
+					RelativePath=".\..\..\include\IQ3LevelMesh.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IParticleCylinderEmitter.h"
+					RelativePath="..\..\include\IQ3Shader.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IParticleEmitter.h"
+					RelativePath=".\..\..\include\ISceneCollisionManager.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IParticleFadeOutAffector.h"
+					RelativePath=".\..\..\include\ISceneManager.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IParticleGravityAffector.h"
+					RelativePath=".\..\..\include\ISceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IParticleMeshEmitter.h"
+					RelativePath=".\..\..\include\ISceneNodeAnimator.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IParticleRingEmitter.h"
+					RelativePath=".\..\..\include\ISceneNodeAnimatorCameraFPS.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IParticleRotationAffector.h"
+					RelativePath=".\..\..\include\ISceneNodeAnimatorCameraMaya.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IParticleSphereEmitter.h"
+					RelativePath=".\..\..\include\ISceneNodeAnimatorCollisionResponse.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IParticleSystemSceneNode.h"
+					RelativePath=".\..\..\include\ISceneNodeAnimatorFactory.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IQ3LevelMesh.h"
+					RelativePath=".\..\..\include\ISceneNodeFactory.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\ISceneCollisionManager.h"
+					RelativePath=".\..\..\include\ISceneNodeMeshLoader.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\ISceneManager.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\ISceneNode.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\ISceneNodeAnimator.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\ISceneNodeAnimatorCameraFPS.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\ISceneNodeAnimatorCameraMaya.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\ISceneNodeAnimatorCollisionResponse.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\ISceneNodeAnimatorFactory.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\ISceneNodeFactory.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\IShadowVolumeSceneNode.h"
+					RelativePath=".\..\..\include\IShadowVolumeSceneNode.h"
 					>
 				</File>
 				<File
@@ -1006,55 +917,55 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\ITerrainSceneNode.h"
+					RelativePath=".\..\..\include\ITerrainSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\ITextSceneNode.h"
+					RelativePath=".\..\..\include\ITextSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\ITriangleSelector.h"
+					RelativePath=".\..\..\include\ITriangleSelector.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IVolumeLightSceneNode.h"
+					RelativePath=".\..\..\include\IVolumeLightSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\SAnimatedMesh.h"
+					RelativePath=".\..\..\include\SAnimatedMesh.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\SceneParameters.h"
+					RelativePath=".\..\..\include\SceneParameters.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\SMesh.h"
+					RelativePath=".\..\..\include\SMesh.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\SMeshBuffer.h"
+					RelativePath=".\..\..\include\SMeshBuffer.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\SMeshBufferLightMap.h"
+					RelativePath=".\..\..\include\SMeshBufferLightMap.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\SMeshBufferTangents.h"
+					RelativePath=".\..\..\include\SMeshBufferTangents.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\SParticle.h"
+					RelativePath=".\..\..\include\SParticle.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\SSkinMeshBuffer.h"
+					RelativePath=".\..\..\include\SSkinMeshBuffer.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\SViewFrustum.h"
+					RelativePath=".\..\..\include\SViewFrustum.h"
 					>
 				</File>
 			</Filter>
@@ -1062,11 +973,7 @@
 				Name="gui"
 				>
 				<File
-					RelativePath="..\..\include\EGUIAlignment.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\include\EGUIElementTypes.h"
+					RelativePath=".\..\..\include\EGUIElementTypes.h"
 					>
 				</File>
 				<File
@@ -1074,31 +981,31 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\ICursorControl.h"
+					RelativePath=".\..\..\include\ICursorControl.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGUIButton.h"
+					RelativePath=".\..\..\include\IGUIButton.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGUICheckbox.h"
+					RelativePath=".\..\..\include\IGUICheckbox.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGUIComboBox.h"
+					RelativePath=".\..\..\include\IGUIComboBox.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGUIContextMenu.h"
+					RelativePath=".\..\..\include\IGUIContextMenu.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGUIEditBox.h"
+					RelativePath=".\..\..\include\IGUIEditBox.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGUIElement.h"
+					RelativePath=".\..\..\include\IGUIElement.h"
 					>
 				</File>
 				<File
@@ -1106,39 +1013,39 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGUIEnvironment.h"
+					RelativePath=".\..\..\include\IGUIEnvironment.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGUIFileOpenDialog.h"
+					RelativePath=".\..\..\include\IGUIFileOpenDialog.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGUIFont.h"
+					RelativePath=".\..\..\include\IGUIFont.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGUIImage.h"
+					RelativePath=".\..\..\include\IGUIImage.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGUIInOutFader.h"
+					RelativePath=".\..\..\include\IGUIInOutFader.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGUIListBox.h"
+					RelativePath=".\..\..\include\IGUIListBox.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGUIMeshViewer.h"
+					RelativePath=".\..\..\include\IGUIMeshViewer.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGUIScrollBar.h"
+					RelativePath=".\..\..\include\IGUIScrollBar.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGUISkin.h"
+					RelativePath=".\..\..\include\IGUISkin.h"
 					>
 				</File>
 				<File
@@ -1150,19 +1057,23 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGUIStaticText.h"
+					RelativePath=".\..\..\include\IGUIStaticText.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGUITabControl.h"
+					RelativePath=".\..\..\include\IGUITabControl.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGUIToolbar.h"
+					RelativePath=".\..\..\include\IGUITable.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\IGUIWindow.h"
+					RelativePath=".\..\..\include\IGUIToolbar.h"
+					>
+				</File>
+				<File
+					RelativePath=".\..\..\include\IGUIWindow.h"
 					>
 				</File>
 			</Filter>
@@ -2022,151 +1933,151 @@
 					>
 				</File>
 				<File
-					RelativePath="CAnimatedMeshMD3.cpp"
+					RelativePath=".\CAnimatedMeshMD3.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CAnimatedMeshMD3.h"
+					RelativePath=".\CAnimatedMeshMD3.h"
 					>
 				</File>
 				<File
-					RelativePath="CB3DMeshFileLoader.cpp"
+					RelativePath=".\CB3DMeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CB3DMeshFileLoader.h"
+					RelativePath=".\CB3DMeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath="CBSPMeshFileLoader.cpp"
+					RelativePath=".\CBSPMeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CBSPMeshFileLoader.h"
+					RelativePath=".\CBSPMeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath="CColladaFileLoader.cpp"
+					RelativePath=".\CColladaFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CColladaFileLoader.h"
+					RelativePath=".\CColladaFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath="CCSMLoader.cpp"
+					RelativePath=".\CCSMLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CCSMLoader.h"
+					RelativePath=".\CCSMLoader.h"
 					>
 				</File>
 				<File
-					RelativePath="CDMFLoader.cpp"
+					RelativePath=".\CDMFLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CDMFLoader.h"
+					RelativePath=".\CDMFLoader.h"
 					>
 				</File>
 				<File
-					RelativePath="CIrrMeshFileLoader.cpp"
+					RelativePath=".\CIrrMeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CIrrMeshFileLoader.h"
+					RelativePath=".\CIrrMeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath="CLMTSMeshFileLoader.cpp"
+					RelativePath=".\CLMTSMeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CLMTSMeshFileLoader.h"
+					RelativePath=".\CLMTSMeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath="CLWOMeshFileLoader.cpp"
+					RelativePath=".\CLWOMeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CLWOMeshFileLoader.h"
+					RelativePath=".\CLWOMeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath="CMD2MeshFileLoader.cpp"
+					RelativePath=".\CMD2MeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CMD2MeshFileLoader.h"
+					RelativePath=".\CMD2MeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath="CMD3MeshFileLoader.cpp"
+					RelativePath=".\CMD3MeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CMD3MeshFileLoader.h"
+					RelativePath=".\CMD3MeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath="CMS3DMeshFileLoader.cpp"
+					RelativePath=".\CMS3DMeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CMS3DMeshFileLoader.h"
+					RelativePath=".\CMS3DMeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath="CMY3DHelper.h"
+					RelativePath=".\CMY3DHelper.h"
 					>
 				</File>
 				<File
-					RelativePath="CMY3DMeshFileLoader.cpp"
+					RelativePath=".\CMY3DMeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CMY3DMeshFileLoader.h"
+					RelativePath=".\CMY3DMeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath="COBJMeshFileLoader.cpp"
+					RelativePath=".\COBJMeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath="COBJMeshFileLoader.h"
+					RelativePath=".\COBJMeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath="COCTLoader.cpp"
+					RelativePath=".\COCTLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath="COCTLoader.h"
+					RelativePath=".\COCTLoader.h"
 					>
 				</File>
 				<File
-					RelativePath="COgreMeshFileLoader.cpp"
+					RelativePath=".\COgreMeshFileLoader.cpp"
 					>
 				</File>
 				<File
-					RelativePath="COgreMeshFileLoader.h"
+					RelativePath=".\COgreMeshFileLoader.h"
 					>
 				</File>
 				<File
-					RelativePath="CQ3LevelMesh.cpp"
+					RelativePath=".\CQ3LevelMesh.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CQ3LevelMesh.h"
+					RelativePath=".\CQ3LevelMesh.h"
 					>
 				</File>
 				<File
-					RelativePath="CSkinnedMesh.cpp"
+					RelativePath=".\CSkinnedMesh.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CSkinnedMesh.h"
+					RelativePath=".\CSkinnedMesh.h"
 					>
 				</File>
 				<File
@@ -2186,7 +2097,7 @@
 					>
 				</File>
 				<File
-					RelativePath="dmfsupport.h"
+					RelativePath=".\dmfsupport.h"
 					>
 				</File>
 			</Filter>
@@ -2194,43 +2105,43 @@
 				Name="sceneNodes"
 				>
 				<File
-					RelativePath="CAnimatedMeshSceneNode.cpp"
+					RelativePath=".\CAnimatedMeshSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CAnimatedMeshSceneNode.h"
+					RelativePath=".\CAnimatedMeshSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="CBillboardSceneNode.cpp"
+					RelativePath=".\CBillboardSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CBillboardSceneNode.h"
+					RelativePath=".\CBillboardSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="CBoneSceneNode.cpp"
+					RelativePath=".\CBoneSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CBoneSceneNode.h"
+					RelativePath=".\CBoneSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="CCameraSceneNode.cpp"
+					RelativePath=".\CCameraSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CCameraSceneNode.h"
+					RelativePath=".\CCameraSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="CCubeSceneNode.cpp"
+					RelativePath=".\CCubeSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CCubeSceneNode.h"
+					RelativePath=".\CCubeSceneNode.h"
 					>
 				</File>
 				<File
@@ -2250,67 +2161,67 @@
 					>
 				</File>
 				<File
-					RelativePath="CLightSceneNode.cpp"
+					RelativePath=".\CLightSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CLightSceneNode.h"
+					RelativePath=".\CLightSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="CMeshSceneNode.cpp"
+					RelativePath=".\CMeshSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CMeshSceneNode.h"
+					RelativePath=".\CMeshSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="COctTreeSceneNode.cpp"
+					RelativePath=".\COctTreeSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath="COctTreeSceneNode.h"
+					RelativePath=".\COctTreeSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="CQuake3ShaderSceneNode.cpp"
+					RelativePath=".\CQuake3ShaderSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CQuake3ShaderSceneNode.h"
+					RelativePath=".\CQuake3ShaderSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="CShadowVolumeSceneNode.cpp"
+					RelativePath=".\CShadowVolumeSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CShadowVolumeSceneNode.h"
+					RelativePath=".\CShadowVolumeSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="CSkyBoxSceneNode.cpp"
+					RelativePath=".\CSkyBoxSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CSkyBoxSceneNode.h"
+					RelativePath=".\CSkyBoxSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="CSkyDomeSceneNode.cpp"
+					RelativePath=".\CSkyDomeSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CSkyDomeSceneNode.h"
+					RelativePath=".\CSkyDomeSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="CSphereSceneNode.cpp"
+					RelativePath=".\CSphereSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CSphereSceneNode.h"
+					RelativePath=".\CSphereSceneNode.h"
 					>
 				</File>
 				<File
@@ -2322,19 +2233,19 @@
 					>
 				</File>
 				<File
-					RelativePath="CTextSceneNode.cpp"
+					RelativePath=".\CTextSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CTextSceneNode.h"
+					RelativePath=".\CTextSceneNode.h"
 					>
 				</File>
 				<File
-					RelativePath="CVolumeLightSceneNode.cpp"
+					RelativePath=".\CVolumeLightSceneNode.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CVolumeLightSceneNode.h"
+					RelativePath=".\CVolumeLightSceneNode.h"
 					>
 				</File>
 				<File
@@ -2353,18 +2264,10 @@
 					RelativePath="CParticleAnimatedMeshSceneNodeEmitter.cpp"
 					>
 				</File>
-				<File
-					RelativePath=".\CParticleAnimatedMeshSceneNodeEmitter.h"
-					>
-				</File>
 				<File
 					RelativePath="CParticleAttractionAffector.cpp"
 					>
 				</File>
-				<File
-					RelativePath=".\CParticleAttractionAffector.h"
-					>
-				</File>
 				<File
 					RelativePath="CParticleBoxEmitter.cpp"
 					>
@@ -2377,10 +2280,6 @@
 					RelativePath="CParticleCylinderEmitter.cpp"
 					>
 				</File>
-				<File
-					RelativePath=".\CParticleCylinderEmitter.h"
-					>
-				</File>
 				<File
 					RelativePath="CParticleFadeOutAffector.cpp"
 					>
@@ -2401,10 +2300,6 @@
 					RelativePath="CParticleMeshEmitter.cpp"
 					>
 				</File>
-				<File
-					RelativePath=".\CParticleMeshEmitter.h"
-					>
-				</File>
 				<File
 					RelativePath="CParticlePointEmitter.cpp"
 					>
@@ -2417,18 +2312,10 @@
 					RelativePath="CParticleRingEmitter.cpp"
 					>
 				</File>
-				<File
-					RelativePath=".\CParticleRingEmitter.h"
-					>
-				</File>
 				<File
 					RelativePath="CParticleRotationAffector.cpp"
 					>
 				</File>
-				<File
-					RelativePath=".\CParticleRotationAffector.h"
-					>
-				</File>
 				<File
 					RelativePath="CParticleScaleAffector.cpp"
 					>
@@ -2441,10 +2328,6 @@
 					RelativePath="CParticleSphereEmitter.cpp"
 					>
 				</File>
-				<File
-					RelativePath=".\CParticleSphereEmitter.h"
-					>
-				</File>
 				<File
 					RelativePath="CParticleSystemSceneNode.cpp"
 					>
@@ -2602,19 +2485,19 @@
 					>
 				</File>
 				<File
-					RelativePath="COBJMeshWriter.cpp"
+					RelativePath=".\COBJMeshWriter.cpp"
 					>
 				</File>
 				<File
-					RelativePath="COBJMeshWriter.h"
+					RelativePath=".\COBJMeshWriter.h"
 					>
 				</File>
 				<File
-					RelativePath="CSTLMeshWriter.cpp"
+					RelativePath=".\CSTLMeshWriter.cpp"
 					>
 				</File>
 				<File
-					RelativePath="CSTLMeshWriter.h"
+					RelativePath=".\CSTLMeshWriter.h"
 					>
 				</File>
 			</Filter>
@@ -2623,63 +2506,63 @@
 			Name="io impl"
 			>
 			<File
-				RelativePath="CAttributeImpl.h"
+				RelativePath=".\CAttributeImpl.h"
 				>
 			</File>
 			<File
-				RelativePath="CAttributes.cpp"
+				RelativePath=".\CAttributes.cpp"
 				>
 			</File>
 			<File
-				RelativePath="CAttributes.h"
+				RelativePath=".\CAttributes.h"
 				>
 			</File>
 			<File
-				RelativePath="CFileList.cpp"
+				RelativePath=".\CFileList.cpp"
 				>
 			</File>
 			<File
-				RelativePath="CFileList.h"
+				RelativePath=".\CFileList.h"
 				>
 			</File>
 			<File
-				RelativePath="CFileSystem.cpp"
+				RelativePath=".\CFileSystem.cpp"
 				>
 			</File>
 			<File
-				RelativePath="CFileSystem.h"
+				RelativePath=".\CFileSystem.h"
 				>
 			</File>
 			<File
-				RelativePath="CLimitReadFile.cpp"
+				RelativePath=".\CLimitReadFile.cpp"
 				>
 			</File>
 			<File
-				RelativePath="CLimitReadFile.h"
+				RelativePath=".\CLimitReadFile.h"
 				>
 			</File>
 			<File
-				RelativePath="CMemoryReadFile.cpp"
+				RelativePath=".\CMemoryReadFile.cpp"
 				>
 			</File>
 			<File
-				RelativePath="CMemoryReadFile.h"
+				RelativePath=".\CMemoryReadFile.h"
 				>
 			</File>
 			<File
-				RelativePath="CPakReader.cpp"
+				RelativePath=".\CPakReader.cpp"
 				>
 			</File>
 			<File
-				RelativePath="CPakReader.h"
+				RelativePath=".\CPakReader.h"
 				>
 			</File>
 			<File
-				RelativePath="CReadFile.cpp"
+				RelativePath=".\CReadFile.cpp"
 				>
 			</File>
 			<File
-				RelativePath="CReadFile.h"
+				RelativePath=".\CReadFile.h"
 				>
 			</File>
 			<File
@@ -2699,7 +2582,7 @@
 				>
 			</File>
 			<File
-				RelativePath="CXMLReaderImpl.h"
+				RelativePath=".\CXMLReaderImpl.h"
 				>
 			</File>
 			<File
@@ -2711,15 +2594,15 @@
 				>
 			</File>
 			<File
-				RelativePath="CZipReader.cpp"
+				RelativePath=".\CZipReader.cpp"
 				>
 			</File>
 			<File
-				RelativePath="CZipReader.h"
+				RelativePath=".\CZipReader.h"
 				>
 			</File>
 			<File
-				RelativePath="irrXML.cpp"
+				RelativePath=".\irrXML.cpp"
 				>
 			</File>
 		</Filter>
@@ -2734,14 +2617,6 @@
 				RelativePath="CIrrDeviceLinux.h"
 				>
 			</File>
-			<File
-				RelativePath="CIrrDeviceSDL.cpp"
-				>
-			</File>
-			<File
-				RelativePath="CIrrDeviceSDL.h"
-				>
-			</File>
 			<File
 				RelativePath="CIrrDeviceStub.cpp"
 				>
@@ -2779,7 +2654,7 @@
 				>
 			</File>
 			<File
-				RelativePath="Irrlicht.cpp"
+				RelativePath=".\Irrlicht.cpp"
 				>
 			</File>
 			<File
@@ -2801,19 +2676,19 @@
 						>
 					</File>
 					<File
-						RelativePath="zlib\compress.c"
+						RelativePath=".\zlib\compress.c"
 						>
 					</File>
 					<File
-						RelativePath="zlib\crc32.c"
+						RelativePath=".\zlib\crc32.c"
 						>
 					</File>
 					<File
-						RelativePath="zlib\crc32.h"
+						RelativePath=".\zlib\crc32.h"
 						>
 					</File>
 					<File
-						RelativePath="zlib\deflate.c"
+						RelativePath=".\zlib\deflate.c"
 						>
 					</File>
 					<File
@@ -3113,71 +2988,71 @@
 					Name="libpng"
 					>
 					<File
-						RelativePath="libpng\png.c"
+						RelativePath=".\libpng\png.c"
 						>
 					</File>
 					<File
-						RelativePath="libpng\png.h"
+						RelativePath=".\libpng\png.h"
 						>
 					</File>
 					<File
-						RelativePath="libpng\pngconf.h"
+						RelativePath=".\libpng\pngconf.h"
 						>
 					</File>
 					<File
-						RelativePath="libpng\pngerror.c"
+						RelativePath=".\libpng\pngerror.c"
 						>
 					</File>
 					<File
-						RelativePath="libpng\pngget.c"
+						RelativePath=".\libpng\pngget.c"
 						>
 					</File>
 					<File
-						RelativePath="libpng\pngmem.c"
+						RelativePath=".\libpng\pngmem.c"
 						>
 					</File>
 					<File
-						RelativePath="libpng\pngpread.c"
+						RelativePath=".\libpng\pngpread.c"
 						>
 					</File>
 					<File
-						RelativePath="libpng\pngread.c"
+						RelativePath=".\libpng\pngread.c"
 						>
 					</File>
 					<File
-						RelativePath="libpng\pngrio.c"
+						RelativePath=".\libpng\pngrio.c"
 						>
 					</File>
 					<File
-						RelativePath="libpng\pngrtran.c"
+						RelativePath=".\libpng\pngrtran.c"
 						>
 					</File>
 					<File
-						RelativePath="libpng\pngrutil.c"
+						RelativePath=".\libpng\pngrutil.c"
 						>
 					</File>
 					<File
-						RelativePath="libpng\pngset.c"
+						RelativePath=".\libpng\pngset.c"
 						>
 					</File>
 					<File
-						RelativePath="libpng\pngtrans.c"
+						RelativePath=".\libpng\pngtrans.c"
 						>
 					</File>
 					<File
-						RelativePath="libpng\pngwio.c"
+						RelativePath=".\libpng\pngwio.c"
 						>
 					</File>
 					<File
-						RelativePath="libpng\pngwrite.c"
+						RelativePath=".\libpng\pngwrite.c"
 						>
 					</File>
 					<File
-						RelativePath="libpng\pngwtran.c"
+						RelativePath=".\libpng\pngwtran.c"
 						>
 					</File>
 					<File
-						RelativePath="libpng\pngwutil.c"
+						RelativePath=".\libpng\pngwutil.c"
 						>
 					</File>
 				</Filter>
diff --git a/src/tools/stuffextract_VC90.vcproj b/src/tools/stuffextract_VC90.vcproj
index 557759d..5ebf6dd 100644
--- a/src/tools/stuffextract_VC90.vcproj
+++ b/src/tools/stuffextract_VC90.vcproj
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="9,00"
 	Name="StuffExtract"
-	ProjectGUID="{4887EDFB-1FE5-425C-8A6E-E4F57C252581}"
+	ProjectGUID="{F14CA928-E505-41F1-BE45-CCF6B85547D2}"
 	RootNamespace="StuffExtract"
 	TargetFrameworkVersion="131072"
 	>