diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IEmulator.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IEmulator.cs
index d6f398dccd..fe2a9222a3 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IEmulator.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IEmulator.cs
@@ -1,45 +1,45 @@
-using BizHawk.Emulation.Common;
-
-namespace BizHawk.Emulation.Cores.Sega.MasterSystem
-{
-	public sealed partial class SMS : IEmulator
-	{
-		public IEmulatorServiceProvider ServiceProvider { get; }
-
-		public ControllerDefinition ControllerDefinition
-		{
-			get
-			{
-				if (IsGameGear)
-				{
-					return GGController;
-				}
-
-				switch(Settings.ControllerType)
-				{
-					case "Paddle":
-						return SMSPaddleController;
-					case "Light Phaser":
-						// scale the vertical to the display mode
-						SMSLightPhaserController.FloatRanges[1] = new ControllerDefinition.FloatRange(0, Vdp.FrameHeight / 2, Vdp.FrameHeight - 1);
-
-						return SMSLightPhaserController;
-					default:
-						return SmsController;
-				}
-			}
-		}
-
-		public void FrameAdvance(IController controller, bool render, bool rendersound)
-		{
-			_controller = controller;
-			_lagged = true;
-			_frame++;
-			PSG.BeginFrame(Cpu.TotalExecutedCycles);
-
-			if (!IsGameGear)
-			{
-				PSG.StereoPanning = Settings.ForceStereoSeparation ? ForceStereoByte : (byte)0xFF;
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Emulation.Cores.Sega.MasterSystem
+{
+	public sealed partial class SMS : IEmulator
+	{
+		public IEmulatorServiceProvider ServiceProvider { get; }
+
+		public ControllerDefinition ControllerDefinition
+		{
+			get
+			{
+				if (IsGameGear)
+				{
+					return GGController;
+				}
+
+				switch(Settings.ControllerType)
+				{
+					case "Paddle":
+						return SMSPaddleController;
+					case "Light Phaser":
+						// scale the vertical to the display mode
+						SMSLightPhaserController.FloatRanges[1] = new ControllerDefinition.FloatRange(0, Vdp.FrameHeight / 2, Vdp.FrameHeight - 1);
+
+						return SMSLightPhaserController;
+					default:
+						return SmsController;
+				}
+			}
+		}
+
+		public void FrameAdvance(IController controller, bool render, bool rendersound)
+		{
+			_controller = controller;
+			_lagged = true;
+			_frame++;
+			PSG.BeginFrame(Cpu.TotalExecutedCycles);
+
+			if (!IsGameGear)
+			{
+				PSG.StereoPanning = Settings.ForceStereoSeparation ? ForceStereoByte : (byte)0xFF;
 			}
 
 			if (Tracer.Enabled)
@@ -49,51 +49,51 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
 			else
 			{
 				Cpu.TraceCallback = null;
-			}
-
-			if (IsGameGear == false)
-			{
-				Cpu.NonMaskableInterrupt = controller.IsPressed("Pause");
-			}
-
-			if (IsGame3D && Settings.Fix3D)
-			{
-				Vdp.ExecFrame((Frame & 1) == 0);
-			}
-			else
-			{
-				Vdp.ExecFrame(render);
-			}
-
-			PSG.EndFrame(Cpu.TotalExecutedCycles);
-			if (_lagged)
-			{
-				_lagCount++;
-				_isLag = true;
-			}
-			else
-			{
-				_isLag = false;
-			}
-		}
-
-	    public int Frame => _frame;
-
-		public string SystemId => "SMS";
-
-		public bool DeterministicEmulation => true;
-
-		public void ResetCounters()
-		{
-			_frame = 0;
-			_lagCount = 0;
-			_isLag = false;
-		}
-
-		public CoreComm CoreComm { get; }
-
-		public void Dispose()
-		{
-		}
-	}
-}
+			}
+
+			if (IsGameGear == false)
+			{
+				Cpu.NonMaskableInterrupt = controller.IsPressed("Pause");
+			}
+
+			if (IsGame3D && Settings.Fix3D)
+			{
+				Vdp.ExecFrame((Frame & 1) == 0);
+			}
+			else
+			{
+				Vdp.ExecFrame(render);
+			}
+
+			PSG.EndFrame(Cpu.TotalExecutedCycles);
+			if (_lagged)
+			{
+				_lagCount++;
+				_isLag = true;
+			}
+			else
+			{
+				_isLag = false;
+			}
+		}
+
+	    public int Frame => _frame;
+
+		public string SystemId => "SMS";
+
+		public bool DeterministicEmulation => true;
+
+		public void ResetCounters()
+		{
+			_frame = 0;
+			_lagCount = 0;
+			_isLag = false;
+		}
+
+		public CoreComm CoreComm { get; }
+
+		public void Dispose()
+		{
+		}
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
index 1e9b39381d..3030c8084d 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
@@ -4,7 +4,7 @@ using BizHawk.Common.StringExtensions;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Common.Components;
 using BizHawk.Emulation.Cores.Components;
-using BizHawk.Emulation.Common.Components.Z80A;
+using BizHawk.Emulation.Cores.Components.Z80A;
 
 /*****************************************************
   TODO: 
diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.cs
index f079d04608..adccda7fd3 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.cs
@@ -4,7 +4,7 @@ using System.IO;
 
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Common.Components.Z80A;
+using BizHawk.Emulation.Cores.Components.Z80A;
 
 
 namespace BizHawk.Emulation.Cores.Sega.MasterSystem