diff --git a/src/BizHawk.Client.EmuHawk/Api/Libraries/CommApi.cs b/src/BizHawk.Client.Common/Api/Classes/CommApi.cs
similarity index 92%
rename from src/BizHawk.Client.EmuHawk/Api/Libraries/CommApi.cs
rename to src/BizHawk.Client.Common/Api/Classes/CommApi.cs
index 22cc6d3caf..aa9031b216 100644
--- a/src/BizHawk.Client.EmuHawk/Api/Libraries/CommApi.cs
+++ b/src/BizHawk.Client.Common/Api/Classes/CommApi.cs
@@ -2,9 +2,7 @@
 
 using System;
 
-using BizHawk.Client.Common;
-
-namespace BizHawk.Client.EmuHawk
+namespace BizHawk.Client.Common
 {
 	public sealed class CommApi : ICommApi
 	{
diff --git a/src/BizHawk.Client.EmuHawk/Api/Libraries/SaveStateApi.cs b/src/BizHawk.Client.Common/Api/Classes/SaveStateApi.cs
similarity index 94%
rename from src/BizHawk.Client.EmuHawk/Api/Libraries/SaveStateApi.cs
rename to src/BizHawk.Client.Common/Api/Classes/SaveStateApi.cs
index 8e1c94855a..a34c1076e0 100644
--- a/src/BizHawk.Client.EmuHawk/Api/Libraries/SaveStateApi.cs
+++ b/src/BizHawk.Client.Common/Api/Classes/SaveStateApi.cs
@@ -1,10 +1,9 @@
 using System;
 using System.IO;
 
-using BizHawk.Client.Common;
 using BizHawk.Common;
 
-namespace BizHawk.Client.EmuHawk
+namespace BizHawk.Client.Common
 {
 	public sealed class SaveStateApi : ISaveStateApi
 	{
diff --git a/src/BizHawk.Client.Common/IEmuHawkMainFormToApi.cs b/src/BizHawk.Client.Common/IEmuHawkMainFormToApi.cs
new file mode 100644
index 0000000000..bda8c412ac
--- /dev/null
+++ b/src/BizHawk.Client.Common/IEmuHawkMainFormToApi.cs
@@ -0,0 +1,109 @@
+using System.Drawing;
+
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Client.Common
+{
+	public interface IMainFormForApi
+	{
+		/// <remarks>only referenced from <c>ClientLuaLibrary</c></remarks>
+		CheatCollection CheatList { get; }
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		Point DesktopLocation { get; }
+
+		/// <remarks>only referenced from <c>ClientLuaLibrary</c></remarks>
+		IEmulator Emulator { get; }
+
+		bool EmulatorPaused { get; }
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		bool InvisibleEmulation { set; }
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		bool IsSeeking { get; }
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		bool IsTurboing { get; }
+
+		/// <remarks>only referenced from <c>InputApi</c></remarks>
+		long MouseWheelTracker { get; }
+
+		/// <remarks>only referenced from <see cref="CommApi"/></remarks>
+		(HttpCommunication HTTP, MemoryMappedFiles MMF, SocketServer Sockets) NetworkingHelpers { get; }
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		bool PauseAvi { set; }
+
+		void AddOnScreenMessage(string message);
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		void ClearHolds();
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		void ClickSpeedItem(int num);
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		void CloseEmulator(int? exitCode = null);
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		void CloseRom(bool clearSram = false);
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		void EnableRewind(bool enabled);
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		bool FlushSaveRAM(bool autosave = false);
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		void FrameAdvance();
+
+		void FrameBufferResized();
+
+		void FrameSkipMessage();
+
+		/// <remarks>only referenced from <see cref="SaveStateApi"/></remarks>
+		void LoadQuickSave(string quickSlotName, bool suppressOSD = false);
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		bool LoadRom(string path, LoadRomArgs args);
+
+		void LoadState(string combine, string name, bool suppressOSD = false);
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		void PauseEmulator();
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		void RebootCore();
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		void Render();
+
+		/// <remarks>only referenced from <see cref="SaveStateApi"/></remarks>
+		void SaveQuickSave(string quickSlotName, bool fromLua = false, bool suppressOSD = false);
+
+		void SaveState(string path, string userFriendlyStateName, bool fromLua = false, bool suppressOSD = false);
+
+		void SeekFrameAdvance();
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		void StepRunLoop_Throttle();
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		void TakeScreenshot();
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		void TakeScreenshot(string path);
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		void TakeScreenshotToClipboard();
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		void TogglePause();
+
+		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
+		void ToggleSound();
+
+		void UnpauseEmulator();
+	}
+}
diff --git a/src/BizHawk.Client.EmuHawk/LoadRomArgs.cs b/src/BizHawk.Client.Common/LoadRomArgs.cs
similarity index 67%
rename from src/BizHawk.Client.EmuHawk/LoadRomArgs.cs
rename to src/BizHawk.Client.Common/LoadRomArgs.cs
index 88dcb968d3..72794622d7 100644
--- a/src/BizHawk.Client.EmuHawk/LoadRomArgs.cs
+++ b/src/BizHawk.Client.Common/LoadRomArgs.cs
@@ -1,6 +1,4 @@
-using BizHawk.Client.Common;
-
-namespace BizHawk.Client.EmuHawk
+namespace BizHawk.Client.Common
 {
 	public class LoadRomArgs
 	{
diff --git a/src/BizHawk.Client.EmuHawk/IEmuHawkMainFormToApi.cs b/src/BizHawk.Client.EmuHawk/IEmuHawkMainFormToApi.cs
deleted file mode 100644
index 3ae0079558..0000000000
--- a/src/BizHawk.Client.EmuHawk/IEmuHawkMainFormToApi.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using System.Drawing;
-
-using BizHawk.Client.Common;
-using BizHawk.Emulation.Common;
-
-namespace BizHawk.Client.EmuHawk
-{
-	public interface IMainFormForApi
-	{
-		/// <remarks>only referenced from <see cref="ClientLuaLibrary"/></remarks>
-		CheatCollection CheatList { get; }
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		Point DesktopLocation { get; }
-
-		/// <remarks>only referenced from <see cref="ClientLuaLibrary"/></remarks>
-		IEmulator Emulator { get; }
-
-		bool EmulatorPaused { get; }
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		bool InvisibleEmulation { set; }
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		bool IsSeeking { get; }
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		bool IsTurboing { get; }
-
-		/// <remarks>only referenced from <see cref="InputApi"/></remarks>
-		long MouseWheelTracker { get; }
-
-		/// <remarks>only referenced from <see cref="CommApi"/></remarks>
-		(HttpCommunication HTTP, MemoryMappedFiles MMF, SocketServer Sockets) NetworkingHelpers { get; }
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		bool PauseAvi { set; }
-
-		void AddOnScreenMessage(string message);
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		void ClearHolds();
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		void ClickSpeedItem(int num);
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		void CloseEmulator(int? exitCode = null);
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		void CloseRom(bool clearSram = false);
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		void EnableRewind(bool enabled);
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		bool FlushSaveRAM(bool autosave = false);
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		void FrameAdvance();
-
-		void FrameBufferResized();
-
-		void FrameSkipMessage();
-
-		/// <remarks>only referenced from <see cref="SaveStateApi"/></remarks>
-		void LoadQuickSave(string quickSlotName, bool suppressOSD = false);
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		bool LoadRom(string path, LoadRomArgs args);
-
-		void LoadState(string combine, string name, bool suppressOSD = false);
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		void PauseEmulator();
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		void RebootCore();
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		void Render();
-
-		/// <remarks>only referenced from <see cref="SaveStateApi"/></remarks>
-		void SaveQuickSave(string quickSlotName, bool fromLua = false, bool suppressOSD = false);
-
-		void SaveState(string path, string userFriendlyStateName, bool fromLua = false, bool suppressOSD = false);
-
-		void SeekFrameAdvance();
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		void StepRunLoop_Throttle();
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		void TakeScreenshot();
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		void TakeScreenshot(string path);
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		void TakeScreenshotToClipboard();
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		void TogglePause();
-
-		/// <remarks>only referenced from <see cref="EmuClientApi"/></remarks>
-		void ToggleSound();
-
-		void UnpauseEmulator();
-	}
-}