diff --git a/VS2008OpenMesh.sln b/VS2008OpenMesh.sln
index d134a411..2660b108 100644
--- a/VS2008OpenMesh.sln
+++ b/VS2008OpenMesh.sln
@@ -1,10 +1,13 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\VS2008Core.vcproj", "{68E46D49-FF4B-337F-9909-E8CC0C457A5D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "src\OpenMesh\Core\VS2008Core.vcproj", "{68E46D49-FF4B-337F-9909-E8CC0C457A5D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tools", "Tools\VS2008Tools.vcproj", "{A84C45D6-CAE9-38A7-8A45-631F520C70CC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tools", "src\OpenMesh\Tools\VS2008Tools.vcproj", "{A84C45D6-CAE9-38A7-8A45-631F520C70CC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{68E46D49-FF4B-337F-9909-E8CC0C457A5D} = {68E46D49-FF4B-337F-9909-E8CC0C457A5D}
+	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VS2008MConvert", "Apps\mconvert\VS2008mconvert.vcproj", "{C2F9DF8D-9293-4B6C-839C-57A38D1C873B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VS2008MConvert", "src\OpenMesh\Apps\mconvert\VS2008mconvert.vcproj", "{C2F9DF8D-9293-4B6C-839C-57A38D1C873B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{68E46D49-FF4B-337F-9909-E8CC0C457A5D} = {68E46D49-FF4B-337F-9909-E8CC0C457A5D}
 		{A84C45D6-CAE9-38A7-8A45-631F520C70CC} = {A84C45D6-CAE9-38A7-8A45-631F520C70CC}
diff --git a/src/OpenMesh/Core/VS2008Core.vcproj b/src/OpenMesh/Core/VS2008Core.vcproj
index 1e3cb49d..77963cf6 100644
--- a/src/OpenMesh/Core/VS2008Core.vcproj
+++ b/src/OpenMesh/Core/VS2008Core.vcproj
@@ -73,7 +73,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="lib\Windows_32_Debug\Core.lib"
+				OutputFile="$(SolutionDir)\lib\libOpenMeshCored.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -149,7 +149,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="lib\Windows_32_Release\Core.lib"
+				OutputFile="$(SolutionDir)\lib\libOpenMeshCore.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -348,11 +348,11 @@
 				>
 			</File>
 			<File
-				RelativePath="Geometry\Config.hh"
+				RelativePath="System\config.hh"
 				>
 			</File>
 			<File
-				RelativePath="System\config.hh"
+				RelativePath="Geometry\Config.hh"
 				>
 			</File>
 			<File
diff --git a/src/OpenMesh/Tools/VS2008Tools.vcproj b/src/OpenMesh/Tools/VS2008Tools.vcproj
index d827ef96..e70cf9e9 100644
--- a/src/OpenMesh/Tools/VS2008Tools.vcproj
+++ b/src/OpenMesh/Tools/VS2008Tools.vcproj
@@ -73,7 +73,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="lib\Windows_32_Debug\Tools.lib"
+				OutputFile="$(SolutionDir)\lib\libOpenMeshToolsd.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -149,7 +149,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="lib\Windows_32_Release\Tools.lib"
+				OutputFile="$(SolutionDir)\lib\libOpenMeshTools.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -211,22 +211,22 @@
 				RelativePath="Subdivider\Uniform\CompositeSqrt3T.hh"
 				>
 			</File>
-			<File
-				RelativePath="Subdivider\Adaptive\Composite\CompositeT.hh"
-				>
-			</File>
 			<File
 				RelativePath="Subdivider\Uniform\Composite\CompositeT.hh"
 				>
 			</File>
 			<File
-				RelativePath="Subdivider\Adaptive\Composite\CompositeTraits.hh"
+				RelativePath="Subdivider\Adaptive\Composite\CompositeT.hh"
 				>
 			</File>
 			<File
 				RelativePath="Subdivider\Uniform\Composite\CompositeTraits.hh"
 				>
 			</File>
+			<File
+				RelativePath="Subdivider\Adaptive\Composite\CompositeTraits.hh"
+				>
+			</File>
 			<File
 				RelativePath="Utils\Config.hh"
 				>