diff --git a/src/StepMania-net2010.vcxproj b/src/StepMania-net2010.vcxproj
index 984e7164a3..213ae062f2 100644
--- a/src/StepMania-net2010.vcxproj
+++ b/src/StepMania-net2010.vcxproj
@@ -762,14 +762,14 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)</Command>
     <ClCompile Include="RageUtil_CharConversions.cpp" />
     <ClCompile Include="RageUtil_FileDB.cpp" />
     <ClCompile Include="RageUtil_WorkerThread.cpp" />
-    <ClCompile Include="Actor.cpp" />
-    <ClCompile Include="ActorFrame.cpp" />
-    <ClCompile Include="ActorFrameTexture.cpp" />
-    <ClCompile Include="ActorMultiTexture.cpp" />
-    <ClCompile Include="ActorProxy.cpp" />
-    <ClCompile Include="ActorScroller.cpp" />
-    <ClCompile Include="ActorSound.cpp" />
-    <ClCompile Include="ActorUtil.cpp" />
+    <ClCompile Include="Actors\Actor.cpp" />
+    <ClCompile Include="Actors\ActorFrame.cpp" />
+    <ClCompile Include="Actors\ActorFrameTexture.cpp" />
+    <ClCompile Include="Actors\ActorMultiTexture.cpp" />
+    <ClCompile Include="Actors\ActorProxy.cpp" />
+    <ClCompile Include="Actors\ActorScroller.cpp" />
+    <ClCompile Include="Actors\ActorSound.cpp" />
+    <ClCompile Include="Actors\ActorUtil.cpp" />
     <ClCompile Include="AutoActor.cpp" />
     <ClCompile Include="BitmapText.cpp" />
     <ClCompile Include="DynamicActorScroller.cpp" />
@@ -2084,13 +2084,13 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)</Command>
     <ClInclude Include="RageUtil_CircularBuffer.h" />
     <ClInclude Include="RageUtil_FileDB.h" />
     <ClInclude Include="RageUtil_WorkerThread.h" />
-    <ClInclude Include="Actor.h" />
-    <ClInclude Include="ActorFrame.h" />
-    <ClInclude Include="ActorFrameTexture.h" />
-    <ClInclude Include="ActorMultiTexture.h" />
-    <ClInclude Include="ActorProxy.h" />
-    <ClInclude Include="ActorScroller.h" />
-    <ClInclude Include="ActorSound.h" />
+    <ClInclude Include="Actors\Actor.h" />
+    <ClInclude Include="Actors\ActorFrame.h" />
+    <ClInclude Include="Actors\ActorFrameTexture.h" />
+    <ClInclude Include="Actors\ActorMultiTexture.h" />
+    <ClInclude Include="Actors\ActorProxy.h" />
+    <ClInclude Include="Actors\ActorScroller.h" />
+    <ClInclude Include="Actors\ActorSound.h" />
     <ClInclude Include="ActorUtil.h" />
     <ClInclude Include="AutoActor.h" />
     <ClInclude Include="BitmapText.h" />
diff --git a/src/StepMania-net2010.vcxproj.filters b/src/StepMania-net2010.vcxproj.filters
index 23b5698cf5..1ce13dfe16 100644
--- a/src/StepMania-net2010.vcxproj.filters
+++ b/src/StepMania-net2010.vcxproj.filters
@@ -1242,25 +1242,25 @@
     <ClCompile Include="RageUtil_WorkerThread.cpp">
       <Filter>Rage</Filter>
     </ClCompile>
-    <ClCompile Include="Actor.cpp">
+    <ClCompile Include="Actors\Actor.cpp">
       <Filter>Actors</Filter>
     </ClCompile>
-    <ClCompile Include="ActorFrame.cpp">
+    <ClCompile Include="Actors\ActorFrame.cpp">
       <Filter>Actors</Filter>
     </ClCompile>
-    <ClCompile Include="ActorFrameTexture.cpp">
+    <ClCompile Include="Actors\ActorFrameTexture.cpp">
       <Filter>Actors</Filter>
     </ClCompile>
-    <ClCompile Include="ActorMultiTexture.cpp">
+    <ClCompile Include="Actors\ActorMultiTexture.cpp">
       <Filter>Actors</Filter>
     </ClCompile>
-    <ClCompile Include="ActorProxy.cpp">
+    <ClCompile Include="Actors\ActorProxy.cpp">
       <Filter>Actors</Filter>
     </ClCompile>
-    <ClCompile Include="ActorScroller.cpp">
+    <ClCompile Include="Actors\ActorScroller.cpp">
       <Filter>Actors</Filter>
     </ClCompile>
-    <ClCompile Include="ActorSound.cpp">
+    <ClCompile Include="Actors\ActorSound.cpp">
       <Filter>Actors</Filter>
     </ClCompile>
     <ClCompile Include="ActorUtil.cpp">
@@ -2777,25 +2777,25 @@
     <ClInclude Include="RageUtil_WorkerThread.h">
       <Filter>Rage</Filter>
     </ClInclude>
-    <ClInclude Include="Actor.h">
+    <ClInclude Include="Actors\Actor.h">
       <Filter>Actors</Filter>
     </ClInclude>
-    <ClInclude Include="ActorFrame.h">
+    <ClInclude Include="Actors\ActorFrame.h">
       <Filter>Actors</Filter>
     </ClInclude>
-    <ClInclude Include="ActorFrameTexture.h">
+    <ClInclude Include="Actors\ActorFrameTexture.h">
       <Filter>Actors</Filter>
     </ClInclude>
-    <ClInclude Include="ActorMultiTexture.h">
+    <ClInclude Include="Actors\ActorMultiTexture.h">
       <Filter>Actors</Filter>
     </ClInclude>
-    <ClInclude Include="ActorProxy.h">
+    <ClInclude Include="Actors\ActorProxy.h">
       <Filter>Actors</Filter>
     </ClInclude>
-    <ClInclude Include="ActorScroller.h">
+    <ClInclude Include="Actors\ActorScroller.h">
       <Filter>Actors</Filter>
     </ClInclude>
-    <ClInclude Include="ActorSound.h">
+    <ClInclude Include="Actors\ActorSound.h">
       <Filter>Actors</Filter>
     </ClInclude>
     <ClInclude Include="ActorUtil.h">