diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs
index b96414777e..074bb41a81 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPad.cs
@@ -55,7 +55,7 @@ namespace BizHawk.Client.EmuHawk
 			{
 				switch (button.Type)
 				{
-					case PadSchema.PadInputType.Boolean:
+					case PadInputType.Boolean:
 						var buttonControl = new VirtualPadButton
 						{
 							Name = button.Name,
@@ -75,7 +75,7 @@ namespace BizHawk.Client.EmuHawk
 						}
 						PadBox.Controls.Add(buttonControl);
 						break;
-					case PadSchema.PadInputType.AnalogStick:
+					case PadInputType.AnalogStick:
 						PadBox.Controls.Add(new VirtualPadAnalogStick
 						{
 							Name = button.Name,
@@ -86,7 +86,7 @@ namespace BizHawk.Client.EmuHawk
 							RangeY = button.SecondaryAxisRange ?? throw new Exception()
 						});
 						break;
-					case PadSchema.PadInputType.TargetedPair:
+					case PadInputType.TargetedPair:
 						PadBox.Controls.Add(new VirtualPadTargetScreen
 						{
 							Name = button.Name,
@@ -98,7 +98,7 @@ namespace BizHawk.Client.EmuHawk
 							RangeY = button.MaxValue // TODO: ability to have a different Y than X
 						});
 						break;
-					case PadSchema.PadInputType.FloatSingle:
+					case PadInputType.FloatSingle:
 						PadBox.Controls.Add(new VirtualPadAnalogButton
 						{
 							Name = button.Name,
@@ -110,7 +110,7 @@ namespace BizHawk.Client.EmuHawk
 							Orientation = button.Orientation
 						});
 						break;
-					case PadSchema.PadInputType.DiscManager:
+					case PadInputType.DiscManager:
 						PadBox.Controls.Add(new VirtualPadDiscManager(button.SecondaryNames)
 						{
 							Name = button.Name,
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs
index d9ac234395..f1e24854ab 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs
@@ -129,16 +129,16 @@ namespace BizHawk.Client.EmuHawk
 					var searchSet = new HashSet<string>();
 					switch (button.Type)
 					{
-						case PadSchema.PadInputType.AnalogStick:
-						case PadSchema.PadInputType.FloatSingle:
-						case PadSchema.PadInputType.TargetedPair:
+						case PadInputType.AnalogStick:
+						case PadInputType.FloatSingle:
+						case PadInputType.TargetedPair:
 							// analog
 							searchSet = analogs;
 							break;
-						case PadSchema.PadInputType.Boolean:
+						case PadInputType.Boolean:
 							searchSet = bools;
 							break;
-						case PadSchema.PadInputType.DiscManager:
+						case PadInputType.DiscManager:
 							searchSet = bools;
 							searchSet.UnionWith(analogs);
 							break;
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs
index e61cdb3c54..b4fa33dd95 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs
@@ -52,31 +52,31 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(174, 74),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(23, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(23, 36)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(44, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Button",
 						DisplayName = "B",
@@ -96,34 +96,34 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(334, 94),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Button 1",
 						DisplayName = "B1",
 						Location = new Point(5, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Button 2",
 						DisplayName = "B2",
 						Location = new Point(5, 48)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Paddle X 1",
 						DisplayName = "Paddle X 1",
 						Location = new Point(55, 17),
-						Type = PadSchema.PadInputType.FloatSingle,
+						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(128, 69),
 						MaxValue = 127,
 						MinValue = -127
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Paddle X 2",
 						DisplayName = "Paddle X 2",
 						Location = new Point(193, 17),
-						Type = PadSchema.PadInputType.FloatSingle,
+						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(128, 69),
 						MaxValue = 127,
 						MinValue = -127
@@ -142,43 +142,43 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(174, 74),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(23, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(23, 36)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(44, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Button",
 						DisplayName = "B",
 						Location = new Point(132, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Button 1",
 						DisplayName = "B1",
 						Location = new Point(68, 36)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Button 2",
 						DisplayName = "B2",
@@ -198,28 +198,28 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(334, 94),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Button",
 						DisplayName = "B1",
 						Location = new Point(5, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Wheel X 1",
 						DisplayName = "Wheel X 1",
 						Location = new Point(55, 17),
-						Type = PadSchema.PadInputType.FloatSingle,
+						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(128, 69),
 						MaxValue = 127,
 						MinValue = -127
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Wheel X 2",
 						DisplayName = "Wheel X 2",
 						Location = new Point(193, 17),
-						Type = PadSchema.PadInputType.FloatSingle,
+						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(128, 69),
 						MaxValue = 127,
 						MinValue = -127
@@ -237,28 +237,28 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(185, 75),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Select",
 						Location = new Point(10, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Reset",
 						Location = new Point(60, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Power",
 						Location = new Point(108, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Toggle Left Difficulty",
 						DisplayName = "Left Difficulty",
 						Location = new Point(10, 40)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Toggle Right Difficulty",
 						DisplayName = "Right Difficulty",
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs
index d8ced24ca4..61355a4ab1 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs
@@ -61,37 +61,37 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(174, 74),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(23, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(23, 36)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(44, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Trigger",
 						DisplayName = "1",
 						Location = new Point(120, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Trigger 2",
 						DisplayName = "2",
@@ -111,31 +111,31 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(174, 74),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(23, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(23, 36)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(44, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Button",
 						DisplayName = "1",
@@ -154,14 +154,14 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(250, 74),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Paddle",
 						DisplayName = "Paddle",
 						Location = new Point(23, 15),
-						Type = PadSchema.PadInputType.FloatSingle
+						Type = PadInputType.FloatSingle
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Trigger",
 						DisplayName = "1",
@@ -181,18 +181,18 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(356, 290),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} VPos",
 						Location = new Point(14, 17),
-						Type = PadSchema.PadInputType.TargetedPair,
+						Type = PadInputType.TargetedPair,
 						TargetSize = new Size(256, 240),
 						SecondaryNames = new[]
 						{
 							$"P{controller} HPos"
 						}
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Trigger",
 						DisplayName = "Trigger",
@@ -211,27 +211,27 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(215, 50),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Select",
 						Location = new Point(10, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Reset",
 						Location = new Point(60, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Power",
 						Location = new Point(108, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Pause",
 						Location = new Point(158, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "BW",
 						Location = new Point(158, 15)
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs
index 2c59e6c131..af0e438532 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs
@@ -25,147 +25,147 @@ namespace BizHawk.Client.EmuHawk
 				Buttons = new[]
 				{
 					/************************** Row 1 **************************/
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Escape",
 						DisplayName = "Esc",
 						Location = new Point(10, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "1",
 						Location = new Point(46, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "2",
 						Location = new Point(70, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "3",
 						Location = new Point(94, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "4",
 						Location = new Point(118, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "5",
 						Location = new Point(142, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "6",
 						Location = new Point(166, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "7",
 						Location = new Point(190, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "8",
 						Location = new Point(214, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "9",
 						Location = new Point(238, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "0",
 						Location = new Point(262, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "-",
 						Location = new Point(286, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "=",
 						Location = new Point(307, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Delete",
 						Location = new Point(331, 18)
 					},
 					
 					/************************** Row 2 **************************/
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Tab",
 						DisplayName = " Tab ",
 						Location = new Point(10, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Q",
 						Location = new Point(52, 42)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "W",
 						Location = new Point(78, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "E",
 						Location = new Point(106, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "R",
 						Location = new Point(130, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "T",
 						Location = new Point(156, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Y",
 						Location = new Point(180, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "U",
 						Location = new Point(204, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "I",
 						Location = new Point(230, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "O",
 						Location = new Point(250, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "P",
 						Location = new Point(276, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "[",
 						Location = new Point(302, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "]",
 						Location = new Point(325, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "\\",
 						DisplayName = " \\ ",
@@ -173,130 +173,130 @@ namespace BizHawk.Client.EmuHawk
 					},
 
 					/************************** Row 3 **************************/
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Control",
 						DisplayName = " Control ",
 						Location = new Point(10, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "A",
 						Location = new Point(66, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "S",
 						Location = new Point(90, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "D",
 						Location = new Point(114, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "F",
 						Location = new Point(140, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "G",
 						Location = new Point(164, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "H",
 						Location = new Point(190, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "J",
 						Location = new Point(216, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "K",
 						Location = new Point(238, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "L"
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = ";",
 						Location = new Point(286, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "'",
 						Location = new Point(307, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Return",
 						Location = new Point(328, 66)
 					},
 
 					/************************** Row 4 **************************/
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Shift",
 						DisplayName = "     Shift     ",
 						Location = new Point(10, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Z",
 						Location = new Point(80, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "X",
 						Location = new Point(106, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "C",
 						Location = new Point(130, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "V",
 						Location = new Point(154, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "B",
 						Location = new Point(178, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "N",
 						Location = new Point(202, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "M",
 						Location = new Point(226, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = ",",
 						Location = new Point(252, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = ".",
 						Location = new Point(272, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "/",
 						Location = new Point(292, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Shift",
 						DisplayName = "    Shift    ",
@@ -305,61 +305,61 @@ namespace BizHawk.Client.EmuHawk
 
 					/************************** Row 5 **************************/
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Caps Lock",
 						DisplayName = "Caps",
 						Location = new Point(10, 114)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "`",
 						DisplayName = "~",
 						Location = new Point(52, 114)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "White Apple",
 						DisplayName = "<",
 						Location = new Point(96, 114)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Space",
 						DisplayName = "                Space                ",
 						Location = new Point(120, 114)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Black Apple",
 						DisplayName = ">",
 						Location = new Point(265, 114)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(289, 114)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(311, 114)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(333, 114)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Up",
 						Icon = Properties.Resources.BlueUp,
@@ -378,13 +378,13 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(120, 50),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Next Disk",
 						DisplayName = "Next",
 						Location = new Point(10, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Previous Disk",
 						DisplayName = "Previous",
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs
new file mode 100644
index 0000000000..b7864e7f4d
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs
@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Client.EmuHawk
+{
+	public enum PadInputType
+	{
+		Boolean,		// A single on/off button
+		AnalogStick,	// An analog stick X,Y Pair
+		FloatSingle,	// A single analog button (pressure sensitive button for instance)
+		TargetedPair,	// A X,Y pair intended to be a screen coordinate (for zappers, mouse, stylus, etc)
+		DiscManager
+	}
+
+	public class ButtonSchema
+	{
+		public string Name { get; set; }
+		public string DisplayName { get; set; }
+		public PadInputType Type { get; set; } = PadInputType.Boolean;
+		public Point Location { get; set; }
+		public Bitmap Icon { get; set; }
+		public Size TargetSize { get; set; } // Specifically for TargetedPair, specifies the screen size
+		public string[] SecondaryNames { get; set; } // Any other buttons necessary to operate (such as the Y axis)
+		public int MaxValue { get; set; } // For non-boolean values, specifies the maximum value the button allows
+		public int MidValue { get; set; } // For non-boolean values, specifies the mid (zero) value for the button
+		public int MinValue { get; set; } // For non-boolean values, specifies the minimum value the button allows
+		public int MaxValueSec { get; set; }
+		public int MidValueSec { get; set; }
+		public int MinValueSec { get; set; }
+		public object OwnerEmulator { get; set; }
+
+		public Orientation Orientation { get; set; } // For Single Float controls
+
+		// for Analog Stick controls
+		public ControllerDefinition.AxisRange? AxisRange { get; set; }
+		public ControllerDefinition.AxisRange? SecondaryAxisRange { get; set; }
+	}
+}
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs
index 8cb8557bbe..94fbb395be 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs
@@ -26,31 +26,31 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(174, 74),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(23, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(23, 36)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(44, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Button",
 						DisplayName = "B",
@@ -69,397 +69,397 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(500, 150),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Left Arrow",
 						DisplayName = "←",
 						Location = new Point(16, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key 1",
 						DisplayName = "1",
 						Location = new Point(46, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key 2",
 						DisplayName = "2",
 						Location = new Point(70, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key 3",
 						DisplayName = "3",
 						Location = new Point(94, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key 4",
 						DisplayName = "4",
 						Location = new Point(118, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key 5",
 						DisplayName = "5",
 						Location = new Point(142, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key 6",
 						DisplayName = "6",
 						Location = new Point(166, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key 7",
 						DisplayName = "7",
 						Location = new Point(190, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key 8",
 						DisplayName = "8",
 						Location = new Point(214, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key 9",
 						DisplayName = "9",
 						Location = new Point(238, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key 0",
 						DisplayName = "0",
 						Location = new Point(262, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Plus",
 						DisplayName = "+",
 						Location = new Point(286, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Minus",
 						DisplayName = "-",
 						Location = new Point(310, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Pound",
 						DisplayName = "£",
 						Location = new Point(330, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Clear/Home",
 						DisplayName = "C/H",
 						Location = new Point(354, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Insert/Delete",
 						DisplayName = "I/D",
 						Location = new Point(392, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key F1",
 						DisplayName = "F 1",
 						Location = new Point(450, 18)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key F3",
 						DisplayName = "F 3",
 						Location = new Point(450, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key F5",
 						DisplayName = "F 5",
 						Location = new Point(450, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key F7",
 						DisplayName = "F 7",
 						Location = new Point(450, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Control",
 						DisplayName = "CTRL",
 						Location = new Point(16, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Q",
 						DisplayName = "Q",
 						Location = new Point(62, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key W",
 						DisplayName = "W",
 						Location = new Point(88, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key E",
 						DisplayName = "E",
 						Location = new Point(116, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key R",
 						DisplayName = "R",
 						Location = new Point(140, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key T",
 						DisplayName = "T",
 						Location = new Point(166, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Y",
 						DisplayName = "Y",
 						Location = new Point(190, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key U",
 						DisplayName = "U",
 						Location = new Point(214, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key I",
 						DisplayName = "I",
 						Location = new Point(240, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key O",
 						DisplayName = "O",
 						Location = new Point(260, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key P",
 						DisplayName = "P",
 						Location = new Point(286, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key At",
 						DisplayName = "@",
 						Location = new Point(310, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Asterisk",
 						DisplayName = "*",
 						Location = new Point(338, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Up Arrow",
 						DisplayName = "↑",
 						Location = new Point(360, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Restore",
 						DisplayName = "RST",
 						Location = new Point(390, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Run/Stop",
 						DisplayName = "R/S",
 						Location = new Point(12, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Lck",
 						DisplayName = "Lck",
 						Location = new Point(50, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key A",
 						DisplayName = "A",
 						Location = new Point(86, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key S",
 						DisplayName = "S",
 						Location = new Point(110, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key D",
 						DisplayName = "D",
 						Location = new Point(134, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key F",
 						DisplayName = "F",
 						Location = new Point(160, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key G",
 						DisplayName = "G",
 						Location = new Point(184, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key H",
 						DisplayName = "H",
 						Location = new Point(210, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key J",
 						DisplayName = "J",
 						Location = new Point(236, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key K",
 						DisplayName = "K",
 						Location = new Point(258, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key L",
 						DisplayName = "L",
 						Location = new Point(282, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Colon",
 						DisplayName = ":",
 						Location = new Point(306, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Semicolon",
 						DisplayName = ";",
 						Location = new Point(326, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Equal",
 						DisplayName = "=",
 						Location = new Point(346, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Return",
 						DisplayName = "Return",
 						Location = new Point(370, 66)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Commodore",
 						DisplayName = "C64",
 						Location = new Point(8, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Left Shift",
 						DisplayName = "Shift",
 						Location = new Point(44, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Z",
 						DisplayName = "Z",
 						Location = new Point(82, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key X",
 						DisplayName = "X",
 						Location = new Point(106, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key C",
 						DisplayName = "C",
 						Location = new Point(130, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key V",
 						DisplayName = "V",
 						Location = new Point(154, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key B",
 						DisplayName = "B",
 						Location = new Point(178, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key N",
 						DisplayName = "N",
 						Location = new Point(202, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key M",
 						DisplayName = "M",
 						Location = new Point(226, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Comma",
 						DisplayName = ",",
 						Location = new Point(252, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Period",
 						DisplayName = ".",
 						Location = new Point(272, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Slash",
 						DisplayName = "/",
 						Location = new Point(292, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Right Shift",
 						DisplayName = "Shift",
 						Location = new Point(314, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Cursor Up/Down",
 						DisplayName = "Csr U",
 						Location = new Point(352, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Cursor Left/Right",
 						DisplayName = "Csr L",
 						Location = new Point(396, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Key Space",
 						DisplayName = "                          Space                          ",
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs
index 5e87fd8a17..f3f67a64f4 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs
@@ -45,113 +45,113 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(128, 200),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(50, 11)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(50, 32)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(29, 22)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(71, 22)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} L",
 						DisplayName = "L",
 						Location = new Point(3, 42)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} R",
 						DisplayName = "R",
 						Location = new Point(100, 42)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 1",
 						DisplayName = "1",
 						Location = new Point(27, 85)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 2",
 						DisplayName = "2",
 						Location = new Point(50, 85)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 3",
 						DisplayName = "3",
 						Location = new Point(73, 85)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 4",
 						DisplayName = "4",
 						Location = new Point(27, 108)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 5",
 						DisplayName = "5",
 						Location = new Point(50, 108)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 6",
 						DisplayName = "6",
 						Location = new Point(73, 108)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 7",
 						DisplayName = "7",
 						Location = new Point(27, 131)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 8",
 						DisplayName = "8",
 						Location = new Point(50, 131)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 9",
 						DisplayName = "9",
 						Location = new Point(73, 131)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Star",
 						DisplayName = "*",
 						Location = new Point(27, 154)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 0",
 						DisplayName = "0",
 						Location = new Point(50, 154)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Pound",
 						DisplayName = "#",
@@ -170,15 +170,15 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(275, 260),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Disc X",
 						AxisRange = controllerDefRanges[0],
 						SecondaryAxisRange = controllerDefRanges[1],
 						Location = new Point(6, 14),
-						Type = PadSchema.PadInputType.AnalogStick
+						Type = PadInputType.AnalogStick
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Pedal",
 						DisplayName = "Pedal",
@@ -196,108 +196,108 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(195, 260),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(50, 11)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(50, 32)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(29, 22)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(71, 22)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 1",
 						DisplayName = "1",
 						Location = new Point(27, 85)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 2",
 						DisplayName = "2",
 						Location = new Point(50, 85)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 3",
 						DisplayName = "3",
 						Location = new Point(73, 85)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 4",
 						DisplayName = "4",
 						Location = new Point(27, 108)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 5",
 						DisplayName = "5",
 						Location = new Point(50, 108)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 6",
 						DisplayName = "6",
 						Location = new Point(73, 108)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 7",
 						DisplayName = "7",
 						Location = new Point(27, 131)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 8",
 						DisplayName = "8",
 						Location = new Point(50, 131)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 9",
 						DisplayName = "9",
 						Location = new Point(73, 131)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Star",
 						DisplayName = "*",
 						Location = new Point(27, 154)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 0",
 						DisplayName = "0",
 						Location = new Point(50, 154)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Pound",
 						DisplayName = "#",
 						Location = new Point(73, 154)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Disc X",
 						DisplayName = "Disc",
@@ -305,28 +305,28 @@ namespace BizHawk.Client.EmuHawk
 						TargetSize = new Size(180, 55),
 						MinValue = -360,
 						MaxValue = 360,
-						Type = PadSchema.PadInputType.FloatSingle
+						Type = PadInputType.FloatSingle
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Yellow",
 						DisplayName = "Yellow",
 						Location = new Point(126, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Red",
 						DisplayName = "Red",
 						Location = new Point(126, 40)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Purple",
 						DisplayName = "Purple",
 						Location = new Point(126, 65)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Blue",
 						DisplayName = "Blue",
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs
index 3c5c48438c..1b06692417 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs
@@ -23,49 +23,49 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(174, 79),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(14, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(14, 56)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(24, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B",
 						DisplayName = "B",
 						Location = new Point(122, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} A",
 						DisplayName = "A",
 						Location = new Point(146, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Select",
 						DisplayName = "s",
 						Location = new Point(52, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "S",
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs
index 16f080c74a..f2a5590c31 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs
@@ -31,38 +31,38 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(256, 326),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Tilt X",
 						Location = new Point(10, 15),
-						Type = PadSchema.PadInputType.FloatSingle,
+						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(226, 69),
 						MinValue = short.MinValue,
 						MaxValue = short.MaxValue
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Tilt Y",
 						Location = new Point(10, 94),
-						Type = PadSchema.PadInputType.FloatSingle,
+						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(226, 69),
 						MinValue = short.MinValue,
 						MaxValue = short.MaxValue
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Tilt Z",
 						Location = new Point(10, 173),
-						Type = PadSchema.PadInputType.FloatSingle,
+						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(226, 69),
 						MinValue = short.MinValue,
 						MaxValue = short.MaxValue
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Light Sensor",
 						Location = new Point(10, 252),
-						Type = PadSchema.PadInputType.FloatSingle,
+						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(226, 69),
 						MaxValue = byte.MaxValue
 					}
@@ -78,58 +78,58 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(194, 90),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(29, 17)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(29, 61)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(17, 39)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(39, 39)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "B",
 						Location = new Point(130, 39)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "A",
 						Location = new Point(154, 39)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Select",
 						DisplayName = "s",
 						Location = new Point(64, 39)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Start",
 						DisplayName = "S",
 						Location = new Point(86, 39)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "L",
 						Location = new Point(2, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "R",
 						Location = new Point(166, 12)
@@ -147,7 +147,7 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(75, 50),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Power",
 						Location = new Point(10, 15)
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs
index 7547354d33..453a95c699 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs
@@ -38,47 +38,47 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(174, 79),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(14, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(14, 56)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(24, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "B",
 						Location = new Point(122, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "A",
 						Location = new Point(146, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Select",
 						DisplayName = "s",
 						Location = new Point(52, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Start",
 						DisplayName = "S",
@@ -97,7 +97,7 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(75, 50),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Power",
 						Location = new Point(10, 15)
@@ -115,49 +115,49 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(174, 79),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "P1 Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(14, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "P1 Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(14, 56)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "P1 Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "P1 Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(24, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "P1 B",
 						DisplayName = "B",
 						Location = new Point(122, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "P1 A",
 						DisplayName = "A",
 						Location = new Point(146, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "P1 Select",
 						DisplayName = "s",
 						Location = new Point(52, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "P1 Start",
 						DisplayName = "S",
@@ -176,7 +176,7 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(75, 50),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "P1 Power",
 						Location = new Point(10, 15)
@@ -195,11 +195,11 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(356, 290),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "P1 Tilt X",
 						Location = new Point(14, 17),
-						Type = PadSchema.PadInputType.TargetedPair,
+						Type = PadInputType.TargetedPair,
 						TargetSize = new Size(256, 240),
 						SecondaryNames = new[]
 						{
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs
index bdde4efdae..2417f104b8 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GGLSchema.cs
@@ -23,43 +23,43 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(174, 90),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(14, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(14, 56)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(24, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "S",
 						Location = new Point(134, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B1",
 						DisplayName = "1",
 						Location = new Point(122, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B2",
 						DisplayName = "2",
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs
index 43c009ee4c..3a6aab7215 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs
@@ -74,49 +74,49 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(174, 90),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(14, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(14, 56)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(24, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} A",
 						DisplayName = "A",
 						Location = new Point(98, 40)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B",
 						DisplayName = "B",
 						Location = new Point(122, 40)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} C",
 						DisplayName = "C",
 						Location = new Point(146, 40)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "S",
@@ -134,67 +134,67 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(174, 90),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(14, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(14, 56)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(24, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} A",
 						DisplayName = "A",
 						Location = new Point(98, 40)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B",
 						DisplayName = "B",
 						Location = new Point(122, 40)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} C",
 						DisplayName = "C",
 						Location = new Point(146, 40)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} X",
 						DisplayName = "X",
 						Location = new Point(98, 65)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Y",
 						DisplayName = "Y",
 						Location = new Point(122, 65)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Z",
 						DisplayName = "Z",
 						Location = new Point(146, 65)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "S",
@@ -213,11 +213,11 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(356, 300),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Lightgun X",
 						Location = new Point(14, 17),
-						Type = PadSchema.PadInputType.TargetedPair,
+						Type = PadInputType.TargetedPair,
 						MaxValue = 10000,
 						TargetSize = new Size(320, 240),
 						SecondaryNames = new[]
@@ -225,13 +225,13 @@ namespace BizHawk.Client.EmuHawk
 							$"P{controller} Lightgun Y"
 						}
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Lightgun Trigger",
 						DisplayName = "Trigger",
 						Location = new Point(284, 17)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Lightgun Start",
 						DisplayName = "Start",
@@ -250,11 +250,11 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(418, 290),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Mouse X",
 						Location = new Point(14, 17),
-						Type = PadSchema.PadInputType.AnalogStick,
+						Type = PadInputType.AnalogStick,
 						MaxValue = 255,
 						TargetSize = new Size(520, 570),
 						SecondaryNames = new[]
@@ -262,25 +262,25 @@ namespace BizHawk.Client.EmuHawk
 							$"P{controller} Mouse Y"
 						}
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Mouse Left",
 						DisplayName = "Left",
 						Location = new Point(365, 17)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Mouse Center",
 						DisplayName = "Center",
 						Location = new Point(365, 40)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Mouse Right",
 						DisplayName = "Right",
 						Location = new Point(365, 63)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Mouse Start",
 						DisplayName = "Start",
@@ -299,12 +299,12 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(150, 50),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Reset",
 						Location = new Point(10, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Power",
 						Location = new Point(58, 15)
@@ -321,55 +321,55 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(110, 110),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(47, 10)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(47, 73)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(15, 43)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(80, 43)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} A",
 						DisplayName = "A",
 						Location = new Point(70, 65)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B",
 						DisplayName = "B",
 						Location = new Point(70, 20)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} C",
 						DisplayName = "C",
 						Location = new Point(22, 20)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} A",
 						DisplayName = "A",
 						Location = new Point(22, 65)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "S",
@@ -387,49 +387,49 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(174, 90),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} A",
 						DisplayName = "A",
 						Location = new Point(98, 40)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B",
 						DisplayName = "B",
 						Location = new Point(122, 40)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} C",
 						DisplayName = "C",
 						Location = new Point(146, 40)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} D",
 						DisplayName = "D",
 						Location = new Point(98, 65)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} E1",
 						DisplayName = "E¹",
 						Location = new Point(122, 65)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} E2",
 						DisplayName = "E²",
 						Location = new Point(152, 65)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "Start",
 						Location = new Point(122, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Select",
 						DisplayName = "Select",
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs
index fe068cf113..778df7be4d 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs
@@ -48,100 +48,100 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(148, 332),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 1",
 						DisplayName = "1",
 						Location = new Point(25, 15)
 
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 2",
 						DisplayName = "2",
 						Location = new Point(51, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 3",
 						DisplayName = "3",
 						Location = new Point(77, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 4",
 						DisplayName = "4",
 						Location = new Point(25, 41)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 5",
 						DisplayName = "5",
 						Location = new Point(51, 41)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 6",
 						DisplayName = "6",
 						Location = new Point(77, 41)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 7",
 						DisplayName = "7",
 						Location = new Point(25, 67)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 8",
 						DisplayName = "8",
 						Location = new Point(51, 67)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 9",
 						DisplayName = "9",
 						Location = new Point(77, 67)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Clear",
 						DisplayName = "C",
 						Location = new Point(25, 93)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 0",
 						DisplayName = "0",
 						Location = new Point(51, 93)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Enter",
 						DisplayName = "E",
 						Location = new Point(77, 93)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Top",
 						DisplayName = "T",
 						Location = new Point(2, 41)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Top",
 						DisplayName = "T",
 						Location = new Point(100, 41)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} L",
 						DisplayName = "L",
 						Location = new Point(2, 67)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} R",
 						DisplayName = "R",
@@ -150,97 +150,97 @@ namespace BizHawk.Client.EmuHawk
 
 					/************** Directional Pad *******************/
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} N",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(51, 124)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} NNE",
 						Icon = Properties.Resources.NNE,
 						Location = new Point(63, 145)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} NNW",
 						Icon = Properties.Resources.NNW,
 						Location = new Point(39, 145)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} NE",
 						Icon = Properties.Resources.NE,
 						Location = new Point(75, 166)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} NW",
 						Icon = Properties.Resources.NW,
 						Location = new Point(27, 166)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} ENE",
 						Icon = Properties.Resources.ENE,
 						Location = new Point(87, 187)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} WNW",
 						Icon = Properties.Resources.WNW,
 						Location = new Point(15, 187)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} E",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(99, 208)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} W",
 						Icon = Properties.Resources.Back,
 						Location = new Point(3, 208)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} ESE",
 						Icon = Properties.Resources.ESE,
 						Location = new Point(87, 229)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} WSW",
 						Icon = Properties.Resources.WSW,
 						Location = new Point(15, 229)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} SE",
 						Icon = Properties.Resources.SE,
 						Location = new Point(75, 250)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} SW",
 						Icon = Properties.Resources.SW,
 						Location = new Point(27, 250)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} SSE",
 						Icon = Properties.Resources.SSE,
 						Location = new Point(63, 271)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} SSW",
 						Icon = Properties.Resources.SSW,
 						Location = new Point(39, 271)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} S",
 						Icon = Properties.Resources.BlueDown,
@@ -260,111 +260,111 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(280, 332),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 1",
 						DisplayName = "1",
 						Location = new Point(91, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 2",
 						DisplayName = "2",
 						Location = new Point(117, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 3",
 						DisplayName = "3",
 						Location = new Point(143, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 4",
 						DisplayName = "4",
 						Location = new Point(91, 41)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 5",
 						DisplayName = "5",
 						Location = new Point(117, 41)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 6",
 						DisplayName = "6",
 						Location = new Point(143, 41)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 7",
 						DisplayName = "7",
 						Location = new Point(91, 67)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 8",
 						DisplayName = "8",
 						Location = new Point(117, 67)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 9",
 						DisplayName = "9",
 						Location = new Point(143, 67)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Clear",
 						DisplayName = "C",
 						Location = new Point(91, 93)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Key 0",
 						DisplayName = "0",
 						Location = new Point(117, 93)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Enter",
 						DisplayName = "E",
 						Location = new Point(143, 93)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Top",
 						DisplayName = "T",
 						Location = new Point(68, 41)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Top",
 						DisplayName = "T",
 						Location = new Point(166, 41)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} L",
 						DisplayName = "L",
 						Location = new Point(68, 67)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} R",
 						DisplayName = "R",
 						Location = new Point(166, 67)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Disc X",
 						AxisRange = controllerDefRanges[0],
 						SecondaryAxisRange = controllerDefRanges[1],
 						Location = new Point(1, 121),
-						Type = PadSchema.PadInputType.AnalogStick
+						Type = PadInputType.AnalogStick
 					}
 				}
 			};
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs
index e1a64bd6cc..21b4d5fa87 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs
@@ -22,55 +22,55 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(194, 90),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(14, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(14, 56)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(24, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "B",
 						DisplayName = "B",
 						Location = new Point(130, 62)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "A",
 						DisplayName = "A",
 						Location = new Point(154, 62)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Option 1",
 						DisplayName = "1",
 						Location = new Point(100, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Option 2",
 						DisplayName = "2",
 						Location = new Point(100, 62)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Pause",
 						DisplayName = "Pause",
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs
index 2dd6ca47cf..aad2c4cd1d 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs
@@ -31,97 +31,97 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(275, 316),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} DPad U",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(24, 230)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} DPad D",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(24, 251)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} DPad L",
 						Icon = Properties.Resources.Back,
 						Location = new Point(3, 242)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} DPad R",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(45, 242)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} L",
 						DisplayName = "L",
 						Location = new Point(3, 185)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} R",
 						DisplayName = "R",
 						Location = new Point(191, 185)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Z",
 						DisplayName = "Z",
 						Location = new Point(81, 269)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "S",
 						Location = new Point(81, 246)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B",
 						DisplayName = "B",
 						Location = new Point(127, 246)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} A",
 						DisplayName = "A",
 						Location = new Point(138, 269)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} C Up",
 						Icon = Properties.Resources.YellowUp,
 						Location = new Point(173, 210)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} C Down",
 						Icon = Properties.Resources.YellowDown,
 						Location = new Point(173, 231)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} C Left",
 						Icon = Properties.Resources.YellowLeft,
 						Location = new Point(152, 221)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} C Right",
 						Icon = Properties.Resources.YellowRight,
 						Location = new Point(194, 221)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} X Axis",
 						AxisRange = controllerDefRanges[0],
 						SecondaryAxisRange = controllerDefRanges[1],
 						Location = new Point(6, 14),
-						Type = PadSchema.PadInputType.AnalogStick
+						Type = PadInputType.AnalogStick
 					}
 				}
 			};
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NdsSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NdsSchema.cs
index c0904de11f..3d25401669 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NdsSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NdsSchema.cs
@@ -22,7 +22,7 @@ namespace BizHawk.Client.EmuHawk.tools.VirtualPads.schema
 				DefaultSize = new Size(50, 35),
 				Buttons = new []
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Lid",
 						Location = new Point(8, 8)
@@ -39,67 +39,67 @@ namespace BizHawk.Client.EmuHawk.tools.VirtualPads.schema
 				DefaultSize = new Size(440, 260),
 				Buttons = new []
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(14, 79)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(14, 122)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 100)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(24, 100)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "L",
 						Location = new Point(2, 10)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "R",
 						Location = new Point(366, 10)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Start",
 						Location = new Point(341, 179)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Select",
 						Location = new Point(341, 201)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Y",
 						Location = new Point(341, 100)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "B",
 						Location = new Point(365, 113)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "X",
 						Location = new Point(341, 76)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "A",
 						DisplayName = "A",
@@ -107,18 +107,18 @@ namespace BizHawk.Client.EmuHawk.tools.VirtualPads.schema
 					},
 
 					// Screen
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "TouchX",
 						Location = new Point(72, 35),
-						Type = PadSchema.PadInputType.TargetedPair,
+						Type = PadInputType.TargetedPair,
 						TargetSize = new Size(256, 192),
 						SecondaryNames = new[]
 						{
 							"TouchY"
 						}
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Touch",
 						Location = new Point(72, 10)
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs
index 864068fa43..d3ab700fdc 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs
@@ -169,12 +169,12 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(150, 50),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Reset",
 						Location = new Point(10, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Power",
 						Location = new Point(58, 15)
@@ -185,19 +185,19 @@ namespace BizHawk.Client.EmuHawk
 
 		private static PadSchema FdsConsoleButtons(int diskSize)
 		{
-			var buttons = new List<PadSchema.ButtonSchema>
+			var buttons = new List<ButtonSchema>
 			{
-				new PadSchema.ButtonSchema
+				new ButtonSchema
 				{
 					Name = "Reset",
 					Location = new Point(10, 15)
 				},
-				new PadSchema.ButtonSchema
+				new ButtonSchema
 				{
 					Name = "Power",
 					Location = new Point(58, 15)
 				},
-				new PadSchema.ButtonSchema
+				new ButtonSchema
 				{
 					Name = "FDS Eject",
 					DisplayName = "Eject",
@@ -207,7 +207,7 @@ namespace BizHawk.Client.EmuHawk
 
 			for (var i = 0; i < diskSize; i++)
 			{
-				buttons.Add(new PadSchema.ButtonSchema
+				buttons.Add(new ButtonSchema
 				{
 					Name = $"FDS Insert {i}",
 					DisplayName = $"Insert {i}",
@@ -240,49 +240,49 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(174, 74),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(23, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(23, 36)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(44, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B",
 						DisplayName = "B",
 						Location = new Point(124, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} A",
 						DisplayName = "A",
 						Location = new Point(147, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Select",
 						DisplayName = "s",
 						Location = new Point(72, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "S",
@@ -303,43 +303,43 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(174, 74),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(23, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(23, 36)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(44, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B",
 						DisplayName = "B",
 						Location = new Point(124, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} A",
 						DisplayName = "A",
 						Location = new Point(147, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Microphone",
 						DisplayName = "Mic",
@@ -359,18 +359,18 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(356, 290),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Zapper X",
 						Location = new Point(14, 17),
-						Type = PadSchema.PadInputType.TargetedPair,
+						Type = PadInputType.TargetedPair,
 						TargetSize = new Size(256, 240),
 						SecondaryNames = new[]
 						{
 							$"P{controller} Zapper Y"
 						}
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Fire",
 						DisplayName = "Fire",
@@ -390,16 +390,16 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(380, 110),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Paddle",
 						DisplayName = "Arkanoid Paddle",
 						Location = new Point(14, 17),
-						Type = PadSchema.PadInputType.FloatSingle,
+						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(380, 69),
 						MaxValue = 160
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Fire",
 						DisplayName = "Fire",
@@ -418,74 +418,74 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(154, 114),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} PP1",
 						DisplayName = "1  ",
 						Location = new Point(14, 17)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} PP2",
 						DisplayName = "2  ",
 						Location = new Point(45, 17)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} PP3",
 						DisplayName = "3  ",
 						Location = new Point(76, 17)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} PP4",
 						DisplayName = "4  ",
 						Location = new Point(107, 17)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} PP5",
 						DisplayName = "5  ",
 						Location = new Point(14, 48)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} PP6",
 						DisplayName = "6  ",
 						Location = new Point(45, 48)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} PP7",
 						DisplayName = "7  ",
 						Location = new Point(76, 48)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} PP8",
 						DisplayName = "8  ",
 						Location = new Point(107, 48)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} PP9",
 						DisplayName = "9  ",
 						Location = new Point(14, 79)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} PP10",
 						DisplayName = "10",
 						Location = new Point(45, 79)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} PP11",
 						DisplayName = "11",
 						Location = new Point(76, 79)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} PP12",
 						DisplayName = "12",
@@ -505,24 +505,24 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(356, 290),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Pen X",
 						Location = new Point(14, 17),
-						Type = PadSchema.PadInputType.TargetedPair,
+						Type = PadInputType.TargetedPair,
 						TargetSize = new Size(256, 240),
 						SecondaryNames = new[]
 						{
 							$"P{controller} Pen Y"
 						}
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Click",
 						DisplayName = "Click",
 						Location = new Point(284, 17)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Touch",
 						DisplayName = "Touch",
@@ -541,433 +541,433 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(560, 180),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} F1",
 						DisplayName = "    F1    ",
 						Location = new Point(23, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} F2",
 						DisplayName = "    F2    ",
 						Location = new Point(76, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} F3",
 						DisplayName = "    F3    ",
 						Location = new Point(129, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} F4",
 						DisplayName = "    F4    ",
 						Location = new Point(182, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} F5",
 						DisplayName = "    F5    ",
 						Location = new Point(235, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} F6",
 						DisplayName = "    F6    ",
 						Location = new Point(288, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} F7",
 						DisplayName = "    F7    ",
 						Location = new Point(341, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} F8",
 						DisplayName = "    F8    ",
 						Location = new Point(394, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} 1",
 						DisplayName = "1",
 						Location = new Point(36, 38)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} 2",
 						DisplayName = "2",
 						Location = new Point(60, 38)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} 3",
 						DisplayName = "3",
 						Location = new Point(84, 38)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} 4",
 						DisplayName = "4",
 						Location = new Point(108, 38)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} 5",
 						DisplayName = "5",
 						Location = new Point(132, 38)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} 6",
 						DisplayName = "6",
 						Location = new Point(156, 38)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} 7",
 						DisplayName = "7",
 						Location = new Point(180, 38)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} 8",
 						DisplayName = "8",
 						Location = new Point(204, 38)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} 9",
 						DisplayName = "9",
 						Location = new Point(228, 38)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} 0",
 						DisplayName = "0",
 						Location = new Point(252, 38)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Minus",
 						DisplayName = "-",
 						Location = new Point(276, 38)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Caret",
 						DisplayName = "^",
 						Location = new Point(296, 38)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Yen",
 						DisplayName = "¥",
 						Location = new Point(320, 38)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Stop",
 						DisplayName = "STOP",
 						Location = new Point(344, 38)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Escape",
 						DisplayName = "ESC",
 						Location = new Point(15, 61)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Q",
 						DisplayName = "Q",
 						Location = new Point(54, 61)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} W",
 						DisplayName = "W",
 						Location = new Point(80, 61)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} E",
 						DisplayName = "E",
 						Location = new Point(108, 61)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} R",
 						DisplayName = "R",
 						Location = new Point(132, 61)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} T",
 						DisplayName = "T",
 						Location = new Point(158, 61)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Y",
 						DisplayName = "Y",
 						Location = new Point(182, 61)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} U",
 						DisplayName = "U",
 						Location = new Point(206, 61)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} I",
 						DisplayName = "I",
 						Location = new Point(232, 61)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} O",
 						DisplayName = "O",
 						Location = new Point(252, 61)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} P",
 						DisplayName = "P",
 						Location = new Point(278, 61)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} At",
 						DisplayName = "@",
 						Location = new Point(302, 61)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left Bracket",
 						DisplayName = "[",
 						Location = new Point(330, 61)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Return",
 						DisplayName = "RETURN",
 						Location = new Point(350, 61)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Control",
 						DisplayName = "CTR",
 						Location = new Point(30, 84)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} A",
 						DisplayName = "A",
 						Location = new Point(70, 84)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} S",
 						DisplayName = "S",
 						Location = new Point(94, 84)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} D",
 						DisplayName = "D",
 						Location = new Point(118, 84)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} F",
 						DisplayName = "F",
 						Location = new Point(144, 84)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} G",
 						DisplayName = "G",
 						Location = new Point(168, 84)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} H",
 						DisplayName = "H",
 						Location = new Point(194, 84)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} J",
 						DisplayName = "J",
 						Location = new Point(220, 84)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} K",
 						DisplayName = "K",
 						Location = new Point(242, 84)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} L",
 						DisplayName = "L",
 						Location = new Point(266, 84)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Semicolon",
 						DisplayName = ";",
 						Location = new Point(290, 84)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Colon",
 						DisplayName = ":",
 						Location = new Point(311, 84)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right Bracket",
 						DisplayName = "]",
 						Location = new Point(332, 84)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} カナ",
 						DisplayName = "カナ",
 						Location = new Point(352, 84)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left Shift",
 						DisplayName = "SHIFT",
 						Location = new Point(10, 107)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Z",
 						DisplayName = "Z",
 						Location = new Point(58, 107)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} X",
 						DisplayName = "X",
 						Location = new Point(82, 107)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} C",
 						DisplayName = "C",
 						Location = new Point(106, 107)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} V",
 						DisplayName = "V",
 						Location = new Point(130, 107)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B",
 						DisplayName = "B",
 						Location = new Point(154, 107)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} N",
 						DisplayName = "N",
 						Location = new Point(178, 107)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} M",
 						DisplayName = "M",
 						Location = new Point(203, 107)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Comma",
 						DisplayName = ",",
 						Location = new Point(229, 107)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Period",
 						DisplayName = ".",
 						Location = new Point(249, 107)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Slash",
 						DisplayName = "/",
 						Location = new Point(270, 107)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Underscore",
 						DisplayName = "_",
 						Location = new Point(292, 107)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right Shift",
 						DisplayName = "SHIFT",
 						Location = new Point(316, 107)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Graph",
 						DisplayName = "GRPH",
 						Location = new Point(82, 130)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Space",
 						DisplayName = "                  SPACE                  ",
 						Location = new Point(130, 130)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Clear/Home",
 						DisplayName = " CLR\nHOME",
 						Location = new Point(420, 46)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Insert",
 						DisplayName = "\nINS",
 						Location = new Point(470, 46)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Delete",
 						DisplayName = "\nDEL",
 						Location = new Point(506, 46)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						DisplayName = "  ↑  ",
 						Location = new Point(468, 86)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						DisplayName = "  ↓  ",
 						Location = new Point(468, 134)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						DisplayName = "  ←  ",
 						Location = new Point(446, 110)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						DisplayName = "  ➝  ",
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs
index 9b67196a6d..e90107c50f 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs
@@ -23,43 +23,43 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(174, 79),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(14, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(14, 56)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(24, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "B",
 						DisplayName = "B",
 						Location = new Point(74, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "A",
 						DisplayName = "A",
 						Location = new Point(98, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Option",
 						DisplayName = "O",
@@ -78,7 +78,7 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(75, 50),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Power",
 						Location = new Point(10, 15)
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs
index 9c1e616516..4daa73a93a 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/O2Schema.cs
@@ -35,31 +35,31 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(100, 100),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(14, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(14, 56)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(24, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} F",
 						DisplayName = "F",
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs
index ac2dc7c498..49e4ad7b39 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs
@@ -54,117 +54,117 @@ namespace BizHawk.Client.EmuHawk
 				DisplayName = $"DualShock Player{controller}",
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(32, 50)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(32, 71)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(11, 62)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(53, 62)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} L1",
 						DisplayName = "L1",
 						Location = new Point(3, 32)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} R1",
 						DisplayName = "R1",
 						Location = new Point(191, 32)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} L2",
 						DisplayName = "L2",
 						Location = new Point(3, 10)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} R2",
 						DisplayName = "R2",
 						Location = new Point(191, 10)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} L3",
 						DisplayName = "L3",
 						Location = new Point(72, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} R3",
 						DisplayName = "R3",
 						Location = new Point(130, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Square",
 						Icon = Properties.Resources.Square,
 						Location = new Point(148, 62)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Triangle",
 						Icon = Properties.Resources.Triangle,
 						Location = new Point(169, 50)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Circle",
 						Icon = Properties.Resources.Circle,
 						Location = new Point(190, 62)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Cross",
 						Icon = Properties.Resources.Cross,
 						Location = new Point(169, 71)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "S",
 						Location = new Point(112, 62)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Select",
 						DisplayName = "s",
 						Location = new Point(90, 62)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} LStick X",
 						AxisRange = stickRanges[0],
 						SecondaryAxisRange = stickRanges[1],
 						Location = new Point(3, 120),
-						Type = PadSchema.PadInputType.AnalogStick
+						Type = PadInputType.AnalogStick
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} RStick X",
 						AxisRange = stickRanges[0],
 						SecondaryAxisRange = stickRanges[1],
 						Location = new Point(260, 120),
-						Type = PadSchema.PadInputType.AnalogStick
+						Type = PadInputType.AnalogStick
 					}
 				}
 			};
@@ -179,85 +179,85 @@ namespace BizHawk.Client.EmuHawk
 				DisplayName = $"Gamepad Player{controller}",
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(37, 55)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(37, 76)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(16, 67)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(58, 67)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} L1",
 						DisplayName = "L1",
 						Location = new Point(8, 37)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} R1",
 						DisplayName = "R1",
 						Location = new Point(196, 37)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} L2",
 						DisplayName = "L2",
 						Location = new Point(8, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} R2",
 						DisplayName = "R2",
 						Location = new Point(196, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Square",
 						Icon = Properties.Resources.Square,
 						Location = new Point(153, 67)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Triangle",
 						Icon = Properties.Resources.Triangle,
 						Location = new Point(174, 55)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Circle",
 						Icon = Properties.Resources.Circle,
 						Location = new Point(195, 67)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Cross",
 						Icon = Properties.Resources.Cross,
 						Location = new Point(174, 76)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "S",
 						Location = new Point(112, 67)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Select",
 						DisplayName = "s",
@@ -276,94 +276,94 @@ namespace BizHawk.Client.EmuHawk
 				DisplayName = $"NeGcon Player{controller}",
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(36, 83)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(36, 104)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(15, 95)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(57, 95)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "S",
 						Location = new Point(78, 118)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B",
 						DisplayName = "B",
 						Location = new Point(278, 38)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} A",
 						DisplayName = "A",
 						Location = new Point(308, 55)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} R",
 						DisplayName = "R",
 						Location = new Point(308, 15)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} L",
 						DisplayName = "L",
 						Location = new Point(5, 15),
-						Type = PadSchema.PadInputType.FloatSingle,
+						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(128, 55),
 						MinValue = 0,
 						MaxValue = 255
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Twist",
 						DisplayName = "Twist",
 						Location = new Point(125, 15),
-						Type = PadSchema.PadInputType.FloatSingle,
+						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(64, 178),
 						MinValue = 0,
 						MaxValue = 255,
 						Orientation = Orientation.Vertical
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} 2",
 						DisplayName = "II",
 						Location = new Point(180, 60),
-						Type = PadSchema.PadInputType.FloatSingle,
+						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(128, 55),
 						MinValue = 0,
 						MaxValue = 255
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} 1",
 						DisplayName = "I",
 						Location = new Point(220, 120),
-						Type = PadSchema.PadInputType.FloatSingle,
+						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(128, 55),
 						MinValue = 0,
 						MaxValue = 255
@@ -381,15 +381,15 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(310, 400),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Reset",
 						Location = new Point(10, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Disc Select", // not really, but shuts up a warning
-						Type = PadSchema.PadInputType.DiscManager,
+						Type = PadInputType.DiscManager,
 						Location = new Point(10, 54),
 						TargetSize = new Size(300, 300),
 						OwnerEmulator = psx,
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchema.cs
index 90fa8ecc05..f686fb2a83 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PadSchema.cs
@@ -1,51 +1,15 @@
 using System.Collections.Generic;
 using System.Drawing;
-using System.Windows.Forms;
-
-using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
 	public class PadSchema
 	{
-		public enum PadInputType
-		{
-			Boolean,		// A single on/off button
-			AnalogStick,	// An analog stick X,Y Pair
-			FloatSingle,	// A single analog button (pressure sensitive button for instance)
-			TargetedPair,	// A X,Y pair intended to be a screen coordinate (for zappers, mouse, stylus, etc)
-			DiscManager
-		}
-
 		// Default size of the pad
 		public Size DefaultSize { get; set; }
 		public Size? MaxSize { get; set; }
 		public bool IsConsole { get; set; }
 		public IEnumerable<ButtonSchema> Buttons { get; set; }
 		public string DisplayName { get; set; } // The name of the pad itself, presumably will be displayed by the given pad time if supplied
-
-		public class ButtonSchema
-		{
-			public string Name { get; set; }
-			public string DisplayName { get; set; }
-			public PadInputType Type { get; set; } = PadInputType.Boolean;
-			public Point Location { get; set; }
-			public Bitmap Icon { get; set; }
-			public Size TargetSize { get; set; } // Specifically for TargetedPair, specifies the screen size
-			public string[] SecondaryNames { get; set; } // Any other buttons necessary to operate (such as the Y axis)
-			public int MaxValue { get; set; } // For non-boolean values, specifies the maximum value the button allows
-			public int MidValue { get; set; } // For non-boolean values, specifies the mid (zero) value for the button
-			public int MinValue { get; set; } // For non-boolean values, specifies the minimum value the button allows
-			public int MaxValueSec { get; set; }
-			public int MidValueSec { get; set; }
-			public int MinValueSec { get; set; }
-			public object OwnerEmulator { get; set; }
-
-			public Orientation Orientation { get; set; } // For Single Float controls
-
-			// for Analog Stick controls
-			public ControllerDefinition.AxisRange? AxisRange { get; set; }
-			public ControllerDefinition.AxisRange? SecondaryAxisRange { get; set; }
-		}
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs
index ddda196526..cdd5454f1e 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs
@@ -56,49 +56,49 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(174, 90),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(14, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(14, 56)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(24, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B2",
 						DisplayName = "II",
 						Location = new Point(122, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B1",
 						DisplayName = "I",
 						Location = new Point(146, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Select",
 						DisplayName = "s",
 						Location = new Point(52, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Run",
 						DisplayName = "R",
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs
index 0fe32455ee..b19fcda43f 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PcfxSchema.cs
@@ -49,25 +49,25 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(230, 100),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(34, 17)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(34, 61)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(22, 39)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
@@ -75,62 +75,62 @@ namespace BizHawk.Client.EmuHawk
 					},
 
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Mode 1",
 						DisplayName = "Mode 1",
 						Location = new Point(74, 17)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Mode 2",
 						DisplayName = "Mode 2",
 						Location = new Point(74, 40)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Select",
 						DisplayName = "s",
 						Location = new Point(77, 63)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Run",
 						DisplayName = "R",
 						Location = new Point(101, 63)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} IV",
 						DisplayName = "IV",
 						Location = new Point(140, 63)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} V",
 						DisplayName = "V",
 						Location = new Point(166, 53)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} VI",
 						DisplayName = "VI",
 						Location = new Point(192, 43)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} I",
 						DisplayName = "I",
 						Location = new Point(140, 40)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} II",
 						DisplayName = "II",
 						Location = new Point(166, 30)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} III",
 						DisplayName = "III",
@@ -149,21 +149,21 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(375, 320),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} X",
 						SecondaryNames = new[] { $"P{controller} Y" },
 						Location = new Point(14, 17),
-						Type = PadSchema.PadInputType.TargetedPair,
+						Type = PadInputType.TargetedPair,
 						TargetSize = new Size(256, 256)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Mouse Left",
 						DisplayName = "Left",
 						Location = new Point(300, 17)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Mouse Right",
 						DisplayName = "Right",
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs
index 5a86120cd1..1608eca5a1 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SGBSchema.cs
@@ -25,49 +25,49 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(174, 79),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controllerNum} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(14, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controllerNum} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(14, 56)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controllerNum} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controllerNum} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(24, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controllerNum} B",
 						DisplayName = "B",
 						Location = new Point(122, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controllerNum} A",
 						DisplayName = "A",
 						Location = new Point(146, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controllerNum} Select",
 						DisplayName = "s",
 						Location = new Point(52, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controllerNum} Start",
 						DisplayName = "S",
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs
index 9aa32b0f44..0bde3585d4 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs
@@ -74,79 +74,79 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(250, 100),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(34, 17)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(34, 61)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(22, 39)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(44, 39)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "S",
 						Location = new Point(78, 52)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} A",
 						DisplayName = "A",
 						Location = new Point(110, 63)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B",
 						DisplayName = "B",
 						Location = new Point(134, 53)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} C",
 						DisplayName = "C",
 						Location = new Point(158, 43)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} X",
 						DisplayName = "X",
 						Location = new Point(110, 40)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Y",
 						DisplayName = "Y",
 						Location = new Point(134, 30)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Z",
 						DisplayName = "Z",
 						Location = new Point(158, 20)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} L",
 						DisplayName = "L",
 						Location = new Point(2, 10)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} R",
 						DisplayName = "R",
@@ -165,97 +165,97 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(458, 285),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(290, 77)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(290, 121)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(278, 99)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(300, 99)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "S",
 						Location = new Point(334, 112)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} A",
 						DisplayName = "A",
 						Location = new Point(366, 123)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B",
 						DisplayName = "B",
 						Location = new Point(390, 113)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} C",
 						DisplayName = "C",
 						Location = new Point(414, 103)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} X",
 						DisplayName = "X",
 						Location = new Point(366, 100)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Y",
 						DisplayName = "Y",
 						Location = new Point(390, 90)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Z",
 						DisplayName = "Z",
 						Location = new Point(414, 80)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Stick Horizontal",
 						SecondaryNames = new[] { $"P{controller} Stick Vertical" },
 						AxisRange = axisRanges[0],
 						SecondaryAxisRange = axisRanges[1],
 						Location = new Point(6, 74),
-						Type = PadSchema.PadInputType.AnalogStick
+						Type = PadInputType.AnalogStick
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left Shoulder",
 						DisplayName = "L",
 						Location = new Point(8, 12),
-						Type = PadSchema.PadInputType.FloatSingle,
+						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(128, 55),
 						MinValue = 0,
 						MaxValue = 255
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right Shoulder",
 						DisplayName = "L",
 						Location = new Point(328, 12),
-						Type = PadSchema.PadInputType.FloatSingle,
+						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(128, 55),
 						MinValue = 0,
 						MaxValue = 255
@@ -273,33 +273,33 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(375, 320),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} X",
 						SecondaryNames = new[] { $"P{controller} Y" },
 						Location = new Point(14, 17),
-						Type = PadSchema.PadInputType.TargetedPair,
+						Type = PadInputType.TargetedPair,
 						TargetSize = new Size(256, 256)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Mouse Left",
 						DisplayName = "Left",
 						Location = new Point(300, 17)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Mouse Center",
 						DisplayName = "Center",
 						Location = new Point(300, 47)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Mouse Right",
 						DisplayName = "Right",
 						Location = new Point(300, 77)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "Start",
@@ -318,65 +318,65 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(325, 100),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Wheel",
 						DisplayName = "Wheel",
 						Location = new Point(8, 12),
-						Type = PadSchema.PadInputType.FloatSingle,
+						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(128, 55),
 						MinValue = 0,
 						MaxValue = 255
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(150, 20)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(150, 43)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} A",
 						DisplayName = "A",
 						Location = new Point(180, 63)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B",
 						DisplayName = "B",
 						Location = new Point(204, 53)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} C",
 						DisplayName = "C",
 						Location = new Point(228, 43)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} X",
 						DisplayName = "X",
 						Location = new Point(180, 40)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Y",
 						DisplayName = "Y",
 						Location = new Point(204, 30)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Z",
 						DisplayName = "Z",
 						Location = new Point(228, 20)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "Start",
@@ -397,75 +397,75 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(445, 230),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "Start",
 						Location = new Point(45, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} L",
 						DisplayName = "L",
 						Location = new Point(5, 58)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} R",
 						DisplayName = "R",
 						Location = new Point(105, 58)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} X",
 						DisplayName = "X",
 						Location = new Point(30, 43)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Y",
 						DisplayName = "Y",
 						Location = new Point(55, 43)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Z",
 						DisplayName = "Z",
 						Location = new Point(80, 43)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} A",
 						DisplayName = "A",
 						Location = new Point(30, 70)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B",
 						DisplayName = "B",
 						Location = new Point(55, 70)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} C",
 						DisplayName = "C",
 						Location = new Point(80, 70)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Stick Horizontal",
 						SecondaryNames = new[] { $"P{controller} Stick Vertical" },
 						AxisRange = axisRanges[0],
 						SecondaryAxisRange = axisRanges[1],
 						Location = new Point(185, 13),
-						Type = PadSchema.PadInputType.AnalogStick
+						Type = PadInputType.AnalogStick
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Throttle",
 						DisplayName = "Throttle",
 						Location = new Point(135, 13),
-						Type = PadSchema.PadInputType.FloatSingle,
+						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(64, 178),
 						MinValue = 0,
 						MaxValue = 255,
@@ -485,41 +485,41 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(680, 230),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left Stick Horizontal",
 						SecondaryNames = new[] { $"P{controller} Left Stick Vertical" },
 						AxisRange = axisRanges[3],
 						SecondaryAxisRange = axisRanges[4],
 						Location = new Point(58, 13),
-						Type = PadSchema.PadInputType.AnalogStick
+						Type = PadInputType.AnalogStick
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left Throttle",
 						DisplayName = "Throttle",
 						Location = new Point(8, 13),
-						Type = PadSchema.PadInputType.FloatSingle,
+						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(64, 178),
 						MinValue = 0,
 						MaxValue = 255,
 						Orientation = Orientation.Vertical
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right Stick Horizontal",
 						SecondaryNames = new[] { $"P{controller} Right Stick Vertical" },
 						AxisRange = axisRanges[0],
 						SecondaryAxisRange = axisRanges[1],
 						Location = new Point(400, 13),
-						Type = PadSchema.PadInputType.AnalogStick
+						Type = PadInputType.AnalogStick
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right Throttle",
 						DisplayName = "Throttle",
 						Location = new Point(350, 13),
-						Type = PadSchema.PadInputType.FloatSingle,
+						Type = PadInputType.FloatSingle,
 						TargetSize = new Size(64, 178),
 						MinValue = 0,
 						MaxValue = 255,
@@ -538,23 +538,23 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(250, 50),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Reset",
 						Location = new Point(10, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Power",
 						Location = new Point(58, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Previous Disk",
 						DisplayName = "Prev Disc",
 						Location = new Point(108, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Next Disk",
 						DisplayName = "Next Disc",
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs
index 3aa6018de3..357656db0a 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs
@@ -33,37 +33,37 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(174, 90),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(14, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(14, 56)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(24, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B1",
 						DisplayName = "1",
 						Location = new Point(122, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B2",
 						DisplayName = "2",
@@ -81,43 +81,43 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(174, 90),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(14, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(14, 56)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(24, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "S",
 						Location = new Point(134, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B1",
 						DisplayName = "1",
 						Location = new Point(122, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B2",
 						DisplayName = "2",
@@ -136,12 +136,12 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(150, 50),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Reset",
 						Location = new Point(10, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Pause",
 						Location = new Point(58, 15)
@@ -159,7 +159,7 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(150, 50),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Reset",
 						Location = new Point(10, 15)
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs
index 7829814912..79599046f8 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs
@@ -116,75 +116,75 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(200, 90),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(34, 17)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(34, 61)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(22, 39)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(44, 39)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} L",
 						DisplayName = "L",
 						Location = new Point(2, 10)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} R",
 						DisplayName = "R",
 						Location = new Point(174, 10)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Select",
 						DisplayName = "s",
 						Location = new Point(70, 39)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "S",
 						Location = new Point(92, 39)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Y",
 						DisplayName = "Y",
 						Location = new Point(121, 39)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B",
 						DisplayName = "B",
 						Location = new Point(145, 52)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} X",
 						DisplayName = "X",
 						Location = new Point(122, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} A",
 						DisplayName = "A",
@@ -203,21 +203,21 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(345, 225),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Mouse X",
 						AxisRange = controllerDefRanges[0],
 						SecondaryAxisRange = controllerDefRanges[1],
 						Location = new Point(6, 14),
-						Type = PadSchema.PadInputType.AnalogStick
+						Type = PadInputType.AnalogStick
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Mouse Left",
 						DisplayName = "Left",
 						Location = new Point(275, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Mouse Right",
 						DisplayName = "Right",
@@ -237,36 +237,36 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(356, 290),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Scope X",
 						Location = new Point(14, 17),
-						Type = PadSchema.PadInputType.TargetedPair,
+						Type = PadInputType.TargetedPair,
 						TargetSize = new Size(256, 240),
 						SecondaryNames = new[]
 						{
 							$"P{controller} Scope Y"
 						}
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Trigger",
 						DisplayName = "Trigger",
 						Location = new Point(284, 17)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Cursor",
 						DisplayName = "Cursor",
 						Location = new Point(284, 47)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Turbo",
 						DisplayName = "Turbo",
 						Location = new Point(284, 77)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Pause",
 						DisplayName = "Pause",
@@ -286,24 +286,24 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(356, 290),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Justifier X",
 						Location = new Point(14, 17),
-						Type = PadSchema.PadInputType.TargetedPair,
+						Type = PadInputType.TargetedPair,
 						TargetSize = new Size(256, 240),
 						SecondaryNames = new[]
 						{
 							$"P{controller} Justifier Y"
 						}
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Trigger",
 						DisplayName = "Trigger",
 						Location = new Point(284, 17)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "Start",
@@ -324,7 +324,7 @@ namespace BizHawk.Client.EmuHawk
 			};
 		}
 
-		private static IEnumerable<PadSchema.ButtonSchema> PayLoadButtons(int controller)
+		private static IEnumerable<ButtonSchema> PayLoadButtons(int controller)
 		{
 			int startX = 5;
 			int startY = 15;
@@ -333,7 +333,7 @@ namespace BizHawk.Client.EmuHawk
 
 			for (int i = 0; i < 16; i++)
 			{
-				yield return new PadSchema.ButtonSchema
+				yield return new ButtonSchema
 				{
 					Name = $"P{controller} B{i}",
 					DisplayName = i.ToString(),
@@ -343,7 +343,7 @@ namespace BizHawk.Client.EmuHawk
 
 			for (int i = 0; i < 16; i++)
 			{
-				yield return new PadSchema.ButtonSchema
+				yield return new ButtonSchema
 				{
 					Name = $"P{controller} B{i + 16}",
 					DisplayName = (i + 16).ToString(),
@@ -361,12 +361,12 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(150, 50),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Reset",
 						Location = new Point(10, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Power",
 						Location = new Point(58, 15)
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs
index fc1ab14fbc..e6302022e2 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VECSchema.cs
@@ -45,49 +45,49 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(200, 100),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(14, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(14, 56)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(24, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Button 1",
 						DisplayName = "1",
 						Location = new Point(74, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Button 2",
 						DisplayName = "2",
 						Location = new Point(98, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Button 3",
 						DisplayName = "3",
 						Location = new Point(122, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Button 4",
 						DisplayName = "4",
@@ -106,37 +106,37 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(280, 380),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Button 1",
 						DisplayName = "1",
 						Location = new Point(74, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Button 2",
 						DisplayName = "2",
 						Location = new Point(98, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Button 3",
 						DisplayName = "3",
 						Location = new Point(122, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Button 4",
 						DisplayName = "4",
 						Location = new Point(146, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Stick X",
 						Location = new Point(2, 80),
 						AxisRange = controllerDefRanges[0],
 						SecondaryAxisRange = controllerDefRanges[1],
-						Type = PadSchema.PadInputType.AnalogStick,
+						Type = PadInputType.AnalogStick,
 						SecondaryNames = new[]
 						{
 							$"P{controller} Stick Y"
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs
index f087165c19..a9346b8d97 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs
@@ -23,82 +23,82 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(222, 103),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "L_Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(14, 36)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "L_Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(14, 80)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "L_Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 58)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "L_Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(24, 58)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "B",
 						Location = new Point(122, 58)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "A",
 						Location = new Point(146, 58)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Select",
 						DisplayName = "s",
 						Location = new Point(52, 58)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Start",
 						DisplayName = "S",
 						Location = new Point(74, 58)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "R_Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(188, 36)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "R_Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(188, 80)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "R_Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(176, 58)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "R_Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(198, 58)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "L",
 						Location = new Point(24, 8)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "R",
 						Location = new Point(176, 8)
@@ -116,7 +116,7 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(75, 50),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Power",
 						DisplayName = "Power",
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs
index 4b2804dc0a..1c1dde31c6 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs
@@ -25,71 +25,71 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(174, 210),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Y1",
 						DisplayName = "Y1",
 						Location = new Point(23, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Y4",
 						DisplayName = "Y4",
 						Location = new Point(9, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Y2",
 						DisplayName = "Y2",
 						Location = new Point(38, 34)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Y3",
 						DisplayName = "Y3",
 						Location = new Point(23, 56)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} X1",
 						DisplayName = "X1",
 						Location = new Point(23, 92)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} X4",
 						DisplayName = "X4",
 						Location = new Point(9, 114)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} X2",
 						DisplayName = "X2",
 						Location = new Point(38, 114)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} X3",
 						DisplayName = "X3",
 						Location = new Point(23, 136)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "S",
 						Location = new Point(80, 114)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B",
 						DisplayName = "B",
 						Location = new Point(110, 114)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} A",
 						DisplayName = "A",
@@ -108,70 +108,70 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(174, 210),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} A",
 						DisplayName = "A",
 						Location = new Point(23, 12)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} B",
 						DisplayName = "B",
 						Location = new Point(46, 22)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Start",
 						DisplayName = "S",
 						Location = new Point(32, 58)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Y2",
 						DisplayName = "Y2",
 						Location = new Point(23, 112)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Y1",
 						DisplayName = "Y1",
 						Location = new Point(9, 134)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Y3",
 						DisplayName = "Y3",
 						Location = new Point(38, 134)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Y4",
 						DisplayName = "Y4",
 						Location = new Point(23, 156)
 					},
 
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} X2",
 						DisplayName = "X2",
 						Location = new Point(103, 112)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} X1",
 						DisplayName = "X1",
 						Location = new Point(89, 134)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} X3",
 						DisplayName = "X3",
 						Location = new Point(118, 134)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} X4",
 						DisplayName = "X4",
@@ -190,7 +190,7 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(75, 50),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Power",
 						Location = new Point(7, 15)
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs
index 722a53aa0b..0aad92d4d2 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ZXSpectrumSchema.cs
@@ -28,31 +28,31 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(174, 74),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Up",
 						Icon = Properties.Resources.BlueUp,
 						Location = new Point(23, 15)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Down",
 						Icon = Properties.Resources.BlueDown,
 						Location = new Point(23, 36)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Left",
 						Icon = Properties.Resources.Back,
 						Location = new Point(2, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Right",
 						Icon = Properties.Resources.Forward,
 						Location = new Point(44, 24)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = $"P{controller} Button",
 						DisplayName = "B",
@@ -146,7 +146,7 @@ namespace BizHawk.Client.EmuHawk
 				DefaultSize = new Size(500, 170)
 			};
 
-			var btns = new List<PadSchema.ButtonSchema>();
+			var btns = new List<ButtonSchema>();
 
 			int rowHeight = 29; //24
 			int stdButtonWidth = 29; //24
@@ -181,7 +181,7 @@ namespace BizHawk.Client.EmuHawk
 
 				if (b.IsActive)
 				{
-					var btn = new PadSchema.ButtonSchema
+					var btn = new ButtonSchema
 					{
 						Name = b.Name,
 						DisplayName = disp,
@@ -207,31 +207,31 @@ namespace BizHawk.Client.EmuHawk
 				MaxSize = new Size(174, 74),
 				Buttons = new[]
 				{
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Play Tape",
 						Icon = Properties.Resources.Play,
 						Location = new Point(23, 22)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Stop Tape",
 						Icon = Properties.Resources.Stop,
 						Location = new Point(53, 22)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "RTZ Tape",
 						Icon = Properties.Resources.BackMore,
 						Location = new Point(83, 22)
 					},
-					 new PadSchema.ButtonSchema
+					 new ButtonSchema
 					{
 						Name = "Insert Next Tape",
 						DisplayName = "NEXT TAPE",
 						Location = new Point(23, 52)
 					},
-					new PadSchema.ButtonSchema
+					new ButtonSchema
 					{
 						Name = "Insert Previous Tape",
 						DisplayName = "PREV TAPE",