diff --git a/src/Actors/Actor.cpp b/src/Actor.cpp
similarity index 100%
rename from src/Actors/Actor.cpp
rename to src/Actor.cpp
diff --git a/src/Actors/Actor.h b/src/Actor.h
similarity index 100%
rename from src/Actors/Actor.h
rename to src/Actor.h
diff --git a/src/Actors/ActorFrame.cpp b/src/ActorFrame.cpp
similarity index 100%
rename from src/Actors/ActorFrame.cpp
rename to src/ActorFrame.cpp
diff --git a/src/Actors/ActorFrame.h b/src/ActorFrame.h
similarity index 100%
rename from src/Actors/ActorFrame.h
rename to src/ActorFrame.h
diff --git a/src/Actors/ActorFrameTexture.cpp b/src/ActorFrameTexture.cpp
similarity index 100%
rename from src/Actors/ActorFrameTexture.cpp
rename to src/ActorFrameTexture.cpp
diff --git a/src/Actors/ActorFrameTexture.h b/src/ActorFrameTexture.h
similarity index 100%
rename from src/Actors/ActorFrameTexture.h
rename to src/ActorFrameTexture.h
diff --git a/src/Actors/ActorMultiTexture.cpp b/src/ActorMultiTexture.cpp
similarity index 100%
rename from src/Actors/ActorMultiTexture.cpp
rename to src/ActorMultiTexture.cpp
diff --git a/src/Actors/ActorMultiTexture.h b/src/ActorMultiTexture.h
similarity index 100%
rename from src/Actors/ActorMultiTexture.h
rename to src/ActorMultiTexture.h
diff --git a/src/Actors/ActorProxy.cpp b/src/ActorProxy.cpp
similarity index 100%
rename from src/Actors/ActorProxy.cpp
rename to src/ActorProxy.cpp
diff --git a/src/Actors/ActorProxy.h b/src/ActorProxy.h
similarity index 100%
rename from src/Actors/ActorProxy.h
rename to src/ActorProxy.h
diff --git a/src/Actors/ActorScroller.cpp b/src/ActorScroller.cpp
similarity index 100%
rename from src/Actors/ActorScroller.cpp
rename to src/ActorScroller.cpp
diff --git a/src/Actors/ActorScroller.h b/src/ActorScroller.h
similarity index 100%
rename from src/Actors/ActorScroller.h
rename to src/ActorScroller.h
diff --git a/src/Actors/ActorSound.cpp b/src/ActorSound.cpp
similarity index 100%
rename from src/Actors/ActorSound.cpp
rename to src/ActorSound.cpp
diff --git a/src/Actors/ActorSound.h b/src/ActorSound.h
similarity index 100%
rename from src/Actors/ActorSound.h
rename to src/ActorSound.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 17d251d7dc..8eb50d2100 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -454,12 +454,12 @@ RageUtil_AutoPtr.h \
 RageUtil_WorkerThread.cpp RageUtil_WorkerThread.h
 
 Actors = \
-Actors/Actor.cpp Actors/Actor.h Actors/ActorFrame.cpp Actors/ActorFrame.h \
-Actors/ActorFrameTexture.cpp Actors/ActorFrameTexture.h \
-Actors/ActorMultiTexture.cpp Actors/ActorMultiTexture.h \
-Actors/ActorProxy.cpp Actors/ActorProxy.h \
-Actors/ActorScroller.cpp Actors/ActorScroller.h ActorUtil.cpp ActorUtil.h \
-Actors/ActorSound.cpp Actors/ActorSound.h \
+Actor.cpp Actor.h ActorFrame.cpp ActorFrame.h \
+ActorFrameTexture.cpp ActorFrameTexture.h \
+ActorMultiTexture.cpp ActorMultiTexture.h \
+ActorProxy.cpp ActorProxy.h \
+ActorScroller.cpp ActorScroller.h ActorUtil.cpp ActorUtil.h \
+ActorSound.cpp ActorSound.h \
 AutoActor.cpp AutoActor.h \
 BitmapText.cpp BitmapText.h Model.cpp Model.h \
 DynamicActorScroller.cpp DynamicActorScroller.h \
