diff --git a/BizHawk.MultiClient/AviWriter.cs b/BizHawk.MultiClient/AVOut/AviWriter.cs
similarity index 100%
rename from BizHawk.MultiClient/AviWriter.cs
rename to BizHawk.MultiClient/AVOut/AviWriter.cs
diff --git a/BizHawk.MultiClient/FFmpegWriter.cs b/BizHawk.MultiClient/AVOut/FFmpegWriter.cs
similarity index 100%
rename from BizHawk.MultiClient/FFmpegWriter.cs
rename to BizHawk.MultiClient/AVOut/FFmpegWriter.cs
diff --git a/BizHawk.MultiClient/FFmpegWriterForm.Designer.cs b/BizHawk.MultiClient/AVOut/FFmpegWriterForm.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/FFmpegWriterForm.Designer.cs
rename to BizHawk.MultiClient/AVOut/FFmpegWriterForm.Designer.cs
diff --git a/BizHawk.MultiClient/FFmpegWriterForm.cs b/BizHawk.MultiClient/AVOut/FFmpegWriterForm.cs
similarity index 100%
rename from BizHawk.MultiClient/FFmpegWriterForm.cs
rename to BizHawk.MultiClient/AVOut/FFmpegWriterForm.cs
diff --git a/BizHawk.MultiClient/FFmpegWriterForm.resx b/BizHawk.MultiClient/AVOut/FFmpegWriterForm.resx
similarity index 100%
rename from BizHawk.MultiClient/FFmpegWriterForm.resx
rename to BizHawk.MultiClient/AVOut/FFmpegWriterForm.resx
diff --git a/BizHawk.MultiClient/IVideoWriter.cs b/BizHawk.MultiClient/AVOut/IVideoWriter.cs
similarity index 100%
rename from BizHawk.MultiClient/IVideoWriter.cs
rename to BizHawk.MultiClient/AVOut/IVideoWriter.cs
diff --git a/BizHawk.MultiClient/JMDForm.Designer.cs b/BizHawk.MultiClient/AVOut/JMDForm.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/JMDForm.Designer.cs
rename to BizHawk.MultiClient/AVOut/JMDForm.Designer.cs
diff --git a/BizHawk.MultiClient/JMDForm.cs b/BizHawk.MultiClient/AVOut/JMDForm.cs
similarity index 100%
rename from BizHawk.MultiClient/JMDForm.cs
rename to BizHawk.MultiClient/AVOut/JMDForm.cs
diff --git a/BizHawk.MultiClient/JMDForm.resx b/BizHawk.MultiClient/AVOut/JMDForm.resx
similarity index 100%
rename from BizHawk.MultiClient/JMDForm.resx
rename to BizHawk.MultiClient/AVOut/JMDForm.resx
diff --git a/BizHawk.MultiClient/JMDWriter.cs b/BizHawk.MultiClient/AVOut/JMDWriter.cs
similarity index 100%
rename from BizHawk.MultiClient/JMDWriter.cs
rename to BizHawk.MultiClient/AVOut/JMDWriter.cs
diff --git a/BizHawk.MultiClient/NutMuxer.cs b/BizHawk.MultiClient/AVOut/NutMuxer.cs
similarity index 100%
rename from BizHawk.MultiClient/NutMuxer.cs
rename to BizHawk.MultiClient/AVOut/NutMuxer.cs
diff --git a/BizHawk.MultiClient/NutWriter.cs b/BizHawk.MultiClient/AVOut/NutWriter.cs
similarity index 100%
rename from BizHawk.MultiClient/NutWriter.cs
rename to BizHawk.MultiClient/AVOut/NutWriter.cs
diff --git a/BizHawk.MultiClient/VideoWriterChooserForm.Designer.cs b/BizHawk.MultiClient/AVOut/VideoWriterChooserForm.Designer.cs
similarity index 100%
rename from BizHawk.MultiClient/VideoWriterChooserForm.Designer.cs
rename to BizHawk.MultiClient/AVOut/VideoWriterChooserForm.Designer.cs
diff --git a/BizHawk.MultiClient/VideoWriterChooserForm.cs b/BizHawk.MultiClient/AVOut/VideoWriterChooserForm.cs
similarity index 100%
rename from BizHawk.MultiClient/VideoWriterChooserForm.cs
rename to BizHawk.MultiClient/AVOut/VideoWriterChooserForm.cs
diff --git a/BizHawk.MultiClient/VideoWriterChooserForm.resx b/BizHawk.MultiClient/AVOut/VideoWriterChooserForm.resx
similarity index 100%
rename from BizHawk.MultiClient/VideoWriterChooserForm.resx
rename to BizHawk.MultiClient/AVOut/VideoWriterChooserForm.resx
diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index f54edfe15e..920601fa78 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -113,7 +113,31 @@
     <Compile Include="ArchiveChooser.Designer.cs">
       <DependentUpon>ArchiveChooser.cs</DependentUpon>
     </Compile>
