diff --git a/msvc/6/appCharacterDemo.dsp b/msvc/6/appCharacterDemo.dsp
index dbdc0ed4a..b8dd324de 100644
--- a/msvc/6/appCharacterDemo.dsp
+++ b/msvc/6/appCharacterDemo.dsp
@@ -158,7 +158,11 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\Demos\CharacterDemo\CharacterController.cpp
+SOURCE=..\..\Demos\CharacterDemo\..\BspDemo\BspConverter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\CharacterDemo\..\BspDemo\BspLoader.cpp
 # End Source File
 # Begin Source File
 
@@ -166,6 +170,14 @@ SOURCE=..\..\Demos\CharacterDemo\CharacterDemo.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Demos\CharacterDemo\DynamicCharacterController.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\CharacterDemo\KinematicCharacterController.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Demos\CharacterDemo\main.cpp
 # End Source File
 # End Group
@@ -174,12 +186,28 @@ SOURCE=..\..\Demos\CharacterDemo\main.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\Demos\CharacterDemo\CharacterController.h
+SOURCE=..\..\Demos\CharacterDemo\..\BspDemo\BspConverter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\CharacterDemo\..\BspDemo\BspLoader.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\CharacterDemo\CharacterControllerInterface.h
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\Demos\CharacterDemo\CharacterDemo.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\CharacterDemo\DynamicCharacterController.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Demos\CharacterDemo\KinematicCharacterController.h
+# End Source File
 # End Group
 # Begin Group "Resource Files"
 
diff --git a/msvc/7/appCharacterDemo.vcproj b/msvc/7/appCharacterDemo.vcproj
index 633b1b106..346ac365a 100644
--- a/msvc/7/appCharacterDemo.vcproj
+++ b/msvc/7/appCharacterDemo.vcproj
@@ -298,11 +298,20 @@
 			Name="Source Files"
 			Filter="">
 			<File
-				RelativePath="..\..\Demos\CharacterDemo\CharacterController.cpp">
+				RelativePath="..\..\Demos\CharacterDemo\..\BspDemo\BspConverter.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\..\BspDemo\BspLoader.cpp">
 			</File>
 			<File
 				RelativePath="..\..\Demos\CharacterDemo\CharacterDemo.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\DynamicCharacterController.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\KinematicCharacterController.cpp">
+			</File>
 			<File
 				RelativePath="..\..\Demos\CharacterDemo\main.cpp">
 			</File>
@@ -311,11 +320,23 @@
 			Name="Header Files"
 			Filter="">
 			<File
-				RelativePath="..\..\Demos\CharacterDemo\CharacterController.h">
+				RelativePath="..\..\Demos\CharacterDemo\..\BspDemo\BspConverter.h">
+			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\..\BspDemo\BspLoader.h">
+			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\CharacterControllerInterface.h">
 			</File>
 			<File
 				RelativePath="..\..\Demos\CharacterDemo\CharacterDemo.h">
 			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\DynamicCharacterController.h">
+			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\KinematicCharacterController.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/msvc/71/appCharacterDemo.vcproj b/msvc/71/appCharacterDemo.vcproj
index 30055c8cf..685505475 100644
--- a/msvc/71/appCharacterDemo.vcproj
+++ b/msvc/71/appCharacterDemo.vcproj
@@ -298,11 +298,20 @@
 			Name="Source Files"
 			Filter="">
 			<File
-				RelativePath="..\..\Demos\CharacterDemo\CharacterController.cpp">
+				RelativePath="..\..\Demos\CharacterDemo\..\BspDemo\BspConverter.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\..\BspDemo\BspLoader.cpp">
 			</File>
 			<File
 				RelativePath="..\..\Demos\CharacterDemo\CharacterDemo.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\DynamicCharacterController.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\KinematicCharacterController.cpp">
+			</File>
 			<File
 				RelativePath="..\..\Demos\CharacterDemo\main.cpp">
 			</File>
@@ -311,11 +320,23 @@
 			Name="Header Files"
 			Filter="">
 			<File
-				RelativePath="..\..\Demos\CharacterDemo\CharacterController.h">
+				RelativePath="..\..\Demos\CharacterDemo\..\BspDemo\BspConverter.h">
+			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\..\BspDemo\BspLoader.h">
+			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\CharacterControllerInterface.h">
 			</File>
 			<File
 				RelativePath="..\..\Demos\CharacterDemo\CharacterDemo.h">
 			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\DynamicCharacterController.h">
+			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\KinematicCharacterController.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/msvc/8/appCharacterDemo.vcproj b/msvc/8/appCharacterDemo.vcproj
index e02b282c5..28cd8dbf4 100644
--- a/msvc/8/appCharacterDemo.vcproj
+++ b/msvc/8/appCharacterDemo.vcproj
@@ -298,11 +298,20 @@
 			Name="Source Files"
 			Filter="">
 			<File
-				RelativePath="..\..\Demos\CharacterDemo\CharacterController.cpp">
+				RelativePath="..\..\Demos\CharacterDemo\..\BspDemo\BspConverter.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\..\BspDemo\BspLoader.cpp">
 			</File>
 			<File
 				RelativePath="..\..\Demos\CharacterDemo\CharacterDemo.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\DynamicCharacterController.cpp">
+			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\KinematicCharacterController.cpp">
+			</File>
 			<File
 				RelativePath="..\..\Demos\CharacterDemo\main.cpp">
 			</File>
@@ -311,11 +320,23 @@
 			Name="Header Files"
 			Filter="">
 			<File
-				RelativePath="..\..\Demos\CharacterDemo\CharacterController.h">
+				RelativePath="..\..\Demos\CharacterDemo\..\BspDemo\BspConverter.h">
+			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\..\BspDemo\BspLoader.h">
+			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\CharacterControllerInterface.h">
 			</File>
 			<File
 				RelativePath="..\..\Demos\CharacterDemo\CharacterDemo.h">
 			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\DynamicCharacterController.h">
+			</File>
+			<File
+				RelativePath="..\..\Demos\CharacterDemo\KinematicCharacterController.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"