diff --git a/CHANGES b/CHANGES
index 1b7687d2e..6bb479303 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,7 +24,9 @@ CHANGES IN FLTK 1.3.0
           widgets (STR #1770)
         - Initial setup (STR #1904)
 	- winsock dll is dynamically loaded and by default ws2_32.dll, use of winsock1 is still possible by defining USE_WSOCK1 at compile time.
-
+	- Cairo support: added --enable-cairo and --enable-cairoext 
+          configure options.
+	- Now vc2005 devenv in ide subdirectory
 
 CHANGES IN FLTK 1.1.9
 
diff --git a/vc2005/CubeView.vcproj b/ide/vc2005/CubeView.vcproj
similarity index 87%
rename from vc2005/CubeView.vcproj
rename to ide/vc2005/CubeView.vcproj
index c52ae1a3b..8b7bf7757 100644
--- a/vc2005/CubeView.vcproj
+++ b/ide/vc2005/CubeView.vcproj
@@ -47,7 +47,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/CubeViewd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\CubeView__0/CubeViewd.pdb"
@@ -143,7 +143,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -171,7 +171,7 @@
 				OutputFile="../test/CubeView.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\CubeView___/CubeView.pdb"
 				SubSystem="2"
@@ -235,7 +235,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -264,7 +264,7 @@
 				OutputFile="../test/CubeViewd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\CubeView__0/CubeViewd.pdb"
@@ -331,7 +331,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -359,7 +359,7 @@
 				OutputFile="../test/CubeView.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\CubeView___/CubeView.pdb"
 				SubSystem="2"
@@ -395,7 +395,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\CubeMain.cxx"
+			RelativePath="..\..\test\CubeMain.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -437,7 +437,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\test\CubeView.cxx"
+			RelativePath="..\..\test\CubeView.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -479,7 +479,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\test\CubeViewUI.cxx"
+			RelativePath="..\..\test\CubeViewUI.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -521,7 +521,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\test\CubeViewUI.fl"
+			RelativePath="..\..\test\CubeViewUI.fl"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -529,8 +529,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c CubeViewUI.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\CubeViewUI.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -539,8 +539,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c CubeViewUI.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\CubeViewUI.cxx"
+					CommandLine="cfluid $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -549,8 +549,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c CubeViewUI.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\CubeViewUI.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -559,8 +559,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c CubeViewUI.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\CubeViewUI.cxx"
+					CommandLine="cfluid -c $(InputName).fl"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/vc2005/adjuster.vcproj b/ide/vc2005/adjuster.vcproj
similarity index 91%
rename from vc2005/adjuster.vcproj
rename to ide/vc2005/adjuster.vcproj
index 3d3276e17..0e67fbc75 100644
--- a/vc2005/adjuster.vcproj
+++ b/ide/vc2005/adjuster.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/adjusterd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\adjuster_/adjusterd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/adjuster.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/adjuster.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/adjusterd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\adjuster_/adjusterd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/adjuster.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/adjuster.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\adjuster.cxx"
+			RelativePath="..\..\test\adjuster.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/arc.vcproj b/ide/vc2005/arc.vcproj
similarity index 91%
rename from vc2005/arc.vcproj
rename to ide/vc2005/arc.vcproj
index 9f59ed500..db2b05003 100644
--- a/vc2005/arc.vcproj
+++ b/ide/vc2005/arc.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/arcd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\arc_/arcd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/arc.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/arc.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/arcd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\arc_/arcd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/arc.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/arc.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\arc.cxx"
+			RelativePath="..\..\test\arc.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/ask.vcproj b/ide/vc2005/ask.vcproj
similarity index 91%
rename from vc2005/ask.vcproj
rename to ide/vc2005/ask.vcproj
index b8f4922b2..a200c70dd 100644
--- a/vc2005/ask.vcproj
+++ b/ide/vc2005/ask.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/askd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\ask_/askd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/ask.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/ask.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/askd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\ask_/askd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/ask.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/ask.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\ask.cxx"
+			RelativePath="..\..\test\ask.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/bitmap.vcproj b/ide/vc2005/bitmap.vcproj
similarity index 91%
rename from vc2005/bitmap.vcproj
rename to ide/vc2005/bitmap.vcproj
index f66bde016..609831977 100644
--- a/vc2005/bitmap.vcproj
+++ b/ide/vc2005/bitmap.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/bitmap.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/bitmap.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/bitmapd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\bitmap_/bitmapd.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/bitmapd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\bitmap_/bitmapd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/bitmap.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/bitmap.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\bitmap.cxx"
+			RelativePath="..\..\test\bitmap.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/boxtype.vcproj b/ide/vc2005/boxtype.vcproj
similarity index 91%
rename from vc2005/boxtype.vcproj
rename to ide/vc2005/boxtype.vcproj
index 15d5320b9..6911e24dc 100644
--- a/vc2005/boxtype.vcproj
+++ b/ide/vc2005/boxtype.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/boxtyped.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\boxtype_/boxtyped.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/boxtype.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/boxtype.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/boxtyped.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\boxtype_/boxtyped.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/boxtype.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/boxtype.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\boxtype.cxx"
+			RelativePath="..\..\test\boxtype.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/browser.vcproj b/ide/vc2005/browser.vcproj
similarity index 91%
rename from vc2005/browser.vcproj
rename to ide/vc2005/browser.vcproj
index a3a04b776..aa597aa54 100644
--- a/vc2005/browser.vcproj
+++ b/ide/vc2005/browser.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/browser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/browser.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/browserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\browser_/browserd.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/browserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\browser_/browserd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/browser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/browser.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\browser.cxx"
+			RelativePath="..\..\test\browser.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/button.vcproj b/ide/vc2005/button.vcproj
similarity index 91%
rename from vc2005/button.vcproj
rename to ide/vc2005/button.vcproj
index 036d44714..bcf43cac6 100644
--- a/vc2005/button.vcproj
+++ b/ide/vc2005/button.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/buttond.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\button_/buttond.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/button.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/button.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/buttond.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\button_/buttond.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/button.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/button.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\button.cxx"
+			RelativePath="..\..\test\button.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/buttons.vcproj b/ide/vc2005/buttons.vcproj
similarity index 91%
rename from vc2005/buttons.vcproj
rename to ide/vc2005/buttons.vcproj
index 2d0016528..015ef43a5 100644
--- a/vc2005/buttons.vcproj
+++ b/ide/vc2005/buttons.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/buttons.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/buttons.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/buttonsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\buttons_/buttonsd.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/buttonsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\buttons_/buttonsd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/buttons.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/buttons.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\buttons.cxx"
+			RelativePath="..\..\test\buttons.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/cairo_test.vcproj b/ide/vc2005/cairo_test.vcproj
similarity index 92%
rename from vc2005/cairo_test.vcproj
rename to ide/vc2005/cairo_test.vcproj
index c9c23e690..374ef361b 100644
--- a/vc2005/cairo_test.vcproj
+++ b/ide/vc2005/cairo_test.vcproj
@@ -71,11 +71,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
+				AdditionalDependencies="fltk.lib comctl32.lib"
 				OutputFile="../test/cairo_test.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/cairo_test.pdb"
 				SubSystem="2"
@@ -165,11 +165,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib"
+				AdditionalDependencies="fltkd.lib comctl32.lib"
 				OutputFile="../test/cairo_testd.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\cairo_test_/cairo_testd.pdb"
@@ -264,7 +264,7 @@
 				OutputFile="../test/cairo_testd.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\cairo_test_/cairo_testd.pdb"
@@ -355,11 +355,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib fltkd.lib comctl32.lib cairo.lib"
+				AdditionalDependencies="cairo.lib fltk.lib comctl32.lib"
 				OutputFile="../test/cairo_test.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/cairo_test.pdb"
 				SubSystem="2"
@@ -397,7 +397,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\cairo_test.cxx"
+			RelativePath="..\..\test\cairo_test.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/ide/vc2005/cfluid.cmd b/ide/vc2005/cfluid.cmd
new file mode 100644
index 000000000..9bf5ba2aa
--- /dev/null
+++ b/ide/vc2005/cfluid.cmd
@@ -0,0 +1,13 @@
+@echo off
+echo Compiling fluid files ...
+pushd .
+cd ../../test
+if "%1"=="/D" goto debugmode
+..\fluid\fluid -c "%1"
+goto end
+
+:debugmode:
+..\fluid\fluidd -c "%2"
+
+:end
+popd
diff --git a/vc2005/checkers.vcproj b/ide/vc2005/checkers.vcproj
similarity index 91%
rename from vc2005/checkers.vcproj
rename to ide/vc2005/checkers.vcproj
index a646fd24d..a0ad4914e 100644
--- a/vc2005/checkers.vcproj
+++ b/ide/vc2005/checkers.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/checkersd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\checkers_/checkersd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/checkers.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/checkers.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/checkersd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\checkers_/checkersd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/checkers.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/checkers.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\checkers.cxx"
+			RelativePath="..\..\test\checkers.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/clock.vcproj b/ide/vc2005/clock.vcproj
similarity index 91%
rename from vc2005/clock.vcproj
rename to ide/vc2005/clock.vcproj
index 16992c180..9e22f98ec 100644
--- a/vc2005/clock.vcproj
+++ b/ide/vc2005/clock.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/clockd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\clock_/clockd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/clock.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/clock.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/clockd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\clock_/clockd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/clock.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/clock.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\clock.cxx"
+			RelativePath="..\..\test\clock.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/colbrowser.vcproj b/ide/vc2005/colbrowser.vcproj
similarity index 91%
rename from vc2005/colbrowser.vcproj
rename to ide/vc2005/colbrowser.vcproj
index 96a706638..88ad25a6d 100644
--- a/vc2005/colbrowser.vcproj
+++ b/ide/vc2005/colbrowser.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/colbrowser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/colbrowser.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/colbrowserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\colbrowser_/colbrowserd.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/colbrowserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\colbrowser_/colbrowserd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/colbrowser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/colbrowser.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\colbrowser.cxx"
+			RelativePath="..\..\test\colbrowser.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/color_chooser.vcproj b/ide/vc2005/color_chooser.vcproj
similarity index 91%
rename from vc2005/color_chooser.vcproj
rename to ide/vc2005/color_chooser.vcproj
index 1a1dafa56..cc2bc4796 100644
--- a/vc2005/color_chooser.vcproj
+++ b/ide/vc2005/color_chooser.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/color_chooserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\color_chooser_/color_chooserd.pdb"
@@ -141,7 +141,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/color_chooser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/color_chooser.pdb"
 				TargetMachine="1"
@@ -232,7 +232,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -261,7 +261,7 @@
 				OutputFile="../test/color_chooserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\color_chooser_/color_chooserd.pdb"
@@ -327,7 +327,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 				OutputFile="../test/color_chooser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/color_chooser.pdb"
 				TargetMachine="1"
@@ -390,7 +390,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\color_chooser.cxx"
+			RelativePath="..\..\test\color_chooser.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/config.h b/ide/vc2005/config.h
similarity index 100%
rename from vc2005/config.h
rename to ide/vc2005/config.h
diff --git a/vc2005/cube.vcproj b/ide/vc2005/cube.vcproj
similarity index 91%
rename from vc2005/cube.vcproj
rename to ide/vc2005/cube.vcproj
index cdf69a8da..980c63c2f 100644
--- a/vc2005/cube.vcproj
+++ b/ide/vc2005/cube.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/cube.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/cube.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/cubed.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\cube_/cubed.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/cubed.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\cube_/cubed.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/cube.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/cube.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\cube.cxx"
+			RelativePath="..\..\test\cube.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/cursor.vcproj b/ide/vc2005/cursor.vcproj
similarity index 91%
rename from vc2005/cursor.vcproj
rename to ide/vc2005/cursor.vcproj
index d295ae043..bbb0f88b5 100644
--- a/vc2005/cursor.vcproj
+++ b/ide/vc2005/cursor.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/cursord.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\cursor_/cursord.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/cursor.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/cursor.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/cursord.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\cursor_/cursord.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/cursor.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/cursor.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\cursor.cxx"
+			RelativePath="..\..\test\cursor.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/curve.vcproj b/ide/vc2005/curve.vcproj
similarity index 91%
rename from vc2005/curve.vcproj
rename to ide/vc2005/curve.vcproj
index 47d329115..222f4fdd8 100644
--- a/vc2005/curve.vcproj
+++ b/ide/vc2005/curve.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/curved.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\curve_/curved.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/curve.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/curve.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/curved.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\curve_/curved.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/curve.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/curve.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\curve.cxx"
+			RelativePath="..\..\test\curve.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/demo.vcproj b/ide/vc2005/demo.vcproj
similarity index 91%
rename from vc2005/demo.vcproj
rename to ide/vc2005/demo.vcproj
index 4bfb5fb4c..434e0bfd3 100644
--- a/vc2005/demo.vcproj
+++ b/ide/vc2005/demo.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/demo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/demo.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/demod.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\demo_/demod.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/demod.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\demo_/demod.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/demo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/demo.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\demo.cxx"
+			RelativePath="..\..\test\demo.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/doublebuffer.vcproj b/ide/vc2005/doublebuffer.vcproj
similarity index 91%
rename from vc2005/doublebuffer.vcproj
rename to ide/vc2005/doublebuffer.vcproj
index 06b3a3602..307138231 100644
--- a/vc2005/doublebuffer.vcproj
+++ b/ide/vc2005/doublebuffer.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/doublebufferd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\doublebuffer_/doublebufferd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/doublebuffer.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/doublebuffer.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/doublebufferd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\doublebuffer_/doublebufferd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/doublebuffer.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/doublebuffer.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\doublebuffer.cxx"
+			RelativePath="..\..\test\doublebuffer.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/editor.vcproj b/ide/vc2005/editor.vcproj
similarity index 93%
rename from vc2005/editor.vcproj
rename to ide/vc2005/editor.vcproj
index d4cb1b8c3..ceed8e816 100644
--- a/vc2005/editor.vcproj
+++ b/ide/vc2005/editor.vcproj
@@ -76,7 +76,7 @@
 				OutputFile="../test/editor.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/editor.pdb"
 				SubSystem="2"
@@ -170,7 +170,7 @@
 				OutputFile="../test/editord.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\editor_/editord.pdb"
@@ -265,7 +265,7 @@
 				OutputFile="../test/editord.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\editor_/editord.pdb"
@@ -361,7 +361,7 @@
 				OutputFile="../test/editor.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/editor.pdb"
 				SubSystem="2"
@@ -398,7 +398,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\editor.cxx"
+			RelativePath="..\..\test\editor.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/fast_slow.vcproj b/ide/vc2005/fast_slow.vcproj
similarity index 86%
rename from vc2005/fast_slow.vcproj
rename to ide/vc2005/fast_slow.vcproj
index 4d6a28906..b6d5d47bd 100644
--- a/vc2005/fast_slow.vcproj
+++ b/ide/vc2005/fast_slow.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/fast_slowd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\fast_slow_/fast_slowd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/fast_slow.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/fast_slow.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/fast_slowd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\fast_slow_/fast_slowd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/fast_slow.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/fast_slow.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\fast_slow.cxx"
+			RelativePath="..\..\test\fast_slow.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -436,7 +436,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\test\fast_slow.fl"
+			RelativePath="..\..\test\fast_slow.fl"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -444,8 +444,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c fast_slow.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\fast_slow.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -454,8 +454,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c fast_slow.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\fast_slow.cxx"
+					CommandLine="cfluid $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -464,8 +464,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c fast_slow.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\fast_slow.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -474,12 +474,9 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c fast_slow.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\fast_slow.cxx"
+					CommandLine="cfluid $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
-			</FileConfiguration>
-		</File>
-	</Files>
 	<Globals>
-	</Globals>
+    </Globals>
 </VisualStudioProject>
diff --git a/vc2005/file_chooser.vcproj b/ide/vc2005/file_chooser.vcproj
similarity index 91%
rename from vc2005/file_chooser.vcproj
rename to ide/vc2005/file_chooser.vcproj
index 1a0f75dd3..226c4a9df 100644
--- a/vc2005/file_chooser.vcproj
+++ b/ide/vc2005/file_chooser.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/file_chooserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcmtd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\file_chooser_/file_chooserd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/file_chooser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcmt"
 				ProgramDatabaseFile=".\Release/file_chooser.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/file_chooserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcmtd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\file_chooser_/file_chooserd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/file_chooser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcmt"
 				ProgramDatabaseFile=".\Release/file_chooser.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\file_chooser.cxx"
+			RelativePath="..\..\test\file_chooser.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/fltk.lib.vcproj b/ide/vc2005/fltk.lib.vcproj
similarity index 87%
rename from vc2005/fltk.lib.vcproj
rename to ide/vc2005/fltk.lib.vcproj
index 26c2c1a18..6ede771a7 100644
--- a/vc2005/fltk.lib.vcproj
+++ b/ide/vc2005/fltk.lib.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -66,7 +66,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkd.lib"
+				OutputFile="..\..\lib\fltkd.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -114,7 +114,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -137,7 +137,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltk.lib"
+				OutputFile="..\..\lib\fltk.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -183,7 +183,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -208,7 +208,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkd.lib"
+				OutputFile="..\..\lib\fltkd.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -256,7 +256,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1, _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -279,7 +279,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltk.lib"
+				OutputFile="..\..\lib\fltk.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -307,460 +307,460 @@
 			Filter="*.h*"
 			>
 			<File
-				RelativePath="..\FL\Fl.H"
+				RelativePath="..\..\FL\Fl.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Adjuster.H"
+				RelativePath="..\..\FL\Fl_Adjuster.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\fl_ask.H"
+				RelativePath="..\..\FL\fl_ask.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Bitmap.H"
+				RelativePath="..\..\FL\Fl_Bitmap.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_BMP_Image.H"
+				RelativePath="..\..\FL\Fl_BMP_Image.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Box.H"
+				RelativePath="..\..\FL\Fl_Box.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Browser.H"
+				RelativePath="..\..\FL\Fl_Browser.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Browser_.H"
+				RelativePath="..\..\FL\Fl_Browser_.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Button.H"
+				RelativePath="..\..\FL\Fl_Button.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Chart.H"
+				RelativePath="..\..\FL\Fl_Chart.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Check_Browser.H"
+				RelativePath="..\..\FL\Fl_Check_Browser.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Check_Button.H"
+				RelativePath="..\..\FL\Fl_Check_Button.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Choice.H"
+				RelativePath="..\..\FL\Fl_Choice.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Clock.H"
+				RelativePath="..\..\FL\Fl_Clock.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Color_Chooser.H"
+				RelativePath="..\..\FL\Fl_Color_Chooser.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Counter.H"
+				RelativePath="..\..\FL\Fl_Counter.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Dial.H"
+				RelativePath="..\..\FL\Fl_Dial.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Double_Window.H"
+				RelativePath="..\..\FL\Fl_Double_Window.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\fl_draw.H"
+				RelativePath="..\..\FL\fl_draw.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Export.H"
+				RelativePath="..\..\FL\Fl_Export.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_File_Browser.H"
+				RelativePath="..\..\FL\Fl_File_Browser.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_File_Chooser.H"
+				RelativePath="..\..\FL\Fl_File_Chooser.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_File_Icon.H"
+				RelativePath="..\..\FL\Fl_File_Icon.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_File_Input.H"
+				RelativePath="..\..\FL\Fl_File_Input.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Fill_Dial.H"
+				RelativePath="..\..\FL\Fl_Fill_Dial.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Fill_Slider.H"
+				RelativePath="..\..\FL\Fl_Fill_Slider.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Float_Input.H"
+				RelativePath="..\..\FL\Fl_Float_Input.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_FormsBitmap.H"
+				RelativePath="..\..\FL\Fl_FormsBitmap.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_FormsPixmap.H"
+				RelativePath="..\..\FL\Fl_FormsPixmap.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Free.H"
+				RelativePath="..\..\FL\Fl_Free.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_GIF_Image.H"
+				RelativePath="..\..\FL\Fl_GIF_Image.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Gl_Window.H"
+				RelativePath="..\..\FL\Fl_Gl_Window.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Group.H"
+				RelativePath="..\..\FL\Fl_Group.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Help_Dialog.H"
+				RelativePath="..\..\FL\Fl_Help_Dialog.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Help_View.H"
+				RelativePath="..\..\FL\Fl_Help_View.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Hold_Browser.H"
+				RelativePath="..\..\FL\Fl_Hold_Browser.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Hor_Fill_Slider.H"
+				RelativePath="..\..\FL\Fl_Hor_Fill_Slider.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Hor_Nice_Slider.H"
+				RelativePath="..\..\FL\Fl_Hor_Nice_Slider.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Hor_Slider.H"
+				RelativePath="..\..\FL\Fl_Hor_Slider.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Hor_Value_Slider.H"
+				RelativePath="..\..\FL\Fl_Hor_Value_Slider.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Image.H"
+				RelativePath="..\..\FL\Fl_Image.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Input.H"
+				RelativePath="..\..\FL\Fl_Input.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Input_.H"
+				RelativePath="..\..\FL\Fl_Input_.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Input_Choice.H"
+				RelativePath="..\..\FL\Fl_Input_Choice.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Int_Input.H"
+				RelativePath="..\..\FL\Fl_Int_Input.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_JPEG_Image.H"
+				RelativePath="..\..\FL\Fl_JPEG_Image.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Light_Button.H"
+				RelativePath="..\..\FL\Fl_Light_Button.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Line_Dial.H"
+				RelativePath="..\..\FL\Fl_Line_Dial.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Menu.H"
+				RelativePath="..\..\FL\Fl_Menu.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Menu_.H"
+				RelativePath="..\..\FL\Fl_Menu_.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Menu_Bar.H"
+				RelativePath="..\..\FL\Fl_Menu_Bar.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Menu_Button.H"
+				RelativePath="..\..\FL\Fl_Menu_Button.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Menu_Item.H"
+				RelativePath="..\..\FL\Fl_Menu_Item.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Menu_Window.H"
+				RelativePath="..\..\FL\Fl_Menu_Window.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\fl_message.H"
+				RelativePath="..\..\FL\fl_message.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Multi_Browser.H"
+				RelativePath="..\..\FL\Fl_Multi_Browser.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Multi_Label.H"
+				RelativePath="..\..\FL\Fl_Multi_Label.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Multiline_Input.H"
+				RelativePath="..\..\FL\Fl_Multiline_Input.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Multiline_Output.H"
+				RelativePath="..\..\FL\Fl_Multiline_Output.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Nice_Slider.H"
+				RelativePath="..\..\FL\Fl_Nice_Slider.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Object.H"
+				RelativePath="..\..\FL\Fl_Object.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Output.H"
+				RelativePath="..\..\FL\Fl_Output.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Overlay_Window.H"
+				RelativePath="..\..\FL\Fl_Overlay_Window.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Pack.H"
+				RelativePath="..\..\FL\Fl_Pack.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Pixmap.H"
+				RelativePath="..\..\FL\Fl_Pixmap.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_PNG_Image.H"
+				RelativePath="..\..\FL\Fl_PNG_Image.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_PNM_Image.H"
+				RelativePath="..\..\FL\Fl_PNM_Image.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Positioner.H"
+				RelativePath="..\..\FL\Fl_Positioner.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Preferences.H"
+				RelativePath="..\..\FL\Fl_Preferences.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Progress.H"
+				RelativePath="..\..\FL\Fl_Progress.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Radio_Button.H"
+				RelativePath="..\..\FL\Fl_Radio_Button.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Radio_Light_Button.H"
+				RelativePath="..\..\FL\Fl_Radio_Light_Button.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Radio_Round_Button.H"
+				RelativePath="..\..\FL\Fl_Radio_Round_Button.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Repeat_Button.H"
+				RelativePath="..\..\FL\Fl_Repeat_Button.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Return_Button.H"
+				RelativePath="..\..\FL\Fl_Return_Button.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_RGB_Image.H"
+				RelativePath="..\..\FL\Fl_RGB_Image.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Roller.H"
+				RelativePath="..\..\FL\Fl_Roller.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Round_Button.H"
+				RelativePath="..\..\FL\Fl_Round_Button.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Round_Clock.H"
+				RelativePath="..\..\FL\Fl_Round_Clock.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Scroll.H"
+				RelativePath="..\..\FL\Fl_Scroll.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Scrollbar.H"
+				RelativePath="..\..\FL\Fl_Scrollbar.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Secret_Input.H"
+				RelativePath="..\..\FL\Fl_Secret_Input.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Select_Browser.H"
+				RelativePath="..\..\FL\Fl_Select_Browser.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Shared_Image.H"
+				RelativePath="..\..\FL\Fl_Shared_Image.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\fl_show_colormap.H"
+				RelativePath="..\..\FL\fl_show_colormap.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\fl_show_input.H"
+				RelativePath="..\..\FL\fl_show_input.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Simple_Counter.H"
+				RelativePath="..\..\FL\Fl_Simple_Counter.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Single_Window.H"
+				RelativePath="..\..\FL\Fl_Single_Window.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Slider.H"
+				RelativePath="..\..\FL\Fl_Slider.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Spinner.H"
+				RelativePath="..\..\FL\Fl_Spinner.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Sys_Menu_Bar.H"
+				RelativePath="..\..\FL\Fl_Sys_Menu_Bar.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Tabs.H"
+				RelativePath="..\..\FL\Fl_Tabs.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Text_Buffer.H"
+				RelativePath="..\..\FL\Fl_Text_Buffer.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Text_Display.H"
+				RelativePath="..\..\FL\Fl_Text_Display.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Text_Editor.H"
+				RelativePath="..\..\FL\Fl_Text_Editor.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Tile.H"
+				RelativePath="..\..\FL\Fl_Tile.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Tiled_Image.H"
+				RelativePath="..\..\FL\Fl_Tiled_Image.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Timer.H"
+				RelativePath="..\..\FL\Fl_Timer.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Toggle_Button.H"
+				RelativePath="..\..\FL\Fl_Toggle_Button.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Toggle_Light_Button.H"
+				RelativePath="..\..\FL\Fl_Toggle_Light_Button.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Toggle_Round_Button.H"
+				RelativePath="..\..\FL\Fl_Toggle_Round_Button.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Tooltip.H"
+				RelativePath="..\..\FL\Fl_Tooltip.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\fl_utf8.H"
+				RelativePath="..\..\FL\fl_utf8.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Valuator.H"
+				RelativePath="..\..\FL\Fl_Valuator.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Value_Input.H"
+				RelativePath="..\..\FL\Fl_Value_Input.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Value_Output.H"
+				RelativePath="..\..\FL\Fl_Value_Output.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Value_Slider.H"
+				RelativePath="..\..\FL\Fl_Value_Slider.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Widget.H"
+				RelativePath="..\..\FL\Fl_Widget.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Window.H"
+				RelativePath="..\..\FL\Fl_Window.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_Wizard.H"
+				RelativePath="..\..\FL\Fl_Wizard.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_XBM_Image.H"
+				RelativePath="..\..\FL\Fl_XBM_Image.H"
 				>
 			</File>
 			<File
-				RelativePath="..\FL\Fl_XPM_Image.H"
+				RelativePath="..\..\FL\Fl_XPM_Image.H"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\src\xutf8\case.c"
+			RelativePath="..\..\src\xutf8\case.c"
 			>
 		</File>
 		<File
-			RelativePath="..\src\filename_absolute.cxx"
+			RelativePath="..\..\src\filename_absolute.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -806,7 +806,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\filename_expand.cxx"
+			RelativePath="..\..\src\filename_expand.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -852,7 +852,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\filename_ext.cxx"
+			RelativePath="..\..\src\filename_ext.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -898,7 +898,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\filename_isdir.cxx"
+			RelativePath="..\..\src\filename_isdir.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -944,7 +944,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\filename_list.cxx"
+			RelativePath="..\..\src\filename_list.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -990,7 +990,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\filename_match.cxx"
+			RelativePath="..\..\src\filename_match.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1036,7 +1036,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\filename_setext.cxx"
+			RelativePath="..\..\src\filename_setext.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1082,7 +1082,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl.cxx"
+			RelativePath="..\..\src\Fl.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1128,7 +1128,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_abort.cxx"
+			RelativePath="..\..\src\Fl_abort.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1174,7 +1174,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_add_idle.cxx"
+			RelativePath="..\..\src\Fl_add_idle.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1220,7 +1220,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Adjuster.cxx"
+			RelativePath="..\..\src\Fl_Adjuster.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1266,7 +1266,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_arc.cxx"
+			RelativePath="..\..\src\fl_arc.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1312,7 +1312,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_arci.cxx"
+			RelativePath="..\..\src\fl_arci.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1358,7 +1358,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_arg.cxx"
+			RelativePath="..\..\src\Fl_arg.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1404,7 +1404,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_ask.cxx"
+			RelativePath="..\..\src\fl_ask.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1450,7 +1450,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Bitmap.cxx"
+			RelativePath="..\..\src\Fl_Bitmap.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1496,7 +1496,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Box.cxx"
+			RelativePath="..\..\src\Fl_Box.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1542,7 +1542,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_boxtype.cxx"
+			RelativePath="..\..\src\fl_boxtype.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1588,7 +1588,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Browser.cxx"
+			RelativePath="..\..\src\Fl_Browser.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1634,7 +1634,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Browser_.cxx"
+			RelativePath="..\..\src\Fl_Browser_.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1680,7 +1680,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Browser_load.cxx"
+			RelativePath="..\..\src\Fl_Browser_load.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1726,7 +1726,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Button.cxx"
+			RelativePath="..\..\src\Fl_Button.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1772,11 +1772,11 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\cairo\Fl_Cairo.cxx"
+			RelativePath="..\..\cairo\Fl_Cairo.cxx"
 			>
 		</File>
 		<File
-			RelativePath="..\src\fl_call_main.c"
+			RelativePath="..\..\src\fl_call_main.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1822,7 +1822,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Chart.cxx"
+			RelativePath="..\..\src\Fl_Chart.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1868,7 +1868,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Check_Browser.cxx"
+			RelativePath="..\..\src\Fl_Check_Browser.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1914,7 +1914,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Check_Button.cxx"
+			RelativePath="..\..\src\Fl_Check_Button.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1960,7 +1960,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Choice.cxx"
+			RelativePath="..\..\src\Fl_Choice.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2006,7 +2006,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Clock.cxx"
+			RelativePath="..\..\src\Fl_Clock.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2052,7 +2052,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_color.cxx"
+			RelativePath="..\..\src\fl_color.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2098,7 +2098,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Color_Chooser.cxx"
+			RelativePath="..\..\src\Fl_Color_Chooser.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2144,7 +2144,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_compose.cxx"
+			RelativePath="..\..\src\Fl_compose.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2190,7 +2190,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Counter.cxx"
+			RelativePath="..\..\src\Fl_Counter.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2236,7 +2236,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_cursor.cxx"
+			RelativePath="..\..\src\fl_cursor.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2282,7 +2282,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_curve.cxx"
+			RelativePath="..\..\src\fl_curve.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2328,7 +2328,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Dial.cxx"
+			RelativePath="..\..\src\Fl_Dial.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2374,7 +2374,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_diamond_box.cxx"
+			RelativePath="..\..\src\fl_diamond_box.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2420,7 +2420,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_display.cxx"
+			RelativePath="..\..\src\Fl_display.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2466,7 +2466,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_dnd.cxx"
+			RelativePath="..\..\src\fl_dnd.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2512,7 +2512,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Double_Window.cxx"
+			RelativePath="..\..\src\Fl_Double_Window.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2558,7 +2558,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_draw.cxx"
+			RelativePath="..\..\src\fl_draw.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2604,7 +2604,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_draw_image.cxx"
+			RelativePath="..\..\src\fl_draw_image.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2650,7 +2650,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_draw_pixmap.cxx"
+			RelativePath="..\..\src\fl_draw_pixmap.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2696,7 +2696,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_engraved_label.cxx"
+			RelativePath="..\..\src\fl_engraved_label.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2742,7 +2742,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_File_Browser.cxx"
+			RelativePath="..\..\src\Fl_File_Browser.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2788,7 +2788,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_File_Chooser.cxx"
+			RelativePath="..\..\src\Fl_File_Chooser.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2834,7 +2834,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_File_Chooser2.cxx"
+			RelativePath="..\..\src\Fl_File_Chooser2.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2880,7 +2880,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_file_dir.cxx"
+			RelativePath="..\..\src\fl_file_dir.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2926,7 +2926,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_File_Icon.cxx"
+			RelativePath="..\..\src\Fl_File_Icon.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2972,7 +2972,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_File_Input.cxx"
+			RelativePath="..\..\src\Fl_File_Input.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3018,7 +3018,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_font.cxx"
+			RelativePath="..\..\src\fl_font.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3064,7 +3064,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_get_key.cxx"
+			RelativePath="..\..\src\Fl_get_key.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3110,7 +3110,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_get_system_colors.cxx"
+			RelativePath="..\..\src\Fl_get_system_colors.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3156,7 +3156,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_grab.cxx"
+			RelativePath="..\..\src\Fl_grab.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3202,7 +3202,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Group.cxx"
+			RelativePath="..\..\src\Fl_Group.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3248,11 +3248,11 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_gtk.cxx"
+			RelativePath="..\..\src\fl_gtk.cxx"
 			>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Help_View.cxx"
+			RelativePath="..\..\src\Fl_Help_View.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3298,7 +3298,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Image.cxx"
+			RelativePath="..\..\src\Fl_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3344,7 +3344,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Input.cxx"
+			RelativePath="..\..\src\Fl_Input.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3390,7 +3390,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Input_.cxx"
+			RelativePath="..\..\src\Fl_Input_.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3436,7 +3436,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_labeltype.cxx"
+			RelativePath="..\..\src\fl_labeltype.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3482,7 +3482,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Light_Button.cxx"
+			RelativePath="..\..\src\Fl_Light_Button.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3528,7 +3528,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_line_style.cxx"
+			RelativePath="..\..\src\fl_line_style.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3574,7 +3574,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_lock.cxx"
+			RelativePath="..\..\src\Fl_lock.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3620,7 +3620,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Menu.cxx"
+			RelativePath="..\..\src\Fl_Menu.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3666,7 +3666,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Menu_.cxx"
+			RelativePath="..\..\src\Fl_Menu_.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3712,7 +3712,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Menu_add.cxx"
+			RelativePath="..\..\src\Fl_Menu_add.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3758,7 +3758,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Menu_Bar.cxx"
+			RelativePath="..\..\src\Fl_Menu_Bar.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3804,7 +3804,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Menu_Button.cxx"
+			RelativePath="..\..\src\Fl_Menu_Button.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3850,7 +3850,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Menu_global.cxx"
+			RelativePath="..\..\src\Fl_Menu_global.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3896,7 +3896,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Menu_Window.cxx"
+			RelativePath="..\..\src\Fl_Menu_Window.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3942,7 +3942,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Multi_Label.cxx"
+			RelativePath="..\..\src\Fl_Multi_Label.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -3988,11 +3988,11 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_open_uri.cxx"
+			RelativePath="..\..\src\fl_open_uri.cxx"
 			>
 		</File>
 		<File
-			RelativePath="..\src\fl_oval_box.cxx"
+			RelativePath="..\..\src\fl_oval_box.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4038,7 +4038,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_overlay.cxx"
+			RelativePath="..\..\src\fl_overlay.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4084,7 +4084,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_overlay_visual.cxx"
+			RelativePath="..\..\src\fl_overlay_visual.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4130,7 +4130,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Overlay_Window.cxx"
+			RelativePath="..\..\src\Fl_Overlay_Window.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4176,7 +4176,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_own_colormap.cxx"
+			RelativePath="..\..\src\Fl_own_colormap.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4222,7 +4222,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Pack.cxx"
+			RelativePath="..\..\src\Fl_Pack.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4268,7 +4268,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Pixmap.cxx"
+			RelativePath="..\..\src\Fl_Pixmap.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4314,7 +4314,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_plastic.cxx"
+			RelativePath="..\..\src\fl_plastic.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4360,7 +4360,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Positioner.cxx"
+			RelativePath="..\..\src\Fl_Positioner.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4406,7 +4406,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Preferences.cxx"
+			RelativePath="..\..\src\Fl_Preferences.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4452,7 +4452,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Progress.cxx"
+			RelativePath="..\..\src\Fl_Progress.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4498,11 +4498,11 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_read_image.cxx"
+			RelativePath="..\..\src\fl_read_image.cxx"
 			>
 		</File>
 		<File
-			RelativePath="..\src\fl_rect.cxx"
+			RelativePath="..\..\src\fl_rect.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4548,7 +4548,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Repeat_Button.cxx"
+			RelativePath="..\..\src\Fl_Repeat_Button.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4594,7 +4594,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Return_Button.cxx"
+			RelativePath="..\..\src\Fl_Return_Button.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4640,7 +4640,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Roller.cxx"
+			RelativePath="..\..\src\Fl_Roller.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4686,7 +4686,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_round_box.cxx"
+			RelativePath="..\..\src\fl_round_box.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4732,7 +4732,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Round_Button.cxx"
+			RelativePath="..\..\src\Fl_Round_Button.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4778,7 +4778,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_rounded_box.cxx"
+			RelativePath="..\..\src\fl_rounded_box.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4824,7 +4824,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Scroll.cxx"
+			RelativePath="..\..\src\Fl_Scroll.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4870,7 +4870,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_scroll_area.cxx"
+			RelativePath="..\..\src\fl_scroll_area.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4916,7 +4916,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Scrollbar.cxx"
+			RelativePath="..\..\src\Fl_Scrollbar.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -4962,7 +4962,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_set_font.cxx"
+			RelativePath="..\..\src\fl_set_font.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5008,7 +5008,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_set_fonts.cxx"
+			RelativePath="..\..\src\fl_set_fonts.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5054,7 +5054,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_shadow_box.cxx"
+			RelativePath="..\..\src\fl_shadow_box.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5100,7 +5100,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Shared_Image.cxx"
+			RelativePath="..\..\src\Fl_Shared_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5146,7 +5146,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_shortcut.cxx"
+			RelativePath="..\..\src\fl_shortcut.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5192,7 +5192,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_show_colormap.cxx"
+			RelativePath="..\..\src\fl_show_colormap.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5238,7 +5238,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Single_Window.cxx"
+			RelativePath="..\..\src\Fl_Single_Window.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5284,7 +5284,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Slider.cxx"
+			RelativePath="..\..\src\Fl_Slider.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5330,7 +5330,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_symbols.cxx"
+			RelativePath="..\..\src\fl_symbols.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5376,7 +5376,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Tabs.cxx"
+			RelativePath="..\..\src\Fl_Tabs.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5422,7 +5422,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Text_Buffer.cxx"
+			RelativePath="..\..\src\Fl_Text_Buffer.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5468,7 +5468,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Text_Display.cxx"
+			RelativePath="..\..\src\Fl_Text_Display.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5514,7 +5514,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Text_Editor.cxx"
+			RelativePath="..\..\src\Fl_Text_Editor.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5560,7 +5560,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Tile.cxx"
+			RelativePath="..\..\src\Fl_Tile.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5606,7 +5606,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Tiled_Image.cxx"
+			RelativePath="..\..\src\Fl_Tiled_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5652,7 +5652,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Tooltip.cxx"
+			RelativePath="..\..\src\Fl_Tooltip.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5698,15 +5698,15 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_utf.c"
+			RelativePath="..\..\src\fl_utf.c"
 			>
 		</File>
 		<File
-			RelativePath="..\src\fl_utf8.cxx"
+			RelativePath="..\..\src\fl_utf8.cxx"
 			>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Valuator.cxx"
+			RelativePath="..\..\src\Fl_Valuator.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5752,7 +5752,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Value_Input.cxx"
+			RelativePath="..\..\src\Fl_Value_Input.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5798,7 +5798,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Value_Output.cxx"
+			RelativePath="..\..\src\Fl_Value_Output.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5844,7 +5844,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Value_Slider.cxx"
+			RelativePath="..\..\src\Fl_Value_Slider.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5890,7 +5890,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_vertex.cxx"
+			RelativePath="..\..\src\fl_vertex.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5936,7 +5936,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_visual.cxx"
+			RelativePath="..\..\src\Fl_visual.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -5982,7 +5982,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Widget.cxx"
+			RelativePath="..\..\src\Fl_Widget.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6028,7 +6028,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Window.cxx"
+			RelativePath="..\..\src\Fl_Window.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6074,7 +6074,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Window_fullscreen.cxx"
+			RelativePath="..\..\src\Fl_Window_fullscreen.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6120,7 +6120,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Window_hotspot.cxx"
+			RelativePath="..\..\src\Fl_Window_hotspot.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6166,7 +6166,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Window_iconize.cxx"
+			RelativePath="..\..\src\Fl_Window_iconize.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6212,7 +6212,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Wizard.cxx"
+			RelativePath="..\..\src\Fl_Wizard.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6258,7 +6258,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_x.cxx"
+			RelativePath="..\..\src\Fl_x.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6304,7 +6304,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_XBM_Image.cxx"
+			RelativePath="..\..\src\Fl_XBM_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6350,7 +6350,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_XPM_Image.cxx"
+			RelativePath="..\..\src\Fl_XPM_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6396,7 +6396,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\flstring.c"
+			RelativePath="..\..\src\flstring.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6442,15 +6442,15 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\xutf8\is_right2left.c"
+			RelativePath="..\..\src\xutf8\is_right2left.c"
 			>
 		</File>
 		<File
-			RelativePath="..\src\xutf8\is_spacing.c"
+			RelativePath="..\..\src\xutf8\is_spacing.c"
 			>
 		</File>
 		<File
-			RelativePath="..\src\numericsort.c"
+			RelativePath="..\..\src\numericsort.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6496,7 +6496,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\scandir.c"
+			RelativePath="..\..\src\scandir.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6542,7 +6542,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\screen_xywh.cxx"
+			RelativePath="..\..\src\screen_xywh.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -6588,7 +6588,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\vsnprintf.c"
+			RelativePath="..\..\src\vsnprintf.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/fltk.sln b/ide/vc2005/fltk.sln
similarity index 100%
rename from vc2005/fltk.sln
rename to ide/vc2005/fltk.sln
diff --git a/vc2005/fltkdll.vcproj b/ide/vc2005/fltkdll.vcproj
similarity index 93%
rename from vc2005/fltkdll.vcproj
rename to ide/vc2005/fltkdll.vcproj
index f90e119d0..2a33609c5 100644
--- a/vc2005/fltkdll.vcproj
+++ b/ide/vc2005/fltkdll.vcproj
@@ -16,7 +16,7 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\test"
+			OutputDirectory="..\..\test"
 			IntermediateDirectory=".\fltkdll"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -49,7 +49,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..,..\zlib,..\png,..\jpeg"
+				AdditionalIncludeDirectories=".;..,..\..\zlib,..\..\png,..\..\jpeg"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -111,7 +111,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\test"
+			OutputDirectory="..\..\test"
 			IntermediateDirectory=".\fltkdlld"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -142,7 +142,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..;..\zlib,..\png,..\jpeg"
+				AdditionalIncludeDirectories=".;..;..\..\zlib,..\..\png,..\..\jpeg"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -236,7 +236,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..;..\zlib,..\png,..\jpeg"
+				AdditionalIncludeDirectories=".;..;..\..\zlib,..\..\png,..\..\jpeg"
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -332,7 +332,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..,..\zlib,..\png,..\jpeg"
+				AdditionalIncludeDirectories=".;..,..\..\zlib,..\..\png,..\..\jpeg"
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;FL_DLL;FL_LIBRARY;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -397,11 +397,11 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\src\xutf8\case.c"
+			RelativePath="..\..\src\xutf8\case.c"
 			>
 		</File>
 		<File
-			RelativePath="..\src\filename_absolute.cxx"
+			RelativePath="..\..\src\filename_absolute.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -443,7 +443,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\filename_expand.cxx"
+			RelativePath="..\..\src\filename_expand.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -485,7 +485,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\filename_ext.cxx"
+			RelativePath="..\..\src\filename_ext.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -527,7 +527,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\filename_isdir.cxx"
+			RelativePath="..\..\src\filename_isdir.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -569,7 +569,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\filename_list.cxx"
+			RelativePath="..\..\src\filename_list.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -611,7 +611,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\filename_match.cxx"
+			RelativePath="..\..\src\filename_match.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -653,7 +653,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\filename_setext.cxx"
+			RelativePath="..\..\src\filename_setext.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -695,7 +695,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl.cxx"
+			RelativePath="..\..\src\Fl.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -737,7 +737,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_abort.cxx"
+			RelativePath="..\..\src\Fl_abort.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -779,7 +779,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_add_idle.cxx"
+			RelativePath="..\..\src\Fl_add_idle.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -821,7 +821,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Adjuster.cxx"
+			RelativePath="..\..\src\Fl_Adjuster.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -863,7 +863,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_arc.cxx"
+			RelativePath="..\..\src\fl_arc.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -905,7 +905,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_arci.cxx"
+			RelativePath="..\..\src\fl_arci.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -947,7 +947,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_arg.cxx"
+			RelativePath="..\..\src\Fl_arg.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -989,7 +989,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_ask.cxx"
+			RelativePath="..\..\src\fl_ask.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1031,7 +1031,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Bitmap.cxx"
+			RelativePath="..\..\src\Fl_Bitmap.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1073,7 +1073,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_BMP_Image.cxx"
+			RelativePath="..\..\src\Fl_BMP_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1115,7 +1115,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Box.cxx"
+			RelativePath="..\..\src\Fl_Box.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1157,7 +1157,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_boxtype.cxx"
+			RelativePath="..\..\src\fl_boxtype.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1199,7 +1199,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Browser.cxx"
+			RelativePath="..\..\src\Fl_Browser.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1241,7 +1241,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Browser_.cxx"
+			RelativePath="..\..\src\Fl_Browser_.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1283,7 +1283,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Browser_load.cxx"
+			RelativePath="..\..\src\Fl_Browser_load.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1325,7 +1325,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Button.cxx"
+			RelativePath="..\..\src\Fl_Button.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1367,7 +1367,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\cairo\Fl_Cairo.cxx"
+			RelativePath="..\..\cairo\Fl_Cairo.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1407,7 +1407,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Chart.cxx"
+			RelativePath="..\..\src\Fl_Chart.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1449,7 +1449,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Check_Browser.cxx"
+			RelativePath="..\..\src\Fl_Check_Browser.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1491,7 +1491,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Check_Button.cxx"
+			RelativePath="..\..\src\Fl_Check_Button.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1533,7 +1533,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Choice.cxx"
+			RelativePath="..\..\src\Fl_Choice.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1575,7 +1575,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Clock.cxx"
+			RelativePath="..\..\src\Fl_Clock.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1617,7 +1617,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_color.cxx"
+			RelativePath="..\..\src\fl_color.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1659,7 +1659,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Color_Chooser.cxx"
+			RelativePath="..\..\src\Fl_Color_Chooser.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1701,7 +1701,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_compose.cxx"
+			RelativePath="..\..\src\Fl_compose.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1743,7 +1743,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Counter.cxx"
+			RelativePath="..\..\src\Fl_Counter.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1785,7 +1785,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_cursor.cxx"
+			RelativePath="..\..\src\fl_cursor.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1827,7 +1827,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_curve.cxx"
+			RelativePath="..\..\src\fl_curve.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1869,7 +1869,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Dial.cxx"
+			RelativePath="..\..\src\Fl_Dial.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1911,7 +1911,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_diamond_box.cxx"
+			RelativePath="..\..\src\fl_diamond_box.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1953,7 +1953,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_display.cxx"
+			RelativePath="..\..\src\Fl_display.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -1995,7 +1995,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_dnd.cxx"
+			RelativePath="..\..\src\fl_dnd.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2037,7 +2037,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Double_Window.cxx"
+			RelativePath="..\..\src\Fl_Double_Window.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2079,7 +2079,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_draw.cxx"
+			RelativePath="..\..\src\fl_draw.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2121,7 +2121,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_draw_image.cxx"
+			RelativePath="..\..\src\fl_draw_image.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2163,7 +2163,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_draw_pixmap.cxx"
+			RelativePath="..\..\src\fl_draw_pixmap.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2205,7 +2205,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_engraved_label.cxx"
+			RelativePath="..\..\src\fl_engraved_label.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2247,7 +2247,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_File_Browser.cxx"
+			RelativePath="..\..\src\Fl_File_Browser.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2289,7 +2289,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_File_Chooser.cxx"
+			RelativePath="..\..\src\Fl_File_Chooser.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2331,7 +2331,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_File_Chooser2.cxx"
+			RelativePath="..\..\src\Fl_File_Chooser2.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2373,7 +2373,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_file_dir.cxx"
+			RelativePath="..\..\src\fl_file_dir.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2415,7 +2415,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_File_Icon.cxx"
+			RelativePath="..\..\src\Fl_File_Icon.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2457,7 +2457,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_File_Icon2.cxx"
+			RelativePath="..\..\src\Fl_File_Icon2.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2499,7 +2499,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_File_Input.cxx"
+			RelativePath="..\..\src\Fl_File_Input.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2541,7 +2541,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_font.cxx"
+			RelativePath="..\..\src\fl_font.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2583,7 +2583,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_get_key.cxx"
+			RelativePath="..\..\src\Fl_get_key.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2625,7 +2625,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_get_system_colors.cxx"
+			RelativePath="..\..\src\Fl_get_system_colors.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2667,7 +2667,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_GIF_Image.cxx"
+			RelativePath="..\..\src\Fl_GIF_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2709,7 +2709,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Gl_Choice.cxx"
+			RelativePath="..\..\src\Fl_Gl_Choice.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2751,7 +2751,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Gl_Overlay.cxx"
+			RelativePath="..\..\src\Fl_Gl_Overlay.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2793,7 +2793,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Gl_Window.cxx"
+			RelativePath="..\..\src\Fl_Gl_Window.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2835,7 +2835,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_grab.cxx"
+			RelativePath="..\..\src\Fl_grab.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2877,7 +2877,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Group.cxx"
+			RelativePath="..\..\src\Fl_Group.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2919,11 +2919,11 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_gtk.cxx"
+			RelativePath="..\..\src\fl_gtk.cxx"
 			>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Help_Dialog.cxx"
+			RelativePath="..\..\src\Fl_Help_Dialog.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -2965,7 +2965,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Help_View.cxx"
+			RelativePath="..\..\src\Fl_Help_View.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3007,7 +3007,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Image.cxx"
+			RelativePath="..\..\src\Fl_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3049,7 +3049,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_images_core.cxx"
+			RelativePath="..\..\src\fl_images_core.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3091,7 +3091,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Input.cxx"
+			RelativePath="..\..\src\Fl_Input.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3133,7 +3133,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Input_.cxx"
+			RelativePath="..\..\src\Fl_Input_.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3175,7 +3175,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_JPEG_Image.cxx"
+			RelativePath="..\..\src\Fl_JPEG_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3217,7 +3217,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_labeltype.cxx"
+			RelativePath="..\..\src\fl_labeltype.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3259,7 +3259,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Light_Button.cxx"
+			RelativePath="..\..\src\Fl_Light_Button.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3301,7 +3301,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_line_style.cxx"
+			RelativePath="..\..\src\fl_line_style.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3343,7 +3343,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_lock.cxx"
+			RelativePath="..\..\src\Fl_lock.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3385,7 +3385,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Menu.cxx"
+			RelativePath="..\..\src\Fl_Menu.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3427,7 +3427,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Menu_.cxx"
+			RelativePath="..\..\src\Fl_Menu_.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3469,7 +3469,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Menu_add.cxx"
+			RelativePath="..\..\src\Fl_Menu_add.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3511,7 +3511,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Menu_Bar.cxx"
+			RelativePath="..\..\src\Fl_Menu_Bar.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3553,7 +3553,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Menu_Button.cxx"
+			RelativePath="..\..\src\Fl_Menu_Button.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3595,7 +3595,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Menu_global.cxx"
+			RelativePath="..\..\src\Fl_Menu_global.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3637,7 +3637,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Menu_Window.cxx"
+			RelativePath="..\..\src\Fl_Menu_Window.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3679,7 +3679,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Multi_Label.cxx"
+			RelativePath="..\..\src\Fl_Multi_Label.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3721,11 +3721,11 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_open_uri.cxx"
+			RelativePath="..\..\src\fl_open_uri.cxx"
 			>
 		</File>
 		<File
-			RelativePath="..\src\fl_oval_box.cxx"
+			RelativePath="..\..\src\fl_oval_box.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3767,7 +3767,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_overlay.cxx"
+			RelativePath="..\..\src\fl_overlay.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3809,7 +3809,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_overlay_visual.cxx"
+			RelativePath="..\..\src\fl_overlay_visual.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3851,7 +3851,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Overlay_Window.cxx"
+			RelativePath="..\..\src\Fl_Overlay_Window.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3893,7 +3893,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_own_colormap.cxx"
+			RelativePath="..\..\src\Fl_own_colormap.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3935,7 +3935,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Pack.cxx"
+			RelativePath="..\..\src\Fl_Pack.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -3977,7 +3977,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Pixmap.cxx"
+			RelativePath="..\..\src\Fl_Pixmap.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4019,7 +4019,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_plastic.cxx"
+			RelativePath="..\..\src\fl_plastic.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4061,7 +4061,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_PNG_Image.cxx"
+			RelativePath="..\..\src\Fl_PNG_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4103,7 +4103,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_PNM_Image.cxx"
+			RelativePath="..\..\src\Fl_PNM_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4145,7 +4145,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Positioner.cxx"
+			RelativePath="..\..\src\Fl_Positioner.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4187,7 +4187,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Preferences.cxx"
+			RelativePath="..\..\src\Fl_Preferences.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4229,7 +4229,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Progress.cxx"
+			RelativePath="..\..\src\Fl_Progress.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4271,11 +4271,11 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_read_image.cxx"
+			RelativePath="..\..\src\fl_read_image.cxx"
 			>
 		</File>
 		<File
-			RelativePath="..\src\fl_rect.cxx"
+			RelativePath="..\..\src\fl_rect.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4317,7 +4317,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Repeat_Button.cxx"
+			RelativePath="..\..\src\Fl_Repeat_Button.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4359,7 +4359,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Return_Button.cxx"
+			RelativePath="..\..\src\Fl_Return_Button.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4401,7 +4401,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Roller.cxx"
+			RelativePath="..\..\src\Fl_Roller.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4443,7 +4443,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_round_box.cxx"
+			RelativePath="..\..\src\fl_round_box.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4485,7 +4485,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Round_Button.cxx"
+			RelativePath="..\..\src\Fl_Round_Button.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4527,7 +4527,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_rounded_box.cxx"
+			RelativePath="..\..\src\fl_rounded_box.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4569,7 +4569,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Scroll.cxx"
+			RelativePath="..\..\src\Fl_Scroll.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4611,7 +4611,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_scroll_area.cxx"
+			RelativePath="..\..\src\fl_scroll_area.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4653,7 +4653,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Scrollbar.cxx"
+			RelativePath="..\..\src\Fl_Scrollbar.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4695,7 +4695,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_set_font.cxx"
+			RelativePath="..\..\src\fl_set_font.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4737,7 +4737,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_set_fonts.cxx"
+			RelativePath="..\..\src\fl_set_fonts.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4779,7 +4779,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_shadow_box.cxx"
+			RelativePath="..\..\src\fl_shadow_box.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4821,7 +4821,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Shared_Image.cxx"
+			RelativePath="..\..\src\Fl_Shared_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4863,7 +4863,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_shortcut.cxx"
+			RelativePath="..\..\src\fl_shortcut.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4905,7 +4905,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_show_colormap.cxx"
+			RelativePath="..\..\src\fl_show_colormap.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4947,7 +4947,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Single_Window.cxx"
+			RelativePath="..\..\src\Fl_Single_Window.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -4989,7 +4989,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Slider.cxx"
+			RelativePath="..\..\src\Fl_Slider.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5031,7 +5031,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_symbols.cxx"
+			RelativePath="..\..\src\fl_symbols.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5073,7 +5073,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Tabs.cxx"
+			RelativePath="..\..\src\Fl_Tabs.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5115,7 +5115,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Text_Buffer.cxx"
+			RelativePath="..\..\src\Fl_Text_Buffer.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5157,7 +5157,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Text_Display.cxx"
+			RelativePath="..\..\src\Fl_Text_Display.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5199,7 +5199,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Text_Editor.cxx"
+			RelativePath="..\..\src\Fl_Text_Editor.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5241,7 +5241,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Tile.cxx"
+			RelativePath="..\..\src\Fl_Tile.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5283,7 +5283,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Tiled_Image.cxx"
+			RelativePath="..\..\src\Fl_Tiled_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5325,7 +5325,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Tooltip.cxx"
+			RelativePath="..\..\src\Fl_Tooltip.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5367,15 +5367,15 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_utf.c"
+			RelativePath="..\..\src\fl_utf.c"
 			>
 		</File>
 		<File
-			RelativePath="..\src\fl_utf8.cxx"
+			RelativePath="..\..\src\fl_utf8.cxx"
 			>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Valuator.cxx"
+			RelativePath="..\..\src\Fl_Valuator.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5417,7 +5417,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Value_Input.cxx"
+			RelativePath="..\..\src\Fl_Value_Input.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5459,7 +5459,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Value_Output.cxx"
+			RelativePath="..\..\src\Fl_Value_Output.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5501,7 +5501,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Value_Slider.cxx"
+			RelativePath="..\..\src\Fl_Value_Slider.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5543,7 +5543,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_vertex.cxx"
+			RelativePath="..\..\src\fl_vertex.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5585,7 +5585,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_visual.cxx"
+			RelativePath="..\..\src\Fl_visual.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5627,7 +5627,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Widget.cxx"
+			RelativePath="..\..\src\Fl_Widget.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5669,7 +5669,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Window.cxx"
+			RelativePath="..\..\src\Fl_Window.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5711,7 +5711,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Window_fullscreen.cxx"
+			RelativePath="..\..\src\Fl_Window_fullscreen.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5753,7 +5753,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Window_hotspot.cxx"
+			RelativePath="..\..\src\Fl_Window_hotspot.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5795,7 +5795,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Window_iconize.cxx"
+			RelativePath="..\..\src\Fl_Window_iconize.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5837,7 +5837,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Wizard.cxx"
+			RelativePath="..\..\src\Fl_Wizard.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5879,7 +5879,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_x.cxx"
+			RelativePath="..\..\src\Fl_x.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5921,7 +5921,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_XBM_Image.cxx"
+			RelativePath="..\..\src\Fl_XBM_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -5963,7 +5963,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_XPM_Image.cxx"
+			RelativePath="..\..\src\Fl_XPM_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6005,7 +6005,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\flstring.c"
+			RelativePath="..\..\src\flstring.c"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6047,7 +6047,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\forms_bitmap.cxx"
+			RelativePath="..\..\src\forms_bitmap.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6089,7 +6089,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\forms_compatability.cxx"
+			RelativePath="..\..\src\forms_compatability.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6131,7 +6131,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\forms_free.cxx"
+			RelativePath="..\..\src\forms_free.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6173,7 +6173,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\forms_fselect.cxx"
+			RelativePath="..\..\src\forms_fselect.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6215,7 +6215,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\forms_pixmap.cxx"
+			RelativePath="..\..\src\forms_pixmap.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6257,7 +6257,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\forms_timer.cxx"
+			RelativePath="..\..\src\forms_timer.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6299,23 +6299,23 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\freeglut_geometry.cxx"
+			RelativePath="..\..\src\freeglut_geometry.cxx"
 			>
 		</File>
 		<File
-			RelativePath="..\src\freeglut_stroke_mono_roman.cxx"
+			RelativePath="..\..\src\freeglut_stroke_mono_roman.cxx"
 			>
 		</File>
 		<File
-			RelativePath="..\src\freeglut_stroke_roman.cxx"
+			RelativePath="..\..\src\freeglut_stroke_roman.cxx"
 			>
 		</File>
 		<File
-			RelativePath="..\src\freeglut_teapot.cxx"
+			RelativePath="..\..\src\freeglut_teapot.cxx"
 			>
 		</File>
 		<File
-			RelativePath="..\src\gl_draw.cxx"
+			RelativePath="..\..\src\gl_draw.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6357,7 +6357,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\gl_start.cxx"
+			RelativePath="..\..\src\gl_start.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6399,7 +6399,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\glut_compatability.cxx"
+			RelativePath="..\..\src\glut_compatability.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6441,7 +6441,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\glut_font.cxx"
+			RelativePath="..\..\src\glut_font.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6483,15 +6483,15 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\xutf8\is_right2left.c"
+			RelativePath="..\..\src\xutf8\is_right2left.c"
 			>
 		</File>
 		<File
-			RelativePath="..\src\xutf8\is_spacing.c"
+			RelativePath="..\..\src\xutf8\is_spacing.c"
 			>
 		</File>
 		<File
-			RelativePath="..\src\numericsort.c"
+			RelativePath="..\..\src\numericsort.c"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6533,7 +6533,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\scandir.c"
+			RelativePath="..\..\src\scandir.c"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6575,7 +6575,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\screen_xywh.cxx"
+			RelativePath="..\..\src\screen_xywh.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -6617,7 +6617,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\vsnprintf.c"
+			RelativePath="..\..\src\vsnprintf.c"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/fltkforms.vcproj b/ide/vc2005/fltkforms.vcproj
similarity index 90%
rename from vc2005/fltkforms.vcproj
rename to ide/vc2005/fltkforms.vcproj
index 6cf394059..1db380396 100644
--- a/vc2005/fltkforms.vcproj
+++ b/ide/vc2005/fltkforms.vcproj
@@ -43,7 +43,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -66,7 +66,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkforms.lib"
+				OutputFile="..\..\lib\fltkforms.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -112,7 +112,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -137,7 +137,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkformsd.lib"
+				OutputFile="..\..\lib\fltkformsd.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -183,7 +183,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -208,7 +208,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkformsd.lib"
+				OutputFile="..\..\lib\fltkformsd.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -256,7 +256,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary= "2"
 				UsePrecompiledHeader="0"
@@ -279,7 +279,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkforms.lib"
+				OutputFile="..\..\lib\fltkforms.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -303,7 +303,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\src\forms_bitmap.cxx"
+			RelativePath="..\..\src\forms_bitmap.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -349,7 +349,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\forms_compatability.cxx"
+			RelativePath="..\..\src\forms_compatability.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -395,7 +395,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\forms_free.cxx"
+			RelativePath="..\..\src\forms_free.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -441,7 +441,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\forms_fselect.cxx"
+			RelativePath="..\..\src\forms_fselect.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -487,7 +487,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\forms_pixmap.cxx"
+			RelativePath="..\..\src\forms_pixmap.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -533,7 +533,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\forms_timer.cxx"
+			RelativePath="..\..\src\forms_timer.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/fltkgl.vcproj b/ide/vc2005/fltkgl.vcproj
similarity index 89%
rename from vc2005/fltkgl.vcproj
rename to ide/vc2005/fltkgl.vcproj
index f2f47fe84..09439fdbb 100644
--- a/vc2005/fltkgl.vcproj
+++ b/ide/vc2005/fltkgl.vcproj
@@ -43,7 +43,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -66,7 +66,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkgl.lib"
+				OutputFile="..\..\lib\fltkgl.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -112,7 +112,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -137,7 +137,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkgld.lib"
+				OutputFile="..\..\lib\fltkgld.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -183,7 +183,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -208,7 +208,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkgld.lib"
+				OutputFile="..\..\lib\fltkgld.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -256,7 +256,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary= "2"
 				UsePrecompiledHeader="0"
@@ -279,7 +279,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkgl.lib"
+				OutputFile="..\..\lib\fltkgl.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -303,7 +303,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\src\Fl_Gl_Choice.cxx"
+			RelativePath="..\..\src\Fl_Gl_Choice.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -349,7 +349,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Gl_Overlay.cxx"
+			RelativePath="..\..\src\Fl_Gl_Overlay.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -395,7 +395,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Gl_Window.cxx"
+			RelativePath="..\..\src\Fl_Gl_Window.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -441,23 +441,23 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\freeglut_geometry.cxx"
+			RelativePath="..\..\src\freeglut_geometry.cxx"
 			>
 		</File>
 		<File
-			RelativePath="..\src\freeglut_stroke_mono_roman.cxx"
+			RelativePath="..\..\src\freeglut_stroke_mono_roman.cxx"
 			>
 		</File>
 		<File
-			RelativePath="..\src\freeglut_stroke_roman.cxx"
+			RelativePath="..\..\src\freeglut_stroke_roman.cxx"
 			>
 		</File>
 		<File
-			RelativePath="..\src\freeglut_teapot.cxx"
+			RelativePath="..\..\src\freeglut_teapot.cxx"
 			>
 		</File>
 		<File
-			RelativePath="..\src\gl_draw.cxx"
+			RelativePath="..\..\src\gl_draw.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -503,7 +503,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\gl_start.cxx"
+			RelativePath="..\..\src\gl_start.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -549,7 +549,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\glut_compatability.cxx"
+			RelativePath="..\..\src\glut_compatability.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -595,7 +595,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\glut_font.cxx"
+			RelativePath="..\..\src\glut_font.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/fltkimages.vcproj b/ide/vc2005/fltkimages.vcproj
similarity index 90%
rename from vc2005/fltkimages.vcproj
rename to ide/vc2005/fltkimages.vcproj
index 227e9dd60..5af87c9fc 100644
--- a/vc2005/fltkimages.vcproj
+++ b/ide/vc2005/fltkimages.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -66,7 +66,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkimagesd.lib"
+				OutputFile="..\..\lib\fltkimagesd.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -114,7 +114,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -137,7 +137,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkimages.lib"
+				OutputFile="..\..\lib\fltkimages.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -183,7 +183,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -208,7 +208,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkimagesd.lib"
+				OutputFile="..\..\lib\fltkimagesd.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -256,7 +256,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary= "2"
 				UsePrecompiledHeader="0"
@@ -279,7 +279,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkimages.lib"
+				OutputFile="..\..\lib\fltkimages.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -303,7 +303,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\src\Fl_BMP_Image.cxx"
+			RelativePath="..\..\src\Fl_BMP_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -349,7 +349,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_File_Icon2.cxx"
+			RelativePath="..\..\src\Fl_File_Icon2.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -395,7 +395,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_GIF_Image.cxx"
+			RelativePath="..\..\src\Fl_GIF_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -441,7 +441,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_Help_Dialog.cxx"
+			RelativePath="..\..\src\Fl_Help_Dialog.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -487,7 +487,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\fl_images_core.cxx"
+			RelativePath="..\..\src\fl_images_core.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -533,7 +533,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_JPEG_Image.cxx"
+			RelativePath="..\..\src\Fl_JPEG_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -579,7 +579,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_PNG_Image.cxx"
+			RelativePath="..\..\src\Fl_PNG_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -625,7 +625,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\Fl_PNM_Image.cxx"
+			RelativePath="..\..\src\Fl_PNM_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/fluid.vcproj b/ide/vc2005/fluid.vcproj
similarity index 90%
rename from vc2005/fluid.vcproj
rename to ide/vc2005/fluid.vcproj
index ef14ec3a0..40eff5206 100644
--- a/vc2005/fluid.vcproj
+++ b/ide/vc2005/fluid.vcproj
@@ -4,6 +4,7 @@
 	Version="8,00"
 	Name="fluid"
 	ProjectGUID="{8AED3078-8CD8-40C9-A8FF-46080024F1EB}"
+	RootNamespace="fluid"
 	>
 	<Platforms>
 		<Platform
@@ -46,7 +47,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -72,10 +73,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib"
-				OutputFile="../fluid/fluidd.exe"
+				OutputFile="../../fluid/fluidd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcmtd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\fluid__0/fluidd.pdb"
@@ -142,7 +143,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -167,10 +168,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib"
-				OutputFile="../fluid/fluid.exe"
+				OutputFile="../../fluid/fluid.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcmt"
 				ProgramDatabaseFile=".\fluid___/fluid.pdb"
 				SubSystem="2"
@@ -234,7 +235,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +264,7 @@
 				OutputFile="../fluid/fluidd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcmtd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\fluid__0/fluidd.pdb"
@@ -330,7 +331,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +359,7 @@
 				OutputFile="../fluid/fluid.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcmt"
 				ProgramDatabaseFile=".\fluid___/fluid.pdb"
 				SubSystem="2"
@@ -394,7 +395,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\fluid\about_panel.cxx"
+			RelativePath="..\..\fluid\about_panel.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -438,7 +439,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\fluid\align_widget.cxx"
+			RelativePath="..\..\fluid\align_widget.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -482,7 +483,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\fluid\alignment_panel.cxx"
+			RelativePath="..\..\fluid\alignment_panel.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -526,7 +527,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\fluid\code.cxx"
+			RelativePath="..\..\fluid\code.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -570,7 +571,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\fluid\CodeEditor.cxx"
+			RelativePath="..\..\fluid\CodeEditor.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -614,7 +615,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\fluid\factory.cxx"
+			RelativePath="..\..\fluid\factory.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -658,7 +659,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\fluid\file.cxx"
+			RelativePath="..\..\fluid\file.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -702,7 +703,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\fluid\Fl_Function_Type.cxx"
+			RelativePath="..\..\fluid\Fl_Function_Type.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -746,7 +747,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\fluid\Fl_Group_Type.cxx"
+			RelativePath="..\..\fluid\Fl_Group_Type.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -790,7 +791,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\fluid\Fl_Menu_Type.cxx"
+			RelativePath="..\..\fluid\Fl_Menu_Type.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -834,7 +835,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\fluid\Fl_Type.cxx"
+			RelativePath="..\..\fluid\Fl_Type.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -878,7 +879,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\fluid\Fl_Widget_Type.cxx"
+			RelativePath="..\..\fluid\Fl_Widget_Type.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -922,7 +923,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\fluid\Fl_Window_Type.cxx"
+			RelativePath="..\..\fluid\Fl_Window_Type.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -966,7 +967,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\fluid\fluid.cxx"
+			RelativePath="..\..\fluid\fluid.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1010,7 +1011,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\fluid\Fluid_Image.cxx"
+			RelativePath="..\..\fluid\Fluid_Image.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1054,7 +1055,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\fluid\function_panel.cxx"
+			RelativePath="..\..\fluid\function_panel.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1098,11 +1099,11 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\fluid\template_panel.cxx"
+			RelativePath="..\..\fluid\template_panel.cxx"
 			>
 		</File>
 		<File
-			RelativePath="..\fluid\undo.cxx"
+			RelativePath="..\..\fluid\undo.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1146,7 +1147,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\fluid\widget_panel.cxx"
+			RelativePath="..\..\fluid\widget_panel.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/fonts.vcproj b/ide/vc2005/fonts.vcproj
similarity index 91%
rename from vc2005/fonts.vcproj
rename to ide/vc2005/fonts.vcproj
index 612036ab2..41e792655 100644
--- a/vc2005/fonts.vcproj
+++ b/ide/vc2005/fonts.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/fontsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\fonts_/fontsd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/fonts.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/fonts.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/fontsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\fonts_/fontsd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/fonts.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/fonts.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\fonts.cxx"
+			RelativePath="..\..\test\fonts.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/forms.vcproj b/ide/vc2005/forms.vcproj
similarity index 91%
rename from vc2005/forms.vcproj
rename to ide/vc2005/forms.vcproj
index 6f9ce0f04..5ae487680 100644
--- a/vc2005/forms.vcproj
+++ b/ide/vc2005/forms.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/formsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\forms_/formsd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/forms.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/forms.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/formsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\forms_/formsd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/forms.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/forms.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\forms.cxx"
+			RelativePath="..\..\test\forms.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/fractals.vcproj b/ide/vc2005/fractals.vcproj
similarity index 91%
rename from vc2005/fractals.vcproj
rename to ide/vc2005/fractals.vcproj
index 4562a3337..447589b60 100644
--- a/vc2005/fractals.vcproj
+++ b/ide/vc2005/fractals.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/fractalsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\fractals_/fractalsd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/fractals.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/fractals.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1; _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/fractalsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\fractals_/fractalsd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/fractals.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/fractals.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\fractals.cxx"
+			RelativePath="..\..\test\fractals.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -436,7 +436,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\test\fracviewer.cxx"
+			RelativePath="..\..\test\fracviewer.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/fullscreen.vcproj b/ide/vc2005/fullscreen.vcproj
similarity index 91%
rename from vc2005/fullscreen.vcproj
rename to ide/vc2005/fullscreen.vcproj
index a71c77aee..9145f0512 100644
--- a/vc2005/fullscreen.vcproj
+++ b/ide/vc2005/fullscreen.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/fullscreend.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\fullscreen_/fullscreend.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/fullscreen.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/fullscreen.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/fullscreend.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\fullscreen_/fullscreend.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/fullscreen.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/fullscreen.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\fullscreen.cxx"
+			RelativePath="..\..\test\fullscreen.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/gl_overlay.vcproj b/ide/vc2005/gl_overlay.vcproj
similarity index 91%
rename from vc2005/gl_overlay.vcproj
rename to ide/vc2005/gl_overlay.vcproj
index f9828fc5d..846ec62af 100644
--- a/vc2005/gl_overlay.vcproj
+++ b/ide/vc2005/gl_overlay.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/gl_overlay.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/gl_overlay.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/gl_overlayd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\gl_overlay_/gl_overlayd.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/gl_overlayd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\gl_overlay_/gl_overlayd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/gl_overlay.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/gl_overlay.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\gl_overlay.cxx"
+			RelativePath="..\..\test\gl_overlay.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/glpuzzle.vcproj b/ide/vc2005/glpuzzle.vcproj
similarity index 91%
rename from vc2005/glpuzzle.vcproj
rename to ide/vc2005/glpuzzle.vcproj
index b3882b7bc..f8a4ed403 100644
--- a/vc2005/glpuzzle.vcproj
+++ b/ide/vc2005/glpuzzle.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/glpuzzled.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\glpuzzle_/glpuzzled.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/glpuzzle.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/glpuzzle.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/glpuzzled.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\glpuzzle_/glpuzzled.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/glpuzzle.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/glpuzzle.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\glpuzzle.cxx"
+			RelativePath="..\..\test\glpuzzle.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/hello.vcproj b/ide/vc2005/hello.vcproj
similarity index 91%
rename from vc2005/hello.vcproj
rename to ide/vc2005/hello.vcproj
index 898aff207..906152e3b 100644
--- a/vc2005/hello.vcproj
+++ b/ide/vc2005/hello.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/hellod.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\hello_/hellod.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/hello.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/hello.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/hellod.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\hello_/hellod.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/hello.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/hello.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\hello.cxx"
+			RelativePath="..\..\test\hello.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/help.vcproj b/ide/vc2005/help.vcproj
similarity index 91%
rename from vc2005/help.vcproj
rename to ide/vc2005/help.vcproj
index 2ccc2c66b..cb85e9611 100644
--- a/vc2005/help.vcproj
+++ b/ide/vc2005/help.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/help.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcmt"
 				ProgramDatabaseFile=".\Release/help.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/helpd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcmtd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\help_/helpd.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/helpd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcmtd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\help_/helpd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/help.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcmt"
 				ProgramDatabaseFile=".\Release/help.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\help.cxx"
+			RelativePath="..\..\test\help.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/iconize.vcproj b/ide/vc2005/iconize.vcproj
similarity index 91%
rename from vc2005/iconize.vcproj
rename to ide/vc2005/iconize.vcproj
index aa813f21e..aa4dfdeda 100644
--- a/vc2005/iconize.vcproj
+++ b/ide/vc2005/iconize.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/iconized.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\iconize_/iconized.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/iconize.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/iconize.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/iconized.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\iconize_/iconized.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/iconize.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/iconize.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\iconize.cxx"
+			RelativePath="..\..\test\iconize.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/image.vcproj b/ide/vc2005/image.vcproj
similarity index 91%
rename from vc2005/image.vcproj
rename to ide/vc2005/image.vcproj
index f5f00d4cf..96b1d21c1 100644
--- a/vc2005/image.vcproj
+++ b/ide/vc2005/image.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/image.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/image.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/imaged.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\image_/imaged.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1; _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/imaged.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\image_/imaged.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/image.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/image.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\image.cxx"
+			RelativePath="..\..\test\image.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/inactive.vcproj b/ide/vc2005/inactive.vcproj
similarity index 86%
rename from vc2005/inactive.vcproj
rename to ide/vc2005/inactive.vcproj
index ab1acabed..6f138cd85 100644
--- a/vc2005/inactive.vcproj
+++ b/ide/vc2005/inactive.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/inactived.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\inactive_/inactived.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/inactive.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/inactive.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/inactived.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\inactive_/inactived.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/inactive.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/inactive.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\inactive.cxx"
+			RelativePath="..\..\test\inactive.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -436,7 +436,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\test\inactive.fl"
+			RelativePath="..\..\test\inactive.fl"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -444,8 +444,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c inactive.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\inactive.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -454,8 +454,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c inactive.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\inactive.cxx"
+					CommandLine="cfluid  $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -464,8 +464,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c inactive.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\inactive.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -474,8 +474,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c inactive.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\inactive.cxx"
+					CommandLine="cfluid -c $(InputName).fl"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/vc2005/input.vcproj b/ide/vc2005/input.vcproj
similarity index 91%
rename from vc2005/input.vcproj
rename to ide/vc2005/input.vcproj
index e259922cd..18f2ff230 100644
--- a/vc2005/input.vcproj
+++ b/ide/vc2005/input.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/input.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/input.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/inputd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\input_/inputd.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/inputd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\input_/inputd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/input.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/input.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\input.cxx"
+			RelativePath="..\..\test\input.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/input_choice.vcproj b/ide/vc2005/input_choice.vcproj
similarity index 91%
rename from vc2005/input_choice.vcproj
rename to ide/vc2005/input_choice.vcproj
index 9e8ce45b9..e20f8b35d 100644
--- a/vc2005/input_choice.vcproj
+++ b/ide/vc2005/input_choice.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/input_choiced.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\input_choice_/input_choiced.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/input_choice.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/input_choice.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/input_choiced.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\input_choice_/input_choiced.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/input_choice.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/input_choice.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\input_choice.cxx"
+			RelativePath="..\..\test\input_choice.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/jpeg.vcproj b/ide/vc2005/jpeg.vcproj
similarity index 91%
rename from vc2005/jpeg.vcproj
rename to ide/vc2005/jpeg.vcproj
index 9ee8a9b8e..c953e7074 100644
--- a/vc2005/jpeg.vcproj
+++ b/ide/vc2005/jpeg.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -64,7 +64,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkjpegd.lib"
+				OutputFile="..\..\lib\fltkjpegd.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -112,7 +112,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -136,7 +136,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkjpeg.lib"
+				OutputFile="..\..\lib\fltkjpeg.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -182,7 +182,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkjpegd.lib"
+				OutputFile="..\..\lib\fltkjpegd.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -254,7 +254,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -278,7 +278,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkjpeg.lib"
+				OutputFile="..\..\lib\fltkjpeg.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -302,7 +302,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\jpeg\jcapimin.c"
+			RelativePath="..\..\jpeg\jcapimin.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -346,7 +346,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jcapistd.c"
+			RelativePath="..\..\jpeg\jcapistd.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -390,7 +390,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jccoefct.c"
+			RelativePath="..\..\jpeg\jccoefct.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -434,7 +434,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jccolor.c"
+			RelativePath="..\..\jpeg\jccolor.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -478,7 +478,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jcdctmgr.c"
+			RelativePath="..\..\jpeg\jcdctmgr.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -522,7 +522,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jchuff.c"
+			RelativePath="..\..\jpeg\jchuff.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -566,7 +566,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jcinit.c"
+			RelativePath="..\..\jpeg\jcinit.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -610,7 +610,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jcmainct.c"
+			RelativePath="..\..\jpeg\jcmainct.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -654,7 +654,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jcmarker.c"
+			RelativePath="..\..\jpeg\jcmarker.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -698,7 +698,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jcmaster.c"
+			RelativePath="..\..\jpeg\jcmaster.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -742,7 +742,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jcomapi.c"
+			RelativePath="..\..\jpeg\jcomapi.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -786,7 +786,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jcparam.c"
+			RelativePath="..\..\jpeg\jcparam.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -830,7 +830,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jcphuff.c"
+			RelativePath="..\..\jpeg\jcphuff.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -874,7 +874,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jcprepct.c"
+			RelativePath="..\..\jpeg\jcprepct.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -918,7 +918,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jcsample.c"
+			RelativePath="..\..\jpeg\jcsample.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -962,7 +962,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jctrans.c"
+			RelativePath="..\..\jpeg\jctrans.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1006,7 +1006,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jdapimin.c"
+			RelativePath="..\..\jpeg\jdapimin.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1050,7 +1050,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jdapistd.c"
+			RelativePath="..\..\jpeg\jdapistd.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1094,7 +1094,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jdatadst.c"
+			RelativePath="..\..\jpeg\jdatadst.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1138,7 +1138,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jdatasrc.c"
+			RelativePath="..\..\jpeg\jdatasrc.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1182,7 +1182,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jdcoefct.c"
+			RelativePath="..\..\jpeg\jdcoefct.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1226,7 +1226,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jdcolor.c"
+			RelativePath="..\..\jpeg\jdcolor.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1270,7 +1270,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jddctmgr.c"
+			RelativePath="..\..\jpeg\jddctmgr.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1314,7 +1314,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jdhuff.c"
+			RelativePath="..\..\jpeg\jdhuff.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1358,7 +1358,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jdinput.c"
+			RelativePath="..\..\jpeg\jdinput.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1402,7 +1402,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jdmainct.c"
+			RelativePath="..\..\jpeg\jdmainct.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1446,7 +1446,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jdmarker.c"
+			RelativePath="..\..\jpeg\jdmarker.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1490,7 +1490,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jdmaster.c"
+			RelativePath="..\..\jpeg\jdmaster.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1534,7 +1534,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jdmerge.c"
+			RelativePath="..\..\jpeg\jdmerge.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1578,7 +1578,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jdphuff.c"
+			RelativePath="..\..\jpeg\jdphuff.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1622,7 +1622,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jdpostct.c"
+			RelativePath="..\..\jpeg\jdpostct.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1666,7 +1666,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jdsample.c"
+			RelativePath="..\..\jpeg\jdsample.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1710,7 +1710,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jdtrans.c"
+			RelativePath="..\..\jpeg\jdtrans.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1754,7 +1754,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jerror.c"
+			RelativePath="..\..\jpeg\jerror.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1798,7 +1798,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jfdctflt.c"
+			RelativePath="..\..\jpeg\jfdctflt.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1842,7 +1842,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jfdctfst.c"
+			RelativePath="..\..\jpeg\jfdctfst.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1886,7 +1886,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jfdctint.c"
+			RelativePath="..\..\jpeg\jfdctint.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1930,7 +1930,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jidctflt.c"
+			RelativePath="..\..\jpeg\jidctflt.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -1974,7 +1974,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jidctfst.c"
+			RelativePath="..\..\jpeg\jidctfst.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2018,7 +2018,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jidctint.c"
+			RelativePath="..\..\jpeg\jidctint.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2062,7 +2062,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jidctred.c"
+			RelativePath="..\..\jpeg\jidctred.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2106,7 +2106,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jmemmgr.c"
+			RelativePath="..\..\jpeg\jmemmgr.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2150,7 +2150,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jmemnobs.c"
+			RelativePath="..\..\jpeg\jmemnobs.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2198,7 +2198,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jquant1.c"
+			RelativePath="..\..\jpeg\jquant1.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2242,7 +2242,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jquant2.c"
+			RelativePath="..\..\jpeg\jquant2.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -2286,7 +2286,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\jpeg\jutils.c"
+			RelativePath="..\..\jpeg\jutils.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/keyboard.vcproj b/ide/vc2005/keyboard.vcproj
similarity index 87%
rename from vc2005/keyboard.vcproj
rename to ide/vc2005/keyboard.vcproj
index 70fa5d455..fb22e9d5f 100644
--- a/vc2005/keyboard.vcproj
+++ b/ide/vc2005/keyboard.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/keyboard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/keyboard.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/keyboardd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\keyboard_/keyboardd.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/keyboardd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\keyboard_/keyboardd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/keyboard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/keyboard.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\keyboard.cxx"
+			RelativePath="..\..\test\keyboard.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -436,7 +436,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\test\keyboard_ui.cxx"
+			RelativePath="..\..\test\keyboard_ui.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -478,7 +478,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\test\keyboard_ui.fl"
+			RelativePath="..\..\test\keyboard_ui.fl"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -486,8 +486,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c keyboard_ui.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\keyboard_ui.cxx"
+					CommandLine="cfluid $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -496,8 +496,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c keyboard_ui.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\keyboard_ui.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -506,8 +506,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c keyboard_ui.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\keyboard_ui.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -516,8 +516,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c keyboard_ui.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\keyboard_ui.cxx"
+					CommandLine="cfluid $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/vc2005/label.vcproj b/ide/vc2005/label.vcproj
similarity index 91%
rename from vc2005/label.vcproj
rename to ide/vc2005/label.vcproj
index 6d39bf34b..d53509121 100644
--- a/vc2005/label.vcproj
+++ b/ide/vc2005/label.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/labeld.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\label_/labeld.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/label.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/label.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/labeld.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\label_/labeld.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/label.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/label.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\label.cxx"
+			RelativePath="..\..\test\label.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/libpng.vcproj b/ide/vc2005/libpng.vcproj
similarity index 90%
rename from vc2005/libpng.vcproj
rename to ide/vc2005/libpng.vcproj
index df1ef965f..7444d2d8c 100644
--- a/vc2005/libpng.vcproj
+++ b/ide/vc2005/libpng.vcproj
@@ -42,7 +42,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -66,7 +66,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkpng.lib"
+				OutputFile="..\..\lib\fltkpng.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -112,7 +112,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -136,7 +136,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkpngd.lib"
+				OutputFile="..\..\lib\fltkpngd.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -182,7 +182,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkpngd.lib"
+				OutputFile="..\..\lib\fltkpngd.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -254,7 +254,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -278,7 +278,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\fltkpng.lib"
+				OutputFile="..\..\lib\fltkpng.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -302,7 +302,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\png\png.c"
+			RelativePath="..\..\png\png.c"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -346,7 +346,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\png\pngerror.c"
+			RelativePath="..\..\png\pngerror.c"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -390,7 +390,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\png\pngget.c"
+			RelativePath="..\..\png\pngget.c"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -434,7 +434,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\png\pngmem.c"
+			RelativePath="..\..\png\pngmem.c"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -478,7 +478,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\png\pngpread.c"
+			RelativePath="..\..\png\pngpread.c"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -522,7 +522,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\png\pngread.c"
+			RelativePath="..\..\png\pngread.c"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -566,7 +566,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\png\pngrio.c"
+			RelativePath="..\..\png\pngrio.c"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -610,7 +610,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\png\pngrtran.c"
+			RelativePath="..\..\png\pngrtran.c"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -654,7 +654,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\png\pngrutil.c"
+			RelativePath="..\..\png\pngrutil.c"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -698,7 +698,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\png\pngset.c"
+			RelativePath="..\..\png\pngset.c"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -742,7 +742,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\png\pngtrans.c"
+			RelativePath="..\..\png\pngtrans.c"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -786,7 +786,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\png\pngwio.c"
+			RelativePath="..\..\png\pngwio.c"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -830,7 +830,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\png\pngwrite.c"
+			RelativePath="..\..\png\pngwrite.c"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -874,7 +874,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\png\pngwtran.c"
+			RelativePath="..\..\png\pngwtran.c"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -918,7 +918,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\png\pngwutil.c"
+			RelativePath="..\..\png\pngwutil.c"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/line_style.vcproj b/ide/vc2005/line_style.vcproj
similarity index 91%
rename from vc2005/line_style.vcproj
rename to ide/vc2005/line_style.vcproj
index 16bee051c..8736b5170 100644
--- a/vc2005/line_style.vcproj
+++ b/ide/vc2005/line_style.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/line_style.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/line_style.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/line_styled.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\line_style_/line_styled.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/line_styled.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\line_style_/line_styled.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/line_style.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/line_style.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\line_style.cxx"
+			RelativePath="..\..\test\line_style.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/mandelbrot.vcproj b/ide/vc2005/mandelbrot.vcproj
similarity index 87%
rename from vc2005/mandelbrot.vcproj
rename to ide/vc2005/mandelbrot.vcproj
index 248247c53..0add3748f 100644
--- a/vc2005/mandelbrot.vcproj
+++ b/ide/vc2005/mandelbrot.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/mandelbrotd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\mandelbrot_/mandelbrotd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/mandelbrot.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/mandelbrot.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/mandelbrotd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\mandelbrot_/mandelbrotd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/mandelbrot.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/mandelbrot.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\mandelbrot.cxx"
+			RelativePath="..\..\test\mandelbrot.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -436,7 +436,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\test\mandelbrot_ui.cxx"
+			RelativePath="..\..\test\mandelbrot_ui.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -478,7 +478,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\test\mandelbrot_ui.fl"
+			RelativePath="..\..\test\mandelbrot_ui.fl"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -486,8 +486,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c mandelbrot_ui.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/mandelbrot_ui.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -496,8 +496,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c mandelbrot_ui.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/mandelbrot_ui.cxx"
+					CommandLine="cfluid $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -506,8 +506,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c mandelbrot_ui.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/mandelbrot_ui.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -516,8 +516,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c mandelbrot_ui.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/mandelbrot_ui.cxx"
+					CommandLine="cfluid $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/vc2005/menubar.vcproj b/ide/vc2005/menubar.vcproj
similarity index 91%
rename from vc2005/menubar.vcproj
rename to ide/vc2005/menubar.vcproj
index b4aea08e5..39040837d 100644
--- a/vc2005/menubar.vcproj
+++ b/ide/vc2005/menubar.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/menubard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\menubar_/menubard.pdb"
@@ -141,7 +141,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/menubar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/menubar.pdb"
 				TargetMachine="1"
@@ -232,7 +232,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -261,7 +261,7 @@
 				OutputFile="../test/menubard.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\menubar_/menubard.pdb"
@@ -327,7 +327,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -355,7 +355,7 @@
 				OutputFile="../test/menubar.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/menubar.pdb"
 				TargetMachine="1"
@@ -390,7 +390,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\menubar.cxx"
+			RelativePath="..\..\test\menubar.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/message.vcproj b/ide/vc2005/message.vcproj
similarity index 91%
rename from vc2005/message.vcproj
rename to ide/vc2005/message.vcproj
index ce178a8fc..7673095e8 100644
--- a/vc2005/message.vcproj
+++ b/ide/vc2005/message.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/messaged.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\message_/messaged.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/message.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/message.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/messaged.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\message_/messaged.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/message.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/message.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\message.cxx"
+			RelativePath="..\..\test\message.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/minimum.vcproj b/ide/vc2005/minimum.vcproj
similarity index 91%
rename from vc2005/minimum.vcproj
rename to ide/vc2005/minimum.vcproj
index 0fb528c59..7ec1d81d5 100644
--- a/vc2005/minimum.vcproj
+++ b/ide/vc2005/minimum.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/minimum.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/minimum.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/minimumd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\minimum_/minimumd.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/minimumd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\minimum_/minimumd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/minimum.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/minimum.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\minimum.cxx"
+			RelativePath="..\..\test\minimum.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/navigation.vcproj b/ide/vc2005/navigation.vcproj
similarity index 91%
rename from vc2005/navigation.vcproj
rename to ide/vc2005/navigation.vcproj
index 6df4d43c4..908f02d54 100644
--- a/vc2005/navigation.vcproj
+++ b/ide/vc2005/navigation.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/navigation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/navigation.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/navigationd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\navigation_/navigationd.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/navigationd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\navigation_/navigationd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/navigation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/navigation.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\navigation.cxx"
+			RelativePath="..\..\test\navigation.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/output.vcproj b/ide/vc2005/output.vcproj
similarity index 91%
rename from vc2005/output.vcproj
rename to ide/vc2005/output.vcproj
index e4a33d08b..7b5ccebb7 100644
--- a/vc2005/output.vcproj
+++ b/ide/vc2005/output.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/output.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/output.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/outputd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\output_/outputd.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/outputd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\output_/outputd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/output.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/output.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\output.cxx"
+			RelativePath="..\..\test\output.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/overlay.vcproj b/ide/vc2005/overlay.vcproj
similarity index 91%
rename from vc2005/overlay.vcproj
rename to ide/vc2005/overlay.vcproj
index 4b319f9f3..597f565db 100644
--- a/vc2005/overlay.vcproj
+++ b/ide/vc2005/overlay.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/overlayd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\overlay_/overlayd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/overlay.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/overlay.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/overlayd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\overlay_/overlayd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/overlay.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/overlay.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\overlay.cxx"
+			RelativePath="..\..\test\overlay.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/pack.vcproj b/ide/vc2005/pack.vcproj
similarity index 91%
rename from vc2005/pack.vcproj
rename to ide/vc2005/pack.vcproj
index 4629e54a3..8799f619a 100644
--- a/vc2005/pack.vcproj
+++ b/ide/vc2005/pack.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/packd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\pack_/packd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/pack.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/pack.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/packd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\pack_/packd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/pack.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/pack.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\pack.cxx"
+			RelativePath="..\..\test\pack.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/pixmap.vcproj b/ide/vc2005/pixmap.vcproj
similarity index 91%
rename from vc2005/pixmap.vcproj
rename to ide/vc2005/pixmap.vcproj
index a54ffb10f..729811a14 100644
--- a/vc2005/pixmap.vcproj
+++ b/ide/vc2005/pixmap.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/pixmap.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/pixmap.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/pixmapd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\pixmap_/pixmapd.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/pixmapd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\pixmap_/pixmapd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/pixmap.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/pixmap.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\pixmap.cxx"
+			RelativePath="..\..\test\pixmap.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/pixmap_browser.vcproj b/ide/vc2005/pixmap_browser.vcproj
similarity index 91%
rename from vc2005/pixmap_browser.vcproj
rename to ide/vc2005/pixmap_browser.vcproj
index 0f0b0cd5e..e6ad5ccbe 100644
--- a/vc2005/pixmap_browser.vcproj
+++ b/ide/vc2005/pixmap_browser.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/pixmap_browserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcmtd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\pixmap_browser_/pixmap_browserd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/pixmap_browser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcmt"
 				ProgramDatabaseFile=".\Release/pixmap_browser.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/pixmap_browserd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcmtd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\pixmap_browser_/pixmap_browserd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/pixmap_browser.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcmt"
 				ProgramDatabaseFile=".\Release/pixmap_browser.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\pixmap_browser.cxx"
+			RelativePath="..\..\test\pixmap_browser.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/preferences.vcproj b/ide/vc2005/preferences.vcproj
similarity index 86%
rename from vc2005/preferences.vcproj
rename to ide/vc2005/preferences.vcproj
index 1e00f1ead..1151ac94a 100644
--- a/vc2005/preferences.vcproj
+++ b/ide/vc2005/preferences.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/preferencesd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\preferences_/preferencesd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/preferences.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/preferences.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/preferencesd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\preferences_/preferencesd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/preferences.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/preferences.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\preferences.cxx"
+			RelativePath="..\..\test\preferences.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -436,7 +436,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\test\preferences.fl"
+			RelativePath="..\..\test\preferences.fl"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -444,8 +444,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c preferences.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\preferences.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -454,8 +454,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c preferences.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\preferences.cxx"
+					CommandLine="cfluid $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -464,8 +464,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c preferences.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\preferences.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -474,8 +474,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c preferences.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="..\test\preferences.cxx"
+					CommandLine="cfluid $(InputName).fl"
+					Outputs="..\..\test\$(InputName).cxx"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/vc2005/radio.vcproj b/ide/vc2005/radio.vcproj
similarity index 87%
rename from vc2005/radio.vcproj
rename to ide/vc2005/radio.vcproj
index 2d2e48a7c..86bb26538 100644
--- a/vc2005/radio.vcproj
+++ b/ide/vc2005/radio.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/radio.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/radio.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/radiod.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\radio_/radiod.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/radiod.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\radio_/radiod.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/radio.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/radio.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\radio.cxx"
+			RelativePath="..\..\test\radio.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -436,7 +436,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\test\radio.fl"
+			RelativePath="..\..\test\radio.fl"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -444,8 +444,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c radio.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/radio.cxx"
+					CommandLine="cfluid $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -454,8 +454,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c radio.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/radio.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -464,8 +464,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c radio.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/radio.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -474,8 +474,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c radio.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/radio.cxx"
+					CommandLine="cfluid $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/vc2005/resize.vcproj b/ide/vc2005/resize.vcproj
similarity index 86%
rename from vc2005/resize.vcproj
rename to ide/vc2005/resize.vcproj
index b1d8df769..32a8d9b9e 100644
--- a/vc2005/resize.vcproj
+++ b/ide/vc2005/resize.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/resized.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\resize_/resized.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/resize.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/resize.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/resized.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\resize_/resized.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/resize.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/resize.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\resize.cxx"
+			RelativePath="..\..\test\resize.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -436,7 +436,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\test\resize.fl"
+			RelativePath="..\..\test\resize.fl"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -444,8 +444,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c resize.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/resize.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -454,8 +454,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c resize.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/resize.cxx"
+					CommandLine="cfluid $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -464,8 +464,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c resize.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/resize.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -474,8 +474,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c resize.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/resize.cxx"
+					CommandLine="cfluid $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/vc2005/resizebox.vcproj b/ide/vc2005/resizebox.vcproj
similarity index 91%
rename from vc2005/resizebox.vcproj
rename to ide/vc2005/resizebox.vcproj
index b772e6b79..64ee860a8 100644
--- a/vc2005/resizebox.vcproj
+++ b/ide/vc2005/resizebox.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/resizeboxd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\resizebox_/resizeboxd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/resizebox.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/resizebox.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/resizeboxd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\resizebox_/resizeboxd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/resizebox.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/resizebox.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\resizebox.cxx"
+			RelativePath="..\..\test\resizebox.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/scroll.vcproj b/ide/vc2005/scroll.vcproj
similarity index 91%
rename from vc2005/scroll.vcproj
rename to ide/vc2005/scroll.vcproj
index 638272615..47c3ea4db 100644
--- a/vc2005/scroll.vcproj
+++ b/ide/vc2005/scroll.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/scroll.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/scroll.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/scrolld.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\scroll_/scrolld.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/scrolld.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\scroll_/scrolld.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/scroll.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/scroll.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\scroll.cxx"
+			RelativePath="..\..\test\scroll.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/shape.vcproj b/ide/vc2005/shape.vcproj
similarity index 91%
rename from vc2005/shape.vcproj
rename to ide/vc2005/shape.vcproj
index a0a2499ab..a31918eac 100644
--- a/vc2005/shape.vcproj
+++ b/ide/vc2005/shape.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/shape.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/shape.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/shaped.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\shape_/shaped.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/shaped.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\shape_/shaped.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/shape.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/shape.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\shape.cxx"
+			RelativePath="..\..\test\shape.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/subwindow.vcproj b/ide/vc2005/subwindow.vcproj
similarity index 91%
rename from vc2005/subwindow.vcproj
rename to ide/vc2005/subwindow.vcproj
index db46bda1c..3d4118599 100644
--- a/vc2005/subwindow.vcproj
+++ b/ide/vc2005/subwindow.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/subwindow.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/subwindow.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/subwindowd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\subwindow_/subwindowd.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/subwindowd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\subwindow_/subwindowd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/subwindow.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/subwindow.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\subwindow.cxx"
+			RelativePath="..\..\test\subwindow.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/sudoku.vcproj b/ide/vc2005/sudoku.vcproj
similarity index 90%
rename from vc2005/sudoku.vcproj
rename to ide/vc2005/sudoku.vcproj
index bc95e1924..b6e072c4d 100644
--- a/vc2005/sudoku.vcproj
+++ b/ide/vc2005/sudoku.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/sudokud.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\sudoku_/sudokud.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/sudoku.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/sudoku.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/sudokud.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\sudoku_/sudokud.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/sudoku.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/sudoku.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\sudoku.cxx"
+			RelativePath="..\..\test\sudoku.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -436,11 +436,11 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\test\sudoku.rc"
+			RelativePath="..\..\test\sudoku.rc"
 			>
 		</File>
 		<File
-			RelativePath="..\test\sudokurc.h"
+			RelativePath="..\..\test\sudokurc.h"
 			>
 		</File>
 	</Files>
diff --git a/vc2005/symbols.vcproj b/ide/vc2005/symbols.vcproj
similarity index 91%
rename from vc2005/symbols.vcproj
rename to ide/vc2005/symbols.vcproj
index 9ea10c7f9..8155f0571 100644
--- a/vc2005/symbols.vcproj
+++ b/ide/vc2005/symbols.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/symbolsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\symbols_/symbolsd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/symbols.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/symbols.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/symbolsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\symbols_/symbolsd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/symbols.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/symbols.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\symbols.cxx"
+			RelativePath="..\..\test\symbols.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/tabs.vcproj b/ide/vc2005/tabs.vcproj
similarity index 86%
rename from vc2005/tabs.vcproj
rename to ide/vc2005/tabs.vcproj
index 610fad4b2..fdfa02899 100644
--- a/vc2005/tabs.vcproj
+++ b/ide/vc2005/tabs.vcproj
@@ -4,6 +4,7 @@
 	Version="8,00"
 	Name="tabs"
 	ProjectGUID="{AF932F77-1804-4DA4-A6DC-950795D6AFC1}"
+	RootNamespace="tabs"
 	>
 	<Platforms>
 		<Platform
@@ -46,7 +47,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +76,7 @@
 				OutputFile="../test/tabsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\tabs_/tabsd.pdb"
@@ -142,7 +143,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +171,7 @@
 				OutputFile="../test/tabs.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/tabs.pdb"
 				SubSystem="2"
@@ -234,7 +235,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +264,7 @@
 				OutputFile="../test/tabsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\tabs_/tabsd.pdb"
@@ -330,7 +331,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +359,7 @@
 				OutputFile="../test/tabs.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/tabs.pdb"
 				SubSystem="2"
@@ -394,7 +395,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\tabs.cxx"
+			RelativePath="..\..\test\tabs.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -436,7 +437,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\test\tabs.fl"
+			RelativePath="..\..\test\tabs.fl"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -444,8 +445,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c tabs.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/tabs.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -453,9 +454,9 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c tabs.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/tabs.cxx"
+					Description="Create $(InputName).cxx and $(InputName).h file with fluid"
+					CommandLine="cfluid $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -464,8 +465,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c tabs.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/tabs.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -474,8 +475,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c tabs.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/tabs.cxx"
+					CommandLine="cfluid $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/vc2005/threads.vcproj b/ide/vc2005/threads.vcproj
similarity index 91%
rename from vc2005/threads.vcproj
rename to ide/vc2005/threads.vcproj
index 84a50dcc9..1844f9c88 100644
--- a/vc2005/threads.vcproj
+++ b/ide/vc2005/threads.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/threadsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\threads_/threadsd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/threads.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/threads.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/threadsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\threads_/threadsd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/threads.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/threads.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\threads.cxx"
+			RelativePath="..\..\test\threads.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/tile.vcproj b/ide/vc2005/tile.vcproj
similarity index 91%
rename from vc2005/tile.vcproj
rename to ide/vc2005/tile.vcproj
index 05112f5ae..5d2ab8aa5 100644
--- a/vc2005/tile.vcproj
+++ b/ide/vc2005/tile.vcproj
@@ -48,7 +48,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/tile.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/tile.pdb"
 				SubSystem="2"
@@ -140,7 +140,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
 				OutputFile="../test/tiled.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\tile_/tiled.pdb"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/tiled.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\tile_/tiled.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/tile.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/tile.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\tile.cxx"
+			RelativePath="..\..\test\tile.cxx"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/vc2005/tiled_image.vcproj b/ide/vc2005/tiled_image.vcproj
similarity index 91%
rename from vc2005/tiled_image.vcproj
rename to ide/vc2005/tiled_image.vcproj
index aacaed4ec..b016bad8c 100644
--- a/vc2005/tiled_image.vcproj
+++ b/ide/vc2005/tiled_image.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/tiled_imaged.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\tiled_image_/tiled_imaged.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/tiled_image.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/tiled_image.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/tiled_imaged.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\tiled_image_/tiled_imaged.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/tiled_image.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/tiled_image.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\tiled_image.cxx"
+			RelativePath="..\..\test\tiled_image.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/utf8.vcproj b/ide/vc2005/utf8.vcproj
similarity index 91%
rename from vc2005/utf8.vcproj
rename to ide/vc2005/utf8.vcproj
index b4095905e..8f0ee0813 100644
--- a/vc2005/utf8.vcproj
+++ b/ide/vc2005/utf8.vcproj
@@ -47,7 +47,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
 				OutputFile="../test/utf8d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\utf8_/utf8d.pdb"
@@ -143,7 +143,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -171,7 +171,7 @@
 				OutputFile="../test/utf8.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/utf8.pdb"
 				SubSystem="2"
@@ -235,7 +235,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -264,7 +264,7 @@
 				OutputFile="../test/utf8d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\utf8_/utf8d.pdb"
@@ -331,7 +331,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -359,7 +359,7 @@
 				OutputFile="../test/utf8.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/utf8.pdb"
 				SubSystem="2"
@@ -395,7 +395,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\utf8.cxx"
+			RelativePath="..\..\test\utf8.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/vc2005/valuators.vcproj b/ide/vc2005/valuators.vcproj
similarity index 86%
rename from vc2005/valuators.vcproj
rename to ide/vc2005/valuators.vcproj
index 7256cc6ed..d4ba8d262 100644
--- a/vc2005/valuators.vcproj
+++ b/ide/vc2005/valuators.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -75,7 +75,7 @@
 				OutputFile="../test/valuatorsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\valuators_/valuatorsd.pdb"
@@ -142,7 +142,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -170,7 +170,7 @@
 				OutputFile="../test/valuators.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/valuators.pdb"
 				SubSystem="2"
@@ -234,7 +234,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -263,7 +263,7 @@
 				OutputFile="../test/valuatorsd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\valuators_/valuatorsd.pdb"
@@ -330,7 +330,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1,_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -358,7 +358,7 @@
 				OutputFile="../test/valuators.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
+				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="libcd"
 				ProgramDatabaseFile=".\Release/valuators.pdb"
 				SubSystem="2"
@@ -394,7 +394,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\test\valuators.cxx"
+			RelativePath="..\..\test\valuators.cxx"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -436,7 +436,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\test\valuators.fl"
+			RelativePath="..\..\test\valuators.fl"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -444,8 +444,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c valuators.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/valuators.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -454,8 +454,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c valuators.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/valuators.cxx"
+					CommandLine="cfluid $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -464,8 +464,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluidd"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluidd -c valuators.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/valuators.cxx"
+					CommandLine="cfluid /D $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -474,8 +474,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Create .cxx and .h file with fluid"
-					CommandLine="cd ..\test&#x0D;&#x0A;..\fluid\fluid -c valuators.fl&#x0D;&#x0A;cd ..\vcnet&#x0D;&#x0A;"
-					Outputs="../test/valuators.cxx"
+					CommandLine="cfluid $(InputName).fl"
+					Outputs="../test/$(InputName).cxx"
 				/>
 			</FileConfiguration>
 		</File>
diff --git a/vc2005/zlib.vcproj b/ide/vc2005/zlib.vcproj
similarity index 91%
rename from vc2005/zlib.vcproj
rename to ide/vc2005/zlib.vcproj
index 51315253e..999d287ee 100644
--- a/vc2005/zlib.vcproj
+++ b/ide/vc2005/zlib.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -112,7 +112,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -181,7 +181,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="HAVE_CAIRO=1"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
@@ -253,7 +253,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\vc2005;..\zlib;..\png;..\jpeg;.."
+				AdditionalIncludeDirectories=".;..\..\zlib;..\..\png;..\..\jpeg;.."
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;VC_EXTRA_LEAN;WIN32_EXTRA_LEAN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -300,7 +300,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\zlib\adler32.c"
+			RelativePath="..\..\zlib\adler32.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -344,7 +344,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\zlib\compress.c"
+			RelativePath="..\..\zlib\compress.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -388,7 +388,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\zlib\crc32.c"
+			RelativePath="..\..\zlib\crc32.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -432,7 +432,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\zlib\deflate.c"
+			RelativePath="..\..\zlib\deflate.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -476,7 +476,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\zlib\gzio.c"
+			RelativePath="..\..\zlib\gzio.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -520,7 +520,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\zlib\inffast.c"
+			RelativePath="..\..\zlib\inffast.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -564,7 +564,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\zlib\inflate.c"
+			RelativePath="..\..\zlib\inflate.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -608,7 +608,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\zlib\inftrees.c"
+			RelativePath="..\..\zlib\inftrees.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -652,7 +652,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\zlib\trees.c"
+			RelativePath="..\..\zlib\trees.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -696,7 +696,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\zlib\uncompr.c"
+			RelativePath="..\..\zlib\uncompr.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -740,7 +740,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\zlib\zutil.c"
+			RelativePath="..\..\zlib\zutil.c"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"