diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 41bf014c5f..0f46d9251d 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -6,7 +6,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Calculator;
+using BizHawk.Emulation.Cores.Calculator;
 using BizHawk.Emulation.Consoles.GB;
 using BizHawk.Emulation.Consoles.Nintendo.SNES;
 
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 9bdc1cdbe4..cb4104ea0a 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -13,7 +13,7 @@ using BizHawk.Client.Common;
 using BizHawk.Emulation;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Computers.Commodore64;
-using BizHawk.Emulation.Calculator;
+using BizHawk.Emulation.Cores.Calculator;
 using BizHawk.Emulation.Consoles.Coleco;
 using BizHawk.Emulation.Consoles.GB;
 using BizHawk.Emulation.Consoles.Intellivision;
diff --git a/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs b/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs
index a826fad828..229b0fb6de 100644
--- a/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs
+++ b/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs
@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-using BizHawk.Emulation.Calculator;
+using BizHawk.Emulation.Cores.Calculator;
 using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
index 1768150755..ea5f4f4b01 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
@@ -4,7 +4,7 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 using BizHawk.Emulation.Consoles.Nintendo;
-using BizHawk.Emulation.Calculator;
+using BizHawk.Emulation.Cores.Calculator;
 using BizHawk.Emulation.Consoles.Nintendo.SNES;
 using BizHawk.Emulation.Consoles.Sega;
 
diff --git a/BizHawk.Emulation/Calculator/TI83.cs b/BizHawk.Emulation/Calculator/TI83.cs
index 8c73e741b7..16dd7f9a04 100644
--- a/BizHawk.Emulation/Calculator/TI83.cs
+++ b/BizHawk.Emulation/Calculator/TI83.cs
@@ -9,7 +9,7 @@ using BizHawk.Emulation.CPUs.Z80;
 
 //http://www.ticalc.org/pub/text/calcinfo/
 
-namespace BizHawk.Emulation.Calculator
+namespace BizHawk.Emulation.Cores.Calculator
 {
 	public class TI83 : IEmulator
 	{