diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index 9a57cb09c1..d066ef33f2 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -155,14 +155,14 @@
       <Project>{e1a23168-b571-411c-b360-2229e7225e0e}</Project>
       <Name>BizHawk.Emulation.Common</Name>
     </ProjectReference>
+    <ProjectReference Include="..\BizHawk.Emulation.Cores\BizHawk.Emulation.Cores.csproj">
+      <Project>{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}</Project>
+      <Name>BizHawk.Emulation.Cores</Name>
+    </ProjectReference>
     <ProjectReference Include="..\BizHawk.Emulation.DiscSystem\BizHawk.Emulation.DiscSystem.csproj">
       <Project>{f51946ea-827f-4d82-b841-1f2f6d060312}</Project>
       <Name>BizHawk.Emulation.DiscSystem</Name>
     </ProjectReference>
-    <ProjectReference Include="..\BizHawk.Emulation\BizHawk.Emulation.csproj">
-      <Project>{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}</Project>
-      <Name>BizHawk.Emulation</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 66b8ab5a9d..74976f0165 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -1011,14 +1011,14 @@
       <Project>{e1a23168-b571-411c-b360-2229e7225e0e}</Project>
       <Name>BizHawk.Emulation.Common</Name>
     </ProjectReference>
+    <ProjectReference Include="..\BizHawk.Emulation.Cores\BizHawk.Emulation.Cores.csproj">
+      <Project>{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}</Project>
+      <Name>BizHawk.Emulation.Cores</Name>
+    </ProjectReference>
     <ProjectReference Include="..\BizHawk.Emulation.DiscSystem\BizHawk.Emulation.DiscSystem.csproj">
       <Project>{f51946ea-827f-4d82-b841-1f2f6d060312}</Project>
       <Name>BizHawk.Emulation.DiscSystem</Name>
     </ProjectReference>
