diff --git a/msvc/6/appCharacterDemo.dsp b/msvc/6/appCharacterDemo.dsp
index e9fc2263c..6bf5c7606 100644
--- a/msvc/6/appCharacterDemo.dsp
+++ b/msvc/6/appCharacterDemo.dsp
@@ -234,10 +234,6 @@ 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
@@ -254,20 +250,12 @@ 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/6/libbulletdynamics.dsp b/msvc/6/libbulletdynamics.dsp
index f1cfa6a9f..a06868220 100644
--- a/msvc/6/libbulletdynamics.dsp
+++ b/msvc/6/libbulletdynamics.dsp
@@ -222,6 +222,10 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\src\BulletDynamics\Character\btKinematicCharacterController.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btConeTwistConstraint.cpp
 # End Source File
 # Begin Source File
@@ -290,6 +294,14 @@ SOURCE=..\..\src\BulletDynamics\Vehicle\btWheelInfo.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\src\BulletDynamics\Character\btCharacterControllerInterface.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletDynamics\Character\btKinematicCharacterController.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletDynamics\ConstraintSolver\btConeTwistConstraint.h
 # End Source File
 # Begin Source File
diff --git a/msvc/7/appCharacterDemo.vcproj b/msvc/7/appCharacterDemo.vcproj
index 61e1f4431..11523d6c4 100644
--- a/msvc/7/appCharacterDemo.vcproj
+++ b/msvc/7/appCharacterDemo.vcproj
@@ -448,9 +448,6 @@
 			<File
 				RelativePath="..\..\Demos\CharacterDemo\DynamicCharacterController.cpp">
 			</File>
-			<File
-				RelativePath="..\..\Demos\CharacterDemo\KinematicCharacterController.cpp">
-			</File>
 			<File
 				RelativePath="..\..\Demos\CharacterDemo\main.cpp">
 			</File>
@@ -464,18 +461,12 @@
 			<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/7/libbulletdynamics.vcproj b/msvc/7/libbulletdynamics.vcproj
index 79142ee80..7624c0227 100644
--- a/msvc/7/libbulletdynamics.vcproj
+++ b/msvc/7/libbulletdynamics.vcproj
@@ -419,6 +419,9 @@
 		<Filter
 			Name="Source Files"
 			Filter="">
+			<File
+				RelativePath="..\..\src\BulletDynamics\Character\btKinematicCharacterController.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btConeTwistConstraint.cpp">
 			</File>
@@ -471,6 +474,12 @@
 		<Filter
 			Name="Header Files"
 			Filter="">
+			<File
+				RelativePath="..\..\src\BulletDynamics\Character\btCharacterControllerInterface.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\Character\btKinematicCharacterController.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btConeTwistConstraint.h">
 			</File>
diff --git a/msvc/71/appCharacterDemo.vcproj b/msvc/71/appCharacterDemo.vcproj
index f4ab3bbc6..3f06ec5d0 100644
--- a/msvc/71/appCharacterDemo.vcproj
+++ b/msvc/71/appCharacterDemo.vcproj
@@ -448,9 +448,6 @@
 			<File
 				RelativePath="..\..\Demos\CharacterDemo\DynamicCharacterController.cpp">
 			</File>
-			<File
-				RelativePath="..\..\Demos\CharacterDemo\KinematicCharacterController.cpp">
-			</File>
 			<File
 				RelativePath="..\..\Demos\CharacterDemo\main.cpp">
 			</File>
@@ -464,18 +461,12 @@
 			<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/libbulletdynamics.vcproj b/msvc/71/libbulletdynamics.vcproj
index bf5d226f5..1e6b00e6c 100644
--- a/msvc/71/libbulletdynamics.vcproj
+++ b/msvc/71/libbulletdynamics.vcproj
@@ -419,6 +419,9 @@
 		<Filter
 			Name="Source Files"
 			Filter="">
+			<File
+				RelativePath="..\..\src\BulletDynamics\Character\btKinematicCharacterController.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btConeTwistConstraint.cpp">
 			</File>
@@ -471,6 +474,12 @@
 		<Filter
 			Name="Header Files"
 			Filter="">
+			<File
+				RelativePath="..\..\src\BulletDynamics\Character\btCharacterControllerInterface.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\Character\btKinematicCharacterController.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btConeTwistConstraint.h">
 			</File>
diff --git a/msvc/8/appCharacterDemo.vcproj b/msvc/8/appCharacterDemo.vcproj
index 8e1dd6f24..22c2845e8 100644
--- a/msvc/8/appCharacterDemo.vcproj
+++ b/msvc/8/appCharacterDemo.vcproj
@@ -448,9 +448,6 @@
 			<File
 				RelativePath="..\..\Demos\CharacterDemo\DynamicCharacterController.cpp">
 			</File>
-			<File
-				RelativePath="..\..\Demos\CharacterDemo\KinematicCharacterController.cpp">
-			</File>
 			<File
 				RelativePath="..\..\Demos\CharacterDemo\main.cpp">
 			</File>
@@ -464,18 +461,12 @@
 			<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/libbulletdynamics.vcproj b/msvc/8/libbulletdynamics.vcproj
index a21fe0fa6..990cbeca2 100644
--- a/msvc/8/libbulletdynamics.vcproj
+++ b/msvc/8/libbulletdynamics.vcproj
@@ -419,6 +419,9 @@
 		<Filter
 			Name="Source Files"
 			Filter="">
+			<File
+				RelativePath="..\..\src\BulletDynamics\Character\btKinematicCharacterController.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btConeTwistConstraint.cpp">
 			</File>
@@ -471,6 +474,12 @@
 		<Filter
 			Name="Header Files"
 			Filter="">
+			<File
+				RelativePath="..\..\src\BulletDynamics\Character\btCharacterControllerInterface.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletDynamics\Character\btKinematicCharacterController.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btConeTwistConstraint.h">
 			</File>