diff --git a/BizHawk.sln b/BizHawk.sln
index 57b550e575..3c51eb32b2 100644
--- a/BizHawk.sln
+++ b/BizHawk.sln
@@ -29,6 +29,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Emulation.DiscSyste
 		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation.HawkCores", "src\BizHawk.Emulation.HawkCores\BizHawk.Emulation.HawkCores.csproj", "{DB17B4D3-3997-44F4-837E-09CE280D8D41}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation.ManagedCores", "src\BizHawk.Emulation.ManagedCores\BizHawk.Emulation.ManagedCores.csproj", "{C5F93B02-6391-4A0A-B7FC-4F766D3DDBA6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation.UnmanagedCores", "src\BizHawk.Emulation.UnmanagedCores\BizHawk.Emulation.UnmanagedCores.csproj", "{AFA21758-408A-429B-87AF-3D56DC87681F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation.WboxCores", "src\BizHawk.Emulation.WboxCores\BizHawk.Emulation.WboxCores.csproj", "{AC8E4528-D3A6-425D-BF6C-6641EBEF5E5A}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Emulation.Common", "src\BizHawk.Emulation.Common\BizHawk.Emulation.Common.csproj", "{E1A23168-B571-411C-B360-2229E7225E0E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
@@ -38,7 +46,7 @@ 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Emulation.Cores", "src\BizHawk.Emulation.Cores\BizHawk.Emulation.Cores.csproj", "{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BizHawk.Emulation.CoresBase", "src\BizHawk.Emulation.CoresBase\BizHawk.Emulation.CoresBase.csproj", "{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0CE8B337-08E3-4602-BF10-C4D4C75D2F13} = {0CE8B337-08E3-4602-BF10-C4D4C75D2F13}
 	EndProjectSection
@@ -107,6 +115,22 @@ Global
 		{284E19E2-661D-4A7D-864A-AC2FC91E7C25}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{284E19E2-661D-4A7D-864A-AC2FC91E7C25}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{284E19E2-661D-4A7D-864A-AC2FC91E7C25}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB17B4D3-3997-44F4-837E-09CE280D8D41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB17B4D3-3997-44F4-837E-09CE280D8D41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB17B4D3-3997-44F4-837E-09CE280D8D41}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB17B4D3-3997-44F4-837E-09CE280D8D41}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5F93B02-6391-4A0A-B7FC-4F766D3DDBA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5F93B02-6391-4A0A-B7FC-4F766D3DDBA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5F93B02-6391-4A0A-B7FC-4F766D3DDBA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C5F93B02-6391-4A0A-B7FC-4F766D3DDBA6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFA21758-408A-429B-87AF-3D56DC87681F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFA21758-408A-429B-87AF-3D56DC87681F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFA21758-408A-429B-87AF-3D56DC87681F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFA21758-408A-429B-87AF-3D56DC87681F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC8E4528-D3A6-425D-BF6C-6641EBEF5E5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC8E4528-D3A6-425D-BF6C-6641EBEF5E5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC8E4528-D3A6-425D-BF6C-6641EBEF5E5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC8E4528-D3A6-425D-BF6C-6641EBEF5E5A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -120,6 +144,10 @@ Global
 		{197D4314-8A9F-49BA-977D-54ACEFAEB6BA} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
 		{B5A2214B-3CB0-48C4-8DB1-98B38D48AC4A} = {B51F1139-3D2C-41BE-A762-EF1F9B41EACA}
 		{284E19E2-661D-4A7D-864A-AC2FC91E7C25} = {74391239-9BC1-40CE-A3D7-180737C5302A}
+		{DB17B4D3-3997-44F4-837E-09CE280D8D41} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
+		{C5F93B02-6391-4A0A-B7FC-4F766D3DDBA6} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
+		{AFA21758-408A-429B-87AF-3D56DC87681F} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
+		{AC8E4528-D3A6-425D-BF6C-6641EBEF5E5A} = {3627C08B-3E43-4224-9DA4-40BD69495FBC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9B9E4316-9185-412E-B951-A63355ACA956}
diff --git a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index b5cd4b6c97..1aeeeb1503 100644
--- a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -9,8 +9,11 @@
 		<Reference Include="NLua" HintPath="$(ProjectDir)../../output/dll/nlua/NLua.dll" Private="False" />
 		<PackageReference Include="SharpCompress" Version="0.24.0" />
 		<PackageReference Include="SharpZipLib" Version="1.1.0" />
-		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.HawkCores/BizHawk.Emulation.HawkCores.csproj" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.ManagedCores/BizHawk.Emulation.ManagedCores.csproj" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.UnmanagedCores/BizHawk.Emulation.UnmanagedCores.csproj" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.WboxCores/BizHawk.Emulation.WboxCores.csproj" />
 		<Compile Include="$(ProjectDir)../BizHawk.Version/svnrev.cs" />
 		<Compile Include="$(ProjectDir)../BizHawk.Version/VersionInfo.cs" />
 	</ItemGroup>
diff --git a/src/BizHawk.Emulation.Cores/Properties/Resources.cs b/src/BizHawk.Emulation.Cores/Properties/Resources.cs
deleted file mode 100644
index 4bcb534912..0000000000
--- a/src/BizHawk.Emulation.Cores/Properties/Resources.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Reflection;
-
-using BizHawk.Common.IOExtensions;
-
-namespace BizHawk.Emulation.Cores.Properties {
-	internal static class Resources {
-		private static readonly Assembly Asm = typeof(Resources).Assembly;
-
-		/// <param name="embedPath">Dir separator is '<c>.</c>'. Path is relative to <c>&lt;NS></c>.</param>
-		private static byte[] ReadEmbeddedByteArray(string embedPath) => Asm.GetManifestResourceStream($"BizHawk.Emulation.Cores.Resources.{embedPath}").ReadAllBytes();
-
-		internal static readonly Lazy<byte[]> CPC_AMSDOS_0_5_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_AMSDOS_0.5.ROM.gz"));
-		internal static readonly Lazy<byte[]> CPC_BASIC_1_0_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_BASIC_1.0.ROM.gz"));
-		internal static readonly Lazy<byte[]> CPC_BASIC_1_1_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_BASIC_1.1.ROM.gz"));
-		internal static readonly Lazy<byte[]> CPC_OS_6128_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_OS_6128.ROM.gz"));
-		internal static readonly Lazy<byte[]> OS_464_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("OS_464.ROM.gz"));
-		internal static readonly Lazy<byte[]> SameboyCgbBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("cgb_boot.rom.gz"));
-		internal static readonly Lazy<byte[]> SameboyAgbBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("agb_boot.rom.gz"));
-		internal static readonly Lazy<byte[]> SameboyDmgBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("dmg_boot.rom.gz"));
-		internal static readonly Lazy<byte[]> SgbCartPresent_SPC = new Lazy<byte[]>(() => ReadEmbeddedByteArray("sgb-cart-present.spc.gz"));
-		internal static readonly Lazy<byte[]> ZX_128_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("128.ROM.gz"));
-		internal static readonly Lazy<byte[]> ZX_48_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("48.ROM.gz"));
-		internal static readonly Lazy<byte[]> ZX_plus2_rom = new Lazy<byte[]>(() => ReadEmbeddedByteArray("plus2.rom.gz"));
-		internal static readonly Lazy<byte[]> ZX_plus2a_rom = new Lazy<byte[]>(() => ReadEmbeddedByteArray("plus2a.rom.gz"));
-	}
-}
diff --git a/src/BizHawk.Emulation.CoresBase/BizHawk.Emulation.CoresBase.csproj b/src/BizHawk.Emulation.CoresBase/BizHawk.Emulation.CoresBase.csproj
new file mode 100644
index 0000000000..c0d05934ed
--- /dev/null
+++ b/src/BizHawk.Emulation.CoresBase/BizHawk.Emulation.CoresBase.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<Import Project="../MainSlnCommon.props" />
+	<PropertyGroup>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<TargetFramework>netstandard2.0</TargetFramework>
+	</PropertyGroup>
+	<ItemGroup>
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj" />
+		<Compile Include="$(ProjectDir)../BizHawk.Version/svnrev.cs" />
+		<Compile Include="$(ProjectDir)../BizHawk.Version/VersionInfo.cs" />
+		<EmbeddedResource Include="Resources/**/*" />
+	</ItemGroup>
+</Project>
diff --git a/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj.DotSettings b/src/BizHawk.Emulation.CoresBase/BizHawk.Emulation.CoresBase.csproj.DotSettings
similarity index 100%
rename from src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj.DotSettings
rename to src/BizHawk.Emulation.CoresBase/BizHawk.Emulation.CoresBase.csproj.DotSettings
diff --git a/src/BizHawk.Emulation.Cores/CPUs/68000/Diassembler.cs b/src/BizHawk.Emulation.CoresBase/CPUs/68000/Diassembler.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/68000/Diassembler.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/68000/Diassembler.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/68000/Instructions/BitArithemetic.cs b/src/BizHawk.Emulation.CoresBase/CPUs/68000/Instructions/BitArithemetic.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/68000/Instructions/BitArithemetic.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/68000/Instructions/BitArithemetic.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/68000/Instructions/DataMovement.cs b/src/BizHawk.Emulation.CoresBase/CPUs/68000/Instructions/DataMovement.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/68000/Instructions/DataMovement.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/68000/Instructions/DataMovement.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/68000/Instructions/IntegerMath.cs b/src/BizHawk.Emulation.CoresBase/CPUs/68000/Instructions/IntegerMath.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/68000/Instructions/IntegerMath.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/68000/Instructions/IntegerMath.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/68000/Instructions/ProgramFlow.cs b/src/BizHawk.Emulation.CoresBase/CPUs/68000/Instructions/ProgramFlow.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/68000/Instructions/ProgramFlow.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/68000/Instructions/ProgramFlow.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/68000/Instructions/Supervisor.cs b/src/BizHawk.Emulation.CoresBase/CPUs/68000/Instructions/Supervisor.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/68000/Instructions/Supervisor.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/68000/Instructions/Supervisor.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/68000/MC68000.cs b/src/BizHawk.Emulation.CoresBase/CPUs/68000/MC68000.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/68000/MC68000.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/68000/MC68000.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/68000/Memory.cs b/src/BizHawk.Emulation.CoresBase/CPUs/68000/Memory.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/68000/Memory.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/68000/Memory.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/68000/OpcodeTable.cs b/src/BizHawk.Emulation.CoresBase/CPUs/68000/OpcodeTable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/68000/OpcodeTable.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/68000/OpcodeTable.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/68000/Tables.cs b/src/BizHawk.Emulation.CoresBase/CPUs/68000/Tables.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/68000/Tables.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/68000/Tables.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/ARM/Darm.cs b/src/BizHawk.Emulation.CoresBase/CPUs/ARM/Darm.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/ARM/Darm.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/ARM/Darm.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.Disassembler.cs b/src/BizHawk.Emulation.CoresBase/CPUs/CP1610/CP1610.Disassembler.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.Disassembler.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/CP1610/CP1610.Disassembler.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.Execute.cs b/src/BizHawk.Emulation.CoresBase/CPUs/CP1610/CP1610.Execute.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.Execute.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/CP1610/CP1610.Execute.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.cs b/src/BizHawk.Emulation.CoresBase/CPUs/CP1610/CP1610.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/CP1610/CP1610.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/HuC6280/CDLOpcodes.cs b/src/BizHawk.Emulation.CoresBase/CPUs/HuC6280/CDLOpcodes.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/HuC6280/CDLOpcodes.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/HuC6280/CDLOpcodes.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/HuC6280/Disassembler.cs b/src/BizHawk.Emulation.CoresBase/CPUs/HuC6280/Disassembler.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/HuC6280/Disassembler.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/HuC6280/Disassembler.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs b/src/BizHawk.Emulation.CoresBase/CPUs/HuC6280/Execute.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/HuC6280/Execute.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs b/src/BizHawk.Emulation.CoresBase/CPUs/HuC6280/HuC6280.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/HuC6280/HuC6280.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280_CDL.cs b/src/BizHawk.Emulation.CoresBase/CPUs/HuC6280/HuC6280_CDL.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280_CDL.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/HuC6280/HuC6280_CDL.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/HuC6280/IDisassemblable.cs b/src/BizHawk.Emulation.CoresBase/CPUs/HuC6280/IDisassemblable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/HuC6280/IDisassemblable.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/HuC6280/IDisassemblable.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/LR35902/Execute.cs b/src/BizHawk.Emulation.CoresBase/CPUs/LR35902/Execute.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/LR35902/Execute.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/LR35902/Execute.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/LR35902/Interrupts.cs b/src/BizHawk.Emulation.CoresBase/CPUs/LR35902/Interrupts.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/LR35902/Interrupts.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/LR35902/Interrupts.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs b/src/BizHawk.Emulation.CoresBase/CPUs/LR35902/LR35902.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/LR35902/LR35902.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/LR35902/NewDisassembler.cs b/src/BizHawk.Emulation.CoresBase/CPUs/LR35902/NewDisassembler.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/LR35902/NewDisassembler.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/LR35902/NewDisassembler.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/LR35902/Operations.cs b/src/BizHawk.Emulation.CoresBase/CPUs/LR35902/Operations.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/LR35902/Operations.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/LR35902/Operations.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/Intel8048/ReadMe.txt b/src/BizHawk.Emulation.CoresBase/CPUs/LR35902/ReadMe.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/Intel8048/ReadMe.txt
rename to src/BizHawk.Emulation.CoresBase/CPUs/LR35902/ReadMe.txt
diff --git a/src/BizHawk.Emulation.Cores/CPUs/LR35902/Registers.cs b/src/BizHawk.Emulation.CoresBase/CPUs/LR35902/Registers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/LR35902/Registers.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/LR35902/Registers.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/LR35902/Tables_Direct.cs b/src/BizHawk.Emulation.CoresBase/CPUs/LR35902/Tables_Direct.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/LR35902/Tables_Direct.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/LR35902/Tables_Direct.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/LR35902/Tables_Indirect.cs b/src/BizHawk.Emulation.CoresBase/CPUs/LR35902/Tables_Indirect.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/LR35902/Tables_Indirect.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/LR35902/Tables_Indirect.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6800/Disassembler.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MC6800/Disassembler.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MC6800/Disassembler.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MC6800/Disassembler.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6800/Execute.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MC6800/Execute.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MC6800/Execute.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MC6800/Execute.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6800/Indexed_Modes.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MC6800/Indexed_Modes.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MC6800/Indexed_Modes.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MC6800/Indexed_Modes.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6800/Interrupts.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MC6800/Interrupts.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MC6800/Interrupts.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MC6800/Interrupts.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6800/MC6800.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MC6800/MC6800.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MC6800/MC6800.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MC6800/MC6800.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6800/OP_Tables.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MC6800/OP_Tables.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MC6800/OP_Tables.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MC6800/OP_Tables.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6800/Operations.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MC6800/Operations.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MC6800/Operations.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MC6800/Operations.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/LR35902/ReadMe.txt b/src/BizHawk.Emulation.CoresBase/CPUs/MC6800/ReadMe.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/LR35902/ReadMe.txt
rename to src/BizHawk.Emulation.CoresBase/CPUs/MC6800/ReadMe.txt
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6800/Registers.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MC6800/Registers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MC6800/Registers.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MC6800/Registers.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6809/Disassembler.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MC6809/Disassembler.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MC6809/Disassembler.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MC6809/Disassembler.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6809/Execute.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MC6809/Execute.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MC6809/Execute.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MC6809/Execute.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6809/Indexed_Modes.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MC6809/Indexed_Modes.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MC6809/Indexed_Modes.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MC6809/Indexed_Modes.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6809/Interrupts.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MC6809/Interrupts.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MC6809/Interrupts.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MC6809/Interrupts.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6809/MC6809.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MC6809/MC6809.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MC6809/MC6809.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MC6809/MC6809.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6809/OP_Tables.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MC6809/OP_Tables.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MC6809/OP_Tables.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MC6809/OP_Tables.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6809/Operations.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MC6809/Operations.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MC6809/Operations.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MC6809/Operations.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6800/ReadMe.txt b/src/BizHawk.Emulation.CoresBase/CPUs/MC6809/ReadMe.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MC6800/ReadMe.txt
rename to src/BizHawk.Emulation.CoresBase/CPUs/MC6809/ReadMe.txt
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6809/Registers.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MC6809/Registers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MC6809/Registers.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MC6809/Registers.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MOS 6502X/Disassembler.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MOS 6502X/Disassembler.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MOS 6502X/Disassembler.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MOS 6502X/Disassembler.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MOS 6502X/Execute.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MOS 6502X/Execute.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MOS 6502X/Execute.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MOS 6502X/Execute.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MOS 6502X/IMOS6502XLink.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MOS 6502X/IMOS6502XLink.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MOS 6502X/IMOS6502XLink.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MOS 6502X/IMOS6502XLink.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs b/src/BizHawk.Emulation.CoresBase/CPUs/MOS 6502X/MOS6502X.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/MOS 6502X/MOS6502X.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/W65816/Disassembler.cs b/src/BizHawk.Emulation.CoresBase/CPUs/W65816/Disassembler.cs
similarity index 96%
rename from src/BizHawk.Emulation.Cores/CPUs/W65816/Disassembler.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/W65816/Disassembler.cs
index 2c8810d971..251952d006 100644
--- a/src/BizHawk.Emulation.Cores/CPUs/W65816/Disassembler.cs
+++ b/src/BizHawk.Emulation.CoresBase/CPUs/W65816/Disassembler.cs
@@ -17,7 +17,7 @@ using BizHawk.Emulation.Common;
 
 namespace BizHawk.Emulation.Cores.Components.W65816
 {
-	class W65816_DisassemblerService : IDisassemblable
+	public class W65816_DisassemblerService : IDisassemblable
 	{
 		public string Cpu { get; set; }
 
diff --git a/src/BizHawk.Emulation.Cores/CPUs/Z80A/Execute.cs b/src/BizHawk.Emulation.CoresBase/CPUs/Z80A/Execute.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/Z80A/Execute.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/Z80A/Execute.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/Z80A/Interrupts.cs b/src/BizHawk.Emulation.CoresBase/CPUs/Z80A/Interrupts.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/Z80A/Interrupts.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/Z80A/Interrupts.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/Z80A/NewDisassembler.cs b/src/BizHawk.Emulation.CoresBase/CPUs/Z80A/NewDisassembler.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/Z80A/NewDisassembler.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/Z80A/NewDisassembler.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/Z80A/Operations.cs b/src/BizHawk.Emulation.CoresBase/CPUs/Z80A/Operations.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/Z80A/Operations.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/Z80A/Operations.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/Z80A/ReadMe.txt b/src/BizHawk.Emulation.CoresBase/CPUs/Z80A/ReadMe.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/Z80A/ReadMe.txt
rename to src/BizHawk.Emulation.CoresBase/CPUs/Z80A/ReadMe.txt
diff --git a/src/BizHawk.Emulation.Cores/CPUs/Z80A/Registers.cs b/src/BizHawk.Emulation.CoresBase/CPUs/Z80A/Registers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/Z80A/Registers.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/Z80A/Registers.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/Z80A/Tables_Direct.cs b/src/BizHawk.Emulation.CoresBase/CPUs/Z80A/Tables_Direct.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/Z80A/Tables_Direct.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/Z80A/Tables_Direct.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/Z80A/Tables_Indirect.cs b/src/BizHawk.Emulation.CoresBase/CPUs/Z80A/Tables_Indirect.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/Z80A/Tables_Indirect.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/Z80A/Tables_Indirect.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/Z80A/Z80A.cs b/src/BizHawk.Emulation.CoresBase/CPUs/Z80A/Z80A.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/Z80A/Z80A.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/Z80A/Z80A.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/x86/Disassembler.cs b/src/BizHawk.Emulation.CoresBase/CPUs/x86/Disassembler.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/x86/Disassembler.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/x86/Disassembler.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/x86/Execute.cs b/src/BizHawk.Emulation.CoresBase/CPUs/x86/Execute.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/x86/Execute.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/x86/Execute.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/x86/Timing.cs b/src/BizHawk.Emulation.CoresBase/CPUs/x86/Timing.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/x86/Timing.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/x86/Timing.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/x86/x86.cs b/src/BizHawk.Emulation.CoresBase/CPUs/x86/x86.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/x86/x86.cs
rename to src/BizHawk.Emulation.CoresBase/CPUs/x86/x86.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/IGameboyCommon.cs b/src/BizHawk.Emulation.CoresBase/Consoles/Nintendo/Gameboy/IGameboyCommon.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/IGameboyCommon.cs
rename to src/BizHawk.Emulation.CoresBase/Consoles/Nintendo/Gameboy/IGameboyCommon.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/BootGodDB.cs b/src/BizHawk.Emulation.CoresBase/Consoles/Nintendo/NES/BootGodDB.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/BootGodDB.cs
rename to src/BizHawk.Emulation.CoresBase/Consoles/Nintendo/NES/BootGodDB.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/CartInfo.cs b/src/BizHawk.Emulation.CoresBase/Consoles/Nintendo/NES/CartInfo.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/CartInfo.cs
rename to src/BizHawk.Emulation.CoresBase/Consoles/Nintendo/NES/CartInfo.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/INESPPUViewable.cs b/src/BizHawk.Emulation.CoresBase/Consoles/Nintendo/NES/INESPPUViewable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/INESPPUViewable.cs
rename to src/BizHawk.Emulation.CoresBase/Consoles/Nintendo/NES/INESPPUViewable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/IGpuView.cs b/src/BizHawk.Emulation.CoresBase/Consoles/PC Engine/IGpuView.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/IGpuView.cs
rename to src/BizHawk.Emulation.CoresBase/Consoles/PC Engine/IGpuView.cs
diff --git a/src/BizHawk.Emulation.Cores/CoreInventory.cs b/src/BizHawk.Emulation.CoresBase/CoreInventory.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CoreInventory.cs
rename to src/BizHawk.Emulation.CoresBase/CoreInventory.cs
diff --git a/src/BizHawk.Emulation.Cores/CoreNames.cs b/src/BizHawk.Emulation.CoresBase/CoreNames.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CoreNames.cs
rename to src/BizHawk.Emulation.CoresBase/CoreNames.cs
diff --git a/src/BizHawk.Emulation.Cores/FileID.cs b/src/BizHawk.Emulation.CoresBase/FileID.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/FileID.cs
rename to src/BizHawk.Emulation.CoresBase/FileID.cs
diff --git a/src/BizHawk.Emulation.Cores/Notes.txt b/src/BizHawk.Emulation.CoresBase/Notes.txt
similarity index 89%
rename from src/BizHawk.Emulation.Cores/Notes.txt
rename to src/BizHawk.Emulation.CoresBase/Notes.txt
index 27d634c2aa..80f367ea12 100644
--- a/src/BizHawk.Emulation.Cores/Notes.txt
+++ b/src/BizHawk.Emulation.CoresBase/Notes.txt
@@ -2,6 +2,8 @@
 BizHawk.Emulation Project Notes
 -------------------------------
 
+yo this document is real old --yoshi
+
 1) Please keep this project free of non-portable external references. 
    Windows.Forms should not be referenced, nor System.Windows.Drawing, nor XNA, nor SlimDX, etc.
    This project should be very close to vanilla C# consisting primarily of basic data manipulation.
@@ -10,10 +12,10 @@ BizHawk.Emulation Project Notes
    a separate project. That project does not yet exist at the time of this writing. If you are creating
    a debugger, please talk to me (vecna) and we'll figure out the right place to put it.
    
-3) The current plan is that all actual emulation cores go in this assembly.
+3) ~~The current plan is that all actual emulation cores go in this assembly.
    At least one reason for this is that .NET will not inline calls across assemblies.
    At this time, please do not separate emulation into multiple assemblies - this is negotiable, but