diff --git a/src/StepMania-net2003.vcproj b/src/StepMania-net2003.vcproj
index e716c59613..d9228ee33f 100644
--- a/src/StepMania-net2003.vcproj
+++ b/src/StepMania-net2003.vcproj
@@ -2956,46 +2956,46 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 			Name="Actors"
 			Filter="">
 			<File
-				RelativePath="Actors\Actor.cpp">
+				RelativePath="Actor.cpp">
 			</File>
 			<File
-				RelativePath="Actors\Actor.h">
+				RelativePath="Actor.h">
 			</File>
 			<File
-				RelativePath="Actors\ActorFrame.cpp">
+				RelativePath="ActorFrame.cpp">
 			</File>
 			<File
-				RelativePath="Actors\ActorFrame.h">
+				RelativePath="ActorFrame.h">
 			</File>
 			<File
-				RelativePath="Actors\ActorFrameTexture.cpp">
+				RelativePath="ActorFrameTexture.cpp">
 			</File>
 			<File
-				RelativePath="Actors\ActorFrameTexture.h">
+				RelativePath="ActorFrameTexture.h">
 			</File>
 			<File
-				RelativePath="Actors\ActorMultiTexture.cpp">
+				RelativePath="ActorMultiTexture.cpp">
 			</File>
 			<File
-				RelativePath="Actors\ActorMultiTexture.h">
+				RelativePath="ActorMultiTexture.h">
 			</File>
 			<File
-				RelativePath="Actors\ActorProxy.cpp">
+				RelativePath="ActorProxy.cpp">
 			</File>
 			<File
-				RelativePath="Actors\ActorProxy.h">
+				RelativePath="ActorProxy.h">
 			</File>
 			<File
-				RelativePath="Actors\ActorScroller.cpp">
+				RelativePath="ActorScroller.cpp">
 			</File>
 			<File
-				RelativePath="Actors\ActorScroller.h">
+				RelativePath="ActorScroller.h">
 			</File>
 			<File
-				RelativePath="Actors\ActorSound.cpp">
+				RelativePath="ActorSound.cpp">
 			</File>
 			<File
-				RelativePath="Actors\ActorSound.h">
+				RelativePath="ActorSound.h">
 			</File>
 			<File
 				RelativePath="ActorUtil.cpp">
diff --git a/src/StepMania-net2005.vcproj b/src/StepMania-net2005.vcproj
index 9f0042087e..fe091bd4a3 100644
--- a/src/StepMania-net2005.vcproj
+++ b/src/StepMania-net2005.vcproj
@@ -4654,59 +4654,59 @@
 			Name="Actors"
 			>
 			<File
-				RelativePath="Actors\Actor.cpp"
+				RelativePath="Actor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="Actors\Actor.h"
+				RelativePath="Actor.h"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorFrame.cpp"
+				RelativePath="ActorFrame.cpp"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorFrame.h"
+				RelativePath="ActorFrame.h"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorFrameTexture.cpp"
+				RelativePath="ActorFrameTexture.cpp"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorFrameTexture.h"
+				RelativePath="ActorFrameTexture.h"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorMultiTexture.cpp"
+				RelativePath="ActorMultiTexture.cpp"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorMultiTexture.h"
+				RelativePath="ActorMultiTexture.h"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorProxy.cpp"
+				RelativePath="ActorProxy.cpp"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorProxy.h"
+				RelativePath="ActorProxy.h"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorScroller.cpp"
+				RelativePath="ActorScroller.cpp"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorScroller.h"
+				RelativePath="ActorScroller.h"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorSound.cpp"
+				RelativePath="ActorSound.cpp"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorSound.h"
+				RelativePath="ActorSound.h"
 				>
 			</File>
 			<File
diff --git a/src/StepMania-net2008.vcproj b/src/StepMania-net2008.vcproj
index b416271fe8..8934309119 100644
--- a/src/StepMania-net2008.vcproj
+++ b/src/StepMania-net2008.vcproj
@@ -3821,59 +3821,59 @@
 			Name="Actors"
 			>
 			<File
