autogenerated updated projectfiles

2006-09-30 02:58:40 +00:00
parent dcf007ca38
commit 45386e05dc
80 changed files with 559 additions and 1033 deletions
--- a/msvc/6/appBspDemo.dsp
+++ b/msvc/6/appBspDemo.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appBspDemo\appBspDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appBspDemo\appBspDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appBspDemo\appBspDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appBspDemo\appBspDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
--- a/msvc/6/appCcdPhysicsDemo.dsp
+++ b/msvc/6/appCcdPhysicsDemo.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appCcdPhysicsDemo\appCcdPhysicsDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appCcdPhysicsDemo\appCcdPhysicsDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appCcdPhysicsDemo\appCcdPhysicsDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appCcdPhysicsDemo\appCcdPhysicsDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -106,10 +106,6 @@ SOURCE="$(InputPath)"

 SOURCE=..\..\Demos\CcdPhysicsDemo\CcdPhysicsDemo.cpp
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\Demos\CcdPhysicsDemo\MyMotionState.cpp
-# End Source File
 # End Group
 # Begin Group "Header Files"

@@ -118,10 +114,6 @@ SOURCE=..\..\Demos\CcdPhysicsDemo\MyMotionState.cpp

 SOURCE=..\..\Demos\CcdPhysicsDemo\CcdPhysicsDemo.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\Demos\CcdPhysicsDemo\MyMotionState.h
-# End Source File
 # End Group
 # Begin Group "Resource Files"

--- a/msvc/6/appColladaDemo.dsp
+++ b/msvc/6/appColladaDemo.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML" /I "..\..\Extras\FCollada"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML" /I "..\..\Extras\FCollada"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appColladaDemo\appColladaDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML" /i "..\..\Extras\FCollada"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appColladaDemo\appColladaDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML" /i "..\..\Extras\FCollada"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML" /I "..\..\Extras\FCollada"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML" /I "..\..\Extras\FCollada"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appColladaDemo\appColladaDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML" /i "..\..\Extras\FCollada"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appColladaDemo\appColladaDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML" /i "..\..\Extras\FCollada"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
--- a/msvc/6/appCollisionDemo.dsp
+++ b/msvc/6/appCollisionDemo.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appCollisionDemo\appCollisionDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appCollisionDemo\appCollisionDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appCollisionDemo\appCollisionDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appCollisionDemo\appCollisionDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
--- a/msvc/6/appCollisionInterfaceDemo.dsp
+++ b/msvc/6/appCollisionInterfaceDemo.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
--- a/msvc/6/appConcaveDemo.dsp
+++ b/msvc/6/appConcaveDemo.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appConcaveDemo\appConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appConcaveDemo\appConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appConcaveDemo\appConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appConcaveDemo\appConcaveDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -106,10 +106,6 @@ SOURCE="$(InputPath)"

 SOURCE=..\..\Demos\ConcaveDemo\ConcavePhysicsDemo.cpp
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\Demos\ConcaveDemo\MyMotionState.cpp
-# End Source File
 # End Group
 # Begin Group "Header Files"

@@ -118,10 +114,6 @@ SOURCE=..\..\Demos\ConcaveDemo\MyMotionState.cpp

 SOURCE=..\..\Demos\ConcaveDemo\ConcaveDemo.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\Demos\ConcaveDemo\MyMotionState.h
-# End Source File
 # End Group
 # Begin Group "Resource Files"

--- a/msvc/6/appConstraintDemo.dsp
+++ b/msvc/6/appConstraintDemo.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appConstraintDemo\appConstraintDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appConstraintDemo\appConstraintDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appConstraintDemo\appConstraintDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appConstraintDemo\appConstraintDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -106,10 +106,6 @@ SOURCE="$(InputPath)"

 SOURCE=..\..\Demos\ConstraintDemo\ConstraintDemo.cpp
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\Demos\ConstraintDemo\MyMotionState.cpp
-# End Source File
 # End Group
 # Begin Group "Header Files"

@@ -118,10 +114,6 @@ SOURCE=..\..\Demos\ConstraintDemo\MyMotionState.cpp

 SOURCE=..\..\Demos\ConstraintDemo\ConstraintDemo.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\Demos\ConstraintDemo\MyMotionState.h
-# End Source File
 # End Group
 # Begin Group "Resource Files"

--- a/msvc/6/appContinuousConvexCollision.dsp
+++ b/msvc/6/appContinuousConvexCollision.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appContinuousConvexCollision\appContinuousConvexCollision.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appContinuousConvexCollision\appContinuousConvexCollision.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appContinuousConvexCollision\appContinuousConvexCollision.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appContinuousConvexCollision\appContinuousConvexCollision.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
--- a/msvc/6/appConvexDecompositionDemo.dsp
+++ b/msvc/6/appConvexDecompositionDemo.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appConvexDecompositionDemo\appConvexDecompositionDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appConvexDecompositionDemo\appConvexDecompositionDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\LibXML"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appConvexDecompositionDemo\appConvexDecompositionDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appConvexDecompositionDemo\appConvexDecompositionDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\LibXML"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
--- a/msvc/6/appGPUphysics.dsp
+++ b/msvc/6/appGPUphysics.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appGPUphysics\appGPUphysics.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appGPUphysics\appGPUphysics.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Demos\OpenGL" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Glut"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appGPUphysics\appGPUphysics.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appGPUphysics\appGPUphysics.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Demos\OpenGL" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Glut"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
--- a/msvc/6/appGjkConvexCastDemo.dsp
+++ b/msvc/6/appGjkConvexCastDemo.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appGjkConvexCastDemo\appGjkConvexCastDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appGjkConvexCastDemo\appGjkConvexCastDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appGjkConvexCastDemo\appGjkConvexCastDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appGjkConvexCastDemo\appGjkConvexCastDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
--- a/msvc/6/appRaytracer.dsp
+++ b/msvc/6/appRaytracer.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appRaytracer\appRaytracer.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appRaytracer\appRaytracer.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appRaytracer\appRaytracer.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appRaytracer\appRaytracer.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
--- a/msvc/6/appSimplexDemo.dsp
+++ b/msvc/6/appSimplexDemo.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appSimplexDemo\appSimplexDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appSimplexDemo\appSimplexDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appSimplexDemo\appSimplexDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appSimplexDemo\appSimplexDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
--- a/msvc/6/appUserCollisionAlgorithm.dsp
+++ b/msvc/6/appUserCollisionAlgorithm.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 1
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut" /I "..\..\Demos\OpenGL"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut" /i "..\..\Demos\OpenGL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
--- a/msvc/6/grpapps_bullet.dsp
+++ b/msvc/6/grpapps_bullet.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\grpapps_bullet\grpapps_bullet.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\grpapps_bullet\grpapps_bullet.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\grpapps_bullet\grpapps_bullet.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\grpapps_bullet\grpapps_bullet.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
--- a/msvc/6/libbulletopenglsupport.dsp
+++ b/msvc/6/libbulletopenglsupport.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\PhysicsInterface\CcdPhysics" /I "..\..\Glut"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletopenglsupport\libbulletopenglsupport.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\PhysicsInterface\CcdPhysics" /i "..\..\Glut"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
--- a/msvc/6/libcollada-dom.dsp
+++ b/msvc/6/libcollada-dom.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libcollada-dom\libcollada-dom.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libcollada-dom\libcollada-dom.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libcollada-dom\libcollada-dom.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libcollada-dom\libcollada-dom.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
--- a/msvc/6/libconvexdecomposition.dsp
+++ b/msvc/6/libconvexdecomposition.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libconvexdecomposition\libconvexdecomposition.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libconvexdecomposition\libconvexdecomposition.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libconvexdecomposition\libconvexdecomposition.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libconvexdecomposition\libconvexdecomposition.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
--- a/msvc/6/liblibxml.dsp
+++ b/msvc/6/liblibxml.dsp
@@ -43,11 +43,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\liblibxml\liblibxml.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\liblibxml\liblibxml.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -75,11 +75,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\PhysicsInterface\Common" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\ConvexDecomposition" /I "..\..\Extras\COLLADA_DOM\include" /I "..\..\Extras\COLLADA_DOM\include\1.4" /I "..\..\Extras\LibXML\include"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\liblibxml\liblibxml.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\PhysicsInterface\Common" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\liblibxml\liblibxml.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\ConvexDecomposition" /i "..\..\Extras\COLLADA_DOM\include" /i "..\..\Extras\COLLADA_DOM\include\1.4" /i "..\..\Extras\LibXML\include"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
--- a/msvc/6/wksbullet.dsw
+++ b/msvc/6/wksbullet.dsw
@@ -11,9 +11,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libbulletccdphysics
-    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name libbulletcollision
    End Project Dependency
@@ -27,9 +24,6 @@ Package=<4>
    Project_Dep_Name libbulletopenglsupport
    End Project Dependency
    Begin Project Dependency
-    Project_Dep_Name libbulletphysicsinterfacecommon
-    End Project Dependency
-    Begin Project Dependency
    Project_Dep_Name libcollada-dom
    End Project Dependency
    Begin Project Dependency
@@ -50,9 +44,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libbulletccdphysics
-    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name libbulletcollision
    End Project Dependency
@@ -65,9 +56,6 @@ Package=<4>
    Begin Project Dependency
    Project_Dep_Name libbulletopenglsupport
    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletphysicsinterfacecommon
-    End Project Dependency
 }}}

 ###############################################################################
@@ -80,9 +68,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libbulletccdphysics
-    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name libbulletcollision
    End Project Dependency