-   for now this is the plan.
+   for now this is the plan.~~ your plan is dumb, I'm splitting up the project --yoshi
 
 4) IEmulator exposes a DeterministicEmulation property. When enabled, a well-behaving core must
    use strictly deterministic (TAS-safe, not having de-syncs) emulation, regardless of the performance cost.
@@ -27,9 +29,9 @@ BizHawk.Emulation Project Notes
       
 5) Classes should default sealed. Make unsealed only if the class is _designed for inheritance_.
 
-6) For GENERATED CPUs, DO NOT UPDATE THE GENERATED FILES DIRECTLY!!!!!!!!!!!!!!
+6) ~~For GENERATED CPUs, DO NOT UPDATE THE GENERATED FILES DIRECTLY!!!!!!!!!!!!!!
    Open the CpuCoreGenerator solution and make your changes there. Run the program to regenerate your cpus.
-   CpuCoreGenerator is a separate solution and it may not be obvious that it is there.
+   CpuCoreGenerator is a separate solution and it may not be obvious that it is there.~~ we ditched this a while ago --yoshi
 
 7) The new new plan is really for cores to be native. Which was actually the original plan.
    Note that native doesn't _necessarily_ mean C++.
diff --git a/src/BizHawk.Emulation.Cores/Properties/AssemblyInfo.cs b/src/BizHawk.Emulation.CoresBase/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Properties/AssemblyInfo.cs
rename to src/BizHawk.Emulation.CoresBase/Properties/AssemblyInfo.cs
diff --git a/src/BizHawk.Emulation.CoresBase/Properties/Resources.cs b/src/BizHawk.Emulation.CoresBase/Properties/Resources.cs
new file mode 100644
index 0000000000..120475f84c
--- /dev/null
+++ b/src/BizHawk.Emulation.CoresBase/Properties/Resources.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Reflection;
+
+using BizHawk.Common.IOExtensions;
+
+namespace BizHawk.Emulation.Cores.Properties {
+	public static class Resources {
+		private static readonly Assembly Asm = typeof(Resources).Assembly;
+
+		/// <param name="embedPath">Dir separator is '<c>.</c>'. Path is relative to <c>&lt;NS></c>.</param>
+		private static byte[] ReadEmbeddedByteArray(string embedPath) => Asm.GetManifestResourceStream($"BizHawk.Emulation.Cores.Resources.{embedPath}").ReadAllBytes();
+
+		public static readonly Lazy<byte[]> CPC_AMSDOS_0_5_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_AMSDOS_0.5.ROM.gz"));
+		public static readonly Lazy<byte[]> CPC_BASIC_1_0_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_BASIC_1.0.ROM.gz"));
+		public static readonly Lazy<byte[]> CPC_BASIC_1_1_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_BASIC_1.1.ROM.gz"));
+		public static readonly Lazy<byte[]> CPC_OS_6128_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("CPC_OS_6128.ROM.gz"));
+		public static readonly Lazy<byte[]> OS_464_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("OS_464.ROM.gz"));
+		public static readonly Lazy<byte[]> SameboyCgbBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("cgb_boot.rom.gz"));
+		public static readonly Lazy<byte[]> SameboyAgbBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("agb_boot.rom.gz"));
+		public static readonly Lazy<byte[]> SameboyDmgBoot = new Lazy<byte[]>(() => ReadEmbeddedByteArray("dmg_boot.rom.gz"));
+		public static readonly Lazy<byte[]> SgbCartPresent_SPC = new Lazy<byte[]>(() => ReadEmbeddedByteArray("sgb-cart-present.spc.gz"));
+		public static readonly Lazy<byte[]> ZX_128_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("128.ROM.gz"));
+		public static readonly Lazy<byte[]> ZX_48_ROM = new Lazy<byte[]>(() => ReadEmbeddedByteArray("48.ROM.gz"));
+		public static readonly Lazy<byte[]> ZX_plus2_rom = new Lazy<byte[]>(() => ReadEmbeddedByteArray("plus2.rom.gz"));
+		public static readonly Lazy<byte[]> ZX_plus2a_rom = new Lazy<byte[]>(() => ReadEmbeddedByteArray("plus2a.rom.gz"));
+	}
+}
diff --git a/src/BizHawk.Emulation.Cores/Resources/128.ROM.gz b/src/BizHawk.Emulation.CoresBase/Resources/128.ROM.gz
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Resources/128.ROM.gz
rename to src/BizHawk.Emulation.CoresBase/Resources/128.ROM.gz
diff --git a/src/BizHawk.Emulation.Cores/Resources/48.ROM.gz b/src/BizHawk.Emulation.CoresBase/Resources/48.ROM.gz
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Resources/48.ROM.gz
rename to src/BizHawk.Emulation.CoresBase/Resources/48.ROM.gz
diff --git a/src/BizHawk.Emulation.Cores/Resources/CPC_AMSDOS_0.5.ROM.gz b/src/BizHawk.Emulation.CoresBase/Resources/CPC_AMSDOS_0.5.ROM.gz
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Resources/CPC_AMSDOS_0.5.ROM.gz
rename to src/BizHawk.Emulation.CoresBase/Resources/CPC_AMSDOS_0.5.ROM.gz
diff --git a/src/BizHawk.Emulation.Cores/Resources/CPC_BASIC_1.0.ROM.gz b/src/BizHawk.Emulation.CoresBase/Resources/CPC_BASIC_1.0.ROM.gz
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Resources/CPC_BASIC_1.0.ROM.gz
rename to src/BizHawk.Emulation.CoresBase/Resources/CPC_BASIC_1.0.ROM.gz
diff --git a/src/BizHawk.Emulation.Cores/Resources/CPC_BASIC_1.1.ROM.gz b/src/BizHawk.Emulation.CoresBase/Resources/CPC_BASIC_1.1.ROM.gz
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Resources/CPC_BASIC_1.1.ROM.gz
rename to src/BizHawk.Emulation.CoresBase/Resources/CPC_BASIC_1.1.ROM.gz
diff --git a/src/BizHawk.Emulation.Cores/Resources/CPC_OS_6128.ROM.gz b/src/BizHawk.Emulation.CoresBase/Resources/CPC_OS_6128.ROM.gz
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Resources/CPC_OS_6128.ROM.gz
rename to src/BizHawk.Emulation.CoresBase/Resources/CPC_OS_6128.ROM.gz
diff --git a/src/BizHawk.Emulation.Cores/Resources/OS_464.ROM.gz b/src/BizHawk.Emulation.CoresBase/Resources/OS_464.ROM.gz
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Resources/OS_464.ROM.gz
rename to src/BizHawk.Emulation.CoresBase/Resources/OS_464.ROM.gz
diff --git a/src/BizHawk.Emulation.Cores/Resources/agb_boot.rom.gz b/src/BizHawk.Emulation.CoresBase/Resources/agb_boot.rom.gz
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Resources/agb_boot.rom.gz
rename to src/BizHawk.Emulation.CoresBase/Resources/agb_boot.rom.gz
diff --git a/src/BizHawk.Emulation.Cores/Resources/cgb_boot.rom.gz b/src/BizHawk.Emulation.CoresBase/Resources/cgb_boot.rom.gz
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Resources/cgb_boot.rom.gz
rename to src/BizHawk.Emulation.CoresBase/Resources/cgb_boot.rom.gz
diff --git a/src/BizHawk.Emulation.Cores/Resources/dmg_boot.rom.gz b/src/BizHawk.Emulation.CoresBase/Resources/dmg_boot.rom.gz
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Resources/dmg_boot.rom.gz
rename to src/BizHawk.Emulation.CoresBase/Resources/dmg_boot.rom.gz
diff --git a/src/BizHawk.Emulation.Cores/Resources/plus2.rom.gz b/src/BizHawk.Emulation.CoresBase/Resources/plus2.rom.gz
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Resources/plus2.rom.gz
rename to src/BizHawk.Emulation.CoresBase/Resources/plus2.rom.gz
diff --git a/src/BizHawk.Emulation.Cores/Resources/plus2a.rom.gz b/src/BizHawk.Emulation.CoresBase/Resources/plus2a.rom.gz
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Resources/plus2a.rom.gz
rename to src/BizHawk.Emulation.CoresBase/Resources/plus2a.rom.gz
diff --git a/src/BizHawk.Emulation.Cores/Resources/sgb-cart-present.spc.gz b/src/BizHawk.Emulation.CoresBase/Resources/sgb-cart-present.spc.gz
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Resources/sgb-cart-present.spc.gz
rename to src/BizHawk.Emulation.CoresBase/Resources/sgb-cart-present.spc.gz
diff --git a/src/BizHawk.Emulation.Cores/Sound/CDAudio.cs b/src/BizHawk.Emulation.CoresBase/Sound/CDAudio.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Sound/CDAudio.cs
rename to src/BizHawk.Emulation.CoresBase/Sound/CDAudio.cs
diff --git a/src/BizHawk.Emulation.Cores/Sound/DualSyncSound.cs b/src/BizHawk.Emulation.CoresBase/Sound/DualSyncSound.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Sound/DualSyncSound.cs
rename to src/BizHawk.Emulation.CoresBase/Sound/DualSyncSound.cs
diff --git a/src/BizHawk.Emulation.Cores/Sound/HuC6280PSG.cs b/src/BizHawk.Emulation.CoresBase/Sound/HuC6280PSG.cs
similarity index 94%
rename from src/BizHawk.Emulation.Cores/Sound/HuC6280PSG.cs
rename to src/BizHawk.Emulation.CoresBase/Sound/HuC6280PSG.cs
index 21a233c9be..e4f5d09812 100644
--- a/src/BizHawk.Emulation.Cores/Sound/HuC6280PSG.cs
+++ b/src/BizHawk.Emulation.CoresBase/Sound/HuC6280PSG.cs
@@ -58,7 +58,7 @@ namespace BizHawk.Emulation.Cores.Components
 			}
 		}
 
