diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index e3bedbaf98..a2ba22cb27 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -97,8 +97,6 @@
     <Compile Include="7z\SevenZipSfx.cs" />
     <Compile Include="7z\StreamWrappers.cs" />
     <Compile Include="BinarySaveStates.cs" />
-    <Compile Include="bk2\Movie2.cs" />
-    <Compile Include="bk2\MovieHeader2.cs" />
     <Compile Include="config\Binding.cs" />
     <Compile Include="config\Config.cs" />
     <Compile Include="config\ConfigService.cs" />
@@ -131,30 +129,32 @@
     <Compile Include="lua\LuaLibraryBase.cs" />
     <Compile Include="lua\LuaMemoryBase.cs" />
     <Compile Include="lua\NamedLuaFunction.cs" />
+    <Compile Include="movie\bk2\Movie2.cs" />
+    <Compile Include="movie\bk2\MovieHeader2.cs" />
+    <Compile Include="movie\bkm\Movie.cs" />
+    <Compile Include="movie\bkm\MovieHeader.cs" />
+    <Compile Include="movie\bkm\MovieLog.cs" />
     <Compile Include="movie\HeaderKeys.cs" />
-    <Compile Include="movie\IMovie.cs" />
-    <Compile Include="movie\IMovieHeader.cs" />
     <Compile Include="movie\InputAdapters.cs" />
+    <Compile Include="movie\interfaces\IMovie.cs" />
+    <Compile Include="movie\interfaces\IMovieHeader.cs" />
     <Compile Include="movie\MnemonicGenerators\BooleanControllerMnemonicGenerator.cs" />
     <Compile Include="movie\MnemonicGenerators\IMnemonicGenerator.cs" />
     <Compile Include="movie\MnemonicGenerators\IMnemonicPorts.cs" />
     <Compile Include="movie\MnemonicGenerators\MnemonicGeneratorFactory.cs" />
     <Compile Include="movie\MnemonicGenerators\NesMnemonicGenerator.cs" />
     <Compile Include="movie\MnemonicsGenerator.cs" />
-    <Compile Include="movie\Movie.cs" />
-    <Compile Include="movie\MovieHeader.cs" />
     <Compile Include="movie\MovieImport.cs" />
-    <Compile Include="movie\MovieLog.cs" />
     <Compile Include="movie\MovieMnemonics.cs" />
-    <Compile Include="movie\MovieRecord.cs" />
-    <Compile Include="movie\MovieRecordList.cs" />
     <Compile Include="movie\MovieSession.cs" />
     <Compile Include="movie\MultitrackRecording.cs" />
     <Compile Include="movie\MnemonicsLookupTable.cs" />
     <Compile Include="movie\PlatformFrameRates.cs" />
     <Compile Include="movie\Subtitle.cs" />
     <Compile Include="movie\SubtitleList.cs" />
-    <Compile Include="movie\TasMovie.cs" />
+    <Compile Include="movie\tasproj\MovieRecord.cs" />
+    <Compile Include="movie\tasproj\MovieRecordList.cs" />
+    <Compile Include="movie\tasproj\TasMovie.cs" />
     <Compile Include="NESGameGenieEncoderDecoder.cs" />
     <Compile Include="PathManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/BizHawk.Client.Common/bk2/Movie2.cs b/BizHawk.Client.Common/movie/bk2/Movie2.cs
similarity index 100%
rename from BizHawk.Client.Common/bk2/Movie2.cs
rename to BizHawk.Client.Common/movie/bk2/Movie2.cs
diff --git a/BizHawk.Client.Common/bk2/MovieHeader2.cs b/BizHawk.Client.Common/movie/bk2/MovieHeader2.cs
similarity index 100%
rename from BizHawk.Client.Common/bk2/MovieHeader2.cs
rename to BizHawk.Client.Common/movie/bk2/MovieHeader2.cs
diff --git a/BizHawk.Client.Common/movie/Movie.cs b/BizHawk.Client.Common/movie/bkm/Movie.cs
similarity index 100%
rename from BizHawk.Client.Common/movie/Movie.cs
rename to BizHawk.Client.Common/movie/bkm/Movie.cs
diff --git a/BizHawk.Client.Common/movie/MovieHeader.cs b/BizHawk.Client.Common/movie/bkm/MovieHeader.cs
similarity index 100%
rename from BizHawk.Client.Common/movie/MovieHeader.cs
rename to BizHawk.Client.Common/movie/bkm/MovieHeader.cs
diff --git a/BizHawk.Client.Common/movie/MovieLog.cs b/BizHawk.Client.Common/movie/bkm/MovieLog.cs
similarity index 100%
rename from BizHawk.Client.Common/movie/MovieLog.cs
rename to BizHawk.Client.Common/movie/bkm/MovieLog.cs
diff --git a/BizHawk.Client.Common/movie/IMovie.cs b/BizHawk.Client.Common/movie/interfaces/IMovie.cs
similarity index 100%
rename from BizHawk.Client.Common/movie/IMovie.cs
rename to BizHawk.Client.Common/movie/interfaces/IMovie.cs
diff --git a/BizHawk.Client.Common/movie/IMovieHeader.cs b/BizHawk.Client.Common/movie/interfaces/IMovieHeader.cs
similarity index 100%
rename from BizHawk.Client.Common/movie/IMovieHeader.cs
rename to BizHawk.Client.Common/movie/interfaces/IMovieHeader.cs
diff --git a/BizHawk.Client.Common/movie/MovieRecord.cs b/BizHawk.Client.Common/movie/tasproj/MovieRecord.cs
similarity index 100%
rename from BizHawk.Client.Common/movie/MovieRecord.cs
rename to BizHawk.Client.Common/movie/tasproj/MovieRecord.cs
diff --git a/BizHawk.Client.Common/movie/MovieRecordList.cs b/BizHawk.Client.Common/movie/tasproj/MovieRecordList.cs
similarity index 100%
rename from BizHawk.Client.Common/movie/MovieRecordList.cs
rename to BizHawk.Client.Common/movie/tasproj/MovieRecordList.cs
diff --git a/BizHawk.Client.Common/movie/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
similarity index 100%
rename from BizHawk.Client.Common/movie/TasMovie.cs
rename to BizHawk.Client.Common/movie/tasproj/TasMovie.cs