@@ -96,9 +81,6 @@ Package=<4>
    Project_Dep_Name libbulletopenglsupport
    End Project Dependency
    Begin Project Dependency
-    Project_Dep_Name libbulletphysicsinterfacecommon
-    End Project Dependency
-    Begin Project Dependency
    Project_Dep_Name libcollada-dom
    End Project Dependency
    Begin Project Dependency
@@ -119,9 +101,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libbulletccdphysics
-    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name libbulletcollision
    End Project Dependency
@@ -134,9 +113,6 @@ Package=<4>
    Begin Project Dependency
    Project_Dep_Name libbulletopenglsupport
    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletphysicsinterfacecommon
-    End Project Dependency
 }}}

 ###############################################################################
@@ -149,9 +125,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libbulletccdphysics
-    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name libbulletcollision
    End Project Dependency
@@ -164,9 +137,6 @@ Package=<4>
    Begin Project Dependency
    Project_Dep_Name libbulletopenglsupport
    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletphysicsinterfacecommon
-    End Project Dependency
 }}}

 ###############################################################################
@@ -179,9 +149,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libbulletccdphysics
-    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name libbulletcollision
    End Project Dependency
@@ -194,9 +161,6 @@ Package=<4>
    Begin Project Dependency
    Project_Dep_Name libbulletopenglsupport
    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletphysicsinterfacecommon
-    End Project Dependency
 }}}

 ###############################################################################
@@ -209,9 +173,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libbulletccdphysics
-    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name libbulletcollision
    End Project Dependency
@@ -224,9 +185,6 @@ Package=<4>
    Begin Project Dependency
    Project_Dep_Name libbulletopenglsupport
    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletphysicsinterfacecommon
-    End Project Dependency
 }}}

 ###############################################################################
@@ -239,9 +197,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libbulletccdphysics
-    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name libbulletcollision
    End Project Dependency
@@ -254,9 +209,6 @@ Package=<4>
    Begin Project Dependency
    Project_Dep_Name libbulletopenglsupport
    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletphysicsinterfacecommon
-    End Project Dependency
 }}}

 ###############################################################################
@@ -269,9 +221,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libbulletccdphysics
-    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name libbulletcollision
    End Project Dependency
@@ -285,9 +234,6 @@ Package=<4>
    Project_Dep_Name libbulletopenglsupport
    End Project Dependency
    Begin Project Dependency
-    Project_Dep_Name libbulletphysicsinterfacecommon
-    End Project Dependency
-    Begin Project Dependency
    Project_Dep_Name libcollada-dom
    End Project Dependency
    Begin Project Dependency
@@ -300,36 +246,6 @@ Package=<4>

 ###############################################################################

-Project: "appForkLiftDemo"=.\appForkLiftDemo.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libbulletccdphysics
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletcollision
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletdynamics
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletmath
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletopenglsupport
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletphysicsinterfacecommon
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "appGjkConvexCastDemo"=.\appGjkConvexCastDemo.dsp - Package Owner=<4>

 Package=<5>
@@ -338,9 +254,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libbulletccdphysics
-    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name libbulletcollision
    End Project Dependency
@@ -353,9 +266,6 @@ Package=<4>
    Begin Project Dependency
    Project_Dep_Name libbulletopenglsupport
    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletphysicsinterfacecommon
-    End Project Dependency
 }}}

 ###############################################################################
@@ -380,9 +290,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libbulletccdphysics
-    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name libbulletcollision
    End Project Dependency
@@ -395,9 +302,6 @@ Package=<4>
    Begin Project Dependency
    Project_Dep_Name libbulletopenglsupport
    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletphysicsinterfacecommon
-    End Project Dependency
 }}}

 ###############################################################################
@@ -410,9 +314,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libbulletccdphysics
-    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name libbulletcollision
    End Project Dependency
@@ -425,9 +326,6 @@ Package=<4>
    Begin Project Dependency
    Project_Dep_Name libbulletopenglsupport
    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletphysicsinterfacecommon
-    End Project Dependency
 }}}

 ###############################################################################
@@ -440,9 +338,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libbulletccdphysics
-    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name libbulletcollision
    End Project Dependency
@@ -455,39 +350,6 @@ Package=<4>
    Begin Project Dependency
    Project_Dep_Name libbulletopenglsupport
    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletphysicsinterfacecommon
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "appVehicleDemo"=.\appVehicleDemo.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libbulletccdphysics
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletcollision
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletdynamics
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletmath
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletopenglsupport
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletphysicsinterfacecommon
-    End Project Dependency
 }}}

 ###############################################################################
@@ -528,9 +390,6 @@ Package=<4>
    Project_Dep_Name appConvexDecompositionDemo
    End Project Dependency
    Begin Project Dependency
-    Project_Dep_Name appForkLiftDemo
-    End Project Dependency
-    Begin Project Dependency
    Project_Dep_Name appGjkConvexCastDemo
    End Project Dependency
    Begin Project Dependency
@@ -546,12 +405,6 @@ Package=<4>
    Project_Dep_Name appUserCollisionAlgorithm
    End Project Dependency
    Begin Project Dependency
-    Project_Dep_Name appVehicleDemo
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libbulletccdphysics
-    End Project Dependency
-    Begin Project Dependency
    Project_Dep_Name libbulletcollision
    End Project Dependency
    Begin Project Dependency
@@ -564,9 +417,6 @@ Package=<4>
    Project_Dep_Name libbulletopenglsupport
    End Project Dependency
    Begin Project Dependency
-    Project_Dep_Name libbulletphysicsinterfacecommon
-    End Project Dependency
-    Begin Project Dependency
    Project_Dep_Name libcollada-dom
    End Project Dependency
    Begin Project Dependency
@@ -615,9 +465,6 @@ Package=<4>
    Project_Dep_Name appConvexDecompositionDemo
    End Project Dependency
    Begin Project Dependency
-    Project_Dep_Name appForkLiftDemo
-    End Project Dependency
-    Begin Project Dependency
    Project_Dep_Name appGjkConvexCastDemo
    End Project Dependency
    Begin Project Dependency
@@ -632,9 +479,6 @@ Package=<4>
    Begin Project Dependency
    Project_Dep_Name appUserCollisionAlgorithm
    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name appVehicleDemo
-    End Project Dependency
 }}}

 ###############################################################################
@@ -647,9 +491,6 @@ Package=<5>

 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name libbulletccdphysics
-    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name libbulletcollision
    End Project Dependency
@@ -663,9 +504,6 @@ Package=<4>
    Project_Dep_Name libbulletopenglsupport
    End Project Dependency
    Begin Project Dependency
-    Project_Dep_Name libbulletphysicsinterfacecommon
-    End Project Dependency
-    Begin Project Dependency
    Project_Dep_Name libcollada-dom
    End Project Dependency
    Begin Project Dependency
@@ -678,18 +516,6 @@ Package=<4>

 ###############################################################################

-Project: "libbulletccdphysics"=.\libbulletccdphysics.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "libbulletcollision"=.\libbulletcollision.dsp - Package Owner=<4>

 Package=<5>
@@ -738,18 +564,6 @@ Package=<4>

 ###############################################################################

-Project: "libbulletphysicsinterfacecommon"=.\libbulletphysicsinterfacecommon.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "libcollada-dom"=.\libcollada-dom.dsp - Package Owner=<4>

 Package=<5>
--- a/msvc/7/appBspDemo.vcproj
+++ b/msvc/7/appBspDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				PrecompiledHeaderFile="..\..\out\release7\build\appBspDemo\appBspDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appBspDemo\"
 				ObjectFile="..\..\out\release7\build\appBspDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appBspDemo\appBspDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appBspDemo\"
 				ObjectFile="..\..\out\debug7\build\appBspDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/7/appCcdPhysicsDemo.vcproj
+++ b/msvc/7/appCcdPhysicsDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release7\build\appCcdPhysicsDemo\appCcdPhysicsDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appCcdPhysicsDemo\"
 				ObjectFile="..\..\out\release7\build\appCcdPhysicsDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appCcdPhysicsDemo\appCcdPhysicsDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appCcdPhysicsDemo\"
 				ObjectFile="..\..\out\debug7\build\appCcdPhysicsDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -169,9 +169,6 @@
 			<File
 				RelativePath="..\..\Demos\CcdPhysicsDemo\CcdPhysicsDemo.cpp">
 			</File>
-			<File
-				RelativePath="..\..\Demos\CcdPhysicsDemo\MyMotionState.cpp">
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -179,9 +176,6 @@
 			<File
 				RelativePath="..\..\Demos\CcdPhysicsDemo\CcdPhysicsDemo.h">
 			</File>
-			<File
-				RelativePath="..\..\Demos\CcdPhysicsDemo\MyMotionState.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
--- a/msvc/7/appColladaDemo.vcproj
+++ b/msvc/7/appColladaDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
 				PrecompiledHeaderFile="..\..\out\release7\build\appColladaDemo\appColladaDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appColladaDemo\"
 				ObjectFile="..\..\out\release7\build\appColladaDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appColladaDemo\appColladaDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appColladaDemo\"
 				ObjectFile="..\..\out\debug7\build\appColladaDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/7/appCollisionDemo.vcproj
+++ b/msvc/7/appCollisionDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release7\build\appCollisionDemo\appCollisionDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appCollisionDemo\"
 				ObjectFile="..\..\out\release7\build\appCollisionDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appCollisionDemo\appCollisionDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appCollisionDemo\"
 				ObjectFile="..\..\out\debug7\build\appCollisionDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/7/appCollisionInterfaceDemo.vcproj