-		internal void BeginFrame(long cycles)
+		public void BeginFrame(long cycles)
 		{
 			while (commands.Count > 0)
 			{
@@ -69,12 +69,12 @@ namespace BizHawk.Emulation.Cores.Components
 			frameStartTime = cycles;
 		}
 
-		internal void EndFrame(long cycles)
+		public void EndFrame(long cycles)
 		{
 			frameStopTime = cycles;
 		}
 
-		internal void WritePSG(byte register, byte value, long cycles)
+		public void WritePSG(byte register, byte value, long cycles)
 		{
 			commands.Enqueue(new QueuedCommand { Register = register, Value = value, Time = cycles - frameStartTime });
 		}
@@ -245,7 +245,7 @@ namespace BizHawk.Emulation.Cores.Components
 			}
 		}
 
-		internal void SyncState(Serializer ser)
+		public void SyncState(Serializer ser)
 		{
 			ser.BeginSection("PSG");
 			ser.Sync(nameof(MainVolumeLeft), ref MainVolumeLeft);
diff --git a/src/BizHawk.Emulation.Cores/Sound/MMC5Audio.cs b/src/BizHawk.Emulation.CoresBase/Sound/MMC5Audio.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Sound/MMC5Audio.cs
rename to src/BizHawk.Emulation.CoresBase/Sound/MMC5Audio.cs
diff --git a/src/BizHawk.Emulation.Cores/Sound/OneBitBeeper.cs b/src/BizHawk.Emulation.CoresBase/Sound/OneBitBeeper.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Sound/OneBitBeeper.cs
rename to src/BizHawk.Emulation.CoresBase/Sound/OneBitBeeper.cs
diff --git a/src/BizHawk.Emulation.Cores/Sound/SN76489sms.cs b/src/BizHawk.Emulation.CoresBase/Sound/SN76489sms.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Sound/SN76489sms.cs
rename to src/BizHawk.Emulation.CoresBase/Sound/SN76489sms.cs
diff --git a/src/BizHawk.Emulation.Cores/Sound/SoundMixer.cs b/src/BizHawk.Emulation.CoresBase/Sound/SoundMixer.cs
similarity index 95%
rename from src/BizHawk.Emulation.Cores/Sound/SoundMixer.cs
rename to src/BizHawk.Emulation.CoresBase/Sound/SoundMixer.cs
index 7754ac651e..afa15bf19c 100644
--- a/src/BizHawk.Emulation.Cores/Sound/SoundMixer.cs
+++ b/src/BizHawk.Emulation.CoresBase/Sound/SoundMixer.cs
@@ -9,14 +9,14 @@ namespace BizHawk.Emulation.Cores.Components
 	/// <summary>
 	/// An interface that extends a sound provider to provide mixing capabilities through the SoundMixer class
 	/// </summary>
-	internal interface IMixedSoundProvider : ISoundProvider
+	public interface IMixedSoundProvider : ISoundProvider
 	{
 		int MaxVolume { get; set; }
 	}
 
 	// This is a straightforward class to mix/chain multiple ISoundProvider sources.
 	// Relies on a hack of passing in the samples per frame for sync sound abilities
-	internal sealed class SoundMixer : ISoundProvider
+	public sealed class SoundMixer : ISoundProvider
 	{
 		private readonly int _spf;
 		private readonly List<IMixedSoundProvider> _soundProviders;
diff --git a/src/BizHawk.Emulation.Cores/Sound/Sunsoft5BAudio.cs b/src/BizHawk.Emulation.CoresBase/Sound/Sunsoft5BAudio.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Sound/Sunsoft5BAudio.cs
rename to src/BizHawk.Emulation.CoresBase/Sound/Sunsoft5BAudio.cs
diff --git a/src/BizHawk.Emulation.Cores/Sound/SyncSoundMixer.cs b/src/BizHawk.Emulation.CoresBase/Sound/SyncSoundMixer.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Sound/SyncSoundMixer.cs
rename to src/BizHawk.Emulation.CoresBase/Sound/SyncSoundMixer.cs
diff --git a/src/BizHawk.Emulation.Cores/Sound/VRC6Alt.cs b/src/BizHawk.Emulation.CoresBase/Sound/VRC6Alt.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Sound/VRC6Alt.cs
rename to src/BizHawk.Emulation.CoresBase/Sound/VRC6Alt.cs
diff --git a/src/BizHawk.Emulation.Cores/Sound/YM2413.cs b/src/BizHawk.Emulation.CoresBase/Sound/YM2413.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Sound/YM2413.cs
rename to src/BizHawk.Emulation.CoresBase/Sound/YM2413.cs
diff --git a/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/src/BizHawk.Emulation.HawkCores/BizHawk.Emulation.HawkCores.csproj
similarity index 68%
rename from src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
rename to src/BizHawk.Emulation.HawkCores/BizHawk.Emulation.HawkCores.csproj
index 6e04f0764b..af5b75191c 100644
--- a/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/src/BizHawk.Emulation.HawkCores/BizHawk.Emulation.HawkCores.csproj
@@ -5,20 +5,12 @@
 		<TargetFramework>netstandard2.0</TargetFramework>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="ELFSharp" Version="2.10.0" />
-		<Reference Include="FlatBuffers.Core" HintPath="$(ProjectDir)../../References/FlatBuffers.Core.dll" Private="true" />
-		<Reference Include="Virtu" HintPath="$(ProjectDir)../../References/Virtu.dll" Private="true" />
-		<ProjectReference Include="$(ProjectDir)../BizHawk.BizInvoke/BizHawk.BizInvoke.csproj" />
-		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj" />
-		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj" />
-		<ProjectReference Include="..\BizHawk.Common\BizHawk.Common.csproj" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.CoresBase/BizHawk.Emulation.CoresBase.csproj" />
 		<Compile Include="$(ProjectDir)../BizHawk.Version/svnrev.cs" />
 		<Compile Include="$(ProjectDir)../BizHawk.Version/VersionInfo.cs" />
-		<EmbeddedResource Include="Resources/**/*" />
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Update="Calculator/TI83.*.cs" DependentUpon="TI83.cs" />
-		<Compile Update="Computers/AppleII/AppleII.*.cs" DependentUpon="AppleII.cs" />
 		<Compile Update="Computers/Commodore64/C64.*.cs" DependentUpon="C64.cs" />
 		<Compile Update="Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.*.cs" DependentUpon="NECUPD765.cs" />
 		<Compile Update="Computers/SinclairSpectrum/Hardware/Disk/NECUPS765.Static.cs" DependentUpon="NECUPD765.cs" />
@@ -32,21 +24,15 @@
 		<Compile Update="Consoles/Atari/2600/Atari2600.*.cs" DependentUpon="Atari2600.cs" />
 		<Compile Update="Consoles/Atari/A7800Hawk/A7800Hawk.*.cs" DependentUpon="A7800Hawk.cs" />
 		<Compile Update="Consoles/Atari/A7800Hawk/MemoryMap.cs" DependentUpon="A7800Hawk.cs" />
-		<Compile Update="Consoles/Atari/lynx/Lynx.*.cs" DependentUpon="Lynx.cs" />
 		<Compile Update="Consoles/Coleco/ColecoVision.*.cs" DependentUpon="ColecoVision.cs" />
 		<Compile Update="Consoles/GCE/Vectrex/VectrexHawk.*.cs" DependentUpon="VectrexHawk..cs" />
 		<Compile Update="Consoles/Intellivision/Intellivision.*.cs" DependentUpon="Intellivision.cs" />
 		<Compile Update="Consoles/Magnavox/Odyssey2/O2Hawk.*.cs" DependentUpon="O2Hawk.cs" />
-		<Compile Update="Consoles/MSX/MSX.*.cs" DependentUpon="MSX.cs" />
-		<Compile Update="Consoles/Nintendo/Gameboy/Gambatte.*.cs" DependentUpon="Gambatte.cs" />
-		<Compile Update="Consoles/Nintendo/Gameboy/GambatteLink.*.cs" DependentUpon="GambatteLink.cs" />
-		<Compile Update="Consoles/Nintendo/GBA/MGBAHawk.*.cs" DependentUpon="MGBAHawk.cs" />
 		<Compile Update="Consoles/Nintendo/GBHawk/GBHawk.*.cs" DependentUpon="GBHawk.cs" />
 		<Compile Update="Consoles/Nintendo/GBHawk/*_PPU.cs" DependentUpon="PPU.cs" />
 		<Compile Update="Consoles/Nintendo/GBHawkLink/GBHawkLink.*.cs" DependentUpon="GBHawkLink.cs" />
 		<Compile Update="Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.*.cs" DependentUpon="GBHawkLink3x.cs" />
 		<Compile Update="Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.*.cs" DependentUpon="GBHawkLink4x.cs" />
-		<Compile Update="Consoles/Nintendo/N64/N64.*.cs" DependentUpon="N64.cs" />
 		<Compile Update="Consoles/Nintendo/NES/Boards/AxROM.cs" SubType="Code" />
 		<Compile Update="Consoles/Nintendo/NES/Boards/CPROM.cs" SubType="Code" />
 		<Compile Update="Consoles/Nintendo/NES/Boards/GxROM.cs" SubType="Code" />
@@ -57,13 +43,8 @@
 		<Compile Update="Consoles/Nintendo/NES/NES.*.cs" DependentUpon="NES.cs" />
 		<Compile Update="Consoles/Nintendo/SubNESHawk/SubNESHawk.*.cs" DependentUpon="SubNESHawk.cs" />
 		<Compile Update="Consoles/Nintendo/QuickNES/QuickNES.*.cs" DependentUpon="QuickNES.cs" />
-		<Compile Update="Consoles/Nintendo/SNES/LibsnesCore.*.cs" DependentUpon="LibsnesCore.cs" />
 		<Compile Update="Consoles/PC Engine/PCEngine.*.cs" DependentUpon="PCEngine.cs" />
 		<Compile Update="Consoles/Sega/GGHawkLink/GGHawkLink.*.cs" DependentUpon="GGHawkLink.cs" />
-		<Compile Update="Consoles/Sega/gpgx64/GPGX.*.cs" DependentUpon="GPGX.cs" />
 		<Compile Update="Consoles/Sega/SMS/SMS.*.cs" DependentUpon="SMS.cs" />
-		<Compile Update="Consoles/Sony/PSX/Octoshock.cs" SubType="Code" />
-		<Compile Update="Consoles/Sony/PSX/Octoshock.*.cs" DependentUpon="Octoshock.cs" />
-		<Compile Update="Consoles/WonderSwan/WonderSwan.*.cs" DependentUpon="WonderSwan.cs" />
 	</ItemGroup>
 </Project>
diff --git a/src/BizHawk.Emulation.Cores/CPUs/Intel8048/Disassembler.cs b/src/BizHawk.Emulation.HawkCores/CPUs/Intel8048/Disassembler.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/Intel8048/Disassembler.cs
rename to src/BizHawk.Emulation.HawkCores/CPUs/Intel8048/Disassembler.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/Intel8048/Execute.cs b/src/BizHawk.Emulation.HawkCores/CPUs/Intel8048/Execute.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/Intel8048/Execute.cs
rename to src/BizHawk.Emulation.HawkCores/CPUs/Intel8048/Execute.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/Intel8048/I8048.cs b/src/BizHawk.Emulation.HawkCores/CPUs/Intel8048/I8048.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/Intel8048/I8048.cs
rename to src/BizHawk.Emulation.HawkCores/CPUs/Intel8048/I8048.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/Intel8048/Interrupts.cs b/src/BizHawk.Emulation.HawkCores/CPUs/Intel8048/Interrupts.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/Intel8048/Interrupts.cs
rename to src/BizHawk.Emulation.HawkCores/CPUs/Intel8048/Interrupts.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/Intel8048/OP_Tables.cs b/src/BizHawk.Emulation.HawkCores/CPUs/Intel8048/OP_Tables.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/Intel8048/OP_Tables.cs
rename to src/BizHawk.Emulation.HawkCores/CPUs/Intel8048/OP_Tables.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/Intel8048/Operations.cs b/src/BizHawk.Emulation.HawkCores/CPUs/Intel8048/Operations.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/Intel8048/Operations.cs
rename to src/BizHawk.Emulation.HawkCores/CPUs/Intel8048/Operations.cs
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MC6809/ReadMe.txt b/src/BizHawk.Emulation.HawkCores/CPUs/Intel8048/ReadMe.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/MC6809/ReadMe.txt
rename to src/BizHawk.Emulation.HawkCores/CPUs/Intel8048/ReadMe.txt
diff --git a/src/BizHawk.Emulation.Cores/CPUs/Intel8048/Registers.cs b/src/BizHawk.Emulation.HawkCores/CPUs/Intel8048/Registers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/CPUs/Intel8048/Registers.cs
rename to src/BizHawk.Emulation.HawkCores/CPUs/Intel8048/Registers.cs
diff --git a/src/BizHawk.Emulation.Cores/Calculator/TI83.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Calculator/TI83.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Calculator/TI83.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Calculator/TI83.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Calculator/TI83.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Calculator/TI83.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Calculator/TI83.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Calculator/TI83.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Calculator/TI83.IInputPollable.cs b/src/BizHawk.Emulation.HawkCores/Calculator/TI83.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Calculator/TI83.IInputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Calculator/TI83.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Calculator/TI83.IMemoryDomains.cs b/src/BizHawk.Emulation.HawkCores/Calculator/TI83.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Calculator/TI83.IMemoryDomains.cs
rename to src/BizHawk.Emulation.HawkCores/Calculator/TI83.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Calculator/TI83.ISettable.cs b/src/BizHawk.Emulation.HawkCores/Calculator/TI83.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Calculator/TI83.ISettable.cs
rename to src/BizHawk.Emulation.HawkCores/Calculator/TI83.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Calculator/TI83.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Calculator/TI83.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Calculator/TI83.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Calculator/TI83.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Calculator/TI83.IVideoProvider.cs b/src/BizHawk.Emulation.HawkCores/Calculator/TI83.IVideoProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Calculator/TI83.IVideoProvider.cs
rename to src/BizHawk.Emulation.HawkCores/Calculator/TI83.IVideoProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Calculator/TI83.cs b/src/BizHawk.Emulation.HawkCores/Calculator/TI83.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Calculator/TI83.cs
rename to src/BizHawk.Emulation.HawkCores/Calculator/TI83.cs
diff --git a/src/BizHawk.Emulation.Cores/Calculator/TI83LinkPort.cs b/src/BizHawk.Emulation.HawkCores/Calculator/TI83LinkPort.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Calculator/TI83LinkPort.cs
rename to src/BizHawk.Emulation.HawkCores/Calculator/TI83LinkPort.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.Controllers.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.Controllers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.Controllers.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.Controllers.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.IMemoryDomains.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.IMemoryDomains.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.ISettable.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.ISettable.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.InputPollable.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.InputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.InputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.InputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.Messaging.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.Messaging.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.Messaging.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.Messaging.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.Util.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.Util.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.Util.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.Util.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/AmstradCPC.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IBeeperDevice.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Abstraction/IBeeperDevice.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IBeeperDevice.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Abstraction/IBeeperDevice.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IFDDHost.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Abstraction/IFDDHost.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IFDDHost.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Abstraction/IFDDHost.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IJoystick.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Abstraction/IJoystick.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IJoystick.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Abstraction/IJoystick.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IKeyboard.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Abstraction/IKeyboard.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IKeyboard.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Abstraction/IKeyboard.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IPSG.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Abstraction/IPSG.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IPSG.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Abstraction/IPSG.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IPortIODevice.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Abstraction/IPortIODevice.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IPortIODevice.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Abstraction/IPortIODevice.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Datacorder/DatacorderDevice.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Datacorder/DatacorderDevice.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Datacorder/DatacorderDevice.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Datacorder/DatacorderDevice.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/CHRN.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Disk/CHRN.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/CHRN.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Disk/CHRN.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Definitions.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Definitions.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Definitions.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Definitions.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDD.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDD.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDD.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDD.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.IPortIODevice.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.IPortIODevice.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.IPortIODevice.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.IPortIODevice.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Timing.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Timing.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Timing.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Timing.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPS765.Static.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Disk/NECUPS765.Static.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPS765.Static.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Disk/NECUPS765.Static.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/AmstradGateArray.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Display/AmstradGateArray.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/AmstradGateArray.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Display/AmstradGateArray.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRCT_6845.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Display/CRCT_6845.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRCT_6845.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Display/CRCT_6845.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTC6845.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Display/CRTC6845.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTC6845.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Display/CRTC6845.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTDevice.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Display/CRTDevice.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTDevice.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Display/CRTDevice.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Input/StandardKeyboard.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Input/StandardKeyboard.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Input/StandardKeyboard.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/Input/StandardKeyboard.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/PPI/PPI_8255.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/PPI/PPI_8255.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/PPI/PPI_8255.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/PPI/PPI_8255.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/AY38912.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/SoundOutput/AY38912.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/AY38912.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/SoundOutput/AY38912.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/Beeper.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/SoundOutput/Beeper.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/Beeper.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Hardware/SoundOutput/Beeper.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.Memory.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPC464/CPC464.Memory.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.Memory.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPC464/CPC464.Memory.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.Port.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPC464/CPC464.Port.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.Port.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPC464/CPC464.Port.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPC464/CPC464.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPC464/CPC464.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.Memory.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.Memory.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.Memory.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.Memory.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.Port.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.Port.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.Port.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.Port.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Input.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPCBase.Input.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Input.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPCBase.Input.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Media.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPCBase.Media.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Media.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPCBase.Media.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Memory.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPCBase.Memory.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Memory.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPCBase.Memory.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Port.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPCBase.Port.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Port.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPCBase.Port.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPCBase.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/CPCBase.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/GateArrayBase.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/GateArrayBase.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/GateArrayBase.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/GateArrayBase.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/MachineType.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/MachineType.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/MachineType.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Machine/MachineType.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/CPCExtendedFloppyDisk.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/Disk/CPCExtendedFloppyDisk.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/CPCExtendedFloppyDisk.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/Disk/CPCExtendedFloppyDisk.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/CPCFloppyDisk.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/Disk/CPCFloppyDisk.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/CPCFloppyDisk.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/Disk/CPCFloppyDisk.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/DiskHandler.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/Disk/DiskHandler.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/DiskHandler.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/Disk/DiskHandler.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/DiskType.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/Disk/DiskType.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/DiskType.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/Disk/DiskType.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/FloppyDisk.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/Disk/FloppyDisk.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/FloppyDisk.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/Disk/FloppyDisk.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/MediaConverter.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/MediaConverter.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/MediaConverter.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/MediaConverter.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/MediaConverterType.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/MediaConverterType.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/MediaConverterType.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/MediaConverterType.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeCommand.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/Tape/TapeCommand.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeCommand.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/Tape/TapeCommand.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/ROM/RomData.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/ROM/RomData.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/ROM/RomData.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/ROM/RomData.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/SoundProviderMixer.cs b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/SoundProviderMixer.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/SoundProviderMixer.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/SoundProviderMixer.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/readme.md b/src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/readme.md
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AmstradCPC/readme.md
rename to src/BizHawk.Emulation.HawkCores/Computers/AmstradCPC/readme.md
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDisassemblable.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.IDisassemblable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDisassemblable.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.IDisassemblable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDriveLight.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.IDriveLight.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDriveLight.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.IDriveLight.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IInputPollable.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IInputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IMemoryDomains.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IMemoryDomains.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.ISettable.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.ISettable.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.Motherboard.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.Motherboard.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.MotherboardInput.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.MotherboardInput.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.MotherboardInput.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.MotherboardInput.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.MotherboardInterface.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.MotherboardInterface.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.MotherboardInterface.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.MotherboardInterface.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64Format.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64Format.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/C64Format.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64Format.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64FormatFinder.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64FormatFinder.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/C64FormatFinder.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/C64FormatFinder.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/CartridgeDevice.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/CartridgeDevice.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/CartridgeDevice.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/CartridgeDevice.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/CartridgePort.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/CartridgePort.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/CartridgePort.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/CartridgePort.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0000.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper0000.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0000.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper0000.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0001.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper0001.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0001.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper0001.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0005.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper0005.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0005.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper0005.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0007.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper0007.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0007.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper0007.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0008.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper0008.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0008.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper0008.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper000A.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper000A.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper000A.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper000A.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper000B.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper000B.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper000B.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper000B.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper000F.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper000F.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper000F.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper000F.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0011.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper0011.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0011.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper0011.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0012.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper0012.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0012.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper0012.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0013.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper0013.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0013.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper0013.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0020.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper0020.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0020.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper0020.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper002B.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper002B.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper002B.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cartridge/Mapper002B.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Cassette/CassettePort.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cassette/CassettePort.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Cassette/CassettePort.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cassette/CassettePort.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Cassette/CassettePortDevice.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cassette/CassettePortDevice.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Cassette/CassettePortDevice.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cassette/CassettePortDevice.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Cassette/TapeDrive.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cassette/TapeDrive.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Cassette/TapeDrive.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Cassette/TapeDrive.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/FFT.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/FFT.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/FFT.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/FFT.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip2114.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip2114.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip2114.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip2114.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip23128.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip23128.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip23128.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip23128.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip4864.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip4864.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip4864.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip4864.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6510.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6510.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.IDisassemblable.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6510.IDisassemblable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.IDisassemblable.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6510.IDisassemblable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6510.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6510.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6522.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6522.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6522.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6522.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6526.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6526.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6526.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6526.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6567R56A.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6567R56A.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6567R56A.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6567R56A.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6567R8.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6567R8.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6567R8.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6567R8.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6569.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6569.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6569.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6569.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6572.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6572.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6572.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6572.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6581R2.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6581R2.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6581R2.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6581R2.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6581R3.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6581R3.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6581R3.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6581R3.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6581R4AR.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6581R4AR.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6581R4AR.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip6581R4AR.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip8580R5.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip8580R5.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip8580R5.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip8580R5.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip90611401.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip90611401.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip90611401.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Chip90611401.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Cia.Port.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Cia.Port.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Cia.Port.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Cia.Port.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Cia.Registers.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Cia.Registers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Cia.Registers.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Cia.Registers.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Cia.Tod.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Cia.Tod.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Cia.Tod.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Cia.Tod.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Cia.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Cia.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Cia.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Cia.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/LatchedPort.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/LatchedPort.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/LatchedPort.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/LatchedPort.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.Envelope.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Sid.Envelope.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.Envelope.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Sid.Envelope.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.Registers.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Sid.Registers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.Registers.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Sid.Registers.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.SoundProvider.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Sid.SoundProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.SoundProvider.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Sid.SoundProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.Voice.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Sid.Voice.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.Voice.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Sid.Voice.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Sid.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Sid.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Sid.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Via.Port.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Via.Port.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Via.Port.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Via.Port.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Via.Registers.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Via.Registers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Via.Registers.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Via.Registers.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Via.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Via.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Via.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Via.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Parse.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Vic.Parse.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Parse.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Vic.Parse.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Registers.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Vic.Registers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Registers.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Vic.Registers.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Render.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Vic.Render.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Render.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Vic.Render.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Sprite.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Vic.Sprite.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Sprite.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Vic.Sprite.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.State.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Vic.State.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.State.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Vic.State.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.TimingBuilder.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Vic.TimingBuilder.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.TimingBuilder.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Vic.TimingBuilder.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.VideoProvider.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Vic.VideoProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.VideoProvider.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Vic.VideoProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Vic.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/MOS/Vic.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Media/D64.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Media/D64.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Media/D64.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Media/D64.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Media/Disk.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Media/Disk.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Media/Disk.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Media/Disk.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Media/DiskBuilder.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Media/DiskBuilder.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Media/DiskBuilder.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Media/DiskBuilder.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Media/G64.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Media/G64.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Media/G64.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Media/G64.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Media/PRG.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Media/PRG.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Media/PRG.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Media/PRG.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Media/Tape.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Media/Tape.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Media/Tape.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Media/Tape.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/SaveState.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/SaveState.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/SaveState.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/SaveState.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.FluxTransitions.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Serial/Drive1541.FluxTransitions.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.FluxTransitions.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Serial/Drive1541.FluxTransitions.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Serial/Drive1541.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Serial/Drive1541.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.IDisassemblable.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Serial/Drive1541.IDisassemblable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.IDisassemblable.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Serial/Drive1541.IDisassemblable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.Motor.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Serial/Drive1541.Motor.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.Motor.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Serial/Drive1541.Motor.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.Registers.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Serial/Drive1541.Registers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.Registers.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Serial/Drive1541.Registers.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Serial/Drive1541.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Serial/Drive1541.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/SerialPort.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Serial/SerialPort.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/SerialPort.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Serial/SerialPort.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/SerialPortDevice.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Serial/SerialPortDevice.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/SerialPortDevice.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/Serial/SerialPortDevice.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/User/UserPort.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/User/UserPort.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/User/UserPort.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/User/UserPort.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/User/UserPortDevice.cs b/src/BizHawk.Emulation.HawkCores/Computers/Commodore64/User/UserPortDevice.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/Commodore64/User/UserPortDevice.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/Commodore64/User/UserPortDevice.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IBeeperDevice.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Abstraction/IBeeperDevice.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IBeeperDevice.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Abstraction/IBeeperDevice.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IFDDHost.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Abstraction/IFDDHost.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IFDDHost.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Abstraction/IFDDHost.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IJoystick.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Abstraction/IJoystick.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IJoystick.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Abstraction/IJoystick.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IKeyboard.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Abstraction/IKeyboard.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IKeyboard.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Abstraction/IKeyboard.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IPSG.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Abstraction/IPSG.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IPSG.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Abstraction/IPSG.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IPortIODevice.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Abstraction/IPortIODevice.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IPortIODevice.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Abstraction/IPortIODevice.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/CHRN.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Disk/CHRN.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/CHRN.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Disk/CHRN.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Definitions.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Definitions.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Definitions.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Definitions.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDD.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDD.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDD.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDD.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.IPortIODevice.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.IPortIODevice.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.IPortIODevice.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.IPortIODevice.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Timing.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Timing.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Timing.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Timing.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPS765.Static.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Disk/NECUPS765.Static.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPS765.Static.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Disk/NECUPS765.Static.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/CursorJoystick.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Input/CursorJoystick.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/CursorJoystick.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Input/CursorJoystick.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/KempstonJoystick.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Input/KempstonJoystick.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/KempstonJoystick.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Input/KempstonJoystick.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/NullJoystick.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Input/NullJoystick.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/NullJoystick.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Input/NullJoystick.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick1.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick1.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick1.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick1.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick2.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick2.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick2.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick2.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/StandardKeyboard.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Input/StandardKeyboard.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/StandardKeyboard.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Input/StandardKeyboard.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Rom/RomData.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Rom/RomData.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Rom/RomData.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/Rom/RomData.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/SoundOuput/AY38912.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/SoundOuput/AY38912.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/SoundOuput/AY38912.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Hardware/SoundOuput/AY38912.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/CPUMonitor.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/CPUMonitor.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/CPUMonitor.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/CPUMonitor.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/MachineType.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/MachineType.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/MachineType.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/MachineType.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Memory.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Memory.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Memory.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Memory.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Port.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Port.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Port.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Port.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Screen.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Screen.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Screen.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Screen.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Media.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/SpectrumBase.Media.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Media.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/SpectrumBase.Media.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Memory.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/SpectrumBase.Memory.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Memory.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/SpectrumBase.Memory.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Port.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/SpectrumBase.Port.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Port.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/SpectrumBase.Port.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/SpectrumBase.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/SpectrumBase.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ULA.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ULA.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ULA.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ULA.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Memory.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Memory.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Memory.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Memory.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Port.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Port.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Port.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Port.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Screen.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Screen.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Screen.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Screen.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2/ZX128Plus2.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2/ZX128Plus2.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2/ZX128Plus2.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2/ZX128Plus2.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Memory.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Memory.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Memory.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Memory.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Port.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Port.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Port.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Port.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Screen.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Screen.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Screen.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Screen.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Memory.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Memory.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Memory.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Memory.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Port.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Port.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Port.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Port.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum16K/ZX16.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum16K/ZX16.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum16K/ZX16.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum16K/ZX16.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Memory.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Memory.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Memory.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Memory.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Port.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Port.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Port.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Port.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Screen.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Screen.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Screen.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Screen.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/CPCFormat/CPCExtendedFloppyDisk.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Disk/CPCFormat/CPCExtendedFloppyDisk.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/CPCFormat/CPCExtendedFloppyDisk.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Disk/CPCFormat/CPCExtendedFloppyDisk.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/CPCFormat/CPCFloppyDisk.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Disk/CPCFormat/CPCFloppyDisk.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/CPCFormat/CPCFloppyDisk.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Disk/CPCFormat/CPCFloppyDisk.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/DiskType.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Disk/DiskType.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/DiskType.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Disk/DiskType.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/FloppyDisk.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Disk/FloppyDisk.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/FloppyDisk.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Disk/FloppyDisk.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/UDIFormat/UDI1_0FloppyDisk.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Disk/UDIFormat/UDI1_0FloppyDisk.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/UDIFormat/UDI1_0FloppyDisk.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Disk/UDIFormat/UDI1_0FloppyDisk.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/MediaConverter.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/MediaConverter.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/MediaConverter.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/MediaConverter.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/MediaConverterType.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/MediaConverterType.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/MediaConverterType.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/MediaConverterType.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Snapshot/SZX/SZX.Methods.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Snapshot/SZX/SZX.Methods.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Snapshot/SZX/SZX.Methods.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Snapshot/SZX/SZX.Methods.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Snapshot/SZX/SZX.Objects.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Snapshot/SZX/SZX.Objects.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Snapshot/SZX/SZX.Objects.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Snapshot/SZX/SZX.Objects.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/CSW/CswConverter.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/CSW/CswConverter.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/CSW/CswConverter.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/CSW/CswConverter.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/PZX/PzxConverter.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/PZX/PzxConverter.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/PZX/PzxConverter.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/PZX/PzxConverter.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TAP/TapConverter.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/TAP/TapConverter.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TAP/TapConverter.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/TAP/TapConverter.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TapeCommand.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/TapeCommand.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TapeCommand.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/TapeCommand.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TapeDataBlock.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/TapeDataBlock.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TapeDataBlock.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/TapeDataBlock.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/WAV/StreamHelper.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/WAV/StreamHelper.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/WAV/StreamHelper.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/WAV/StreamHelper.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/WAV/WavConverter.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/WAV/WavConverter.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/WAV/WavConverter.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/WAV/WavConverter.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/WAV/WavHeader.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/WAV/WavHeader.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/WAV/WavHeader.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/WAV/WavHeader.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/WAV/WavStreamReader.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/WAV/WavStreamReader.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/WAV/WavStreamReader.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/Media/Tape/WAV/WavStreamReader.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Controllers.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.Controllers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Controllers.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.Controllers.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.ICodeDataLog.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.ICodeDataLog.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.ICodeDataLog.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.ICodeDataLog.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.IInputPollable.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.IInputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.IMemoryDomains.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.IMemoryDomains.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.ISettable.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.ISettable.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Messaging.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.Messaging.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Messaging.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.Messaging.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Util.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.Util.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Util.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.Util.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/ZXSpectrum.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/readme.md b/src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/readme.md
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/readme.md
rename to src/BizHawk.Emulation.HawkCores/Computers/SinclairSpectrum/readme.md
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600.Core.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600.Core.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IInputPollable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IInputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IMemoryDomains.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IMemoryDomains.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.ISettable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.ISettable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.RomHeuristics.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600.RomHeuristics.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.RomHeuristics.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600.RomHeuristics.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600ControllerDeck.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600ControllerDeck.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600ControllerDeck.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600ControllerDeck.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600Controllers.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600Controllers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600Controllers.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Atari2600Controllers.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/M6532.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/M6532.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/M6532.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/M6532.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/MapperBase.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/MapperBase.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/MapperBase.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/MapperBase.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/Multicart2K.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/Multicart2K.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/Multicart2K.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/Multicart2K.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/Multicart4K.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/Multicart4K.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/Multicart4K.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/Multicart4K.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/Multicart8K.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/Multicart8K.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/Multicart8K.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/Multicart8K.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m0840.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/m0840.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m0840.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/m0840.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m2K.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/m2K.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m2K.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/m2K.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m3E.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/m3E.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m3E.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/m3E.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m3F.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/m3F.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m3F.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/m3F.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m4A50.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/m4A50.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m4A50.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/m4A50.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m4K.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/m4K.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m4K.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/m4K.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mAR.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mAR.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mAR.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mAR.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mCM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mCM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mCM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mCM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mCV.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mCV.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mCV.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mCV.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mDPC.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mDPC.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mDPC.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mDPC.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mDPCPlus.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mDPCPlus.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mDPCPlus.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mDPCPlus.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mE0.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mE0.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mE0.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mE0.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mE7.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mE7.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mE7.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mE7.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mEF.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mEF.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mEF.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mEF.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mEFSC.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mEFSC.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mEFSC.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mEFSC.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF0.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mF0.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF0.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mF0.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF4.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mF4.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF4.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mF4.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF4SC.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mF4SC.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF4SC.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mF4SC.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF6.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mF6.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF6.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mF6.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF6SC.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mF6SC.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF6SC.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mF6SC.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF8.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mF8.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF8.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mF8.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF8SC.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mF8SC.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF8SC.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mF8SC.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF8_sega.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mF8_sega.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF8_sega.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mF8_sega.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mFA.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mFA.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mFA.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mFA.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mFA2.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mFA2.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mFA2.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mFA2.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mFE.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mFE.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mFE.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mFE.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mMC.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mMC.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mMC.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mMC.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mSB.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mSB.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mSB.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mSB.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mUA.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mUA.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mUA.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mUA.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mX07.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mX07.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mX07.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/mX07.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/scrom.asm b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/scrom.asm
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/scrom.asm
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Mappers/scrom.asm
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/TIA.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/TIA.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/TIA.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/TIA.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.Audio.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.Audio.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.Audio.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.Audio.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.BallData.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.BallData.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.BallData.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.BallData.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.HMoveData.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.HMoveData.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.HMoveData.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.HMoveData.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.ISoundProvider.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.ISoundProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.ISoundProvider.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.ISoundProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.IVideoProvider.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.IVideoProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.IVideoProvider.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.IVideoProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.MissleData.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.MissleData.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.MissleData.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.MissleData.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.Palette.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.Palette.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.Palette.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.Palette.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.PlayerData.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.PlayerData.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.PlayerData.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.PlayerData.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.PlayfieldData.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.PlayfieldData.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.PlayfieldData.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.PlayfieldData.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.SyncState.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.SyncState.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.SyncState.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/2600/Tia/Tia.SyncState.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800Hawk.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800Hawk.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800Hawk.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800Hawk.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IInputPollable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800Hawk.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IInputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800Hawk.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IMemoryDomains.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800Hawk.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IMemoryDomains.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800Hawk.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.ISaveRam.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800Hawk.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.ISaveRam.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800Hawk.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.ISettable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800Hawk.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.ISettable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800Hawk.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800Hawk.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800Hawk.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800Hawk.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800Hawk.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800HawkControllerDeck.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800HawkControllerDeck.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800HawkControllerDeck.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800HawkControllerDeck.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800HawkControllers.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800HawkControllers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800HawkControllers.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/A7800HawkControllers.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/M6532.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/M6532.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/M6532.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/M6532.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Mappers/MapperBase.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Mappers/MapperBase.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Mappers/MapperBase.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Mappers/MapperBase.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Mappers/MapperDefault.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Mappers/MapperDefault.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Mappers/MapperDefault.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Mappers/MapperDefault.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Mappers/MapperF18.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Mappers/MapperF18.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Mappers/MapperF18.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Mappers/MapperF18.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Mappers/MapperFractalus.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Mappers/MapperFractalus.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Mappers/MapperFractalus.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Mappers/MapperFractalus.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Mappers/MapperRampage.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Mappers/MapperRampage.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Mappers/MapperRampage.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Mappers/MapperRampage.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Mappers/MapperSG.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Mappers/MapperSG.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Mappers/MapperSG.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Mappers/MapperSG.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Mappers/MapperSGE.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Mappers/MapperSGE.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Mappers/MapperSGE.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Mappers/MapperSGE.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Maria.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Maria.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Maria.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Maria.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/MemoryMap.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/MemoryMap.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/MemoryMap.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/MemoryMap.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Pokey.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Pokey.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Pokey.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Pokey.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Readme.txt b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Readme.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Readme.txt
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/Readme.txt
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/TIA.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/TIA_Sound/TIA.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/TIA.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/TIA_Sound/TIA.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.Audio.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.Audio.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.Audio.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.Audio.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.SyncState.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.SyncState.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.SyncState.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.SyncState.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/docs/2600_mem_map.txt b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/docs/2600_mem_map.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/docs/2600_mem_map.txt
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/docs/2600_mem_map.txt
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/docs/Atari2600_CompatibilityList.xlsx b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/docs/Atari2600_CompatibilityList.xlsx
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/docs/Atari2600_CompatibilityList.xlsx
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/docs/Atari2600_CompatibilityList.xlsx
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/docs/Atari7800_MapperGuide.txt b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/docs/Atari7800_MapperGuide.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/docs/Atari7800_MapperGuide.txt
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/docs/Atari7800_MapperGuide.txt
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/docs/Atari_Mappers.txt b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/docs/Atari_Mappers.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/docs/Atari_Mappers.txt
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/docs/Atari_Mappers.txt
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/docs/CartFormats_KevinHorton.txt b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/docs/CartFormats_KevinHorton.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/docs/CartFormats_KevinHorton.txt
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/docs/CartFormats_KevinHorton.txt
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/docs/TIA_HW_Notes.txt b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/docs/TIA_HW_Notes.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/docs/TIA_HW_Notes.txt
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/docs/TIA_HW_Notes.txt
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/docs/stella.pdf b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/docs/stella.pdf
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/docs/stella.pdf
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/docs/stella.pdf
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/logic/TIA.circ b/src/BizHawk.Emulation.HawkCores/Consoles/Atari/logic/TIA.circ
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/logic/TIA.circ
rename to src/BizHawk.Emulation.HawkCores/Consoles/Atari/logic/TIA.circ
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Coleco/AY_3_8910_SGM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Coleco/AY_3_8910_SGM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Coleco/AY_3_8910_SGM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Coleco/AY_3_8910_SGM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoControllerDeck.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoControllerDeck.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoControllerDeck.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoControllerDeck.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoControllers.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoControllers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoControllers.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoControllers.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoVision.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoVision.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoVision.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoVision.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IInputPollable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoVision.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IInputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoVision.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IMemoryDomains.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoVision.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IMemoryDomains.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoVision.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.ISettable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoVision.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.ISettable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoVision.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.ISoundProvider.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoVision.ISoundProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.ISoundProvider.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoVision.ISoundProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoVision.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoVision.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoVision.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Coleco/ColecoVision.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Coleco/SN76489col.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Coleco/SN76489col.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Coleco/SN76489col.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Coleco/SN76489col.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Coleco/TMS9918A.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Coleco/TMS9918A.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Coleco/TMS9918A.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Coleco/TMS9918A.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Coleco/docs/CV-Sound.txt b/src/BizHawk.Emulation.HawkCores/Consoles/Coleco/docs/CV-Sound.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Coleco/docs/CV-Sound.txt
rename to src/BizHawk.Emulation.HawkCores/Consoles/Coleco/docs/CV-Sound.txt
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Coleco/docs/CV-Tech.txt b/src/BizHawk.Emulation.HawkCores/Consoles/Coleco/docs/CV-Tech.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Coleco/docs/CV-Tech.txt
rename to src/BizHawk.Emulation.HawkCores/Consoles/Coleco/docs/CV-Tech.txt
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Coleco/docs/colecovision tech1.pdf b/src/BizHawk.Emulation.HawkCores/Consoles/Coleco/docs/colecovision tech1.pdf
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Coleco/docs/colecovision tech1.pdf
rename to src/BizHawk.Emulation.HawkCores/Consoles/Coleco/docs/colecovision tech1.pdf
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Coleco/docs/colecovision tech2.pdf b/src/BizHawk.Emulation.HawkCores/Consoles/Coleco/docs/colecovision tech2.pdf
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Coleco/docs/colecovision tech2.pdf
rename to src/BizHawk.Emulation.HawkCores/Consoles/Coleco/docs/colecovision tech2.pdf
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/Audio.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/Audio.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/Audio.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/Audio.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/Cart.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/Cart.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/Cart.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/Cart.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.Controllers.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/ChannelF.Controllers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.Controllers.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/ChannelF.Controllers.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/ChannelF.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/ChannelF.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/ChannelF.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/ChannelF.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.ISettable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/ChannelF.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.ISettable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/ChannelF.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/ChannelF.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/ChannelF.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IVideoProvider.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/ChannelF.IVideoProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IVideoProvider.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/ChannelF.IVideoProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.InputPollable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/ChannelF.InputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.InputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/ChannelF.InputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.MemoryDomains.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/ChannelF.MemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.MemoryDomains.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/ChannelF.MemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/ChannelF.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/ChannelF.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Disassembler.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/F8/F3850.Disassembler.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Disassembler.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/F8/F3850.Disassembler.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Execute.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/F8/F3850.Execute.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Execute.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/F8/F3850.Execute.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Operations.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/F8/F3850.Operations.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Operations.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/F8/F3850.Operations.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Registers.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/F8/F3850.Registers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Registers.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/F8/F3850.Registers.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Tables.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/F8/F3850.Tables.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Tables.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/F8/F3850.Tables.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/F8/F3850.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/F8/F3850.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/Memory.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/Memory.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/Memory.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/Memory.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/Ports.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/Ports.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/Ports.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/Ports.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/Video.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/Video.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/Video.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Fairchild/ChannelF/Video.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/Audio.cs b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/Audio.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/Audio.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/Audio.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/HW_Registers.cs b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/HW_Registers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/HW_Registers.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/HW_Registers.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/Mappers/MapperBase.cs b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/Mappers/MapperBase.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/Mappers/MapperBase.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/Mappers/MapperBase.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/Mappers/Mapper_Default.cs b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/Mappers/Mapper_Default.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/Mappers/Mapper_Default.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/Mappers/Mapper_Default.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/Mappers/ReadMe.txt b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/Mappers/ReadMe.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/Mappers/ReadMe.txt
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/Mappers/ReadMe.txt
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/MemoryMap.cs b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/MemoryMap.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/MemoryMap.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/MemoryMap.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/PPU.cs b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/PPU.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/PPU.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/PPU.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/ReadMe.txt b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/ReadMe.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/ReadMe.txt
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/ReadMe.txt
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/SerialPort.cs b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/SerialPort.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/SerialPort.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/SerialPort.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.ICodeDataLog.cs b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawk.ICodeDataLog.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.ICodeDataLog.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawk.ICodeDataLog.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawk.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawk.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawk.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawk.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.IInputPollable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawk.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.IInputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawk.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.IMemoryDomains.cs b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawk.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.IMemoryDomains.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawk.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.ISaveRam.cs b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawk.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.ISaveRam.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawk.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.ISettable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawk.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.ISettable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawk.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawk.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawk.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawk.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawk.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawkControllerDeck.cs b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawkControllerDeck.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawkControllerDeck.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawkControllerDeck.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawkControllers.cs b/src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawkControllers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawkControllers.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/GCE/Vectrex/VectrexHawkControllers.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Cartridge.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Cartridge.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Intellivision/Cartridge.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Cartridge.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Controllers/IntellivisionControllerDeck.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Controllers/IntellivisionControllerDeck.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Intellivision/Controllers/IntellivisionControllerDeck.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Controllers/IntellivisionControllerDeck.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Controllers/IntellivisionControllers.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Controllers/IntellivisionControllers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Intellivision/Controllers/IntellivisionControllers.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Controllers/IntellivisionControllers.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/ICart.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/ICart.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Intellivision/ICart.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/ICart.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellicart.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellicart.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellicart.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellicart.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellivision.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellivision.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IDisassemblable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellivision.IDisassemblable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IDisassemblable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellivision.IDisassemblable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellivision.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellivision.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IInputPollable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellivision.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IInputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellivision.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IMemoryDomains.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellivision.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IMemoryDomains.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellivision.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.ISettable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellivision.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.ISettable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellivision.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellivision.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellivision.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.MemoryMap.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellivision.MemoryMap.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.MemoryMap.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellivision.MemoryMap.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellivision.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/Intellivision.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/PSG.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/PSG.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Intellivision/PSG.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/PSG.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/STIC.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/STIC.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Intellivision/STIC.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Intellivision/STIC.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/MapperBase.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/Mappers/MapperBase.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/MapperBase.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/Mappers/MapperBase.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/Mapper_Default.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/Mappers/Mapper_Default.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/Mapper_Default.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/Mappers/Mapper_Default.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/ReadMe.txt b/src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/Mappers/ReadMe.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/ReadMe.txt
rename to src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/Mappers/ReadMe.txt
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/MemoryMap.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/MemoryMap.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/MemoryMap.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/MemoryMap.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.ICodeDataLog.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2Hawk.ICodeDataLog.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.ICodeDataLog.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2Hawk.ICodeDataLog.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2Hawk.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2Hawk.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2Hawk.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2Hawk.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IInputPollable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2Hawk.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IInputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2Hawk.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IMemoryDomains.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2Hawk.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IMemoryDomains.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2Hawk.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.ISaveRam.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2Hawk.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.ISaveRam.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2Hawk.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.ISettable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2Hawk.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.ISettable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2Hawk.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2Hawk.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2Hawk.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2Hawk.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2Hawk.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2HawkControllerDeck.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2HawkControllerDeck.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2HawkControllerDeck.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2HawkControllerDeck.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2HawkControllers.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2HawkControllers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2HawkControllers.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/O2HawkControllers.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/PPU.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/PPU.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/PPU.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Magnavox/Odyssey2/PPU.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Audio.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Audio.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Audio.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Audio.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_GB_PPU.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBC_GB_PPU.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_GB_PPU.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBC_GB_PPU.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBC_PPU.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBC_PPU.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.ICodeDataLog.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawk.ICodeDataLog.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.ICodeDataLog.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawk.ICodeDataLog.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawk.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawk.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawk.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawk.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IInputPollable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawk.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IInputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawk.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IMemoryDomains.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawk.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IMemoryDomains.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawk.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.ISaveRam.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawk.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.ISaveRam.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawk.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.ISettable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawk.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.ISettable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawk.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawk.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawk.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawk.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawk.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawkControllerDeck.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawkControllerDeck.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawkControllerDeck.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawkControllerDeck.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawkControllers.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawkControllers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawkControllers.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GBHawkControllers.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GB_PPU.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/GB_PPU.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/HW_Registers.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/HW_Registers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/HW_Registers.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/HW_Registers.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/MapperBase.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/MapperBase.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/MapperBase.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/MapperBase.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Camera.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Camera.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Camera.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Camera.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Default.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Default.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Default.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Default.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC1.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC1.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC1.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC1.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC3.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC3.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC3.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC3.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1_Multi.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1_Multi.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1_Multi.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1_Multi.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC2.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC2.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC2.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC2.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC3.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC3.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC3.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC3.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC5.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC5.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC5.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC5.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC6.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC6.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC6.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC6.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC7.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC7.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC7.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC7.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MMM01.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MMM01.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MMM01.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MMM01.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_RockMan8.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_RockMan8.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_RockMan8.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_RockMan8.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Sachen_MMC1.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Sachen_MMC1.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Sachen_MMC1.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Sachen_MMC1.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Sachen_MMC2.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Sachen_MMC2.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Sachen_MMC2.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Sachen_MMC2.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_TAMA5.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_TAMA5.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_TAMA5.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_TAMA5.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_WisdomTree.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_WisdomTree.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_WisdomTree.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/Mapper_WisdomTree.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/ReadMe.txt b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/ReadMe.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/ReadMe.txt
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Mappers/ReadMe.txt
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/MemoryMap.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/MemoryMap.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/MemoryMap.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/MemoryMap.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/PPU.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/PPU.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/PPU.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/PPU.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/ReadMe.txt b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/ReadMe.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/ReadMe.txt
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/ReadMe.txt
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/SerialPort.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/SerialPort.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/SerialPort.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/SerialPort.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Timer.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Timer.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Timer.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawk/Timer.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.ICodeDataLog.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLink.ICodeDataLog.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.ICodeDataLog.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLink.ICodeDataLog.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IInputPollable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IInputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IMemoryDomains.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IMemoryDomains.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.ISaveRam.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLink.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.ISaveRam.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLink.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.ISettable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLink.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.ISettable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLink.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLink.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLink.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLinkControllerDeck.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLinkControllerDeck.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLinkControllerDeck.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLinkControllerDeck.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLinkControllers.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLinkControllers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLinkControllers.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink/GBHawkLinkControllers.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.ICodeDataLog.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.ICodeDataLog.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.ICodeDataLog.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.ICodeDataLog.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IInputPollable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IInputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IMemoryDomains.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IMemoryDomains.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.ISaveRam.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.ISaveRam.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.ISettable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.ISettable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3xControllerDeck.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3xControllerDeck.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3xControllerDeck.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3xControllerDeck.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3xControllers.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3xControllers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3xControllers.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3xControllers.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.ICodeDataLog.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.ICodeDataLog.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.ICodeDataLog.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.ICodeDataLog.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IInputPollable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IInputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IMemoryDomains.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IMemoryDomains.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.ISaveRam.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.ISaveRam.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.ISettable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.ISettable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4xControllerDeck.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4xControllerDeck.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4xControllerDeck.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4xControllerDeck.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4xControllers.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4xControllers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4xControllers.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4xControllers.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/APU.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/APU.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/APU.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/APU.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AVE-NINA.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/AVE-NINA.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AVE-NINA.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/AVE-NINA.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AxROM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/AxROM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AxROM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/AxROM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_161_32.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_161_32.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_161_32.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_161_32.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Bonza.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Bonza.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Bonza.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Bonza.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BxROM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/BxROM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BxROM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/BxROM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CNROM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/CNROM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CNROM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/CNROM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CPROM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/CPROM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CPROM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/CPROM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Camerica.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Camerica.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Camerica.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Camerica.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CamericaGoldenFive.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/CamericaGoldenFive.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CamericaGoldenFive.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/CamericaGoldenFive.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Cony.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Cony.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Cony.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Cony.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CoolBoy.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/CoolBoy.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CoolBoy.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/CoolBoy.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/DatachBarcode.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/DatachBarcode.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/DatachBarcode.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/DatachBarcode.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/ExROM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/ExROM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FFE/Mapper006.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/FFE/Mapper006.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FFE/Mapper006.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/FFE/Mapper006.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FFE/Mapper017.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/FFE/Mapper017.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FFE/Mapper017.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/FFE/Mapper017.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FS304.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/FS304.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FS304.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/FS304.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Farid-UNROM-8-in-1.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Farid-UNROM-8-in-1.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Farid-UNROM-8-in-1.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Farid-UNROM-8-in-1.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/GameGenie.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/GameGenie.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/GameGenie.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/GameGenie.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/GxROM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/GxROM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/GxROM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/GxROM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IC_74x377.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/IC_74x377.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IC_74x377.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/IC_74x377.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/INesBoard.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/INesBoard.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/INesBoard.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/INesBoard.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IREM-74_161_161_21_138.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/IREM-74_161_161_21_138.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IREM-74_161_161_21_138.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/IREM-74_161_161_21_138.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IREM_TAM_S1.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/IREM_TAM_S1.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IREM_TAM_S1.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/IREM_TAM_S1.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/InesBoardImplAttribute.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/InesBoardImplAttribute.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/InesBoardImplAttribute.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/InesBoardImplAttribute.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Irem_G101.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Irem_G101.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Irem_G101.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Irem_G101.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Irem_H3001.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Irem_H3001.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Irem_H3001.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Irem_H3001.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_13.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/JALECO_JF_13.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_13.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/JALECO_JF_13.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_17.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/JALECO_JF_17.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_17.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/JALECO_JF_17.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_SS8806.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/JALECO_SS8806.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_SS8806.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/JALECO_SS8806.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Jaleco-JF_11_14.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Jaleco-JF_11_14.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Jaleco-JF_11_14.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Jaleco-JF_11_14.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper012.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper012.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper012.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper012.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper037.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper037.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper037.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper037.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper044.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper044.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper044.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper044.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper074.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper074.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper074.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper074.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper114.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper114.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper114.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper114.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper121.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper121.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper121.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper121.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper123.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper123.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper123.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper123.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper134.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper134.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper134.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper134.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper165.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper165.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper165.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper165.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper182.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper182.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper182.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper182.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper187.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper187.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper187.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper187.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper189.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper189.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper189.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper189.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper192.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper192.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper192.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper192.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper194.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper194.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper194.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper194.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper195.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper195.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper195.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper195.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper195_CW.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper195_CW.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper195_CW.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper195_CW.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper196.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper196.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper196.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper196.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper197.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper197.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper197.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper197.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper198.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper198.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper198.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper198.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper199.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper199.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper199.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper199.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper205.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper205.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper205.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper205.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper208.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper208.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper208.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper208.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper215.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper215.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper215.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper215.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper217.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper217.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper217.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper217.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper219.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper219.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper219.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper219.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper223.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper223.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper223.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper223.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper238.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper238.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper238.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper238.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper250.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper250.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper250.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper250.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper254.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper254.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper254.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper254.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/NES-QJ.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/NES-QJ.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/NES-QJ.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/NES-QJ.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Pocahontas.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Pocahontas.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Pocahontas.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/Pocahontas.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/RexSoftSL1632.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/RexSoftSL1632.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/RexSoftSL1632.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/RexSoftSL1632.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TLSROM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/TLSROM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TLSROM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/TLSROM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TQROM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/TQROM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TQROM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/TQROM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TVROM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/TVROM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TVROM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/TVROM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper015.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper015.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper015.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper015.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper028.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper028.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper028.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper028.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper029.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper029.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper029.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper029.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper030.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper030.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper030.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper030.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper034.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper034.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper034.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper034.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper036.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper036.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper036.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper036.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper038.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper038.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper038.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper038.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper040.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper040.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper040.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper040.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper041.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper041.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper041.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper041.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper042.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper042.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper042.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper042.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper043.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper043.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper043.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper043.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper045.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper045.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper045.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper045.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper046.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper046.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper046.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper046.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper051.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper051.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper051.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper051.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper053.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper053.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper053.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper053.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper057.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper057.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper057.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper057.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper058.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper058.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper058.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper058.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper063.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper063.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper063.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper063.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper069.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper069.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper069.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper069.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper078.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper078.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper078.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper078.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper090.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper090.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper090.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper090.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper091.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper091.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper091.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper091.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper101.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper101.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper101.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper101.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper103.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper103.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper103.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper103.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper106.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper106.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper106.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper106.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper107.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper107.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper107.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper107.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper108.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper108.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper108.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper108.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper116.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper116.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper116.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper116.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper120.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper120.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper120.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper120.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper125.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper125.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper125.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper125.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper132.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper132.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper132.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper132.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper136.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper136.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper136.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper136.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper142.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper142.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper142.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper142.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper143.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper143.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper143.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper143.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper147.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper147.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper147.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper147.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper150.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper150.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper150.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper150.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper156.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper156.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper156.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper156.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper162.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper162.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper162.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper162.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper164.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper164.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper164.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper164.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper168.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper168.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper168.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper168.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper170.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper170.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper170.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper170.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper175.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper175.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper175.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper175.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper176.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper176.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper176.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper176.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper177.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper177.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper177.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper177.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper178.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper178.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper178.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper178.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper180.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper180.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper180.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper180.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper183.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper183.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper183.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper183.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper186.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper186.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper186.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper186.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper188.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper188.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper188.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper188.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper190.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper190.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper190.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper190.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper193.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper193.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper193.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper193.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper200.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper200.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper200.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper200.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper201.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper201.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper201.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper201.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper202.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper202.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper202.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper202.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper203.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper203.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper203.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper203.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper204.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper204.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper204.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper204.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper212.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper212.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper212.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper212.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper213.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper213.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper213.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper213.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper214.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper214.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper214.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper214.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper218.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper218.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper218.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper218.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper220.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper220.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper220.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper220.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper221.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper221.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper221.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper221.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper222.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper222.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper222.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper222.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper225.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper225.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper225.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper225.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper226.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper226.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper226.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper226.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper227.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper227.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper227.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper227.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper230.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper230.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper230.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper230.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper231.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper231.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper231.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper231.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper233.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper233.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper233.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper233.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper235.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper235.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper235.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper235.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper236.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper236.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper236.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper236.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper240.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper240.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper240.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper240.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper241.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper241.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper241.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper241.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper242.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper242.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper242.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper242.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper243.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper243.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper243.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper243.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper244.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper244.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper244.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper244.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper246.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper246.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper246.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper246.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper252.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper252.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper252.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper252.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper253.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper253.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper253.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper253.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper50.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper50.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper50.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper50.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper60.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper60.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper60.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper60.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper61.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper61.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper61.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper61.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper62.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper62.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper62.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Mapper62.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MapperPropAttribute.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MapperPropAttribute.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MapperPropAttribute.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/MapperPropAttribute.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NES-EVENT.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/NES-EVENT.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NES-EVENT.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/NES-EVENT.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NROM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/NROM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NROM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/NROM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NSFBoard.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/NSFBoard.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NSFBoard.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/NSFBoard.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot129_163.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot129_163.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot129_163.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot129_163.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot175_340.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot175_340.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot175_340.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot175_340.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/DRROM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot1xx/DRROM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/DRROM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot1xx/DRROM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper076.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper076.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper076.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper076.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper088.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper088.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper088.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper088.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper095.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper095.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper095.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper095.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper112.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper112.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper112.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper112.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper206.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper206.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper206.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper206.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namco163Audio.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namco163Audio.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namco163Audio.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namco163Audio.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namcot1xx.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namcot1xx.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namcot1xx.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namcot1xx.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NanJing.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/NanJing.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NanJing.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/NanJing.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NesBoardBase.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/NesBoardBase.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NesBoardBase.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/NesBoardBase.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NovelDiamond.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/NovelDiamond.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NovelDiamond.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/NovelDiamond.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SEEPROM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/SEEPROM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SEEPROM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/SEEPROM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sachen8259.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Sachen8259.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sachen8259.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Sachen8259.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SachenSimple.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/SachenSimple.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SachenSimple.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/SachenSimple.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Subor.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Subor.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Subor.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Subor.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft1.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Sunsoft1.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft1.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Sunsoft1.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft1_Alt.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Sunsoft1_Alt.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft1_Alt.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Sunsoft1_Alt.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft3.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Sunsoft3.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft3.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Sunsoft3.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft4.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Sunsoft4.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft4.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Sunsoft4.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SxROM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/SxROM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SxROM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/SxROM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TENGEN_800008.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/TENGEN_800008.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TENGEN_800008.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/TENGEN_800008.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_TC0190FMC.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Taito_TC0190FMC.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_TC0190FMC.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Taito_TC0190FMC.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF-DREAMTECH01.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF-DREAMTECH01.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF-DREAMTECH01.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF-DREAMTECH01.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-12-IN-1.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-12-IN-1.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-12-IN-1.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-12-IN-1.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-190in1.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-190in1.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-190in1.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-190in1.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-64in1-NR.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-64in1-NR.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-64in1-NR.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-64in1-NR.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-810544-C-A1.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-810544-C-A1.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-810544-C-A1.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-810544-C-A1.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-8157.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-8157.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-8157.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-8157.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-A65AS.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-A65AS.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-A65AS.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-A65AS.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-BS-5.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-BS-5.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-BS-5.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-BS-5.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-D1038.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-D1038.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-D1038.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-D1038.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-GS-2004.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-GS-2004.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-GS-2004.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-GS-2004.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-GS-2013.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-GS-2013.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-GS-2013.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-GS-2013.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-Ghostbusters63in1.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-Ghostbusters63in1.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-Ghostbusters63in1.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-Ghostbusters63in1.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-NTD-03.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-NTD-03.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-NTD-03.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-NTD-03.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-T-262.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-T-262.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-T-262.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-T-262.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-WS.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-WS.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-WS.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-WS.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMCFK23C.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMCFK23C.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMCFK23C.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMCFK23C.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC_Super24in1SC03.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC_Super24in1SC03.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC_Super24in1SC03.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC_Super24in1SC03.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BTL-Mario1-MALEE2.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BTL-Mario1-MALEE2.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BTL-Mario1-MALEE2.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BTL-Mario1-MALEE2.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-43272.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-43272.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-43272.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-43272.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-AC08.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-AC08.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-AC08.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-AC08.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-AX5705.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-AX5705.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-AX5705.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-AX5705.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-BB.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-BB.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-BB.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-BB.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-CC-21.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-CC-21.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-CC-21.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-CC-21.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-EDU2000.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-EDU2000.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-EDU2000.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-EDU2000.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KOF97.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KOF97.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KOF97.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KOF97.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KS7012.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KS7012.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KS7012.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KS7012.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KS7013B.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KS7013B.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KS7013B.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KS7013B.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-LH10.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-LH10.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-LH10.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-LH10.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-SHERO.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-SHERO.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-SHERO.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-SHERO.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-TF1201.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-TF1201.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-TF1201.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-TF1201.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL_DripGame.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL_DripGame.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL_DripGame.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL_DripGame.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL_SMB2J.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL_SMB2J.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL_SMB2J.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL_SMB2J.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UxROM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UxROM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UxROM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/UxROM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC1.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/VRC1.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC1.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/VRC1.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC2_4.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/VRC2_4.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC2_4.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/VRC2_4.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC3.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/VRC3.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC3.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/VRC3.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC6.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/VRC6.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC6.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/VRC6.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC7.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/VRC7.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC7.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/VRC7.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VS_M99.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/VS_M99.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VS_M99.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/VS_M99.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/inlnsf.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/inlnsf.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/inlnsf.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Boards/inlnsf.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/BoardTable.xlsx b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Docs/BoardTable.xlsx
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/BoardTable.xlsx
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Docs/BoardTable.xlsx
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/MapperCompatibilityList.url b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Docs/MapperCompatibilityList.url
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/MapperCompatibilityList.url
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Docs/MapperCompatibilityList.url
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/nesasm.pdf b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Docs/nesasm.pdf
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/nesasm.pdf
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Docs/nesasm.pdf
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/sunsoft.txt b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Docs/sunsoft.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/sunsoft.txt
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Docs/sunsoft.txt
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/sxrom_notes.txt b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Docs/sxrom_notes.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Docs/sxrom_notes.txt
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Docs/sxrom_notes.txt
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDS.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/FDS/FDS.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDS.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/FDS/FDS.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDSAudio.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/FDS/FDSAudio.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDSAudio.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/FDS/FDSAudio.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDSInspector.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/FDS/FDSInspector.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDSInspector.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/FDS/FDSInspector.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/RamAdapter.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/FDS/RamAdapter.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/RamAdapter.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/FDS/RamAdapter.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.BoardSystem.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.BoardSystem.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.Core.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.Core.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.CpuLink.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.CpuLink.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.CpuLink.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.CpuLink.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.ICodeDataLogger.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.ICodeDataLogger.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.ICodeDataLogger.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.ICodeDataLogger.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.IDriveLight.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.IDriveLight.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.IDriveLight.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.IDriveLight.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.IInputPollable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.IInputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.IMemoryDomains.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.IMemoryDomains.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.INESPPUViewable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.INESPPUViewable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.INESPPUViewable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.INESPPUViewable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.ISaveRam.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.ISaveRam.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.ISettable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.ISettable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.iNES.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.iNES.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.iNES.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NES.iNES.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NESControllers.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NESControllers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NESControllers.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NESControllers.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NSFFormat.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NSFFormat.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NSFFormat.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/NSFFormat.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/PPU.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/PPU.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.regs.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/PPU.regs.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.regs.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/PPU.regs.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.run.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/PPU.run.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.run.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/PPU.run.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Palettes.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Palettes.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Palettes.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Palettes.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Unif.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Unif.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Unif.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/NES/Unif.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubGBHawk/SubGBHawk.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/SubGBHawk/SubGBHawk.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubGBHawk/SubGBHawk.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/SubGBHawk/SubGBHawk.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubGBHawk/SubGBHawk.IInputPollable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/SubGBHawk/SubGBHawk.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubGBHawk/SubGBHawk.IInputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/SubGBHawk/SubGBHawk.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubGBHawk/SubGBHawk.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/SubGBHawk/SubGBHawk.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubGBHawk/SubGBHawk.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/SubGBHawk/SubGBHawk.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubGBHawk/SubGBHawk.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/SubGBHawk/SubGBHawk.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubGBHawk/SubGBHawk.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/SubGBHawk/SubGBHawk.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubNESHawk/SubNESHawk.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/SubNESHawk/SubNESHawk.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubNESHawk/SubNESHawk.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/SubNESHawk/SubNESHawk.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubNESHawk/SubNESHawk.IInputPollable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/SubNESHawk/SubNESHawk.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubNESHawk/SubNESHawk.IInputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/SubNESHawk/SubNESHawk.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubNESHawk/SubNESHawk.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/SubNESHawk/SubNESHawk.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubNESHawk/SubNESHawk.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/SubNESHawk/SubNESHawk.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubNESHawk/SubNESHawk.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/SubNESHawk/SubNESHawk.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubNESHawk/SubNESHawk.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Nintendo/SubNESHawk/SubNESHawk.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/ADPCM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/ADPCM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/ADPCM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/ADPCM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/Compat.txt b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/Compat.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/Compat.txt
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/Compat.txt
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.Populous.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/MemoryMap.Populous.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.Populous.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/MemoryMap.Populous.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.SF2.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/MemoryMap.SF2.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.SF2.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/MemoryMap.SF2.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.SuperGrafx.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/MemoryMap.SuperGrafx.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.SuperGrafx.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/MemoryMap.SuperGrafx.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.TurboCD.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/MemoryMap.TurboCD.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.TurboCD.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/MemoryMap.TurboCD.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/MemoryMap.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/MemoryMap.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/MemoryMap.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.ArcadeCard.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.ArcadeCard.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.ArcadeCard.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.ArcadeCard.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.ICodeDataLogger.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.ICodeDataLogger.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.ICodeDataLogger.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.ICodeDataLogger.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IDriveLight.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.IDriveLight.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IDriveLight.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.IDriveLight.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IInputPollable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IInputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IMemoryDomains.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IMemoryDomains.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.ISaveRam.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.ISaveRam.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.ISettable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.ISettable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.Input.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.Input.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.Input.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.Input.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.TurboCD.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.TurboCD.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.TurboCD.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.TurboCD.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PCEngine.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PceControllerDeck.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PceControllerDeck.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/PceControllerDeck.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/PceControllerDeck.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/QuickCollections.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/QuickCollections.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/QuickCollections.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/QuickCollections.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/ScsiCDBus.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/ScsiCDBus.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/ScsiCDBus.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/ScsiCDBus.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/VCE.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/VCE.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/VCE.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/VCE.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/VDC.Render.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/VDC.Render.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/VDC.Render.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/VDC.Render.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/VDC.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/VDC.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/VDC.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/VDC.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/VPC.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/VPC.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/VPC.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/VPC.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/VecnaSynchronizer.cs b/src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/VecnaSynchronizer.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/PC Engine/VecnaSynchronizer.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/PC Engine/VecnaSynchronizer.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.ICodeDataLog.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLink.ICodeDataLog.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.ICodeDataLog.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLink.ICodeDataLog.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLink.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLink.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLink.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLink.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.IInputPollable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLink.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.IInputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLink.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.IMemoryDomains.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLink.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.IMemoryDomains.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLink.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.ISaveRam.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLink.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.ISaveRam.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLink.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.ISettable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLink.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.ISettable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLink.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLink.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLink.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLink.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLink.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLinkControllerDeck.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLinkControllerDeck.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLinkControllerDeck.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLinkControllerDeck.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLinkControllers.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLinkControllers.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLinkControllers.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/GGHawkLinkControllers.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/ReadMe.txt b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/ReadMe.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/ReadMe.txt
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/GGHawkLink/ReadMe.txt
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/Compat.txt b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/Compat.txt
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/Compat.txt
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/Compat.txt
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/EEPROM.93c46.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/EEPROM.93c46.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/EEPROM.93c46.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/EEPROM.93c46.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/ISmsGpuView.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/ISmsGpuView.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/ISmsGpuView.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/ISmsGpuView.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.CodeMasters.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/MemoryMap.CodeMasters.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.CodeMasters.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/MemoryMap.CodeMasters.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.EEPROM.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/MemoryMap.EEPROM.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.EEPROM.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/MemoryMap.EEPROM.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.ExtRam.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/MemoryMap.ExtRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.ExtRam.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/MemoryMap.ExtRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.Korea.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/MemoryMap.Korea.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.Korea.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/MemoryMap.Korea.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.Sega.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/MemoryMap.Sega.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/MemoryMap.Sega.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/MemoryMap.Sega.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.ICodeDataLogger.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.ICodeDataLogger.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.ICodeDataLogger.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.ICodeDataLogger.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IDebuggable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IDebuggable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IEmulator.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IEmulator.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IInputPollable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IInputPollable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IMemoryDomains.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IMemoryDomains.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.ISaveRam.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.ISaveRam.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.ISettable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.ISettable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.ISoundProvider.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.ISoundProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.ISoundProvider.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.ISoundProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IStatable.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IStatable.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.Input.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.Input.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.Input.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.Input.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/SMS.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/TerebiOekaki.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/TerebiOekaki.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/TerebiOekaki.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/TerebiOekaki.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.Mode4.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/VDP.Mode4.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.Mode4.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/VDP.Mode4.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.ModeTMS.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/VDP.ModeTMS.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.ModeTMS.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/VDP.ModeTMS.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.Tables.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/VDP.Tables.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.Tables.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/VDP.Tables.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.cs b/src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/VDP.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.cs
rename to src/BizHawk.Emulation.HawkCores/Consoles/Sega/SMS/VDP.cs
diff --git a/src/BizHawk.Emulation.ManagedCores/BizHawk.Emulation.ManagedCores.csproj b/src/BizHawk.Emulation.ManagedCores/BizHawk.Emulation.ManagedCores.csproj
new file mode 100644
index 0000000000..3b3d69d0a3
--- /dev/null
+++ b/src/BizHawk.Emulation.ManagedCores/BizHawk.Emulation.ManagedCores.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<Import Project="../MainSlnCommon.props" />
+	<PropertyGroup>
+		<TargetFramework>netstandard2.0</TargetFramework>
+	</PropertyGroup>
+	<ItemGroup>
+		<Reference Include="Virtu" HintPath="$(ProjectDir)../../References/Virtu.dll" Private="true" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.CoresBase/BizHawk.Emulation.CoresBase.csproj" />
+		<Compile Include="$(ProjectDir)../BizHawk.Version/svnrev.cs" />
+		<Compile Include="$(ProjectDir)../BizHawk.Version/VersionInfo.cs" />
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Update="Computers/AppleII/AppleII.*.cs" DependentUpon="AppleII.cs" />
+	</ItemGroup>
+</Project>
diff --git a/src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IDebuggable.cs b/src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IDebuggable.cs
rename to src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IDisassembler.cs b/src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.IDisassembler.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IDisassembler.cs
rename to src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.IDisassembler.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IEmulator.cs b/src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IEmulator.cs
rename to src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IInputPollable.cs b/src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IInputPollable.cs
rename to src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IMemoryDomains.cs b/src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IMemoryDomains.cs
rename to src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.ISettable.cs b/src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.ISettable.cs
rename to src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.ISoundProvider.cs b/src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.ISoundProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.ISoundProvider.cs
rename to src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.ISoundProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IStatable.cs b/src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IStatable.cs
rename to src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IVideoProvider.cs b/src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.IVideoProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IVideoProvider.cs
rename to src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.IVideoProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs b/src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs
rename to src/BizHawk.Emulation.ManagedCores/Computers/AppleII/AppleII.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AppleII/Components.cs b/src/BizHawk.Emulation.ManagedCores/Computers/AppleII/Components.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AppleII/Components.cs
rename to src/BizHawk.Emulation.ManagedCores/Computers/AppleII/Components.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AppleII/Components/CassetteComponent.cs b/src/BizHawk.Emulation.ManagedCores/Computers/AppleII/Components/CassetteComponent.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AppleII/Components/CassetteComponent.cs
rename to src/BizHawk.Emulation.ManagedCores/Computers/AppleII/Components/CassetteComponent.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AppleII/Components/EmptyPeripheralComponent.cs b/src/BizHawk.Emulation.ManagedCores/Computers/AppleII/Components/EmptyPeripheralComponent.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AppleII/Components/EmptyPeripheralComponent.cs
rename to src/BizHawk.Emulation.ManagedCores/Computers/AppleII/Components/EmptyPeripheralComponent.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/AppleII/Components/GamePortComponent.cs b/src/BizHawk.Emulation.ManagedCores/Computers/AppleII/Components/GamePortComponent.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/AppleII/Components/GamePortComponent.cs
rename to src/BizHawk.Emulation.ManagedCores/Computers/AppleII/Components/GamePortComponent.cs
diff --git a/src/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs b/src/BizHawk.Emulation.UnmanagedCores/Arcades/MAME/LibMAME.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Arcades/MAME/LibMAME.cs
diff --git a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs b/src/BizHawk.Emulation.UnmanagedCores/Arcades/MAME/MAME.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Arcades/MAME/MAME.cs
diff --git a/src/BizHawk.Emulation.UnmanagedCores/BizHawk.Emulation.UnmanagedCores.csproj b/src/BizHawk.Emulation.UnmanagedCores/BizHawk.Emulation.UnmanagedCores.csproj
new file mode 100644
index 0000000000..a593b95e5b
--- /dev/null
+++ b/src/BizHawk.Emulation.UnmanagedCores/BizHawk.Emulation.UnmanagedCores.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<Import Project="../MainSlnCommon.props" />
+	<PropertyGroup>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<TargetFramework>netstandard2.0</TargetFramework>
+	</PropertyGroup>
+	<ItemGroup>
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.CoresBase/BizHawk.Emulation.CoresBase.csproj" />
+		<Compile Include="$(ProjectDir)../BizHawk.Version/svnrev.cs" />
+		<Compile Include="$(ProjectDir)../BizHawk.Version/VersionInfo.cs" />
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Update="Consoles/Atari/lynx/Lynx.*.cs" DependentUpon="Lynx.cs" />
+		<Compile Update="Consoles/MSX/MSX.*.cs" DependentUpon="MSX.cs" />
+		<Compile Update="Consoles/Nintendo/Gameboy/Gambatte.*.cs" DependentUpon="Gambatte.cs" />
+		<Compile Update="Consoles/Nintendo/Gameboy/GambatteLink.*.cs" DependentUpon="GambatteLink.cs" />
+		<Compile Update="Consoles/Nintendo/GBA/MGBAHawk.*.cs" DependentUpon="MGBAHawk.cs" />
+		<Compile Update="Consoles/Nintendo/N64/N64.*.cs" DependentUpon="N64.cs" />
+		<Compile Update="Consoles/Sony/PSX/Octoshock.cs" SubType="Code" />
+		<Compile Update="Consoles/Sony/PSX/Octoshock.*.cs" DependentUpon="Octoshock.cs" />
+		<Compile Update="Consoles/WonderSwan/WonderSwan.*.cs" DependentUpon="WonderSwan.cs" />
+	</ItemGroup>
+</Project>
diff --git a/src/BizHawk.Emulation.Cores/Computers/MSX/LibMSX.cs b/src/BizHawk.Emulation.UnmanagedCores/Computers/MSX/LibMSX.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/MSX/LibMSX.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Computers/MSX/LibMSX.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.IEmulator.cs b/src/BizHawk.Emulation.UnmanagedCores/Computers/MSX/MSX.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/MSX/MSX.IEmulator.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Computers/MSX/MSX.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.IInputPollable.cs b/src/BizHawk.Emulation.UnmanagedCores/Computers/MSX/MSX.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/MSX/MSX.IInputPollable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Computers/MSX/MSX.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.IMemoryDomains.cs b/src/BizHawk.Emulation.UnmanagedCores/Computers/MSX/MSX.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/MSX/MSX.IMemoryDomains.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Computers/MSX/MSX.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.ISaveRam.cs b/src/BizHawk.Emulation.UnmanagedCores/Computers/MSX/MSX.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/MSX/MSX.ISaveRam.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Computers/MSX/MSX.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.ISettable.cs b/src/BizHawk.Emulation.UnmanagedCores/Computers/MSX/MSX.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/MSX/MSX.ISettable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Computers/MSX/MSX.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.IStatable.cs b/src/BizHawk.Emulation.UnmanagedCores/Computers/MSX/MSX.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/MSX/MSX.IStatable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Computers/MSX/MSX.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.Input.cs b/src/BizHawk.Emulation.UnmanagedCores/Computers/MSX/MSX.Input.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/MSX/MSX.Input.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Computers/MSX/MSX.Input.cs
diff --git a/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.cs b/src/BizHawk.Emulation.UnmanagedCores/Computers/MSX/MSX.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Computers/MSX/MSX.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Computers/MSX/MSX.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/LibLynx.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Atari/lynx/LibLynx.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/LibLynx.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Atari/lynx/LibLynx.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.IInputPollable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Atari/lynx/Lynx.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.IInputPollable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Atari/lynx/Lynx.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.IMemoryDomains.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Atari/lynx/Lynx.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.IMemoryDomains.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Atari/lynx/Lynx.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.ISaveRam.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Atari/lynx/Lynx.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.ISaveRam.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Atari/lynx/Lynx.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.ISoundProvider.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Atari/lynx/Lynx.ISoundProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.ISoundProvider.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Atari/lynx/Lynx.ISoundProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.IStatable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Atari/lynx/Lynx.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.IStatable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Atari/lynx/Lynx.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.IVideoProvider.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Atari/lynx/Lynx.IVideoProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.IVideoProvider.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Atari/lynx/Lynx.IVideoProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Atari/lynx/Lynx.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Atari/lynx/Lynx.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/ArmV4Disassembler.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/ArmV4Disassembler.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/ArmV4Disassembler.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/ArmV4Disassembler.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/IGBAGPUViewable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/IGBAGPUViewable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/IGBAGPUViewable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/IGBAGPUViewable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/LibmGBA.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/LibmGBA.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.IDebuggable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAHawk.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.IDebuggable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAHawk.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.IInputPollable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAHawk.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.IInputPollable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAHawk.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.IMemoryDomains.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAHawk.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.IMemoryDomains.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAHawk.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.ISaveRam.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAHawk.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.ISaveRam.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAHawk.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.ISettable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAHawk.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.ISettable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAHawk.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.ISoundProvider.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAHawk.ISoundProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.ISoundProvider.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAHawk.ISoundProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.IStatable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAHawk.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.IStatable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAHawk.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.IVideoProvider.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAHawk.IVideoProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.IVideoProvider.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAHawk.IVideoProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAHawk.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAHawk.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAMemoryCallbackSystem.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAMemoryCallbackSystem.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAMemoryCallbackSystem.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/GBA/MGBAMemoryCallbackSystem.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GBColors.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GBColors.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GBColors.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GBColors.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GBDisassembler.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GBDisassembler.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GBDisassembler.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GBDisassembler.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ICodeDataLog.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.ICodeDataLog.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ICodeDataLog.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.ICodeDataLog.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.IDebuggable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.IDebuggable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.IEmulator.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.IEmulator.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ILinkable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.ILinkable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ILinkable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.ILinkable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.IMemoryDomains.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.IMemoryDomains.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISaveRam.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISaveRam.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISoundProvider.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.ISoundProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISoundProvider.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.ISoundProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.IStatable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.IStatable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ITraceable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.ITraceable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ITraceable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.ITraceable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.IVideoProvider.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.IVideoProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.IVideoProvider.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.IVideoProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/Gambatte.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.ICodeDataLog.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.ICodeDataLog.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.ICodeDataLog.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.ICodeDataLog.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IDebuggable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IDebuggable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IEmulator.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IEmulator.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IInputPollable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IInputPollable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IMemoryDomains.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IMemoryDomains.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.ISaveRam.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.ISaveRam.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.ISettable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.ISettable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.ISoundProvider.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.ISoundProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.ISoundProvider.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.ISoundProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IStatable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IStatable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IVideoProvider.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.IVideoProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IVideoProvider.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.IVideoProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambatteLink.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambattePrinter.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambattePrinter.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambattePrinter.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/GambattePrinter.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibGambatte.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/LibGambatte.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibGambatte.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/Gameboy/LibGambatte.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDisassemblable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64.IDisassemblable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDisassemblable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64.IDisassemblable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IInputPollable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IInputPollable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IMemoryDomains.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IMemoryDomains.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.ISaveRam.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.ISaveRam.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.ISettable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.ISettable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IStatable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IStatable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.ITraceable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64.ITraceable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.ITraceable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64.ITraceable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Audio.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64Audio.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Audio.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64Audio.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Input.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64Input.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Input.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64Input.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Settings.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64Settings.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Settings.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64Settings.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.Controller.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64SyncSettings.Controller.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.Controller.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64SyncSettings.Controller.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.GLideN64.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64SyncSettings.GLideN64.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.GLideN64.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64SyncSettings.GLideN64.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.Glide.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64SyncSettings.Glide.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.Glide.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64SyncSettings.Glide.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.GlideMk2.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64SyncSettings.GlideMk2.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.GlideMk2.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64SyncSettings.GlideMk2.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.Rice.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64SyncSettings.Rice.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.Rice.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64SyncSettings.Rice.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64SyncSettings.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64SyncSettings.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64VideoProvider.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64VideoProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64VideoProvider.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/N64VideoProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusAudioApi.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/NativeApi/mupen64plusAudioApi.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusAudioApi.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/NativeApi/mupen64plusAudioApi.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusCoreApi.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/NativeApi/mupen64plusCoreApi.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusCoreApi.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/NativeApi/mupen64plusCoreApi.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusInputApi.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/NativeApi/mupen64plusInputApi.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusInputApi.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/NativeApi/mupen64plusInputApi.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusVideoApi.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/NativeApi/mupen64plusVideoApi.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusVideoApi.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/N64/NativeApi/mupen64plusVideoApi.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/NDS/MelonDS.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/NDS/MelonDS.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_InputPollable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/NDS/MelonDS_InputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_InputPollable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/NDS/MelonDS_InputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_MemoryDomains.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/NDS/MelonDS_MemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_MemoryDomains.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/NDS/MelonDS_MemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_SaveRam.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/NDS/MelonDS_SaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_SaveRam.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/NDS/MelonDS_SaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_Settable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/NDS/MelonDS_Settable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_Settable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/NDS/MelonDS_Settable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_SoundProvider.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/NDS/MelonDS_SoundProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_SoundProvider.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/NDS/MelonDS_SoundProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_Statable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/NDS/MelonDS_Statable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_Statable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/NDS/MelonDS_Statable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_VideoProvider.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/NDS/MelonDS_VideoProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_VideoProvider.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/NDS/MelonDS_VideoProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/LibQuickNES.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/LibQuickNES.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/LibQuickNES.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/LibQuickNES.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/Nes_NTSC_Colors.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/Nes_NTSC_Colors.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/Nes_NTSC_Colors.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/Nes_NTSC_Colors.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IDebuggable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IDebuggable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IDisassembler.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.IDisassembler.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IDisassembler.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.IDisassembler.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IInputPollable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IInputPollable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IMemoryDomains.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IMemoryDomains.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.INESPPUViewable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.INESPPUViewable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.INESPPUViewable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.INESPPUViewable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ISaveRam.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ISaveRam.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ISettable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ISettable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ISoundProvider.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.ISoundProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ISoundProvider.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.ISoundProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IStatable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IStatable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ITraceable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.ITraceable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ITraceable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.ITraceable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IVideoProvider.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.IVideoProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IVideoProvider.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.IVideoProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Nintendo/QuickNES/QuickNES.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.IDebuggable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Sony/PSX/Octoshock.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.IDebuggable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Sony/PSX/Octoshock.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.IDisassemblable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Sony/PSX/Octoshock.IDisassemblable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.IDisassemblable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Sony/PSX/Octoshock.IDisassemblable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.ITraceable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Sony/PSX/Octoshock.ITraceable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.ITraceable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Sony/PSX/Octoshock.ITraceable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Sony/PSX/Octoshock.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Sony/PSX/Octoshock.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/OctoshockDll.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Sony/PSX/OctoshockDll.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/OctoshockDll.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Sony/PSX/OctoshockDll.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/OctoshockFIOConfig.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Sony/PSX/OctoshockFIOConfig.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/OctoshockFIOConfig.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Sony/PSX/OctoshockFIOConfig.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/PSF.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/Sony/PSX/PSF.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/PSF.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/Sony/PSX/PSF.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/WonderSwan/BizSwan.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/WonderSwan/BizSwan.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.Controller.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/WonderSwan/WonderSwan.Controller.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.Controller.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/WonderSwan/WonderSwan.Controller.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.IMemoryDomains.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/WonderSwan/WonderSwan.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.IMemoryDomains.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/WonderSwan/WonderSwan.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.ISaveRam.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/WonderSwan/WonderSwan.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.ISaveRam.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/WonderSwan/WonderSwan.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.ISettable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/WonderSwan/WonderSwan.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.ISettable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/WonderSwan/WonderSwan.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.ISoundProvider.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/WonderSwan/WonderSwan.ISoundProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.ISoundProvider.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/WonderSwan/WonderSwan.ISoundProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.IStatable.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/WonderSwan/WonderSwan.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.IStatable.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/WonderSwan/WonderSwan.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs b/src/BizHawk.Emulation.UnmanagedCores/Consoles/WonderSwan/WonderSwan.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Consoles/WonderSwan/WonderSwan.cs
diff --git a/src/BizHawk.Emulation.Cores/Libretro/LibretroApi.cs b/src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroApi.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Libretro/LibretroApi.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroApi.cs
diff --git a/src/BizHawk.Emulation.Cores/Libretro/LibretroApi_BRK.cs b/src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroApi_BRK.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Libretro/LibretroApi_BRK.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroApi_BRK.cs
diff --git a/src/BizHawk.Emulation.Cores/Libretro/LibretroApi_CMD.cs b/src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroApi_CMD.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Libretro/LibretroApi_CMD.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroApi_CMD.cs
diff --git a/src/BizHawk.Emulation.Cores/Libretro/LibretroApi_Enums.cs b/src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroApi_Enums.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Libretro/LibretroApi_Enums.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroApi_Enums.cs
diff --git a/src/BizHawk.Emulation.Cores/Libretro/LibretroApi_QUERY.cs b/src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroApi_QUERY.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Libretro/LibretroApi_QUERY.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroApi_QUERY.cs
diff --git a/src/BizHawk.Emulation.Cores/Libretro/LibretroApi_SIG.cs b/src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroApi_SIG.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Libretro/LibretroApi_SIG.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroApi_SIG.cs
diff --git a/src/BizHawk.Emulation.Cores/Libretro/LibretroApi_Structs.cs b/src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroApi_Structs.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Libretro/LibretroApi_Structs.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroApi_Structs.cs
diff --git a/src/BizHawk.Emulation.Cores/Libretro/LibretroCore.cs b/src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroCore.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Libretro/LibretroCore.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroCore.cs
diff --git a/src/BizHawk.Emulation.Cores/Libretro/LibretroCoreSettings.cs b/src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroCoreSettings.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Libretro/LibretroCoreSettings.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroCoreSettings.cs
diff --git a/src/BizHawk.Emulation.Cores/Libretro/LibretroCore_Description.cs b/src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroCore_Description.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Libretro/LibretroCore_Description.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroCore_Description.cs
diff --git a/src/BizHawk.Emulation.Cores/Libretro/LibretroCore_InputCallbacks.cs b/src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroCore_InputCallbacks.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Libretro/LibretroCore_InputCallbacks.cs
rename to src/BizHawk.Emulation.UnmanagedCores/Libretro/LibretroCore_InputCallbacks.cs
diff --git a/src/BizHawk.Emulation.WboxCores/BizHawk.Emulation.WboxCores.csproj b/src/BizHawk.Emulation.WboxCores/BizHawk.Emulation.WboxCores.csproj
new file mode 100644
index 0000000000..8fc3b949f4
--- /dev/null
+++ b/src/BizHawk.Emulation.WboxCores/BizHawk.Emulation.WboxCores.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<Import Project="../MainSlnCommon.props" />
+	<PropertyGroup>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<TargetFramework>netstandard2.0</TargetFramework>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="ELFSharp" Version="2.10.0" />
+		<Reference Include="FlatBuffers.Core" HintPath="$(ProjectDir)../../References/FlatBuffers.Core.dll" Private="true" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.BizInvoke/BizHawk.BizInvoke.csproj" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.CoresBase/BizHawk.Emulation.CoresBase.csproj" />
+		<Compile Include="$(ProjectDir)../BizHawk.Version/svnrev.cs" />
+		<Compile Include="$(ProjectDir)../BizHawk.Version/VersionInfo.cs" />
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Update="Consoles/Nintendo/SNES/LibsnesCore.*.cs" DependentUpon="LibsnesCore.cs" />
+		<Compile Update="Consoles/Sega/gpgx64/GPGX.*.cs" DependentUpon="GPGX.cs" />
+	</ItemGroup>
+</Project>
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Belogic/LibUzem.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Belogic/LibUzem.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Belogic/LibUzem.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Belogic/LibUzem.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Belogic/Uzem.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Belogic/Uzem.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Belogic/Uzem.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Belogic/Uzem.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs b/src/BizHawk.Emulation.WboxCores/Consoles/NEC/PCE/HyperNyma.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/NEC/PCE/HyperNyma.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs b/src/BizHawk.Emulation.WboxCores/Consoles/NEC/PCE/TurboNyma.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/NEC/PCE/TurboNyma.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs b/src/BizHawk.Emulation.WboxCores/Consoles/NEC/PCFX/Tst.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/NEC/PCFX/Tst.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Faust/Faust.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/Faust/Faust.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Faust/Faust.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/Faust/Faust.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibSameboy.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/Gameboy/LibSameboy.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibSameboy.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/Gameboy/LibSameboy.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Sameboy.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/Gameboy/Sameboy.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Sameboy.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/Gameboy/Sameboy.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesApi.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesApi.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi_BRK.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesApi_BRK.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi_BRK.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesApi_BRK.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi_CMD.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesApi_CMD.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi_CMD.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesApi_CMD.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi_Enums.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesApi_Enums.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi_Enums.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesApi_Enums.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi_QUERY.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesApi_QUERY.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi_QUERY.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesApi_QUERY.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi_SIG.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesApi_SIG.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi_SIG.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesApi_SIG.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesControllerDeck.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesControllerDeck.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesControllerDeck.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesControllerDeck.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.ICodeDataLogger.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.ICodeDataLogger.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.ICodeDataLogger.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.ICodeDataLogger.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IDebuggable.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IDebuggable.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IEmulator.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IEmulator.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IInputPollable.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IInputPollable.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IMemoryDomains.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IMemoryDomains.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IRegionable.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.IRegionable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IRegionable.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.IRegionable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.ISaveRam.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.ISaveRam.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.ISettable.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.ISettable.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IStatable.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IStatable.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IVideoProvider.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.IVideoProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.IVideoProvider.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.IVideoProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/LibsnesCore.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/SNESGraphicsDecoder.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/SNESGraphicsDecoder.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/SNESGraphicsDecoder.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/SNESGraphicsDecoder.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/ScanlineHookManager.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/ScanlineHookManager.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/ScanlineHookManager.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/ScanlineHookManager.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/SnesColors.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/SnesColors.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/SnesColors.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES/SnesColors.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/LibSnes9x.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES9X/LibSnes9x.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/LibSnes9x.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES9X/LibSnes9x.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/Snes9x.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES9X/Snes9x.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/Snes9x.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/SNES9X/Snes9x.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/LibVirtualBoyee.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/VB/LibVirtualBoyee.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/LibVirtualBoyee.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/VB/LibVirtualBoyee.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/VirtualBoyee.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/VB/VirtualBoyee.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/VirtualBoyee.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Nintendo/VB/VirtualBoyee.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/SNK/LibNeoGeoPort.cs b/src/BizHawk.Emulation.WboxCores/Consoles/SNK/LibNeoGeoPort.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/SNK/LibNeoGeoPort.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/SNK/LibNeoGeoPort.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/SNK/NeoGeoPort.cs b/src/BizHawk.Emulation.WboxCores/Consoles/SNK/NeoGeoPort.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/SNK/NeoGeoPort.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/SNK/NeoGeoPort.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/LibPicoDrive.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/PicoDrive/LibPicoDrive.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/LibPicoDrive.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/PicoDrive/LibPicoDrive.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/PicoDrive.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/PicoDrive/PicoDrive.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/PicoDrive.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/PicoDrive/PicoDrive.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/Saturn/Saturnus.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/Saturn/Saturnus.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.ICodeDataLogger.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.ICodeDataLogger.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.ICodeDataLogger.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.ICodeDataLogger.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDebuggable.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.IDebuggable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDebuggable.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.IDebuggable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDisassembler.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.IDisassembler.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDisassembler.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.IDisassembler.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDriveLight.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.IDriveLight.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDriveLight.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.IDriveLight.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IEmulator.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.IEmulator.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IEmulator.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.IEmulator.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IInputPollable.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.IInputPollable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IInputPollable.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.IInputPollable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IMemoryDomains.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.IMemoryDomains.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IMemoryDomains.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.IMemoryDomains.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.ISaveRam.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.ISaveRam.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.ISaveRam.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.ISaveRam.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.ISettable.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.ISettable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.ISettable.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.ISettable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.ISoundProvider.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.ISoundProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.ISoundProvider.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.ISoundProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IStatable.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.IStatable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IStatable.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.IStatable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.ITraceable.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.ITraceable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.ITraceable.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.ITraceable.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IVideoProvider.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.IVideoProvider.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IVideoProvider.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.IVideoProvider.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGX.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGXControlConverter.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGXControlConverter.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGXControlConverter.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GPGXControlConverter.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GenDbgHlp.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GenDbgHlp.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GenDbgHlp.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/GenDbgHlp.cs
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/LibGPGX.cs b/src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/LibGPGX.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/LibGPGX.cs
rename to src/BizHawk.Emulation.WboxCores/Consoles/Sega/gpgx64/LibGPGX.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/ElfLoader.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/ElfLoader.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/ElfLoader.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/ElfLoader.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/EmuLibc.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/EmuLibc.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/EmuLibc.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/EmuLibc.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/Heap.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/Heap.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/Heap.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/Heap.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/LibNymaCore.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/LibNymaCore.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/LibNymaCore.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/LibNymaCore.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/LibWaterboxCore.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/LibWaterboxCore.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/LibWaterboxCore.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/LibWaterboxCore.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/MapHeap.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/MapHeap.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/MapHeap.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/MapHeap.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Cd.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaCore.Cd.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Cd.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaCore.Cd.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.ButtonNameOverrides.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaCore.Controller.ButtonNameOverrides.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.ButtonNameOverrides.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaCore.Controller.ButtonNameOverrides.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaCore.Controller.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Controller.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaCore.Controller.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Settings.ComponentModel.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaCore.Settings.ComponentModel.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Settings.ComponentModel.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaCore.Settings.ComponentModel.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Settings.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaCore.Settings.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaCore.Settings.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaCore.Settings.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaCore.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaCore.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/AxisFlags.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/AxisFlags.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/AxisFlags.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/AxisFlags.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/DeviceFlags.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/DeviceFlags.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/DeviceFlags.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/DeviceFlags.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/EnumValue.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/EnumValue.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/EnumValue.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/EnumValue.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/InputType.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/InputType.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/InputType.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/InputType.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NAxisInfo.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NAxisInfo.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NAxisInfo.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NAxisInfo.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NButtonInfo.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NButtonInfo.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NButtonInfo.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NButtonInfo.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NDeviceInfo.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NDeviceInfo.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NDeviceInfo.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NDeviceInfo.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NInputExtra.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NInputExtra.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NInputExtra.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NInputExtra.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NInputInfo.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NInputInfo.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NInputInfo.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NInputInfo.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NPortInfo.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NPortInfo.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NPortInfo.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NPortInfo.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NPorts.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NPorts.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NPorts.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NPorts.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NStatusInfo.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NStatusInfo.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NStatusInfo.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NStatusInfo.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NStatusState.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NStatusState.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NStatusState.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NStatusState.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NSwitchInfo.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NSwitchInfo.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NSwitchInfo.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NSwitchInfo.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NSwitchPosition.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NSwitchPosition.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/NSwitchPosition.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/NSwitchPosition.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/Setting.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/Setting.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/Setting.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/Setting.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/SettingType.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/SettingType.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/SettingType.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/SettingType.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/Settings.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/Settings.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/Settings.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/Settings.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/SettingsFlags.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/SettingsFlags.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/NymaTypes/SettingsFlags.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/NymaTypes/SettingsFlags.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/Swappable.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/Swappable.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/Swappable.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/Swappable.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/Syscalls/Errno.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/Syscalls/Errno.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/Syscalls/Errno.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/Syscalls/Errno.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/Syscalls/MMan.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/Syscalls/MMan.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/Syscalls/MMan.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/Syscalls/MMan.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/Syscalls/NotImplementedSyscalls.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/Syscalls/NotImplementedSyscalls.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/Syscalls/NotImplementedSyscalls.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/Syscalls/NotImplementedSyscalls.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/Syscalls/Stat.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/Syscalls/Stat.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/Syscalls/Stat.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/Syscalls/Stat.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/Syscalls/Syscalls.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/Syscalls/Syscalls.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/Syscalls/Syscalls.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/Syscalls/Syscalls.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/WaterboxCore.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/WaterboxCore.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/WaterboxCore.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/WaterboxCore.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/WaterboxHost.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/WaterboxHost.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/WaterboxHost.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/WaterboxHost.cs
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/WaterboxMemoryDomain.cs b/src/BizHawk.Emulation.WboxCores/Waterbox/WaterboxMemoryDomain.cs
similarity index 100%
rename from src/BizHawk.Emulation.Cores/Waterbox/WaterboxMemoryDomain.cs
rename to src/BizHawk.Emulation.WboxCores/Waterbox/WaterboxMemoryDomain.cs