-    <Compile Include="AviWriter.cs" />
+    <Compile Include="AVOut\AviWriter.cs" />
+    <Compile Include="AVOut\FFmpegWriter.cs" />
+    <Compile Include="AVOut\FFmpegWriterForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="AVOut\FFmpegWriterForm.Designer.cs">
+      <DependentUpon>FFmpegWriterForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="AVOut\IVideoWriter.cs" />
+    <Compile Include="AVOut\JMDForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="AVOut\JMDForm.Designer.cs">
+      <DependentUpon>JMDForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="AVOut\JMDWriter.cs" />
+    <Compile Include="AVOut\NutMuxer.cs" />
+    <Compile Include="AVOut\NutWriter.cs" />
+    <Compile Include="AVOut\VideoWriterChooserForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="AVOut\VideoWriterChooserForm.Designer.cs">
+      <DependentUpon>VideoWriterChooserForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="AVOut\WavWriter.cs" />
     <Compile Include="BizBox.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -164,13 +188,6 @@
     </Compile>
     <Compile Include="DisplayManager\DisplayManager.cs" />
     <Compile Include="DisplayManager\Filters\Hq2x.cs" />
-    <Compile Include="FFmpegWriter.cs" />
-    <Compile Include="FFmpegWriterForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FFmpegWriterForm.Designer.cs">
-      <DependentUpon>FFmpegWriterForm.cs</DependentUpon>
-    </Compile>
     <Compile Include="Gameboy\Debugger.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -182,13 +199,6 @@
     <Compile Include="Input\ControllerBinding.cs" />
     <Compile Include="Input\GamePad.cs" Condition=" '$(OS)' == 'Windows_NT' " />
     <Compile Include="Input\Input.cs" />
-    <Compile Include="JMDForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="JMDForm.Designer.cs">
-      <DependentUpon>JMDForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="JMDWriter.cs" />
     <Compile Include="LogConsole.cs" />
     <Compile Include="LogWindow.cs">
       <SubType>Form</SubType>
@@ -287,8 +297,6 @@
     <Compile Include="NEStools\SpriteViewer.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="NutMuxer.cs" />
-    <Compile Include="NutWriter.cs" />
     <Compile Include="PCEtools\PCEBGCanvas.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -312,7 +320,6 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="IVideoWriter.cs" />
     <Compile Include="tools\HexColor.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -326,26 +333,22 @@
       <DependentUpon>HexFind.cs</DependentUpon>
     </Compile>
     <Compile Include="tools\WatchCommon.cs" />
-    <Compile Include="VideoWriterChooserForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="VideoWriterChooserForm.Designer.cs">
+    <EmbeddedResource Include="AVOut\FFmpegWriterForm.resx">
+      <DependentUpon>FFmpegWriterForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="AVOut\JMDForm.resx">
+      <DependentUpon>JMDForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="AVOut\VideoWriterChooserForm.resx">
       <DependentUpon>VideoWriterChooserForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="WavWriter.cs" />
+    </EmbeddedResource>
     <EmbeddedResource Include="config\GifAnimator.resx">
       <DependentUpon>GifAnimator.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FFmpegWriterForm.resx">
-      <DependentUpon>FFmpegWriterForm.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Gameboy\Debugger.resx">
       <DependentUpon>Debugger.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="JMDForm.resx">
-      <DependentUpon>JMDForm.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -390,9 +393,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <EmbeddedResource Include="VideoWriterChooserForm.resx">
-      <DependentUpon>VideoWriterChooserForm.cs</DependentUpon>
-    </EmbeddedResource>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>