+++ b/msvc/7/appCollisionInterfaceDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release7\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appCollisionInterfaceDemo\"
 				ObjectFile="..\..\out\release7\build\appCollisionInterfaceDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appCollisionInterfaceDemo\"
 				ObjectFile="..\..\out\debug7\build\appCollisionInterfaceDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/7/appConcaveDemo.vcproj
+++ b/msvc/7/appConcaveDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release7\build\appConcaveDemo\appConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appConcaveDemo\"
 				ObjectFile="..\..\out\release7\build\appConcaveDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appConcaveDemo\appConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appConcaveDemo\"
 				ObjectFile="..\..\out\debug7\build\appConcaveDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -169,9 +169,6 @@
 			<File
 				RelativePath="..\..\Demos\ConcaveDemo\ConcavePhysicsDemo.cpp">
 			</File>
-			<File
-				RelativePath="..\..\Demos\ConcaveDemo\MyMotionState.cpp">
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -179,9 +176,6 @@
 			<File
 				RelativePath="..\..\Demos\ConcaveDemo\ConcaveDemo.h">
 			</File>
-			<File
-				RelativePath="..\..\Demos\ConcaveDemo\MyMotionState.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
--- a/msvc/7/appConstraintDemo.vcproj
+++ b/msvc/7/appConstraintDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release7\build\appConstraintDemo\appConstraintDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appConstraintDemo\"
 				ObjectFile="..\..\out\release7\build\appConstraintDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appConstraintDemo\appConstraintDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appConstraintDemo\"
 				ObjectFile="..\..\out\debug7\build\appConstraintDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -169,9 +169,6 @@
 			<File
 				RelativePath="..\..\Demos\ConstraintDemo\ConstraintDemo.cpp">
 			</File>
-			<File
-				RelativePath="..\..\Demos\ConstraintDemo\MyMotionState.cpp">
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -179,9 +176,6 @@
 			<File
 				RelativePath="..\..\Demos\ConstraintDemo\ConstraintDemo.h">
 			</File>
-			<File
-				RelativePath="..\..\Demos\ConstraintDemo\MyMotionState.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
--- a/msvc/7/appContinuousConvexCollision.vcproj
+++ b/msvc/7/appContinuousConvexCollision.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release7\build\appContinuousConvexCollision\appContinuousConvexCollision.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appContinuousConvexCollision\"
 				ObjectFile="..\..\out\release7\build\appContinuousConvexCollision\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appContinuousConvexCollision\appContinuousConvexCollision.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appContinuousConvexCollision\"
 				ObjectFile="..\..\out\debug7\build\appContinuousConvexCollision\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/7/appConvexDecompositionDemo.vcproj
+++ b/msvc/7/appConvexDecompositionDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				PrecompiledHeaderFile="..\..\out\release7\build\appConvexDecompositionDemo\appConvexDecompositionDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appConvexDecompositionDemo\"
 				ObjectFile="..\..\out\release7\build\appConvexDecompositionDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appConvexDecompositionDemo\appConvexDecompositionDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appConvexDecompositionDemo\"
 				ObjectFile="..\..\out\debug7\build\appConvexDecompositionDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/7/appGPUphysics.vcproj
+++ b/msvc/7/appGPUphysics.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
 				PrecompiledHeaderFile="..\..\out\release7\build\appGPUphysics\appGPUphysics.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appGPUphysics\"
 				ObjectFile="..\..\out\release7\build\appGPUphysics\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appGPUphysics\appGPUphysics.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appGPUphysics\"
 				ObjectFile="..\..\out\debug7\build\appGPUphysics\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/7/appGjkConvexCastDemo.vcproj
+++ b/msvc/7/appGjkConvexCastDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release7\build\appGjkConvexCastDemo\appGjkConvexCastDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appGjkConvexCastDemo\"
 				ObjectFile="..\..\out\release7\build\appGjkConvexCastDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appGjkConvexCastDemo\appGjkConvexCastDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appGjkConvexCastDemo\"
 				ObjectFile="..\..\out\debug7\build\appGjkConvexCastDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/7/appRaytracer.vcproj
+++ b/msvc/7/appRaytracer.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release7\build\appRaytracer\appRaytracer.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appRaytracer\"
 				ObjectFile="..\..\out\release7\build\appRaytracer\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appRaytracer\appRaytracer.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appRaytracer\"
 				ObjectFile="..\..\out\debug7\build\appRaytracer\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/7/appSimplexDemo.vcproj
+++ b/msvc/7/appSimplexDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release7\build\appSimplexDemo\appSimplexDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appSimplexDemo\"
 				ObjectFile="..\..\out\release7\build\appSimplexDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appSimplexDemo\appSimplexDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appSimplexDemo\"
 				ObjectFile="..\..\out\debug7\build\appSimplexDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/7/appUserCollisionAlgorithm.vcproj
+++ b/msvc/7/appUserCollisionAlgorithm.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release7\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appUserCollisionAlgorithm\"
 				ObjectFile="..\..\out\release7\build\appUserCollisionAlgorithm\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appUserCollisionAlgorithm\"
 				ObjectFile="..\..\out\debug7\build\appUserCollisionAlgorithm\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/7/grpapps_bullet.vcproj
+++ b/msvc/7/grpapps_bullet.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				PrecompiledHeaderFile="..\..\out\release7\build\grpapps_bullet\grpapps_bullet.pch"
 				AssemblerListingLocation="..\..\out\release7\build\grpapps_bullet\"
 				ObjectFile="..\..\out\release7\build\grpapps_bullet\"
@@ -78,7 +78,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				PrecompiledHeaderFile="..\..\out\debug7\build\grpapps_bullet\grpapps_bullet.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\grpapps_bullet\"
 				ObjectFile="..\..\out\debug7\build\grpapps_bullet\"
@@ -149,7 +149,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/7/libbulletopenglsupport.vcproj
+++ b/msvc/7/libbulletopenglsupport.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
 				PrecompiledHeaderFile="..\..\out\release7\build\libbulletopenglsupport\libbulletopenglsupport.pch"
 				AssemblerListingLocation="..\..\out\release7\build\libbulletopenglsupport\"
 				ObjectFile="..\..\out\release7\build\libbulletopenglsupport\"
@@ -78,7 +78,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
 				PrecompiledHeaderFile="..\..\out\debug7\build\libbulletopenglsupport\libbulletopenglsupport.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\libbulletopenglsupport\"
 				ObjectFile="..\..\out\debug7\build\libbulletopenglsupport\"
@@ -149,7 +149,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/7/libcollada-dom.vcproj
+++ b/msvc/7/libcollada-dom.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				PrecompiledHeaderFile="..\..\out\release7\build\libcollada-dom\libcollada-dom.pch"
 				AssemblerListingLocation="..\..\out\release7\build\libcollada-dom\"
 				ObjectFile="..\..\out\release7\build\libcollada-dom\"
@@ -78,7 +78,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				PrecompiledHeaderFile="..\..\out\debug7\build\libcollada-dom\libcollada-dom.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\libcollada-dom\"
 				ObjectFile="..\..\out\debug7\build\libcollada-dom\"
@@ -149,7 +149,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/7/libconvexdecomposition.vcproj
+++ b/msvc/7/libconvexdecomposition.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\release7\build\libconvexdecomposition\libconvexdecomposition.pch"
 				AssemblerListingLocation="..\..\out\release7\build\libconvexdecomposition\"
 				ObjectFile="..\..\out\release7\build\libconvexdecomposition\"
@@ -78,7 +78,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\debug7\build\libconvexdecomposition\libconvexdecomposition.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\libconvexdecomposition\"
 				ObjectFile="..\..\out\debug7\build\libconvexdecomposition\"
@@ -149,7 +149,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/7/liblibxml.vcproj
+++ b/msvc/7/liblibxml.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				PrecompiledHeaderFile="..\..\out\release7\build\liblibxml\liblibxml.pch"
 				AssemblerListingLocation="..\..\out\release7\build\liblibxml\"
 				ObjectFile="..\..\out\release7\build\liblibxml\"
@@ -78,7 +78,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				PrecompiledHeaderFile="..\..\out\debug7\build\liblibxml\liblibxml.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\liblibxml\"
 				ObjectFile="..\..\out\debug7\build\liblibxml\"
