diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs
index 513fb44125..48595764c8 100644
--- a/BizHawk.Client.Common/RomLoader.cs
+++ b/BizHawk.Client.Common/RomLoader.cs
@@ -3,6 +3,7 @@ using System.IO;
 
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
+using BizHawk.Emulation.Cores;
 using BizHawk.Emulation.Cores.Atari.Atari2600;
 using BizHawk.Emulation.Cores.Atari.Atari7800;
 using BizHawk.Emulation.Cores.Calculators;
@@ -417,7 +418,6 @@ namespace BizHawk.Client.Common
 								break;
 							case "C64":
 								var c64 = new C64(nextComm, game, rom.RomData, rom.Extension);
-								c64.HardReset(); // TODO: The core should be responsible for this!
 								nextEmulator = c64;
 								break;
 							case "GBA":
diff --git a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
index 98efb454a1..22bdb5a470 100644
--- a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
+++ b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
@@ -95,8 +95,6 @@
     <Compile Include="Interfaces\ISoundProvider.cs" />
     <Compile Include="Interfaces\ISyncSoundProvider.cs" />
     <Compile Include="Interfaces\IVideoProvider.cs" />
-    <Compile Include="LibRetro.cs" />
-    <Compile Include="LibRetroEmulator.cs" />
     <Compile Include="MemoryDomain.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\svnrev.cs" />
diff --git a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
index 0e2aa8931f..7734af1173 100644
--- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
@@ -436,6 +436,8 @@
     <Compile Include="Consoles\Sony\PSP\PSP.cs" />
     <Compile Include="Consoles\Sony\PSX\LibMednahawkDll.cs" />
     <Compile Include="Consoles\Sony\PSX\Octoshock.cs" />
+    <Compile Include="LibRetro.cs" />
+    <Compile Include="LibRetroEmulator.cs" />
     <Compile Include="Properties\svnrev.cs" />
     <Compile Include="Consoles\PC Engine\Input.cs" />
     <Compile Include="Consoles\PC Engine\MemoryMap.cs" />
diff --git a/BizHawk.Emulation.Common/LibRetro.cs b/BizHawk.Emulation.Cores/LibRetro.cs
similarity index 95%
rename from BizHawk.Emulation.Common/LibRetro.cs
rename to BizHawk.Emulation.Cores/LibRetro.cs
index fcd83d5c61..1d0444788c 100644
--- a/BizHawk.Emulation.Common/LibRetro.cs
+++ b/BizHawk.Emulation.Cores/LibRetro.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Runtime.InteropServices;
 using System.Reflection;
 
-namespace BizHawk.Emulation.Common
+namespace BizHawk.Emulation.Cores
 {
 	/// <summary>
 	/// libretro related shims
diff --git a/BizHawk.Emulation.Common/LibRetroEmulator.cs b/BizHawk.Emulation.Cores/LibRetroEmulator.cs
similarity index 95%
rename from BizHawk.Emulation.Common/LibRetroEmulator.cs
rename to BizHawk.Emulation.Cores/LibRetroEmulator.cs
index f98d26b792..02d6287634 100644
--- a/BizHawk.Emulation.Common/LibRetroEmulator.cs
+++ b/BizHawk.Emulation.Cores/LibRetroEmulator.cs
@@ -4,7 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Runtime.InteropServices;
 
-namespace BizHawk.Emulation.Common
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Emulation.Cores
 {
 	public unsafe class LibRetroEmulator : IEmulator, IVideoProvider
 	{