diff --git a/src/BizHawk.Client.Common/fwmanager/FirmwareEventArgs.cs b/src/BizHawk.Client.Common/fwmanager/FirmwareEventArgs.cs
new file mode 100644
index 0000000000..9b0fc9b252
--- /dev/null
+++ b/src/BizHawk.Client.Common/fwmanager/FirmwareEventArgs.cs
@@ -0,0 +1,13 @@
+namespace BizHawk.Client.Common
+{
+	public sealed class FirmwareEventArgs
+	{
+		public string FirmwareId { get; set; }
+
+		public string Hash { get; set; }
+
+		public long Size { get; set; }
+
+		public string SystemId { get; set; }
+	}
+}
diff --git a/src/BizHawk.Client.Common/FirmwareManager.cs b/src/BizHawk.Client.Common/fwmanager/FirmwareManager.cs
similarity index 87%
rename from src/BizHawk.Client.Common/FirmwareManager.cs
rename to src/BizHawk.Client.Common/fwmanager/FirmwareManager.cs
index 14860e7ba9..ab28c5e75c 100644
--- a/src/BizHawk.Client.Common/FirmwareManager.cs
+++ b/src/BizHawk.Client.Common/fwmanager/FirmwareManager.cs
@@ -11,37 +11,10 @@ namespace BizHawk.Client.Common
 {
 	public class FirmwareManager
 	{
-		// represents a file found on disk in the user's firmware directory matching a file in our database
-		public class RealFirmwareFile
-		{
-			public FileInfo FileInfo { get; set; }
-			public string Hash { get; set; }
-		}
-
 		public List<FirmwareEventArgs> RecentlyServed { get; } = new List<FirmwareEventArgs>();
 
-		public class ResolutionInfo
-		{
-			public bool UserSpecified { get; set; }
-			public bool Missing { get; set; }
-			public bool KnownMismatching { get; set; }
-			public FirmwareDatabase.FirmwareFile KnownFirmwareFile { get; set; }
-			public string FilePath { get; set; }
-			public string Hash { get; set; }
-			public long Size { get; set; }
-		}
-
 		private readonly Dictionary<FirmwareDatabase.FirmwareRecord, ResolutionInfo> _resolutionDictionary = new Dictionary<FirmwareDatabase.FirmwareRecord, ResolutionInfo>();
 
-		public class FirmwareEventArgs
-		{
-			public string Hash { get; set; }
-			public long Size { get; set; }
-			public string SystemId { get; set; }
-			public string FirmwareId { get; set; }
-		}
-
-		
 		// purpose of forbidScan: sometimes this is called from a loop in Scan(). we don't want to repeatedly DoScanAndResolve in that case, its already been done.
 		public ResolutionInfo Resolve(PathEntryCollection pathEntries, IDictionary<string, string> userSpecifications, FirmwareDatabase.FirmwareRecord record, bool forbidScan = false)
 		{
diff --git a/src/BizHawk.Client.Common/fwmanager/RealFirmwareFile.cs b/src/BizHawk.Client.Common/fwmanager/RealFirmwareFile.cs
new file mode 100644
index 0000000000..f07807f895
--- /dev/null
+++ b/src/BizHawk.Client.Common/fwmanager/RealFirmwareFile.cs
@@ -0,0 +1,12 @@
+using System.IO;
+
+namespace BizHawk.Client.Common
+{
+	/// <summary>represents a file found on disk in the user's firmware directory matching a file in our database</summary>
+	public sealed class RealFirmwareFile
+	{
+		public FileInfo FileInfo { get; set; }
+
+		public string Hash { get; set; }
+	}
+}
diff --git a/src/BizHawk.Client.Common/fwmanager/ResolutionInfo.cs b/src/BizHawk.Client.Common/fwmanager/ResolutionInfo.cs
new file mode 100644
index 0000000000..11ea74ce76
--- /dev/null
+++ b/src/BizHawk.Client.Common/fwmanager/ResolutionInfo.cs
@@ -0,0 +1,21 @@
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Client.Common
+{
+	public sealed class ResolutionInfo
+	{
+		public string FilePath { get; set; }
+
+		public string Hash { get; set; }
+
+		public FirmwareDatabase.FirmwareFile KnownFirmwareFile { get; set; }
+
+		public bool KnownMismatching { get; set; }
+
+		public bool Missing { get; set; }
+
+		public long Size { get; set; }
+
+		public bool UserSpecified { get; set; }
+	}
+}