diff --git a/BizHawk.Client.ApiHawk/Classes/ClientApi.cs b/BizHawk.Client.ApiHawk/Classes/ClientApi.cs
index 55502afda2..b96fe6b855 100644
--- a/BizHawk.Client.ApiHawk/Classes/ClientApi.cs
+++ b/BizHawk.Client.ApiHawk/Classes/ClientApi.cs
@@ -9,7 +9,6 @@ using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Cores.Nintendo.Gameboy;
 using BizHawk.Emulation.Cores.PCEngine;
 using BizHawk.Emulation.Cores.Sega.MasterSystem;
-using BizHawk.Client.ApiHawk.Classes.Events;
 using System.IO;
 using BizHawk.Emulation.Common.IEmulatorExtensions;
 using BizHawk.Common;
diff --git a/BizHawk.Client.ApiHawk/Classes/EventTypes.cs b/BizHawk.Client.ApiHawk/Classes/EventTypes.cs
new file mode 100644
index 0000000000..f58af53e9b
--- /dev/null
+++ b/BizHawk.Client.ApiHawk/Classes/EventTypes.cs
@@ -0,0 +1,127 @@
+using System;
+
+namespace BizHawk.Client.ApiHawk
+{
+	/// <summary>
+	/// This class holds event data for BeforeQuickLoad event
+	/// </summary>
+	public sealed class BeforeQuickLoadEventArgs : EventArgs
+	{
+		internal BeforeQuickLoadEventArgs(string name)
+		{
+			Name = name;
+		}
+
+		/// <summary>
+		/// Gets or sets value that defined if saved has been handled or not
+		/// </summary>
+		public bool Handled { get; set; }
+
+
+		/// <summary>
+		/// Gets quicksave name
+		/// </summary>
+		public string Name { get; }
+
+
+		/// <summary>
+		/// Gets slot used for quicksave
+		/// </summary>
+		public int Slot => int.Parse(Name.Substring(Name.Length - 1));
+	}
+
+	/// <summary>
+	/// This class holds event data for BeforeQuickSave event
+	/// </summary>
+	public sealed class BeforeQuickSaveEventArgs : EventArgs
+	{
+		internal BeforeQuickSaveEventArgs(string name)
+		{
+			Name = name;
+		}
+
+		/// <summary>
+		/// Gets or sets value that defined if saved has been handled or not
+		/// </summary>
+		public bool Handled { get; set; }
+
+		/// <summary>
+		/// Gets quicksave name
+		/// </summary>
+		public string Name { get; }
+
+
+		/// <summary>
+		/// Gets slot used for quicksave
+		/// </summary>
+		public int Slot => int.Parse(Name.Substring(Name.Length - 1));
+	}
+
+	/// <summary>
+	/// This class holds event data for StateLoaded event
+	/// </summary>
+	public sealed class StateLoadedEventArgs: EventArgs
+	{
+		/// <summary>
+		/// Initialize a new instance of <see cref="StateLoadedEventArgs"/>
+		/// </summary>
+		/// <param name="stateName">User friendly name of loaded state</param>
+		internal StateLoadedEventArgs(string stateName)
+		{
+			Name = stateName;
+		}
+
+		/// <summary>
+		/// Gets user friendly name of the loaded savestate
+		/// </summary>
+		public string Name { get; }
+	}
+
+	/// <summary>
+	/// This class holds event data for StateSaved event
+	/// </summary>
+	public sealed class StateSavedEventArgs : EventArgs
+	{
+		/// <summary>
+		/// Initialize a new instance of <see cref="StateSavedEventArgs"/>
+		/// </summary>
+		/// <param name="stateName">User friendly name of loaded state</param>
+		internal StateSavedEventArgs(string stateName)
+		{
+			Name = stateName;
+		}
+
+		/// <summary>
+		/// Gets user friendly name of the loaded savestate
+		/// </summary>
+		public string Name { get; }
+	}
+
+	/// <summary>
+	/// Represent a method that will handle the event raised before a quickload is done
+	/// </summary>
+	/// <param name="sender">Object that raised the event</param>
+	/// <param name="e">Event arguments</param>
+	public delegate void BeforeQuickLoadEventHandler(object sender, BeforeQuickLoadEventArgs e);
+
+	/// <summary>
+	/// Represent a method that will handle the event raised before a quicksave is done
+	/// </summary>
+	/// <param name="sender">Object that raised the event</param>
+	/// <param name="e">Event arguments</param>
+	public delegate void BeforeQuickSaveEventHandler(object sender, BeforeQuickSaveEventArgs e);
+
+	/// <summary>
+	/// Represent a method that will handle the event raised when a savestate is loaded
+	/// </summary>
+	/// <param name="sender">Object that raised the event</param>
+	/// <param name="e">Event arguments</param>
+	public delegate void StateLoadedEventHandler(object sender, StateLoadedEventArgs e);
+
+	/// <summary>
+	/// Represent a method that will handle the event raised when a savestate is saved
+	/// </summary>
+	/// <param name="sender">Object that raised the event</param>
+	/// <param name="e">Event arguments</param>
+	public delegate void StateSavedEventHandler(object sender, StateSavedEventArgs e);
+}
diff --git a/BizHawk.Client.ApiHawk/Classes/Events/EventArgs/BeforeQuickLoadEventArgs.cs b/BizHawk.Client.ApiHawk/Classes/Events/EventArgs/BeforeQuickLoadEventArgs.cs
deleted file mode 100644
index 9eb331e570..0000000000
--- a/BizHawk.Client.ApiHawk/Classes/Events/EventArgs/BeforeQuickLoadEventArgs.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-
-namespace BizHawk.Client.ApiHawk.Classes.Events
-{
-	/// <summary>
-	/// This class holds event data for BeforeQuickLoad event
-	/// </summary>
-	public sealed class BeforeQuickLoadEventArgs : EventArgs
-	{
-		internal BeforeQuickLoadEventArgs(string name)
-		{
-			Name = name;
-		}
-
-		/// <summary>
-		/// Gets or sets value that defined if saved has been handled or not
-		/// </summary>
-		public bool Handled { get; set; }
-		
-
-		/// <summary>
-		/// Gets quicksave name
-		/// </summary>
-		public string Name { get; }
-
-
-		/// <summary>
-		/// Gets slot used for quicksave
-		/// </summary>
-		public int Slot => int.Parse(Name.Substring(Name.Length - 1));
-	}
-}
diff --git a/BizHawk.Client.ApiHawk/Classes/Events/EventArgs/BeforeQuickSaveEventArgs.cs b/BizHawk.Client.ApiHawk/Classes/Events/EventArgs/BeforeQuickSaveEventArgs.cs
deleted file mode 100644
index b2a9299e69..0000000000
--- a/BizHawk.Client.ApiHawk/Classes/Events/EventArgs/BeforeQuickSaveEventArgs.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-
-namespace BizHawk.Client.ApiHawk.Classes.Events
-{
-	/// <summary>
-	/// This class holds event data for BeforeQuickSave event
-	/// </summary>
-	public sealed class BeforeQuickSaveEventArgs : EventArgs
-	{
-		internal BeforeQuickSaveEventArgs(string name)
-		{
-			Name = name;
-		}
-
-		/// <summary>
-		/// Gets or sets value that defined if saved has been handled or not
-		/// </summary>
-		public bool Handled { get; set; }
-
-		/// <summary>
-		/// Gets quicksave name
-		/// </summary>
-		public string Name { get; }
-
-
-		/// <summary>
-		/// Gets slot used for quicksave
-		/// </summary>
-		public int Slot => int.Parse(Name.Substring(Name.Length - 1));
-	}
-}
diff --git a/BizHawk.Client.ApiHawk/Classes/Events/EventArgs/StateLoadedEventArgs.cs b/BizHawk.Client.ApiHawk/Classes/Events/EventArgs/StateLoadedEventArgs.cs
deleted file mode 100644
index b3a1afdf2f..0000000000
--- a/BizHawk.Client.ApiHawk/Classes/Events/EventArgs/StateLoadedEventArgs.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-
-namespace BizHawk.Client.ApiHawk.Classes.Events
-{
-	/// <summary>
-	/// This class holds event data for StateLoaded event
-	/// </summary>
-	public sealed class StateLoadedEventArgs: EventArgs
-	{
-		/// <summary>
-		/// Initialize a new instance of <see cref="StateLoadedEventArgs"/>
-		/// </summary>
-		/// <param name="stateName">User friendly name of loaded state</param>
-		internal StateLoadedEventArgs(string stateName)
-		{
-			Name = stateName;
-		}
-
-		/// <summary>
-		/// Gets user friendly name of the loaded savestate
-		/// </summary>
-		public string Name { get; }
-	}
-}
diff --git a/BizHawk.Client.ApiHawk/Classes/Events/EventArgs/StateSavedEventArgs.cs b/BizHawk.Client.ApiHawk/Classes/Events/EventArgs/StateSavedEventArgs.cs
deleted file mode 100644
index 9cd197e8ab..0000000000
--- a/BizHawk.Client.ApiHawk/Classes/Events/EventArgs/StateSavedEventArgs.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-
-namespace BizHawk.Client.ApiHawk.Classes.Events
-{
-	/// <summary>
-	/// This class holds event data for StateSaved event
-	/// </summary>
-	public sealed class StateSavedEventArgs : EventArgs
-	{
-		/// <summary>
-		/// Initialize a new instance of <see cref="StateSavedEventArgs"/>
-		/// </summary>
-		/// <param name="stateName">User friendly name of loaded state</param>
-		internal StateSavedEventArgs(string stateName)
-		{
-			Name = stateName;
-		}
-
-		/// <summary>
-		/// Gets user friendly name of the loaded savestate
-		/// </summary>
-		public string Name { get; }
-	}
-}
diff --git a/BizHawk.Client.ApiHawk/Classes/Events/EventHandlers/BeforeQuickLoadEventhandler.cs b/BizHawk.Client.ApiHawk/Classes/Events/EventHandlers/BeforeQuickLoadEventhandler.cs
deleted file mode 100644
index 86c19b7bef..0000000000
--- a/BizHawk.Client.ApiHawk/Classes/Events/EventHandlers/BeforeQuickLoadEventhandler.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace BizHawk.Client.ApiHawk.Classes.Events
-{
-	/// <summary>
-	/// Represent a method that will handle the event raised before a quickload is done
-	/// </summary>
-	/// <param name="sender">Object that raised the event</param>
-	/// <param name="e">Event arguments</param>
-	public delegate void BeforeQuickLoadEventHandler(object sender, BeforeQuickLoadEventArgs e);
-}
diff --git a/BizHawk.Client.ApiHawk/Classes/Events/EventHandlers/BeforeQuickSaveEventhandler.cs b/BizHawk.Client.ApiHawk/Classes/Events/EventHandlers/BeforeQuickSaveEventhandler.cs
deleted file mode 100644
index fdb5ba6fab..0000000000
--- a/BizHawk.Client.ApiHawk/Classes/Events/EventHandlers/BeforeQuickSaveEventhandler.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace BizHawk.Client.ApiHawk.Classes.Events
-{
-	/// <summary>
-	/// Represent a method that will handle the event raised before a quicksave is done
-	/// </summary>
-	/// <param name="sender">Object that raised the event</param>
-	/// <param name="e">Event arguments</param>
-	public delegate void BeforeQuickSaveEventHandler(object sender, BeforeQuickSaveEventArgs e);
-}
diff --git a/BizHawk.Client.ApiHawk/Classes/Events/EventHandlers/StateLoadedEventHandler.cs b/BizHawk.Client.ApiHawk/Classes/Events/EventHandlers/StateLoadedEventHandler.cs
deleted file mode 100644
index e5debf85d6..0000000000
--- a/BizHawk.Client.ApiHawk/Classes/Events/EventHandlers/StateLoadedEventHandler.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace BizHawk.Client.ApiHawk.Classes.Events
-{
-	/// <summary>
-	/// Represent a method that will handle the event raised when a savestate is loaded
-	/// </summary>
-	/// <param name="sender">Object that raised the event</param>
-	/// <param name="e">Event arguments</param>
-	public delegate void StateLoadedEventHandler(object sender, StateLoadedEventArgs e);
-}
diff --git a/BizHawk.Client.ApiHawk/Classes/Events/EventHandlers/StateSavedEventHandler.cs b/BizHawk.Client.ApiHawk/Classes/Events/EventHandlers/StateSavedEventHandler.cs
deleted file mode 100644
index ae8a026171..0000000000
--- a/BizHawk.Client.ApiHawk/Classes/Events/EventHandlers/StateSavedEventHandler.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace BizHawk.Client.ApiHawk.Classes.Events
-{
-	/// <summary>
-	/// Represent a method that will handle the event raised when a savestate is saved
-	/// </summary>
-	/// <param name="sender">Object that raised the event</param>
-	/// <param name="e">Event arguments</param>
-	public delegate void StateSavedEventHandler(object sender, StateSavedEventArgs e);
-}