-    <ProjectReference Include="..\BizHawk.Emulation\BizHawk.Emulation.csproj">
-      <Project>{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}</Project>
-      <Name>BizHawk.Emulation</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="AboutBox.resx">
diff --git a/BizHawk.Emulation/BizHawk.Emulation.csproj b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
similarity index 100%
rename from BizHawk.Emulation/BizHawk.Emulation.csproj
rename to BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
diff --git a/BizHawk.Emulation/Calculator/TI83.cs b/BizHawk.Emulation.Cores/Calculator/TI83.cs
similarity index 100%
rename from BizHawk.Emulation/Calculator/TI83.cs
rename to BizHawk.Emulation.Cores/Calculator/TI83.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/C64.Core.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Core.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/C64.Core.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/C64.Core.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/C64.Input.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Input.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/C64.Input.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/C64.Input.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/C64.Motherboard.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/C64.Motherboard.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/C64.MotherboardInterface.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.MotherboardInterface.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/C64.MotherboardInterface.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/C64.MotherboardInterface.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/C64.Savestate.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Savestate.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/C64.Savestate.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/C64.Savestate.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/C64.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/C64.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Cartridge/Cart.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Cart.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Cartridge/Cart.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Cart.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Cartridge/Mapper0000.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0000.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Cartridge/Mapper0000.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0000.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Cartridge/Mapper0005.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0005.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Cartridge/Mapper0005.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0005.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Cartridge/Mapper000B.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper000B.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Cartridge/Mapper000B.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper000B.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Cartridge/Mapper000F.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper000F.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Cartridge/Mapper000F.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper000F.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Cartridge/Mapper0011.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0011.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Cartridge/Mapper0011.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0011.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Cartridge/Mapper0012.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0012.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Cartridge/Mapper0012.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0012.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Cartridge/Mapper0013.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0013.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Cartridge/Mapper0013.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0013.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Cartridge/Mapper0020.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0020.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Cartridge/Mapper0020.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0020.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Disk/VIC1541.PLA.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Disk/VIC1541.PLA.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Disk/VIC1541.PLA.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Disk/VIC1541.PLA.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Disk/VIC1541.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Disk/VIC1541.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Disk/VIC1541.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Disk/VIC1541.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/C64.Glue.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/C64.Glue.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/C64.Glue.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/C64.Glue.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/C64.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/C64.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/C64.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/C64.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/C64Presets.NTSC.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/C64Presets.NTSC.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/C64Presets.NTSC.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/C64Presets.NTSC.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/C64Presets.PAL.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/C64Presets.PAL.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/C64Presets.PAL.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/C64Presets.PAL.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Cassette.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cassette.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Cassette.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cassette.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Cia.Interface.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cia.Interface.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Cia.Interface.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cia.Interface.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Cia.Internal.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cia.Internal.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Cia.Internal.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cia.Internal.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Cia.Registers.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cia.Registers.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Cia.Registers.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cia.Registers.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Cia.Settings.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cia.Settings.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Cia.Settings.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cia.Settings.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Cpu.Interface.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cpu.Interface.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Cpu.Interface.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cpu.Interface.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Cpu.Internal.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cpu.Internal.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Cpu.Internal.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cpu.Internal.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Cpu.State.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cpu.State.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Cpu.State.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Cpu.State.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Expansion.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Expansion.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Expansion.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Expansion.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Joystick.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Joystick.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Joystick.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Joystick.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Keyboard.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Keyboard.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Keyboard.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Keyboard.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Pla.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Pla.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Pla.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Pla.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Ram.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Ram.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Ram.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Ram.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Rom.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Rom.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Rom.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Rom.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Serial.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Serial.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Serial.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Serial.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Sid.Interface.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Sid.Interface.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Sid.Interface.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Sid.Interface.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Sid.Internal.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Sid.Internal.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Sid.Internal.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Sid.Internal.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Sid.Registers.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Sid.Registers.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Sid.Registers.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Sid.Registers.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Sid.Settings.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Sid.Settings.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Sid.Settings.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Sid.Settings.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Sid.SoundProvider.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Sid.SoundProvider.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Sid.SoundProvider.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Sid.SoundProvider.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Userport.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Userport.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Userport.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Userport.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.Graphics.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.Graphics.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.Graphics.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.Graphics.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.Interface.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.Interface.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.Interface.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.Interface.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.Internal.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.Internal.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.Internal.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.Internal.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.Registers.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.Registers.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.Registers.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.Registers.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.Settings.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.Settings.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.Settings.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.Settings.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.Sprite.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.Sprite.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.Sprite.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.Sprite.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.State.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.State.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.State.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.State.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.Synth.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.Synth.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.Synth.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.Synth.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.Timing.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.Timing.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.Timing.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.Timing.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.VideoProvider.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.VideoProvider.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Internals/Vic.VideoProvider.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Internals/Vic.VideoProvider.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Presets.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Presets.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/Chips/Presets.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/Chips/Presets.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Experimental/IMotherboard.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/IMotherboard.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Experimental/IMotherboard.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Experimental/IMotherboard.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/InputFileInfo.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/InputFileInfo.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/InputFileInfo.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/InputFileInfo.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/CartridgePort.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/CartridgePort.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/CartridgePort.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/CartridgePort.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/CassettePort.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/CassettePort.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/CassettePort.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/CassettePort.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/Chip2114.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip2114.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/Chip2114.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip2114.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/Chip23XX.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip23XX.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/Chip23XX.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip23XX.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/Chip4864.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip4864.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/Chip4864.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip4864.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/MOS6510.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/MOS6510.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/MOS6510.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/MOS6510.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/MOS6522.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/MOS6522.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/MOS6522.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/MOS6522.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/MOS6526.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/MOS6526.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/MOS6526.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/MOS6526.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/MOS6567.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/MOS6567.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/MOS6567.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/MOS6567.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/MOS6569.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/MOS6569.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/MOS6569.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/MOS6569.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/MOS6581.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/MOS6581.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/MOS6581.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/MOS6581.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/MOSPLA.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/MOSPLA.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/MOSPLA.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/MOSPLA.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/Port.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Port.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/Port.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Port.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/SerialPort.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/SerialPort.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/SerialPort.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/SerialPort.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/Sid.Envelope.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.Envelope.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/Sid.Envelope.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.Envelope.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/Sid.Voice.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.Voice.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/Sid.Voice.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.Voice.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/Sid.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/Sid.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/UserPort.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/UserPort.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/UserPort.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/UserPort.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/Vic.GraphicsGenerator.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.GraphicsGenerator.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/Vic.GraphicsGenerator.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.GraphicsGenerator.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/Vic.Parse.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Parse.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/Vic.Parse.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Parse.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/Vic.Registers.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Registers.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/Vic.Registers.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Registers.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/Vic.Render.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Render.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/Vic.Render.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Render.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/Vic.SpriteGenerator.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.SpriteGenerator.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/Vic.SpriteGenerator.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.SpriteGenerator.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/Vic.State.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.State.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/Vic.State.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.State.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/Vic.TimingBuilder.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.TimingBuilder.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/Vic.TimingBuilder.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.TimingBuilder.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/Vic.VideoProvider.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.VideoProvider.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/Vic.VideoProvider.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.VideoProvider.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/MOS/Vic.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/MOS/Vic.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Media/D64.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Media/D64.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Media/D64.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Media/D64.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Media/Disk.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Media/Disk.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Media/Disk.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Media/Disk.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Media/G64.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Media/G64.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Media/G64.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Media/G64.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Media/PRG.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Media/PRG.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Media/PRG.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Media/PRG.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/SaveState.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/SaveState.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/SaveState.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/SaveState.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/Tape/VIC1530.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Tape/VIC1530.cs
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/Tape/VIC1530.cs
rename to BizHawk.Emulation.Cores/Computers/Commodore64/Tape/VIC1530.cs
diff --git a/BizHawk.Emulation/Computers/Commodore64/docs/CRT.TXT b/BizHawk.Emulation.Cores/Computers/Commodore64/docs/CRT.TXT
similarity index 100%
rename from BizHawk.Emulation/Computers/Commodore64/docs/CRT.TXT
rename to BizHawk.Emulation.Cores/Computers/Commodore64/docs/CRT.TXT
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.Core.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Atari2600.Core.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Atari2600.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/M6532.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/M6532.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/M6532.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/M6532.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m0840.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m0840.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/m0840.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m0840.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m2K.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m2K.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/m2K.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m2K.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3E.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m3E.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3E.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m3E.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3F.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m3F.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3F.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m3F.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3Fe.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m3Fe.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3Fe.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m3Fe.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4A50.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m4A50.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4A50.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m4A50.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4K.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m4K.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4K.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m4K.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mCV.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mCV.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/mCV.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mCV.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mDPC.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mDPC.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/mDPC.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mDPC.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE0.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mE0.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE0.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mE0.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE7.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mE7.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE7.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mE7.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mEF.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mEF.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/mEF.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mEF.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF0.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF0.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF0.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF0.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF4.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF4.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF4.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF4.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF6.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF6.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF6.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF6.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF8.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF8.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF8.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF8.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFA.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mFA.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFA.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mFA.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFE.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mFE.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFE.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mFE.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mMC.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mMC.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/mMC.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mMC.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mUA.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mUA.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/mUA.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mUA.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mX07.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mX07.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/Mappers/mX07.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mX07.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/TIA.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/TIA.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/TIA.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/TIA.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/oldTIA.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/oldTIA.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/2600/oldTIA.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/2600/oldTIA.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.Core.cs b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.Core.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/7800/Atari7800.Core.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.Core.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800Control.cs b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800Control.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/7800/Atari7800Control.cs
rename to BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800Control.cs
diff --git a/BizHawk.Emulation/Consoles/Atari/docs/2600_mem_map.txt b/BizHawk.Emulation.Cores/Consoles/Atari/docs/2600_mem_map.txt
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/docs/2600_mem_map.txt
rename to BizHawk.Emulation.Cores/Consoles/Atari/docs/2600_mem_map.txt
diff --git a/BizHawk.Emulation/Consoles/Atari/docs/Atari2600_CompatibilityList.xlsx b/BizHawk.Emulation.Cores/Consoles/Atari/docs/Atari2600_CompatibilityList.xlsx
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/docs/Atari2600_CompatibilityList.xlsx
rename to BizHawk.Emulation.Cores/Consoles/Atari/docs/Atari2600_CompatibilityList.xlsx
diff --git a/BizHawk.Emulation/Consoles/Atari/docs/Atari7800_MapperGuide.txt b/BizHawk.Emulation.Cores/Consoles/Atari/docs/Atari7800_MapperGuide.txt
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/docs/Atari7800_MapperGuide.txt
rename to BizHawk.Emulation.Cores/Consoles/Atari/docs/Atari7800_MapperGuide.txt
diff --git a/BizHawk.Emulation/Consoles/Atari/docs/Atari_Mappers.txt b/BizHawk.Emulation.Cores/Consoles/Atari/docs/Atari_Mappers.txt
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/docs/Atari_Mappers.txt
rename to BizHawk.Emulation.Cores/Consoles/Atari/docs/Atari_Mappers.txt
diff --git a/BizHawk.Emulation/Consoles/Atari/docs/CartFormats_KevinHorton.txt b/BizHawk.Emulation.Cores/Consoles/Atari/docs/CartFormats_KevinHorton.txt
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/docs/CartFormats_KevinHorton.txt
rename to BizHawk.Emulation.Cores/Consoles/Atari/docs/CartFormats_KevinHorton.txt
diff --git a/BizHawk.Emulation/Consoles/Atari/docs/TIA_HW_Notes.txt b/BizHawk.Emulation.Cores/Consoles/Atari/docs/TIA_HW_Notes.txt
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/docs/TIA_HW_Notes.txt
rename to BizHawk.Emulation.Cores/Consoles/Atari/docs/TIA_HW_Notes.txt
diff --git a/BizHawk.Emulation/Consoles/Atari/docs/stella.pdf b/BizHawk.Emulation.Cores/Consoles/Atari/docs/stella.pdf
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/docs/stella.pdf
rename to BizHawk.Emulation.Cores/Consoles/Atari/docs/stella.pdf
diff --git a/BizHawk.Emulation/Consoles/Atari/logic/TIA.circ b/BizHawk.Emulation.Cores/Consoles/Atari/logic/TIA.circ
similarity index 100%
rename from BizHawk.Emulation/Consoles/Atari/logic/TIA.circ
rename to BizHawk.Emulation.Cores/Consoles/Atari/logic/TIA.circ
diff --git a/BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs
rename to BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs
diff --git a/BizHawk.Emulation/Consoles/Coleco/Input.cs b/BizHawk.Emulation.Cores/Consoles/Coleco/Input.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Coleco/Input.cs
rename to BizHawk.Emulation.Cores/Consoles/Coleco/Input.cs
diff --git a/BizHawk.Emulation/Consoles/Coleco/MemoryMap.cs b/BizHawk.Emulation.Cores/Consoles/Coleco/MemoryMap.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Coleco/MemoryMap.cs
rename to BizHawk.Emulation.Cores/Consoles/Coleco/MemoryMap.cs
diff --git a/BizHawk.Emulation/Consoles/Coleco/TMS9918A.cs b/BizHawk.Emulation.Cores/Consoles/Coleco/TMS9918A.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Coleco/TMS9918A.cs
rename to BizHawk.Emulation.Cores/Consoles/Coleco/TMS9918A.cs
diff --git a/BizHawk.Emulation/Consoles/Coleco/docs/CV-Sound.txt b/BizHawk.Emulation.Cores/Consoles/Coleco/docs/CV-Sound.txt
similarity index 100%
rename from BizHawk.Emulation/Consoles/Coleco/docs/CV-Sound.txt
rename to BizHawk.Emulation.Cores/Consoles/Coleco/docs/CV-Sound.txt
diff --git a/BizHawk.Emulation/Consoles/Coleco/docs/CV-Tech.txt b/BizHawk.Emulation.Cores/Consoles/Coleco/docs/CV-Tech.txt
similarity index 100%
rename from BizHawk.Emulation/Consoles/Coleco/docs/CV-Tech.txt
rename to BizHawk.Emulation.Cores/Consoles/Coleco/docs/CV-Tech.txt
diff --git a/BizHawk.Emulation/Consoles/Coleco/docs/colecovision tech1.pdf b/BizHawk.Emulation.Cores/Consoles/Coleco/docs/colecovision tech1.pdf
similarity index 100%
rename from BizHawk.Emulation/Consoles/Coleco/docs/colecovision tech1.pdf
rename to BizHawk.Emulation.Cores/Consoles/Coleco/docs/colecovision tech1.pdf
diff --git a/BizHawk.Emulation/Consoles/Coleco/docs/colecovision tech2.pdf b/BizHawk.Emulation.Cores/Consoles/Coleco/docs/colecovision tech2.pdf
similarity index 100%
rename from BizHawk.Emulation/Consoles/Coleco/docs/colecovision tech2.pdf
rename to BizHawk.Emulation.Cores/Consoles/Coleco/docs/colecovision tech2.pdf
diff --git a/BizHawk.Emulation/Consoles/Intellivision/Cartridge.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/Cartridge.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Intellivision/Cartridge.cs
rename to BizHawk.Emulation.Cores/Consoles/Intellivision/Cartridge.cs
diff --git a/BizHawk.Emulation/Consoles/Intellivision/ICart.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/ICart.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Intellivision/ICart.cs
rename to BizHawk.Emulation.Cores/Consoles/Intellivision/ICart.cs
diff --git a/BizHawk.Emulation/Consoles/Intellivision/Intellicart.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellicart.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Intellivision/Intellicart.cs
rename to BizHawk.Emulation.Cores/Consoles/Intellivision/Intellicart.cs
diff --git a/BizHawk.Emulation/Consoles/Intellivision/Intellivision.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Intellivision/Intellivision.cs
rename to BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs
diff --git a/BizHawk.Emulation/Consoles/Intellivision/MemoryMap.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/MemoryMap.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Intellivision/MemoryMap.cs
rename to BizHawk.Emulation.Cores/Consoles/Intellivision/MemoryMap.cs
diff --git a/BizHawk.Emulation/Consoles/Intellivision/PSG.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/PSG.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Intellivision/PSG.cs
rename to BizHawk.Emulation.Cores/Consoles/Intellivision/PSG.cs
diff --git a/BizHawk.Emulation/Consoles/Intellivision/STIC.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/STIC.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Intellivision/STIC.cs
rename to BizHawk.Emulation.Cores/Consoles/Intellivision/STIC.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/GBA/LibMeteor.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibMeteor.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/GBA/LibMeteor.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibMeteor.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/GBColors.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GBColors.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/Gameboy/GBColors.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GBColors.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/GambatteLink.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/Gameboy/GambatteLink.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/LibGambatte.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibGambatte.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/Gameboy/LibGambatte.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibGambatte.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/N64/mupen64plusApi.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/mupen64plusApi.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/N64/mupen64plusApi.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/N64/mupen64plusApi.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/APU.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/APU.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/APU.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/APU.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/BisqAPU.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/BisqAPU.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/BisqAPU.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/BisqAPU.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/BoardSystem.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/BoardSystem.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/AVE-NINA.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AVE-NINA.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/AVE-NINA.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AVE-NINA.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/AxROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AxROM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/AxROM.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AxROM.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI_74_161_161_32.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_161_32.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BANDAI_74_161_161_32.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_161_32.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BxROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BxROM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/BxROM.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BxROM.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/CNROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CNROM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/CNROM.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CNROM.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/CPROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CPROM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/CPROM.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CPROM.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Camerica.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Camerica.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Camerica.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Camerica.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/ExROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/ExROM.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/GxROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/GxROM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/GxROM.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/GxROM.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/IC_74x377.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IC_74x377.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/IC_74x377.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IC_74x377.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/IREM-74_161_161_21_138.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IREM-74_161_161_21_138.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/IREM-74_161_161_21_138.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IREM-74_161_161_21_138.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/IREM_TAM_S1.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IREM_TAM_S1.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/IREM_TAM_S1.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IREM_TAM_S1.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Irem_G101.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Irem_G101.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Irem_G101.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Irem_G101.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Irem_H3001.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Irem_H3001.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Irem_H3001.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Irem_H3001.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_13.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_13.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_13.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_13.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_17.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_17.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_17.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_17.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_SS8806.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_SS8806.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/JALECO_SS8806.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_SS8806.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Jaleco-JF_11_14.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Jaleco-JF_11_14.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Jaleco-JF_11_14.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Jaleco-JF_11_14.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper012.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper012.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper012.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper012.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper037.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper037.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper037.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper037.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper044.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper044.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper044.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper044.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper074.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper074.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper074.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper074.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper165.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper165.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper165.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper165.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper182.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper182.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper182.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper182.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper189.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper189.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper189.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper189.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper192.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper192.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper192.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper192.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper194.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper194.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper194.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper194.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper197.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper197.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper197.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper197.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper205.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper205.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper205.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper205.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper250.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper250.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper250.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper250.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/NES-QJ.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/NES-QJ.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/NES-QJ.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/NES-QJ.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TLSROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TLSROM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TLSROM.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TLSROM.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TQROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TQROM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TQROM.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TQROM.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TVROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TVROM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TVROM.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TVROM.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper015.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper015.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper015.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper015.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper028.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper028.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper028.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper028.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper036.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper036.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper036.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper036.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper038.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper038.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper038.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper038.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper040.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper040.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper040.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper040.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper041.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper041.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper041.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper041.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper042.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper042.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper042.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper042.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper045.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper045.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper045.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper045.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper046.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper046.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper046.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper046.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper057.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper057.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper057.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper057.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper058.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper058.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper058.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper058.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper069.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper069.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper069.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper069.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper078.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper078.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper078.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper078.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper090.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper090.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper090.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper090.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper091.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper091.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper091.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper091.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper099.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper099.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper099.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper099.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper101.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper101.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper101.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper101.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper103.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper103.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper103.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper103.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper107.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper107.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper107.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper107.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper108.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper108.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper108.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper108.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper116.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper116.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper116.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper116.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper120.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper120.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper120.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper120.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper132.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper132.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper132.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper132.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper143.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper143.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper143.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper143.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper156.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper156.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper156.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper156.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper164.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper164.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper164.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper164.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper168.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper168.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper168.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper168.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper176.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper176.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper176.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper176.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper177.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper177.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper177.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper177.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper178.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper178.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper178.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper178.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper180.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper180.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper180.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper180.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper193.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper193.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper193.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper193.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper200.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper200.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper200.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper200.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper201.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper201.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper201.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper201.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper203.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper203.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper203.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper203.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper207.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper207.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper207.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper207.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper218.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper218.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper218.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper218.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper225.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper225.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper225.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper225.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper226.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper226.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper226.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper226.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper227.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper227.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper227.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper227.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper230.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper230.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper230.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper230.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper231.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper231.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper231.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper231.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper233.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper233.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper233.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper233.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper240.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper240.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper240.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper240.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper241.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper241.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper241.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper241.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper242.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper242.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper242.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper242.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper243.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper243.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper243.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper243.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper246.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper246.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper246.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper246.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper50.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper50.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper50.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper50.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper60.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper60.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper60.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper60.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper61.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper61.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper61.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper61.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper62.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper62.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper62.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper62.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NAMCOT_m19_m210.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NAMCOT_m19_m210.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NAMCOT_m19_m210.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NAMCOT_m19_m210.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NES-EVENT.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NES-EVENT.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NES-EVENT.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NES-EVENT.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NROM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NROM.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NROM.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NROM368.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NROM368.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NROM368.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NROM368.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/DRROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/DRROM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/DRROM.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/DRROM.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper076.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper076.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper076.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper076.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper088.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper088.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper088.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper088.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper095.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper095.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper095.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper095.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper112.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper112.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper112.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper112.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper206.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper206.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper206.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper206.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Namco163Audio.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namco163Audio.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Namco163Audio.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namco163Audio.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Namcot1xx.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namcot1xx.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Namcot1xx.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namcot1xx.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NanJing.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NanJing.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NanJing.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NanJing.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NovelDiamond.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NovelDiamond.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/NovelDiamond.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NovelDiamond.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SEEPROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SEEPROM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SEEPROM.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SEEPROM.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SachenSimple.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SachenSimple.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SachenSimple.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SachenSimple.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft1.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft1.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft1.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft1.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft3.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft3.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft3.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft3.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft4.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft4.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Sunsoft4.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft4.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SxROM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SxROM.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TENGEN_800008.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TENGEN_800008.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/TENGEN_800008.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TENGEN_800008.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_TC0190FMC.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_TC0190FMC.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_TC0190FMC.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_TC0190FMC.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/UxROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UxROM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/UxROM.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UxROM.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC1.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC1.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC1.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC1.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC2_4.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC2_4.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC2_4.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC2_4.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC3.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC3.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC3.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC3.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC6.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC6.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC6.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC6.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC7.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC7.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VRC7.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC7.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Core.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Core.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Docs/BoardTable.xlsx b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/BoardTable.xlsx
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Docs/BoardTable.xlsx
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/BoardTable.xlsx
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Docs/MapperCompatibilityList.url b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/MapperCompatibilityList.url
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Docs/MapperCompatibilityList.url
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/MapperCompatibilityList.url
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Docs/nesasm.pdf b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/nesasm.pdf
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Docs/nesasm.pdf
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/nesasm.pdf
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Docs/sunsoft.txt b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/sunsoft.txt
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Docs/sunsoft.txt
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/sunsoft.txt
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Docs/sxrom_notes.txt b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/sxrom_notes.txt
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Docs/sxrom_notes.txt
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/sxrom_notes.txt
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/FDS/FDS.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDS.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/FDS/FDS.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDS.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/FDS/FDSAudio.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDSAudio.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/FDS/FDSAudio.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDSAudio.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/FDS/RamAdapter.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/RamAdapter.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/FDS/RamAdapter.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/RamAdapter.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/PPU.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.regs.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.regs.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.run.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.run.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/PPU.run.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.run.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Palettes.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Palettes.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Palettes.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Palettes.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Unif.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Unif.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/Unif.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Unif.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/iNES.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/NES/iNES.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/NES/iNES.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesApi.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesApi.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/SNES/SNESGraphicsDecoder.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/SNESGraphicsDecoder.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/SNES/SNESGraphicsDecoder.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/SNESGraphicsDecoder.cs
diff --git a/BizHawk.Emulation/Consoles/Nintendo/SNES/SnesColors.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/SnesColors.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Nintendo/SNES/SnesColors.cs
rename to BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/SnesColors.cs
diff --git a/BizHawk.Emulation/Consoles/PC Engine/ADPCM.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/ADPCM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/PC Engine/ADPCM.cs
rename to BizHawk.Emulation.Cores/Consoles/PC Engine/ADPCM.cs
diff --git a/BizHawk.Emulation/Consoles/PC Engine/ArcadeCard.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/ArcadeCard.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/PC Engine/ArcadeCard.cs
rename to BizHawk.Emulation.Cores/Consoles/PC Engine/ArcadeCard.cs
diff --git a/BizHawk.Emulation/Consoles/PC Engine/Compat.txt b/BizHawk.Emulation.Cores/Consoles/PC Engine/Compat.txt
similarity index 100%
rename from BizHawk.Emulation/Consoles/PC Engine/Compat.txt
rename to BizHawk.Emulation.Cores/Consoles/PC Engine/Compat.txt
diff --git a/BizHawk.Emulation/Consoles/PC Engine/Input.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/Input.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/PC Engine/Input.cs
rename to BizHawk.Emulation.Cores/Consoles/PC Engine/Input.cs
diff --git a/BizHawk.Emulation/Consoles/PC Engine/MemoryMap.Populous.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.Populous.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/PC Engine/MemoryMap.Populous.cs
rename to BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.Populous.cs
diff --git a/BizHawk.Emulation/Consoles/PC Engine/MemoryMap.SF2.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.SF2.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/PC Engine/MemoryMap.SF2.cs
rename to BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.SF2.cs
diff --git a/BizHawk.Emulation/Consoles/PC Engine/MemoryMap.SuperGrafx.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.SuperGrafx.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/PC Engine/MemoryMap.SuperGrafx.cs
rename to BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.SuperGrafx.cs
diff --git a/BizHawk.Emulation/Consoles/PC Engine/MemoryMap.TurboCD.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.TurboCD.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/PC Engine/MemoryMap.TurboCD.cs
rename to BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.TurboCD.cs
diff --git a/BizHawk.Emulation/Consoles/PC Engine/MemoryMap.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/PC Engine/MemoryMap.cs
rename to BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.cs
diff --git a/BizHawk.Emulation/Consoles/PC Engine/PCEngine.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/PC Engine/PCEngine.cs
rename to BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
diff --git a/BizHawk.Emulation/Consoles/PC Engine/ScsiCDBus.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/ScsiCDBus.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/PC Engine/ScsiCDBus.cs
rename to BizHawk.Emulation.Cores/Consoles/PC Engine/ScsiCDBus.cs
diff --git a/BizHawk.Emulation/Consoles/PC Engine/TurboCD.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/TurboCD.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/PC Engine/TurboCD.cs
rename to BizHawk.Emulation.Cores/Consoles/PC Engine/TurboCD.cs
diff --git a/BizHawk.Emulation/Consoles/PC Engine/VCE.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/VCE.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/PC Engine/VCE.cs
rename to BizHawk.Emulation.Cores/Consoles/PC Engine/VCE.cs
diff --git a/BizHawk.Emulation/Consoles/PC Engine/VDC.Render.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/VDC.Render.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/PC Engine/VDC.Render.cs
rename to BizHawk.Emulation.Cores/Consoles/PC Engine/VDC.Render.cs
diff --git a/BizHawk.Emulation/Consoles/PC Engine/VDC.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/VDC.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/PC Engine/VDC.cs
rename to BizHawk.Emulation.Cores/Consoles/PC Engine/VDC.cs
diff --git a/BizHawk.Emulation/Consoles/PC Engine/VPC.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/VPC.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/PC Engine/VPC.cs
rename to BizHawk.Emulation.Cores/Consoles/PC Engine/VPC.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/Cart/EEPROM.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Cart/EEPROM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/Genesis/Cart/EEPROM.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Cart/EEPROM.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/Cart/RomHeader.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Cart/RomHeader.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/Genesis/Cart/RomHeader.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Cart/RomHeader.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/Cart/SaveRAM.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Cart/SaveRAM.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/Genesis/Cart/SaveRAM.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Cart/SaveRAM.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/Compat.txt b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Compat.txt
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/Genesis/Compat.txt
rename to BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Compat.txt
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/GenVDP.DMA.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/GenVDP.DMA.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/Genesis/GenVDP.DMA.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/Genesis/GenVDP.DMA.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/GenVDP.Render.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/GenVDP.Render.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/Genesis/GenVDP.Render.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/Genesis/GenVDP.Render.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/GenVDP.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/GenVDP.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/Genesis/GenVDP.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/Genesis/GenVDP.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/Genesis/Genesis.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Genesis.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/IO.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/IO.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/Genesis/IO.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/Genesis/IO.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/Input.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Input.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/Genesis/Input.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Input.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/MemoryMap.68000.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/MemoryMap.68000.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/Genesis/MemoryMap.68000.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/Genesis/MemoryMap.68000.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/MemoryMap.Z80.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/MemoryMap.Z80.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/Genesis/MemoryMap.Z80.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/Genesis/MemoryMap.Z80.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/Genesis/Native68000/Musashi.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Native68000/Musashi.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/Genesis/Native68000/Musashi.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/Genesis/Native68000/Musashi.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/SMS/BIOS.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/BIOS.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/SMS/BIOS.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/SMS/BIOS.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/SMS/Compat.txt b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/Compat.txt
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/SMS/Compat.txt
rename to BizHawk.Emulation.Cores/Consoles/Sega/SMS/Compat.txt
diff --git a/BizHawk.Emulation/Consoles/Sega/SMS/Input.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/Input.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/SMS/Input.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/SMS/Input.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/SMS/MemoryMap.CodeMasters.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.CodeMasters.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/SMS/MemoryMap.CodeMasters.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.CodeMasters.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/SMS/MemoryMap.Sega.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.Sega.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/SMS/MemoryMap.Sega.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.Sega.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/SMS/SMS.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/SMS/VDP.Mode4.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.Mode4.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/SMS/VDP.Mode4.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.Mode4.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/SMS/VDP.ModeTMS.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.ModeTMS.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/SMS/VDP.ModeTMS.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.ModeTMS.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/SMS/VDP.Tables.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.Tables.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/SMS/VDP.Tables.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.Tables.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/SMS/VDP.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/SMS/VDP.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/Saturn/FilePiping.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/FilePiping.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/Saturn/FilePiping.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/Saturn/FilePiping.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/Saturn/LibYabause.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/LibYabause.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/Saturn/LibYabause.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/Saturn/LibYabause.cs
diff --git a/BizHawk.Emulation/Consoles/Sega/Saturn/Yabause.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sega/Saturn/Yabause.cs
rename to BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs
diff --git a/BizHawk.Emulation/Consoles/Sony/PSP/PPSSPPDll.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSP/PPSSPPDll.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sony/PSP/PPSSPPDll.cs
rename to BizHawk.Emulation.Cores/Consoles/Sony/PSP/PPSSPPDll.cs
diff --git a/BizHawk.Emulation/Consoles/Sony/PSP/PSP.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSP/PSP.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sony/PSP/PSP.cs
rename to BizHawk.Emulation.Cores/Consoles/Sony/PSP/PSP.cs
diff --git a/BizHawk.Emulation/Consoles/Sony/PSX/LibMednahawkDll.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/LibMednahawkDll.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sony/PSX/LibMednahawkDll.cs
rename to BizHawk.Emulation.Cores/Consoles/Sony/PSX/LibMednahawkDll.cs
diff --git a/BizHawk.Emulation/Consoles/Sony/PSX/Octoshock.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
similarity index 100%
rename from BizHawk.Emulation/Consoles/Sony/PSX/Octoshock.cs
rename to BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
diff --git a/BizHawk.Emulation/ExternalCores/EmuFile.cs b/BizHawk.Emulation.Cores/ExternalCores/EmuFile.cs
similarity index 100%
rename from BizHawk.Emulation/ExternalCores/EmuFile.cs
rename to BizHawk.Emulation.Cores/ExternalCores/EmuFile.cs
diff --git a/BizHawk.Emulation/ExternalCores/ExternalCore.cs b/BizHawk.Emulation.Cores/ExternalCores/ExternalCore.cs
similarity index 100%
rename from BizHawk.Emulation/ExternalCores/ExternalCore.cs
rename to BizHawk.Emulation.Cores/ExternalCores/ExternalCore.cs
diff --git a/BizHawk.Emulation/ExternalCores/PsxCore.cs b/BizHawk.Emulation.Cores/ExternalCores/PsxCore.cs
similarity index 100%
rename from BizHawk.Emulation/ExternalCores/PsxCore.cs
rename to BizHawk.Emulation.Cores/ExternalCores/PsxCore.cs
diff --git a/BizHawk.Emulation/ExternalCores/Snippets.txt b/BizHawk.Emulation.Cores/ExternalCores/Snippets.txt
similarity index 100%
rename from BizHawk.Emulation/ExternalCores/Snippets.txt
rename to BizHawk.Emulation.Cores/ExternalCores/Snippets.txt
diff --git a/BizHawk.Emulation/Notes.txt b/BizHawk.Emulation.Cores/Notes.txt
similarity index 100%
rename from BizHawk.Emulation/Notes.txt
rename to BizHawk.Emulation.Cores/Notes.txt
diff --git a/BizHawk.Emulation/Properties/AssemblyInfo.cs b/BizHawk.Emulation.Cores/Properties/AssemblyInfo.cs
similarity index 100%
rename from BizHawk.Emulation/Properties/AssemblyInfo.cs
rename to BizHawk.Emulation.Cores/Properties/AssemblyInfo.cs
diff --git a/BizHawk.Emulation/Properties/svnrev_template b/BizHawk.Emulation.Cores/Properties/svnrev_template
similarity index 100%
rename from BizHawk.Emulation/Properties/svnrev_template
rename to BizHawk.Emulation.Cores/Properties/svnrev_template
diff --git a/BizHawk.sln b/BizHawk.sln
index 41fd550187..bafc083f06 100644
--- a/BizHawk.sln
+++ b/BizHawk.sln
@@ -1,8 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation", "BizHawk.Emulation\BizHawk.Emulation.csproj", "{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.Common", "BizHawk.Client.Common\BizHawk.Client.Common.csproj", "{24A0AA3C-B25F-4197-B23D-476D6462DBA0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Common", "BizHawk.Common\BizHawk.Common.csproj", "{866F8D13-0678-4FF9-80A4-A3993FD4D8A3}"
@@ -19,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{B51F11
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Emulation", "Emulation", "{3627C08B-3E43-4224-9DA4-40BD69495FBC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation.Cores", "BizHawk.Emulation.Cores\BizHawk.Emulation.Cores.csproj", "{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -31,20 +31,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Win32.Build.0 = Debug|Any CPU
-		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Win32.ActiveCfg = Release|Any CPU
-		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Win32.Build.0 = Release|Any CPU
-		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|x86.ActiveCfg = Release|Any CPU
 		{24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -117,16 +103,28 @@ Global
 		{E1A23168-B571-411C-B360-2229E7225E0E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E1A23168-B571-411C-B360-2229E7225E0E}.Release|Win32.ActiveCfg = Release|Any CPU
 		{E1A23168-B571-411C-B360-2229E7225E0E}.Release|x86.ActiveCfg = Release|Any CPU
+		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Win32.ActiveCfg = Release|Any CPU
+		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{24A0AA3C-B25F-4197-B23D-476D6462DBA0} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
-		{C4366030-6D03-424B-AE53-F4F43BB217C3} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
 		{DD448B37-BA3F-4544-9754-5406E8094723} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
-		{F51946EA-827F-4D82-B841-1F2F6D060312} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
+		{C4366030-6D03-424B-AE53-F4F43BB217C3} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
+		{24A0AA3C-B25F-4197-B23D-476D6462DBA0} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
 		{E1A23168-B571-411C-B360-2229E7225E0E} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
+		{F51946EA-827F-4D82-B841-1F2F6D060312} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
 		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution