diff --git a/BizHawk.Emulation/BizHawk.Emulation.csproj b/BizHawk.Emulation/BizHawk.Emulation.csproj
index 25aa8b6c25..6f157fe239 100644
--- a/BizHawk.Emulation/BizHawk.Emulation.csproj
+++ b/BizHawk.Emulation/BizHawk.Emulation.csproj
@@ -182,17 +182,39 @@
     <Compile Include="Database\CRC32.cs" />
     <Compile Include="Database\Database.cs" />
     <Compile Include="Database\GameInfo.cs" />
-    <Compile Include="Disc\Blobs\Blob_WaveFile.cs" />
-    <Compile Include="Disc\Blobs\RiffMaster.cs" />
-    <Compile Include="Disc\CCD_format.cs" />
-    <Compile Include="Disc\CUE_format.cs" />
-    <Compile Include="Disc\Disc.API.cs" />
-    <Compile Include="Disc\Disc.cs" />
-    <Compile Include="Disc\DiscTOC.cs" />
-    <Compile Include="Disc\ECM.cs" />
-    <Compile Include="Disc\FFmpeg.cs" />
-    <Compile Include="Disc\Subcode.cs" />
-    <Compile Include="Disc\TOC_format.cs" />
+    <Compile Include="DiscSystem\Blobs\Blob_WaveFile.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DiscSystem\Blobs\RiffMaster.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DiscSystem\CCD_format.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DiscSystem\CUE_format.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DiscSystem\Disc.API.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DiscSystem\Disc.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DiscSystem\DiscTOC.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DiscSystem\ECM.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DiscSystem\FFmpeg.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DiscSystem\Subcode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DiscSystem\TOC_format.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="ExternalCores\EmuFile.cs" />
     <Compile Include="ExternalCores\ExternalCore.cs" />
     <Compile Include="ExternalCores\PsxCore.cs" />
diff --git a/BizHawk.Emulation/Disc/Blobs/Blob_WaveFile.cs b/BizHawk.Emulation/DiscSystem/Blobs/Blob_WaveFile.cs
similarity index 100%
rename from BizHawk.Emulation/Disc/Blobs/Blob_WaveFile.cs
rename to BizHawk.Emulation/DiscSystem/Blobs/Blob_WaveFile.cs
diff --git a/BizHawk.Emulation/Disc/Blobs/RiffMaster.cs b/BizHawk.Emulation/DiscSystem/Blobs/RiffMaster.cs
similarity index 100%
rename from BizHawk.Emulation/Disc/Blobs/RiffMaster.cs
rename to BizHawk.Emulation/DiscSystem/Blobs/RiffMaster.cs
diff --git a/BizHawk.Emulation/Disc/CCD_format.cs b/BizHawk.Emulation/DiscSystem/CCD_format.cs
similarity index 100%
rename from BizHawk.Emulation/Disc/CCD_format.cs
rename to BizHawk.Emulation/DiscSystem/CCD_format.cs
diff --git a/BizHawk.Emulation/Disc/CUE_format.cs b/BizHawk.Emulation/DiscSystem/CUE_format.cs
similarity index 100%
rename from BizHawk.Emulation/Disc/CUE_format.cs
rename to BizHawk.Emulation/DiscSystem/CUE_format.cs
diff --git a/BizHawk.Emulation/Disc/Disc.API.cs b/BizHawk.Emulation/DiscSystem/Disc.API.cs
similarity index 100%
rename from BizHawk.Emulation/Disc/Disc.API.cs
rename to BizHawk.Emulation/DiscSystem/Disc.API.cs
diff --git a/BizHawk.Emulation/Disc/Disc.cs b/BizHawk.Emulation/DiscSystem/Disc.cs
similarity index 100%
rename from BizHawk.Emulation/Disc/Disc.cs
rename to BizHawk.Emulation/DiscSystem/Disc.cs
diff --git a/BizHawk.Emulation/Disc/DiscTOC.cs b/BizHawk.Emulation/DiscSystem/DiscTOC.cs
similarity index 100%
rename from BizHawk.Emulation/Disc/DiscTOC.cs
rename to BizHawk.Emulation/DiscSystem/DiscTOC.cs
diff --git a/BizHawk.Emulation/Disc/ECM.cs b/BizHawk.Emulation/DiscSystem/ECM.cs
similarity index 100%
rename from BizHawk.Emulation/Disc/ECM.cs
rename to BizHawk.Emulation/DiscSystem/ECM.cs
diff --git a/BizHawk.Emulation/Disc/FFmpeg.cs b/BizHawk.Emulation/DiscSystem/FFmpeg.cs
similarity index 100%
rename from BizHawk.Emulation/Disc/FFmpeg.cs
rename to BizHawk.Emulation/DiscSystem/FFmpeg.cs
diff --git a/BizHawk.Emulation/Disc/Subcode.cs b/BizHawk.Emulation/DiscSystem/Subcode.cs
similarity index 100%
rename from BizHawk.Emulation/Disc/Subcode.cs
rename to BizHawk.Emulation/DiscSystem/Subcode.cs
diff --git a/BizHawk.Emulation/Disc/TOC_format.cs b/BizHawk.Emulation/DiscSystem/TOC_format.cs
similarity index 100%
rename from BizHawk.Emulation/Disc/TOC_format.cs
rename to BizHawk.Emulation/DiscSystem/TOC_format.cs