diff --git a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
index d06c9d4414..a042c31897 100644
--- a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
+++ b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
@@ -94,6 +94,7 @@
     <Compile Include="Interfaces\IVideoProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ServiceInjector.cs" />
+    <Compile Include="Sound\CDAudio.cs" />
     <Compile Include="Sound\HuC6280PSG.cs" />
     <Compile Include="Sound\MMC5Audio.cs" />
     <Compile Include="Sound\SN76489.cs" />
@@ -117,6 +118,10 @@
       <Project>{866f8d13-0678-4ff9-80a4-a3993fd4d8a3}</Project>
       <Name>BizHawk.Common</Name>
     </ProjectReference>
+    <ProjectReference Include="..\BizHawk.Emulation.DiscSystem\BizHawk.Emulation.DiscSystem.csproj">
+      <Project>{F51946EA-827F-4D82-B841-1F2F6D060312}</Project>
+      <Name>BizHawk.Emulation.DiscSystem</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
diff --git a/BizHawk.Emulation.DiscSystem/CDAudio.cs b/BizHawk.Emulation.Common/Sound/CDAudio.cs
similarity index 94%
rename from BizHawk.Emulation.DiscSystem/CDAudio.cs
rename to BizHawk.Emulation.Common/Sound/CDAudio.cs
index 37f93d97c7..aeac7fb0d2 100644
--- a/BizHawk.Emulation.DiscSystem/CDAudio.cs
+++ b/BizHawk.Emulation.Common/Sound/CDAudio.cs
@@ -2,13 +2,14 @@
 using System.IO;
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
+using BizHawk.Emulation.DiscSystem;
 
 // The state of the cd player is quantized to the frame level.
 // This isn't ideal. But life's too short. 
 // I decided not to let the perfect be the enemy of the good.
 // It can always be refactored. It's at least deterministic.
 
-namespace BizHawk.Emulation.DiscSystem
+namespace BizHawk.Emulation.Common.Components
 {
 	public sealed class CDAudio : ISoundProvider
 	{
diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/ScsiCDBus.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/ScsiCDBus.cs
index 1fb67b8043..acb0d77ad6 100644
--- a/BizHawk.Emulation.Cores/Consoles/PC Engine/ScsiCDBus.cs	
+++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/ScsiCDBus.cs	
@@ -5,6 +5,7 @@ using System.Globalization;
 using BizHawk.Common;
 using BizHawk.Common.NumberExtensions;
 using BizHawk.Emulation.Common;
+using BizHawk.Emulation.Common.Components;
 using BizHawk.Emulation.DiscSystem;
 
 namespace BizHawk.Emulation.Cores.PCEngine
diff --git a/BizHawk.Emulation.DiscSystem/API/Disc.API.cs b/BizHawk.Emulation.DiscSystem/API/Disc.API.cs
deleted file mode 100644
index 7f5da1006c..0000000000
--- a/BizHawk.Emulation.DiscSystem/API/Disc.API.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using BizHawk.Common.BufferExtensions;
-
-//some old junk
-
-namespace BizHawk.Emulation.DiscSystem
-{
-	sealed public partial class Disc
-	{
-
-	
-
-
-		
-	}
-}
\ No newline at end of file
diff --git a/BizHawk.Emulation.DiscSystem/API/Disc.ID.cs b/BizHawk.Emulation.DiscSystem/API/DiscIdentifier.cs
similarity index 100%
rename from BizHawk.Emulation.DiscSystem/API/Disc.ID.cs
rename to BizHawk.Emulation.DiscSystem/API/DiscIdentifier.cs
diff --git a/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj b/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
index 18dd392acb..f120c3ad16 100644
--- a/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
+++ b/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
@@ -50,10 +50,9 @@
     <Compile Include="..\Version\VersionInfo.cs">
       <Link>VersionInfo.cs</Link>
     </Compile>
-    <Compile Include="API\Disc.API.cs" />
-    <Compile Include="API\Disc.ID.cs" />
     <Compile Include="API\DiscExceptions.cs" />
     <Compile Include="API\DiscHasher.cs" />
+    <Compile Include="API\DiscIdentifier.cs" />
     <Compile Include="API\DiscSectorReader.cs" />
     <Compile Include="API\DiscStream.cs" />
     <Compile Include="Blobs\Blob_ECM.cs" />
@@ -63,7 +62,6 @@
     <Compile Include="Blobs\IBlob.cs" />
     <Compile Include="Blobs\RiffMaster.cs" />
     <Compile Include="CCD_format.cs" />
-    <Compile Include="CDAudio.cs" />
     <Compile Include="cdfs\EndianBitConverter.cs" />
     <Compile Include="cdfs\ISODirectoryNode.cs" />
     <Compile Include="cdfs\ISOFile.cs" />
@@ -103,10 +101,6 @@
       <Project>{866f8d13-0678-4ff9-80a4-a3993fd4d8a3}</Project>
       <Name>BizHawk.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\BizHawk.Emulation.Common\BizHawk.Emulation.Common.csproj">
-      <Project>{E1A23168-B571-411C-B360-2229E7225E0E}</Project>
-      <Name>BizHawk.Emulation.Common</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="docs\notes.txt" />