@@ -149,7 +149,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/7/wksbullet.sln
+++ b/msvc/7/wksbullet.sln
@@ -18,8 +18,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appContinuousConvexCollisio
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appConvexDecompositionDemo", "appConvexDecompositionDemo.vcproj", "{69C821C7-1E18-D894-068D-C55E063F4859}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appForkLiftDemo", "appForkLiftDemo.vcproj", "{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGPUphysics", "appGPUphysics.vcproj", "{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}"
@@ -30,16 +28,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimple
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appUserCollisionAlgorithm", "appUserCollisionAlgorithm.vcproj", "{330B5049-6935-5CE6-79B7-28F570962895}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appVehicleDemo", "appVehicleDemo.vcproj", "{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpall_bullet", "grpall_bullet.vcproj", "{6210A080-01C0-6D67-F1DB-669393175402}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_bullet", "grpapps_bullet.vcproj", "{9E59B16D-0924-409C-1611-DF2207A0053F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grplibs_bullet", "grplibs_bullet.vcproj", "{DFAF0062-4CD7-9AB8-0683-A6026B326F56}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletccdphysics", "libbulletccdphysics.vcproj", "{C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletcollision", "libbulletcollision.vcproj", "{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbulletdynamics.vcproj", "{61BD1097-CF2E-B296-DAA9-73A6FE135319}"
@@ -48,8 +42,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletm
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletphysicsinterfacecommon", "libbulletphysicsinterfacecommon.vcproj", "{85BCCE3E-992B-B6D7-28F6-CF0A12680822}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcollada-dom", "libcollada-dom.vcproj", "{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "libconvexdecomposition.vcproj", "{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}"
@@ -62,105 +54,67 @@ Global
 		ConfigName.1 = Debug
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{330B5049-6935-5CE6-79B7-28F570962895}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{330B5049-6935-5CE6-79B7-28F570962895}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{330B5049-6935-5CE6-79B7-28F570962895}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{330B5049-6935-5CE6-79B7-28F570962895}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{330B5049-6935-5CE6-79B7-28F570962895}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{330B5049-6935-5CE6-79B7-28F570962895}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{7284F809-AF30-6315-88C6-86F1C0798760}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{7284F809-AF30-6315-88C6-86F1C0798760}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{7284F809-AF30-6315-88C6-86F1C0798760}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{7284F809-AF30-6315-88C6-86F1C0798760}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{DAA547D0-0166-C085-0F93-B88CAB800F97}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{DAA547D0-0166-C085-0F93-B88CAB800F97}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{DAA547D0-0166-C085-0F93-B88CAB800F97}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{DAA547D0-0166-C085-0F93-B88CAB800F97}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{60F71B6A-F888-C449-EF49-268BB9F7C963}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{60F71B6A-F888-C449-EF49-268BB9F7C963}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{60A1DC9D-F837-3923-E9DE-A7925394A578}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{60A1DC9D-F837-3923-E9DE-A7925394A578}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{60A1DC9D-F837-3923-E9DE-A7925394A578}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{330B5049-6935-5CE6-79B7-28F570962895}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{330B5049-6935-5CE6-79B7-28F570962895}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{330B5049-6935-5CE6-79B7-28F570962895}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{330B5049-6935-5CE6-79B7-28F570962895}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{6210A080-01C0-6D67-F1DB-669393175402}.0 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
 		{6210A080-01C0-6D67-F1DB-669393175402}.1 = {7284F809-AF30-6315-88C6-86F1C0798760}
 		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
@@ -170,22 +124,18 @@ Global
 		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
 		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
 		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {69C821C7-1E18-D894-068D-C55E063F4859}
-		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}
-		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
-		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
-		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
-		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {330B5049-6935-5CE6-79B7-28F570962895}
-		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
-		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{6210A080-01C0-6D67-F1DB-669393175402}.17 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{6210A080-01C0-6D67-F1DB-669393175402}.18 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{6210A080-01C0-6D67-F1DB-669393175402}.19 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{6210A080-01C0-6D67-F1DB-669393175402}.20 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.21 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{6210A080-01C0-6D67-F1DB-669393175402}.22 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
-		{6210A080-01C0-6D67-F1DB-669393175402}.23 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.24 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
+		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
+		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
+		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
+		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {330B5049-6935-5CE6-79B7-28F570962895}
+		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{6210A080-01C0-6D67-F1DB-669393175402}.17 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.18 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
+		{6210A080-01C0-6D67-F1DB-669393175402}.19 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.20 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {7284F809-AF30-6315-88C6-86F1C0798760}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
@@ -195,22 +145,18 @@ Global
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {69C821C7-1E18-D894-068D-C55E063F4859}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {330B5049-6935-5CE6-79B7-28F570962895}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {330B5049-6935-5CE6-79B7-28F570962895}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.Release.ActiveCfg = Release|Win32
@@ -249,10 +195,6 @@ Global
 		{69C821C7-1E18-D894-068D-C55E063F4859}.Release.Build.0 = Release|Win32
 		{69C821C7-1E18-D894-068D-C55E063F4859}.Debug.ActiveCfg = Debug|Win32
 		{69C821C7-1E18-D894-068D-C55E063F4859}.Debug.Build.0 = Debug|Win32
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.Release.ActiveCfg = Release|Win32
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.Release.Build.0 = Release|Win32
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.Debug.ActiveCfg = Debug|Win32
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.Debug.Build.0 = Debug|Win32
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.ActiveCfg = Release|Win32
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.Build.0 = Release|Win32
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.ActiveCfg = Debug|Win32
@@ -273,10 +215,6 @@ Global
 		{330B5049-6935-5CE6-79B7-28F570962895}.Release.Build.0 = Release|Win32
 		{330B5049-6935-5CE6-79B7-28F570962895}.Debug.ActiveCfg = Debug|Win32
 		{330B5049-6935-5CE6-79B7-28F570962895}.Debug.Build.0 = Debug|Win32
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Release.ActiveCfg = Release|Win32
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Release.Build.0 = Release|Win32
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Debug.ActiveCfg = Debug|Win32
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Debug.Build.0 = Debug|Win32
 		{6210A080-01C0-6D67-F1DB-669393175402}.Release.ActiveCfg = Release|Win32
 		{6210A080-01C0-6D67-F1DB-669393175402}.Release.Build.0 = Release|Win32
 		{6210A080-01C0-6D67-F1DB-669393175402}.Debug.ActiveCfg = Debug|Win32
@@ -289,10 +227,6 @@ Global
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Release.Build.0 = Release|Win32
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Debug.ActiveCfg = Debug|Win32
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Debug.Build.0 = Debug|Win32
-		{C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Release.ActiveCfg = Release|Win32
-		{C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Release.Build.0 = Release|Win32
-		{C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Debug.ActiveCfg = Debug|Win32
-		{C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Debug.Build.0 = Debug|Win32
 		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release.ActiveCfg = Release|Win32
 		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release.Build.0 = Release|Win32
 		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Debug.ActiveCfg = Debug|Win32
@@ -309,10 +243,6 @@ Global
 		{7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32
 		{7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.ActiveCfg = Debug|Win32
 		{7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.Build.0 = Debug|Win32
-		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Release.ActiveCfg = Release|Win32
-		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Release.Build.0 = Release|Win32
-		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Debug.ActiveCfg = Debug|Win32
-		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Debug.Build.0 = Debug|Win32
 		{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Release.ActiveCfg = Release|Win32
 		{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Release.Build.0 = Release|Win32
 		{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Debug.ActiveCfg = Debug|Win32
--- a/msvc/71/appBspDemo.vcproj
+++ b/msvc/71/appBspDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				PrecompiledHeaderFile="..\..\out\release71\build\appBspDemo\appBspDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appBspDemo\"
 				ObjectFile="..\..\out\release71\build\appBspDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appBspDemo\appBspDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appBspDemo\"
 				ObjectFile="..\..\out\debug71\build\appBspDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/71/appCcdPhysicsDemo.vcproj
+++ b/msvc/71/appCcdPhysicsDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release71\build\appCcdPhysicsDemo\appCcdPhysicsDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appCcdPhysicsDemo\"
 				ObjectFile="..\..\out\release71\build\appCcdPhysicsDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appCcdPhysicsDemo\appCcdPhysicsDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appCcdPhysicsDemo\"
 				ObjectFile="..\..\out\debug71\build\appCcdPhysicsDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -169,9 +169,6 @@
 			<File
 				RelativePath="..\..\Demos\CcdPhysicsDemo\CcdPhysicsDemo.cpp">
 			</File>
-			<File
-				RelativePath="..\..\Demos\CcdPhysicsDemo\MyMotionState.cpp">
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -179,9 +176,6 @@
 			<File
 				RelativePath="..\..\Demos\CcdPhysicsDemo\CcdPhysicsDemo.h">
 			</File>
-			<File
-				RelativePath="..\..\Demos\CcdPhysicsDemo\MyMotionState.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
--- a/msvc/71/appColladaDemo.vcproj
+++ b/msvc/71/appColladaDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
 				PrecompiledHeaderFile="..\..\out\release71\build\appColladaDemo\appColladaDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appColladaDemo\"
 				ObjectFile="..\..\out\release71\build\appColladaDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appColladaDemo\appColladaDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appColladaDemo\"
 				ObjectFile="..\..\out\debug71\build\appColladaDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/71/appCollisionDemo.vcproj
+++ b/msvc/71/appCollisionDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release71\build\appCollisionDemo\appCollisionDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appCollisionDemo\"
 				ObjectFile="..\..\out\release71\build\appCollisionDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appCollisionDemo\appCollisionDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appCollisionDemo\"
 				ObjectFile="..\..\out\debug71\build\appCollisionDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/71/appCollisionInterfaceDemo.vcproj
+++ b/msvc/71/appCollisionInterfaceDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release71\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appCollisionInterfaceDemo\"
 				ObjectFile="..\..\out\release71\build\appCollisionInterfaceDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appCollisionInterfaceDemo\"
 				ObjectFile="..\..\out\debug71\build\appCollisionInterfaceDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/71/appConcaveDemo.vcproj
+++ b/msvc/71/appConcaveDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release71\build\appConcaveDemo\appConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appConcaveDemo\"
 				ObjectFile="..\..\out\release71\build\appConcaveDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appConcaveDemo\appConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appConcaveDemo\"
 				ObjectFile="..\..\out\debug71\build\appConcaveDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -169,9 +169,6 @@
 			<File
 				RelativePath="..\..\Demos\ConcaveDemo\ConcavePhysicsDemo.cpp">
 			</File>
-			<File
-				RelativePath="..\..\Demos\ConcaveDemo\MyMotionState.cpp">
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -179,9 +176,6 @@
 			<File
 				RelativePath="..\..\Demos\ConcaveDemo\ConcaveDemo.h">
 			</File>
-			<File
-				RelativePath="..\..\Demos\ConcaveDemo\MyMotionState.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
--- a/msvc/71/appConstraintDemo.vcproj
+++ b/msvc/71/appConstraintDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release71\build\appConstraintDemo\appConstraintDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appConstraintDemo\"
 				ObjectFile="..\..\out\release71\build\appConstraintDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appConstraintDemo\appConstraintDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appConstraintDemo\"
 				ObjectFile="..\..\out\debug71\build\appConstraintDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -169,9 +169,6 @@
 			<File
 				RelativePath="..\..\Demos\ConstraintDemo\ConstraintDemo.cpp">
 			</File>
-			<File
-				RelativePath="..\..\Demos\ConstraintDemo\MyMotionState.cpp">
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -179,9 +176,6 @@
 			<File
 				RelativePath="..\..\Demos\ConstraintDemo\ConstraintDemo.h">
 			</File>
-			<File
-				RelativePath="..\..\Demos\ConstraintDemo\MyMotionState.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
--- a/msvc/71/appContinuousConvexCollision.vcproj
+++ b/msvc/71/appContinuousConvexCollision.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release71\build\appContinuousConvexCollision\appContinuousConvexCollision.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appContinuousConvexCollision\"
 				ObjectFile="..\..\out\release71\build\appContinuousConvexCollision\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appContinuousConvexCollision\appContinuousConvexCollision.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appContinuousConvexCollision\"
 				ObjectFile="..\..\out\debug71\build\appContinuousConvexCollision\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/71/appConvexDecompositionDemo.vcproj
+++ b/msvc/71/appConvexDecompositionDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				PrecompiledHeaderFile="..\..\out\release71\build\appConvexDecompositionDemo\appConvexDecompositionDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appConvexDecompositionDemo\"
 				ObjectFile="..\..\out\release71\build\appConvexDecompositionDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appConvexDecompositionDemo\appConvexDecompositionDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appConvexDecompositionDemo\"
 				ObjectFile="..\..\out\debug71\build\appConvexDecompositionDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/71/appGPUphysics.vcproj
+++ b/msvc/71/appGPUphysics.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
 				PrecompiledHeaderFile="..\..\out\release71\build\appGPUphysics\appGPUphysics.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appGPUphysics\"
 				ObjectFile="..\..\out\release71\build\appGPUphysics\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appGPUphysics\appGPUphysics.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appGPUphysics\"
 				ObjectFile="..\..\out\debug71\build\appGPUphysics\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/71/appGjkConvexCastDemo.vcproj
+++ b/msvc/71/appGjkConvexCastDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release71\build\appGjkConvexCastDemo\appGjkConvexCastDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appGjkConvexCastDemo\"
 				ObjectFile="..\..\out\release71\build\appGjkConvexCastDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appGjkConvexCastDemo\appGjkConvexCastDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appGjkConvexCastDemo\"
 				ObjectFile="..\..\out\debug71\build\appGjkConvexCastDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/71/appRaytracer.vcproj
+++ b/msvc/71/appRaytracer.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release71\build\appRaytracer\appRaytracer.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appRaytracer\"
 				ObjectFile="..\..\out\release71\build\appRaytracer\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appRaytracer\appRaytracer.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appRaytracer\"
 				ObjectFile="..\..\out\debug71\build\appRaytracer\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/71/appSimplexDemo.vcproj
+++ b/msvc/71/appSimplexDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release71\build\appSimplexDemo\appSimplexDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appSimplexDemo\"
 				ObjectFile="..\..\out\release71\build\appSimplexDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appSimplexDemo\appSimplexDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appSimplexDemo\"
 				ObjectFile="..\..\out\debug71\build\appSimplexDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/71/appUserCollisionAlgorithm.vcproj
+++ b/msvc/71/appUserCollisionAlgorithm.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release71\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appUserCollisionAlgorithm\"
 				ObjectFile="..\..\out\release71\build\appUserCollisionAlgorithm\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appUserCollisionAlgorithm\"
 				ObjectFile="..\..\out\debug71\build\appUserCollisionAlgorithm\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/71/grpapps_bullet.vcproj
+++ b/msvc/71/grpapps_bullet.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				PrecompiledHeaderFile="..\..\out\release71\build\grpapps_bullet\grpapps_bullet.pch"
 				AssemblerListingLocation="..\..\out\release71\build\grpapps_bullet\"
 				ObjectFile="..\..\out\release71\build\grpapps_bullet\"
@@ -78,7 +78,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				PrecompiledHeaderFile="..\..\out\debug71\build\grpapps_bullet\grpapps_bullet.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\grpapps_bullet\"
 				ObjectFile="..\..\out\debug71\build\grpapps_bullet\"
@@ -149,7 +149,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/71/libbulletopenglsupport.vcproj
+++ b/msvc/71/libbulletopenglsupport.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
 				PrecompiledHeaderFile="..\..\out\release71\build\libbulletopenglsupport\libbulletopenglsupport.pch"
 				AssemblerListingLocation="..\..\out\release71\build\libbulletopenglsupport\"
 				ObjectFile="..\..\out\release71\build\libbulletopenglsupport\"
@@ -78,7 +78,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
 				PrecompiledHeaderFile="..\..\out\debug71\build\libbulletopenglsupport\libbulletopenglsupport.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\libbulletopenglsupport\"
 				ObjectFile="..\..\out\debug71\build\libbulletopenglsupport\"
@@ -149,7 +149,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/71/libcollada-dom.vcproj
+++ b/msvc/71/libcollada-dom.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				PrecompiledHeaderFile="..\..\out\release71\build\libcollada-dom\libcollada-dom.pch"
 				AssemblerListingLocation="..\..\out\release71\build\libcollada-dom\"
 				ObjectFile="..\..\out\release71\build\libcollada-dom\"
@@ -78,7 +78,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				PrecompiledHeaderFile="..\..\out\debug71\build\libcollada-dom\libcollada-dom.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\libcollada-dom\"
 				ObjectFile="..\..\out\debug71\build\libcollada-dom\"
@@ -149,7 +149,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/71/libconvexdecomposition.vcproj
+++ b/msvc/71/libconvexdecomposition.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\release71\build\libconvexdecomposition\libconvexdecomposition.pch"
 				AssemblerListingLocation="..\..\out\release71\build\libconvexdecomposition\"
 				ObjectFile="..\..\out\release71\build\libconvexdecomposition\"
@@ -78,7 +78,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\debug71\build\libconvexdecomposition\libconvexdecomposition.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\libconvexdecomposition\"
 				ObjectFile="..\..\out\debug71\build\libconvexdecomposition\"
@@ -149,7 +149,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/71/liblibxml.vcproj
+++ b/msvc/71/liblibxml.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				PrecompiledHeaderFile="..\..\out\release71\build\liblibxml\liblibxml.pch"
 				AssemblerListingLocation="..\..\out\release71\build\liblibxml\"
 				ObjectFile="..\..\out\release71\build\liblibxml\"
@@ -78,7 +78,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				PrecompiledHeaderFile="..\..\out\debug71\build\liblibxml\liblibxml.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\liblibxml\"
 				ObjectFile="..\..\out\debug71\build\liblibxml\"
@@ -149,7 +149,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/71/wksbullet.sln
+++ b/msvc/71/wksbullet.sln
@@ -18,8 +18,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appContinuousConvexCollisio
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appConvexDecompositionDemo", "appConvexDecompositionDemo.vcproj", "{69C821C7-1E18-D894-068D-C55E063F4859}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appForkLiftDemo", "appForkLiftDemo.vcproj", "{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGPUphysics", "appGPUphysics.vcproj", "{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}"
@@ -30,16 +28,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimple
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appUserCollisionAlgorithm", "appUserCollisionAlgorithm.vcproj", "{330B5049-6935-5CE6-79B7-28F570962895}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appVehicleDemo", "appVehicleDemo.vcproj", "{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpall_bullet", "grpall_bullet.vcproj", "{6210A080-01C0-6D67-F1DB-669393175402}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_bullet", "grpapps_bullet.vcproj", "{9E59B16D-0924-409C-1611-DF2207A0053F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grplibs_bullet", "grplibs_bullet.vcproj", "{DFAF0062-4CD7-9AB8-0683-A6026B326F56}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletccdphysics", "libbulletccdphysics.vcproj", "{C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletcollision", "libbulletcollision.vcproj", "{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbulletdynamics.vcproj", "{61BD1097-CF2E-B296-DAA9-73A6FE135319}"
@@ -48,8 +42,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletm
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletphysicsinterfacecommon", "libbulletphysicsinterfacecommon.vcproj", "{85BCCE3E-992B-B6D7-28F6-CF0A12680822}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcollada-dom", "libcollada-dom.vcproj", "{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "libconvexdecomposition.vcproj", "{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}"
@@ -62,105 +54,67 @@ Global
 		ConfigName.1 = Debug
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{330B5049-6935-5CE6-79B7-28F570962895}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{330B5049-6935-5CE6-79B7-28F570962895}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{330B5049-6935-5CE6-79B7-28F570962895}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{330B5049-6935-5CE6-79B7-28F570962895}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{330B5049-6935-5CE6-79B7-28F570962895}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{330B5049-6935-5CE6-79B7-28F570962895}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{7284F809-AF30-6315-88C6-86F1C0798760}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{7284F809-AF30-6315-88C6-86F1C0798760}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{7284F809-AF30-6315-88C6-86F1C0798760}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{7284F809-AF30-6315-88C6-86F1C0798760}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{DAA547D0-0166-C085-0F93-B88CAB800F97}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{DAA547D0-0166-C085-0F93-B88CAB800F97}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{DAA547D0-0166-C085-0F93-B88CAB800F97}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{DAA547D0-0166-C085-0F93-B88CAB800F97}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{60F71B6A-F888-C449-EF49-268BB9F7C963}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{60F71B6A-F888-C449-EF49-268BB9F7C963}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{60A1DC9D-F837-3923-E9DE-A7925394A578}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{60A1DC9D-F837-3923-E9DE-A7925394A578}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{60A1DC9D-F837-3923-E9DE-A7925394A578}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{330B5049-6935-5CE6-79B7-28F570962895}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{330B5049-6935-5CE6-79B7-28F570962895}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{330B5049-6935-5CE6-79B7-28F570962895}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{330B5049-6935-5CE6-79B7-28F570962895}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{6210A080-01C0-6D67-F1DB-669393175402}.0 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
 		{6210A080-01C0-6D67-F1DB-669393175402}.1 = {7284F809-AF30-6315-88C6-86F1C0798760}
 		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
@@ -170,22 +124,18 @@ Global
 		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
 		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
 		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {69C821C7-1E18-D894-068D-C55E063F4859}
-		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}
-		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
-		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
-		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
-		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {330B5049-6935-5CE6-79B7-28F570962895}
-		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
-		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{6210A080-01C0-6D67-F1DB-669393175402}.17 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{6210A080-01C0-6D67-F1DB-669393175402}.18 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{6210A080-01C0-6D67-F1DB-669393175402}.19 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{6210A080-01C0-6D67-F1DB-669393175402}.20 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.21 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{6210A080-01C0-6D67-F1DB-669393175402}.22 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
-		{6210A080-01C0-6D67-F1DB-669393175402}.23 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.24 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
+		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
+		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
+		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
+		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {330B5049-6935-5CE6-79B7-28F570962895}
+		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{6210A080-01C0-6D67-F1DB-669393175402}.17 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.18 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
+		{6210A080-01C0-6D67-F1DB-669393175402}.19 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.20 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {7284F809-AF30-6315-88C6-86F1C0798760}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
@@ -195,22 +145,18 @@ Global
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {69C821C7-1E18-D894-068D-C55E063F4859}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {330B5049-6935-5CE6-79B7-28F570962895}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {330B5049-6935-5CE6-79B7-28F570962895}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.Release.ActiveCfg = Release|Win32
@@ -249,10 +195,6 @@ Global
 		{69C821C7-1E18-D894-068D-C55E063F4859}.Release.Build.0 = Release|Win32
 		{69C821C7-1E18-D894-068D-C55E063F4859}.Debug.ActiveCfg = Debug|Win32
 		{69C821C7-1E18-D894-068D-C55E063F4859}.Debug.Build.0 = Debug|Win32
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.Release.ActiveCfg = Release|Win32
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.Release.Build.0 = Release|Win32
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.Debug.ActiveCfg = Debug|Win32
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.Debug.Build.0 = Debug|Win32
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.ActiveCfg = Release|Win32
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.Build.0 = Release|Win32
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.ActiveCfg = Debug|Win32
@@ -273,10 +215,6 @@ Global
 		{330B5049-6935-5CE6-79B7-28F570962895}.Release.Build.0 = Release|Win32
 		{330B5049-6935-5CE6-79B7-28F570962895}.Debug.ActiveCfg = Debug|Win32
 		{330B5049-6935-5CE6-79B7-28F570962895}.Debug.Build.0 = Debug|Win32
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Release.ActiveCfg = Release|Win32
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Release.Build.0 = Release|Win32
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Debug.ActiveCfg = Debug|Win32
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Debug.Build.0 = Debug|Win32
 		{6210A080-01C0-6D67-F1DB-669393175402}.Release.ActiveCfg = Release|Win32
 		{6210A080-01C0-6D67-F1DB-669393175402}.Release.Build.0 = Release|Win32
 		{6210A080-01C0-6D67-F1DB-669393175402}.Debug.ActiveCfg = Debug|Win32
@@ -289,10 +227,6 @@ Global
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Release.Build.0 = Release|Win32
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Debug.ActiveCfg = Debug|Win32
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Debug.Build.0 = Debug|Win32
-		{C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Release.ActiveCfg = Release|Win32
-		{C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Release.Build.0 = Release|Win32
-		{C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Debug.ActiveCfg = Debug|Win32
-		{C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Debug.Build.0 = Debug|Win32
 		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release.ActiveCfg = Release|Win32
 		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release.Build.0 = Release|Win32
 		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Debug.ActiveCfg = Debug|Win32
@@ -309,10 +243,6 @@ Global
 		{7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32
 		{7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.ActiveCfg = Debug|Win32
 		{7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.Build.0 = Debug|Win32
-		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Release.ActiveCfg = Release|Win32
-		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Release.Build.0 = Release|Win32
-		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Debug.ActiveCfg = Debug|Win32
-		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Debug.Build.0 = Debug|Win32
 		{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Release.ActiveCfg = Release|Win32
 		{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Release.Build.0 = Release|Win32
 		{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Debug.ActiveCfg = Debug|Win32
--- a/msvc/8/appBspDemo.vcproj
+++ b/msvc/8/appBspDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				PrecompiledHeaderFile="..\..\out\release8\build\appBspDemo\appBspDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appBspDemo\"
 				ObjectFile="..\..\out\release8\build\appBspDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appBspDemo\appBspDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appBspDemo\"
 				ObjectFile="..\..\out\debug8\build\appBspDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/8/appCcdPhysicsDemo.vcproj
+++ b/msvc/8/appCcdPhysicsDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release8\build\appCcdPhysicsDemo\appCcdPhysicsDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appCcdPhysicsDemo\"
 				ObjectFile="..\..\out\release8\build\appCcdPhysicsDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appCcdPhysicsDemo\appCcdPhysicsDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appCcdPhysicsDemo\"
 				ObjectFile="..\..\out\debug8\build\appCcdPhysicsDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -169,9 +169,6 @@
 			<File
 				RelativePath="..\..\Demos\CcdPhysicsDemo\CcdPhysicsDemo.cpp">
 			</File>
-			<File
-				RelativePath="..\..\Demos\CcdPhysicsDemo\MyMotionState.cpp">
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -179,9 +176,6 @@
 			<File
 				RelativePath="..\..\Demos\CcdPhysicsDemo\CcdPhysicsDemo.h">
 			</File>
-			<File
-				RelativePath="..\..\Demos\CcdPhysicsDemo\MyMotionState.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
--- a/msvc/8/appColladaDemo.vcproj
+++ b/msvc/8/appColladaDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
 				PrecompiledHeaderFile="..\..\out\release8\build\appColladaDemo\appColladaDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appColladaDemo\"
 				ObjectFile="..\..\out\release8\build\appColladaDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appColladaDemo\appColladaDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appColladaDemo\"
 				ObjectFile="..\..\out\debug8\build\appColladaDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML;..\..\Extras\FCollada"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/8/appCollisionDemo.vcproj
+++ b/msvc/8/appCollisionDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release8\build\appCollisionDemo\appCollisionDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appCollisionDemo\"
 				ObjectFile="..\..\out\release8\build\appCollisionDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appCollisionDemo\appCollisionDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appCollisionDemo\"
 				ObjectFile="..\..\out\debug8\build\appCollisionDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/8/appCollisionInterfaceDemo.vcproj
+++ b/msvc/8/appCollisionInterfaceDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release8\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appCollisionInterfaceDemo\"
 				ObjectFile="..\..\out\release8\build\appCollisionInterfaceDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appCollisionInterfaceDemo\appCollisionInterfaceDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appCollisionInterfaceDemo\"
 				ObjectFile="..\..\out\debug8\build\appCollisionInterfaceDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/8/appConcaveDemo.vcproj
+++ b/msvc/8/appConcaveDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release8\build\appConcaveDemo\appConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appConcaveDemo\"
 				ObjectFile="..\..\out\release8\build\appConcaveDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appConcaveDemo\appConcaveDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appConcaveDemo\"
 				ObjectFile="..\..\out\debug8\build\appConcaveDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -169,9 +169,6 @@
 			<File
 				RelativePath="..\..\Demos\ConcaveDemo\ConcavePhysicsDemo.cpp">
 			</File>
-			<File
-				RelativePath="..\..\Demos\ConcaveDemo\MyMotionState.cpp">
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -179,9 +176,6 @@
 			<File
 				RelativePath="..\..\Demos\ConcaveDemo\ConcaveDemo.h">
 			</File>
-			<File
-				RelativePath="..\..\Demos\ConcaveDemo\MyMotionState.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
--- a/msvc/8/appConstraintDemo.vcproj
+++ b/msvc/8/appConstraintDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release8\build\appConstraintDemo\appConstraintDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appConstraintDemo\"
 				ObjectFile="..\..\out\release8\build\appConstraintDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appConstraintDemo\appConstraintDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appConstraintDemo\"
 				ObjectFile="..\..\out\debug8\build\appConstraintDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -169,9 +169,6 @@
 			<File
 				RelativePath="..\..\Demos\ConstraintDemo\ConstraintDemo.cpp">
 			</File>
-			<File
-				RelativePath="..\..\Demos\ConstraintDemo\MyMotionState.cpp">
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -179,9 +176,6 @@
 			<File
 				RelativePath="..\..\Demos\ConstraintDemo\ConstraintDemo.h">
 			</File>
-			<File
-				RelativePath="..\..\Demos\ConstraintDemo\MyMotionState.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
--- a/msvc/8/appContinuousConvexCollision.vcproj
+++ b/msvc/8/appContinuousConvexCollision.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release8\build\appContinuousConvexCollision\appContinuousConvexCollision.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appContinuousConvexCollision\"
 				ObjectFile="..\..\out\release8\build\appContinuousConvexCollision\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appContinuousConvexCollision\appContinuousConvexCollision.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appContinuousConvexCollision\"
 				ObjectFile="..\..\out\debug8\build\appContinuousConvexCollision\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/8/appConvexDecompositionDemo.vcproj
+++ b/msvc/8/appConvexDecompositionDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				PrecompiledHeaderFile="..\..\out\release8\build\appConvexDecompositionDemo\appConvexDecompositionDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appConvexDecompositionDemo\"
 				ObjectFile="..\..\out\release8\build\appConvexDecompositionDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appConvexDecompositionDemo\appConvexDecompositionDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appConvexDecompositionDemo\"
 				ObjectFile="..\..\out\debug8\build\appConvexDecompositionDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\LibXML"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/8/appGPUphysics.vcproj
+++ b/msvc/8/appGPUphysics.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
 				PrecompiledHeaderFile="..\..\out\release8\build\appGPUphysics\appGPUphysics.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appGPUphysics\"
 				ObjectFile="..\..\out\release8\build\appGPUphysics\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appGPUphysics\appGPUphysics.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appGPUphysics\"
 				ObjectFile="..\..\out\debug8\build\appGPUphysics\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Demos\OpenGL;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Extras\PhysicsInterface\Common;..\..\Glut"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/8/appGjkConvexCastDemo.vcproj
+++ b/msvc/8/appGjkConvexCastDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release8\build\appGjkConvexCastDemo\appGjkConvexCastDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appGjkConvexCastDemo\"
 				ObjectFile="..\..\out\release8\build\appGjkConvexCastDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appGjkConvexCastDemo\appGjkConvexCastDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appGjkConvexCastDemo\"
 				ObjectFile="..\..\out\debug8\build\appGjkConvexCastDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/8/appRaytracer.vcproj
+++ b/msvc/8/appRaytracer.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release8\build\appRaytracer\appRaytracer.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appRaytracer\"
 				ObjectFile="..\..\out\release8\build\appRaytracer\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appRaytracer\appRaytracer.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appRaytracer\"
 				ObjectFile="..\..\out\debug8\build\appRaytracer\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/8/appSimplexDemo.vcproj
+++ b/msvc/8/appSimplexDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release8\build\appSimplexDemo\appSimplexDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appSimplexDemo\"
 				ObjectFile="..\..\out\release8\build\appSimplexDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appSimplexDemo\appSimplexDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appSimplexDemo\"
 				ObjectFile="..\..\out\debug8\build\appSimplexDemo\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/8/appUserCollisionAlgorithm.vcproj
+++ b/msvc/8/appUserCollisionAlgorithm.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\release8\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appUserCollisionAlgorithm\"
 				ObjectFile="..\..\out\release8\build\appUserCollisionAlgorithm\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -107,7 +107,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appUserCollisionAlgorithm\appUserCollisionAlgorithm.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appUserCollisionAlgorithm\"
 				ObjectFile="..\..\out\debug8\build\appUserCollisionAlgorithm\"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut;..\..\Demos\OpenGL"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/8/grpapps_bullet.vcproj
+++ b/msvc/8/grpapps_bullet.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				PrecompiledHeaderFile="..\..\out\release8\build\grpapps_bullet\grpapps_bullet.pch"
 				AssemblerListingLocation="..\..\out\release8\build\grpapps_bullet\"
 				ObjectFile="..\..\out\release8\build\grpapps_bullet\"
@@ -78,7 +78,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				PrecompiledHeaderFile="..\..\out\debug8\build\grpapps_bullet\grpapps_bullet.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\grpapps_bullet\"
 				ObjectFile="..\..\out\debug8\build\grpapps_bullet\"
@@ -149,7 +149,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/8/libbulletopenglsupport.vcproj
+++ b/msvc/8/libbulletopenglsupport.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
 				PrecompiledHeaderFile="..\..\out\release8\build\libbulletopenglsupport\libbulletopenglsupport.pch"
 				AssemblerListingLocation="..\..\out\release8\build\libbulletopenglsupport\"
 				ObjectFile="..\..\out\release8\build\libbulletopenglsupport\"
@@ -78,7 +78,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
 				PrecompiledHeaderFile="..\..\out\debug8\build\libbulletopenglsupport\libbulletopenglsupport.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\libbulletopenglsupport\"
 				ObjectFile="..\..\out\debug8\build\libbulletopenglsupport\"
@@ -149,7 +149,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include;..\..\Extras\PhysicsInterface\Common;..\..\Extras\PhysicsInterface\CcdPhysics;..\..\Glut"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/8/libcollada-dom.vcproj
+++ b/msvc/8/libcollada-dom.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				PrecompiledHeaderFile="..\..\out\release8\build\libcollada-dom\libcollada-dom.pch"
 				AssemblerListingLocation="..\..\out\release8\build\libcollada-dom\"
 				ObjectFile="..\..\out\release8\build\libcollada-dom\"
@@ -78,7 +78,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				PrecompiledHeaderFile="..\..\out\debug8\build\libcollada-dom\libcollada-dom.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\libcollada-dom\"
 				ObjectFile="..\..\out\debug8\build\libcollada-dom\"
@@ -149,7 +149,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/8/libconvexdecomposition.vcproj
+++ b/msvc/8/libconvexdecomposition.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\release8\build\libconvexdecomposition\libconvexdecomposition.pch"
 				AssemblerListingLocation="..\..\out\release8\build\libconvexdecomposition\"
 				ObjectFile="..\..\out\release8\build\libconvexdecomposition\"
@@ -78,7 +78,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\debug8\build\libconvexdecomposition\libconvexdecomposition.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\libconvexdecomposition\"
 				ObjectFile="..\..\out\debug8\build\libconvexdecomposition\"
@@ -149,7 +149,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/8/liblibxml.vcproj
+++ b/msvc/8/liblibxml.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				PrecompiledHeaderFile="..\..\out\release8\build\liblibxml\liblibxml.pch"
 				AssemblerListingLocation="..\..\out\release8\build\liblibxml\"
 				ObjectFile="..\..\out\release8\build\liblibxml\"
@@ -78,7 +78,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				PrecompiledHeaderFile="..\..\out\debug8\build\liblibxml\liblibxml.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\liblibxml\"
 				ObjectFile="..\..\out\debug8\build\liblibxml\"
@@ -149,7 +149,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\PhysicsInterface\Common;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\ConvexDecomposition;..\..\Extras\COLLADA_DOM\include;..\..\Extras\COLLADA_DOM\include\1.4;..\..\Extras\LibXML\include"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
--- a/msvc/8/wksbullet.sln
+++ b/msvc/8/wksbullet.sln
@@ -18,8 +18,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appContinuousConvexCollisio
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appConvexDecompositionDemo", "appConvexDecompositionDemo.vcproj", "{69C821C7-1E18-D894-068D-C55E063F4859}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appForkLiftDemo", "appForkLiftDemo.vcproj", "{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGjkConvexCastDemo", "appGjkConvexCastDemo.vcproj", "{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appGPUphysics", "appGPUphysics.vcproj", "{385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}"
@@ -30,16 +28,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appSimplexDemo", "appSimple
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appUserCollisionAlgorithm", "appUserCollisionAlgorithm.vcproj", "{330B5049-6935-5CE6-79B7-28F570962895}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appVehicleDemo", "appVehicleDemo.vcproj", "{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpall_bullet", "grpall_bullet.vcproj", "{6210A080-01C0-6D67-F1DB-669393175402}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_bullet", "grpapps_bullet.vcproj", "{9E59B16D-0924-409C-1611-DF2207A0053F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grplibs_bullet", "grplibs_bullet.vcproj", "{DFAF0062-4CD7-9AB8-0683-A6026B326F56}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletccdphysics", "libbulletccdphysics.vcproj", "{C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletcollision", "libbulletcollision.vcproj", "{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletdynamics", "libbulletdynamics.vcproj", "{61BD1097-CF2E-B296-DAA9-73A6FE135319}"
@@ -48,8 +42,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletmath", "libbulletm
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletopenglsupport", "libbulletopenglsupport.vcproj", "{7C428E76-9271-6284-20F0-9B38ED6931E3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbulletphysicsinterfacecommon", "libbulletphysicsinterfacecommon.vcproj", "{85BCCE3E-992B-B6D7-28F6-CF0A12680822}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcollada-dom", "libcollada-dom.vcproj", "{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libconvexdecomposition", "libconvexdecomposition.vcproj", "{8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}"
@@ -62,105 +54,67 @@ Global
 		ConfigName.1 = Debug
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{7284F809-AF30-6315-88C6-86F1C0798760}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{DAA547D0-0166-C085-0F93-B88CAB800F97}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{69C821C7-1E18-D894-068D-C55E063F4859}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{60F71B6A-F888-C449-EF49-268BB9F7C963}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{60A1DC9D-F837-3923-E9DE-A7925394A578}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{330B5049-6935-5CE6-79B7-28F570962895}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{330B5049-6935-5CE6-79B7-28F570962895}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{330B5049-6935-5CE6-79B7-28F570962895}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{330B5049-6935-5CE6-79B7-28F570962895}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{330B5049-6935-5CE6-79B7-28F570962895}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{330B5049-6935-5CE6-79B7-28F570962895}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{7284F809-AF30-6315-88C6-86F1C0798760}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{7284F809-AF30-6315-88C6-86F1C0798760}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{7284F809-AF30-6315-88C6-86F1C0798760}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{7284F809-AF30-6315-88C6-86F1C0798760}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{E70DB92E-C1F5-AE72-F9E2-DB9B4B3DBEC9}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{F38629D2-EEB2-1A09-FB82-52B8A8DE759B}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{B94C19C6-F6E7-2F60-56E2-E0BA681B74B3}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{DAA547D0-0166-C085-0F93-B88CAB800F97}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{DAA547D0-0166-C085-0F93-B88CAB800F97}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{DAA547D0-0166-C085-0F93-B88CAB800F97}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{DAA547D0-0166-C085-0F93-B88CAB800F97}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{801CB6D4-A45C-C9D2-B176-9711A74B9164}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{69C821C7-1E18-D894-068D-C55E063F4859}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{60F71B6A-F888-C449-EF49-268BB9F7C963}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{60F71B6A-F888-C449-EF49-268BB9F7C963}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{60F71B6A-F888-C449-EF49-268BB9F7C963}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{60F71B6A-F888-C449-EF49-268BB9F7C963}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{60A1DC9D-F837-3923-E9DE-A7925394A578}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{60A1DC9D-F837-3923-E9DE-A7925394A578}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{60A1DC9D-F837-3923-E9DE-A7925394A578}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{60A1DC9D-F837-3923-E9DE-A7925394A578}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{330B5049-6935-5CE6-79B7-28F570962895}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{330B5049-6935-5CE6-79B7-28F570962895}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{330B5049-6935-5CE6-79B7-28F570962895}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{330B5049-6935-5CE6-79B7-28F570962895}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
 		{6210A080-01C0-6D67-F1DB-669393175402}.0 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
 		{6210A080-01C0-6D67-F1DB-669393175402}.1 = {7284F809-AF30-6315-88C6-86F1C0798760}
 		{6210A080-01C0-6D67-F1DB-669393175402}.2 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
@@ -170,22 +124,18 @@ Global
 		{6210A080-01C0-6D67-F1DB-669393175402}.6 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
 		{6210A080-01C0-6D67-F1DB-669393175402}.7 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
 		{6210A080-01C0-6D67-F1DB-669393175402}.8 = {69C821C7-1E18-D894-068D-C55E063F4859}
-		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}
-		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
-		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
-		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
-		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {330B5049-6935-5CE6-79B7-28F570962895}
-		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
-		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{6210A080-01C0-6D67-F1DB-669393175402}.17 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{6210A080-01C0-6D67-F1DB-669393175402}.18 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{6210A080-01C0-6D67-F1DB-669393175402}.19 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{6210A080-01C0-6D67-F1DB-669393175402}.20 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.21 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{6210A080-01C0-6D67-F1DB-669393175402}.22 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
-		{6210A080-01C0-6D67-F1DB-669393175402}.23 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{6210A080-01C0-6D67-F1DB-669393175402}.24 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{6210A080-01C0-6D67-F1DB-669393175402}.9 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
+		{6210A080-01C0-6D67-F1DB-669393175402}.10 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
+		{6210A080-01C0-6D67-F1DB-669393175402}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
+		{6210A080-01C0-6D67-F1DB-669393175402}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
+		{6210A080-01C0-6D67-F1DB-669393175402}.13 = {330B5049-6935-5CE6-79B7-28F570962895}
+		{6210A080-01C0-6D67-F1DB-669393175402}.14 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{6210A080-01C0-6D67-F1DB-669393175402}.15 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{6210A080-01C0-6D67-F1DB-669393175402}.16 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{6210A080-01C0-6D67-F1DB-669393175402}.17 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.18 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
+		{6210A080-01C0-6D67-F1DB-669393175402}.19 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{6210A080-01C0-6D67-F1DB-669393175402}.20 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.0 = {255A379C-F159-5362-4024-D5ADB9F5FBD2}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.1 = {7284F809-AF30-6315-88C6-86F1C0798760}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.2 = {D7BF5DDA-C097-9E8B-5EC1-40DE45FB46BF}
@@ -195,22 +145,18 @@ Global
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.6 = {DAA547D0-0166-C085-0F93-B88CAB800F97}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.7 = {801CB6D4-A45C-C9D2-B176-9711A74B9164}
 		{9E59B16D-0924-409C-1611-DF2207A0053F}.8 = {69C821C7-1E18-D894-068D-C55E063F4859}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {4FF98546-7A0D-00AA-743C-F1EA15BC00E2}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.14 = {330B5049-6935-5CE6-79B7-28F570962895}
-		{9E59B16D-0924-409C-1611-DF2207A0053F}.15 = {07E712DB-DAF8-887E-F099-CE43D4E8B1F9}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {85BCCE3E-992B-B6D7-28F6-CF0A12680822}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.7 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
-		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.8 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.9 = {780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.10 = {385D5AB2-3904-6848-ACA6-9DFFF2F5A23F}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.11 = {60F71B6A-F888-C449-EF49-268BB9F7C963}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.12 = {60A1DC9D-F837-3923-E9DE-A7925394A578}
+		{9E59B16D-0924-409C-1611-DF2207A0053F}.13 = {330B5049-6935-5CE6-79B7-28F570962895}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.0 = {6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.1 = {61BD1097-CF2E-B296-DAA9-73A6FE135319}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.2 = {7D6E339F-9C2C-31DA-FDB0-5EE50973CF2A}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.3 = {7C428E76-9271-6284-20F0-9B38ED6931E3}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.4 = {5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.5 = {8050F819-5B5B-1504-BC6D-7F2B4C6C85F3}
+		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.6 = {A0958CD9-0E39-4A77-3711-9B488F508FBF}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{255A379C-F159-5362-4024-D5ADB9F5FBD2}.Release.ActiveCfg = Release|Win32
@@ -249,10 +195,6 @@ Global
 		{69C821C7-1E18-D894-068D-C55E063F4859}.Release.Build.0 = Release|Win32
 		{69C821C7-1E18-D894-068D-C55E063F4859}.Debug.ActiveCfg = Debug|Win32
 		{69C821C7-1E18-D894-068D-C55E063F4859}.Debug.Build.0 = Debug|Win32
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.Release.ActiveCfg = Release|Win32
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.Release.Build.0 = Release|Win32
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.Debug.ActiveCfg = Debug|Win32
-		{4FF98546-7A0D-00AA-743C-F1EA15BC00E2}.Debug.Build.0 = Debug|Win32
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.ActiveCfg = Release|Win32
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Release.Build.0 = Release|Win32
 		{780752A8-6322-5D3E-EF42-D0FD8BF9CEA1}.Debug.ActiveCfg = Debug|Win32
@@ -273,10 +215,6 @@ Global
 		{330B5049-6935-5CE6-79B7-28F570962895}.Release.Build.0 = Release|Win32
 		{330B5049-6935-5CE6-79B7-28F570962895}.Debug.ActiveCfg = Debug|Win32
 		{330B5049-6935-5CE6-79B7-28F570962895}.Debug.Build.0 = Debug|Win32
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Release.ActiveCfg = Release|Win32
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Release.Build.0 = Release|Win32
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Debug.ActiveCfg = Debug|Win32
-		{07E712DB-DAF8-887E-F099-CE43D4E8B1F9}.Debug.Build.0 = Debug|Win32
 		{6210A080-01C0-6D67-F1DB-669393175402}.Release.ActiveCfg = Release|Win32
 		{6210A080-01C0-6D67-F1DB-669393175402}.Release.Build.0 = Release|Win32
 		{6210A080-01C0-6D67-F1DB-669393175402}.Debug.ActiveCfg = Debug|Win32
@@ -289,10 +227,6 @@ Global
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Release.Build.0 = Release|Win32
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Debug.ActiveCfg = Debug|Win32
 		{DFAF0062-4CD7-9AB8-0683-A6026B326F56}.Debug.Build.0 = Debug|Win32
-		{C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Release.ActiveCfg = Release|Win32
-		{C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Release.Build.0 = Release|Win32
-		{C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Debug.ActiveCfg = Debug|Win32
-		{C63CFD5B-23E8-FB4F-79DB-E40F463B0C1E}.Debug.Build.0 = Debug|Win32
 		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release.ActiveCfg = Release|Win32
 		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Release.Build.0 = Release|Win32
 		{6ADA430D-009C-2ED4-A787-2AC2D6FEB8CE}.Debug.ActiveCfg = Debug|Win32
@@ -309,10 +243,6 @@ Global
 		{7C428E76-9271-6284-20F0-9B38ED6931E3}.Release.Build.0 = Release|Win32
 		{7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.ActiveCfg = Debug|Win32
 		{7C428E76-9271-6284-20F0-9B38ED6931E3}.Debug.Build.0 = Debug|Win32
-		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Release.ActiveCfg = Release|Win32
-		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Release.Build.0 = Release|Win32
-		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Debug.ActiveCfg = Debug|Win32
-		{85BCCE3E-992B-B6D7-28F6-CF0A12680822}.Debug.Build.0 = Debug|Win32
 		{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Release.ActiveCfg = Release|Win32
 		{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Release.Build.0 = Release|Win32
 		{5E57E40B-B2C3-7595-57AB-A3936FFBD7D4}.Debug.ActiveCfg = Debug|Win32