-				RelativePath="Actors\Actor.cpp"
+				RelativePath="Actor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="Actors\Actor.h"
+				RelativePath="Actor.h"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorFrame.cpp"
+				RelativePath="ActorFrame.cpp"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorFrame.h"
+				RelativePath="ActorFrame.h"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorFrameTexture.cpp"
+				RelativePath="ActorFrameTexture.cpp"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorFrameTexture.h"
+				RelativePath="ActorFrameTexture.h"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorMultiTexture.cpp"
+				RelativePath="ActorMultiTexture.cpp"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorMultiTexture.h"
+				RelativePath="ActorMultiTexture.h"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorProxy.cpp"
+				RelativePath="ActorProxy.cpp"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorProxy.h"
+				RelativePath="ActorProxy.h"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorScroller.cpp"
+				RelativePath="ActorScroller.cpp"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorScroller.h"
+				RelativePath="ActorScroller.h"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorSound.cpp"
+				RelativePath="ActorSound.cpp"
 				>
 			</File>
 			<File
-				RelativePath="Actors\ActorSound.h"
+				RelativePath="ActorSound.h"
 				>
 			</File>
 			<File
diff --git a/src/StepMania-net2010.vcxproj b/src/StepMania-net2010.vcxproj
index 213ae062f2..984e7164a3 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="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="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="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="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="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="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 1ce13dfe16..23b5698cf5 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="Actors\Actor.cpp">
+    <ClCompile Include="Actor.cpp">
       <Filter>Actors</Filter>
     </ClCompile>
-    <ClCompile Include="Actors\ActorFrame.cpp">
+    <ClCompile Include="ActorFrame.cpp">
       <Filter>Actors</Filter>
     </ClCompile>
-    <ClCompile Include="Actors\ActorFrameTexture.cpp">
+    <ClCompile Include="ActorFrameTexture.cpp">
       <Filter>Actors</Filter>
     </ClCompile>
-    <ClCompile Include="Actors\ActorMultiTexture.cpp">
+    <ClCompile Include="ActorMultiTexture.cpp">
       <Filter>Actors</Filter>
     </ClCompile>
-    <ClCompile Include="Actors\ActorProxy.cpp">
+    <ClCompile Include="ActorProxy.cpp">
       <Filter>Actors</Filter>
     </ClCompile>
-    <ClCompile Include="Actors\ActorScroller.cpp">
+    <ClCompile Include="ActorScroller.cpp">
       <Filter>Actors</Filter>
     </ClCompile>
-    <ClCompile Include="Actors\ActorSound.cpp">
+    <ClCompile Include="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="Actors\Actor.h">
+    <ClInclude Include="Actor.h">
       <Filter>Actors</Filter>
     </ClInclude>
-    <ClInclude Include="Actors\ActorFrame.h">
+    <ClInclude Include="ActorFrame.h">
       <Filter>Actors</Filter>
     </ClInclude>
-    <ClInclude Include="Actors\ActorFrameTexture.h">
+    <ClInclude Include="ActorFrameTexture.h">
       <Filter>Actors</Filter>
     </ClInclude>
-    <ClInclude Include="Actors\ActorMultiTexture.h">
+    <ClInclude Include="ActorMultiTexture.h">
       <Filter>Actors</Filter>
     </ClInclude>
-    <ClInclude Include="Actors\ActorProxy.h">
+    <ClInclude Include="ActorProxy.h">
       <Filter>Actors</Filter>
     </ClInclude>
-    <ClInclude Include="Actors\ActorScroller.h">
+    <ClInclude Include="ActorScroller.h">
       <Filter>Actors</Filter>
     </ClInclude>
-    <ClInclude Include="Actors\ActorSound.h">
+    <ClInclude Include="ActorSound.h">
       <Filter>Actors</Filter>
     </ClInclude>
     <ClInclude Include="ActorUtil.h">