diff --git a/BizHawk.Client.Common/config/Config.cs b/BizHawk.Client.Common/config/Config.cs
index 464ab7293f..158bc5371c 100644
--- a/BizHawk.Client.Common/config/Config.cs
+++ b/BizHawk.Client.Common/config/Config.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Collections;
 
 using BizHawk.Emulation.Common;
+using BizHawk.Emulation.Cores.Nintendo.Gameboy;
 
 namespace BizHawk.Client.Common
 {
@@ -618,7 +619,7 @@ namespace BizHawk.Client.Common
 		public bool GB_MulticartCompat = false;
 		public string GB_PaletteFile = "";
 		public bool GB_AsSGB = false;
-		public Emulation.Consoles.GB.GBColors.ColorType CGBColors = Emulation.Consoles.GB.GBColors.ColorType.gambatte;
+		public GBColors.ColorType CGBColors = GBColors.ColorType.gambatte;
 
 		//Dual Gb
 
diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 0f46d9251d..a7d67b69c5 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -6,8 +6,9 @@ using System.Windows.Forms;
 
 using BizHawk.Client.Common;
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Cores.Calculator;
-using BizHawk.Emulation.Consoles.GB;
+using BizHawk.Emulation.Cores.Calculators;
+using BizHawk.Emulation.Cores.Atari.Atari2600;
+using BizHawk.Emulation.Cores.Nintendo.Gameboy;
 using BizHawk.Emulation.Consoles.Nintendo.SNES;
 
 namespace BizHawk.Client.EmuHawk
diff --git a/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
index a9334f06a3..870ae94ddf 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Movie.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
@@ -3,6 +3,10 @@ using System.IO;
 using System.Windows.Forms;
 
 using BizHawk.Client.Common;
+using BizHawk.Emulation.Cores.Nintendo.GBA;
+using BizHawk.Emulation.Consoles.Sega;
+using BizHawk.Emulation.Consoles.Sega.Saturn;
+using BizHawk.Emulation.Consoles.Sony.PSP;
 
 namespace BizHawk.Client.EmuHawk
 {
@@ -89,10 +93,10 @@ namespace BizHawk.Client.EmuHawk
 		public void LoadRecordMovieDialog()
 		{
 			// put any BEETA quality cores here
-			if (Global.Emulator is Emulation.Consoles.Nintendo.GBA.GBA ||
-				Global.Emulator is Emulation.Consoles.Sega.Genesis ||
-				Global.Emulator is Emulation.Consoles.Sega.Saturn.Yabause ||
-				Global.Emulator is Emulation.Consoles.Sony.PSP.PSP)
+			if (Global.Emulator is GBA ||
+				Global.Emulator is Genesis ||
+				Global.Emulator is Yabause ||
+				Global.Emulator is PSP)
 			{
 				var result = MessageBox.Show
 					(this, "Thanks for using Bizhawk!  The emulation core you have selected " +
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index cf39958b92..16db65697a 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -13,13 +13,15 @@ using BizHawk.Client.Common;
 using BizHawk.Emulation;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Cores.Computers.Commodore64;
-using BizHawk.Emulation.Cores.Calculator;
-using BizHawk.Emulation.Consoles.Coleco;
-using BizHawk.Emulation.Consoles.GB;
-using BizHawk.Emulation.Consoles.Intellivision;
+using BizHawk.Emulation.Cores.Calculators;
+using BizHawk.Emulation.Cores.Atari.Atari2600;
+using BizHawk.Emulation.Cores.Atari.Atari7800;
+using BizHawk.Emulation.Cores.ColecoVision;
+using BizHawk.Emulation.Cores.Nintendo.Gameboy;
+using BizHawk.Emulation.Cores.Intellivision;
 using BizHawk.Emulation.Consoles.Nintendo;
-using BizHawk.Emulation.Consoles.Nintendo.GBA;
-using BizHawk.Emulation.Consoles.Nintendo.N64;
+using BizHawk.Emulation.Cores.Nintendo.GBA;
+using BizHawk.Emulation.Cores.Nintendo.N64;
 using BizHawk.Emulation.Consoles.Nintendo.SNES;
 using BizHawk.Emulation.Consoles.Sega;
 using BizHawk.Emulation.Consoles.TurboGrafx;
diff --git a/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs b/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs
index 796525ab4f..3e2ccc259b 100644
--- a/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs
+++ b/BizHawk.Client.EmuHawk/config/GB/CGBColorChooserForm.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-using BizHawk.Emulation.Consoles.GB;
 
 using BizHawk.Client.Common;
+using BizHawk.Emulation.Cores.Nintendo.Gameboy;
 
 namespace BizHawk.Client.EmuHawk
 {
diff --git a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
index 286eaa5085..e4db41dbdd 100644
--- a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
+++ b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
@@ -3,12 +3,12 @@ using System.Windows.Forms;
 using System.IO;
 
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Consoles.GB;
+using BizHawk.Emulation.Cores.ColecoVision;
+using BizHawk.Emulation.Cores.Nintendo.Gameboy;
 using BizHawk.Emulation.Consoles.Nintendo.SNES;
 using BizHawk.Emulation.Consoles.Sega;
 using BizHawk.Emulation.Consoles.Nintendo;
-using BizHawk.Emulation.Consoles.Coleco;
-using BizHawk.Emulation.Consoles.Nintendo.N64;
+using BizHawk.Emulation.Cores.Nintendo.N64;
 using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
diff --git a/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs b/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs
index 52ebcea40c..19b3aece7e 100644
--- a/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs
+++ b/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs
@@ -5,6 +5,7 @@ using System.Windows.Forms;
 
 using BizHawk.Common;
 using BizHawk.Client.Common;
+using BizHawk.Emulation.Cores.Nintendo.Gameboy;
 
 namespace BizHawk.Client.EmuHawk
 {
@@ -25,7 +26,7 @@ namespace BizHawk.Client.EmuHawk
 		// g' = 8.25g
 	    // b' = 8.25b
 
-		Emulation.Consoles.GB.Gameboy gb;
+		Gameboy gb;
 
 		// gambatte doesn't modify these memory locations unless you reconstruct, so we can store
 		IntPtr vram;
@@ -84,9 +85,9 @@ namespace BizHawk.Client.EmuHawk
 
 		public void Restart()
 		{
-			if (Global.Emulator is Emulation.Consoles.GB.Gameboy)
+			if (Global.Emulator is Gameboy)
 			{
-				gb = Global.Emulator as Emulation.Consoles.GB.Gameboy;
+				gb = Global.Emulator as Gameboy;
 				cgb = gb.IsCGBMode();
 				_lcdc = 0;
 				if (!gb.GetGPUMemoryAreas(out vram, out bgpal, out sppal, out oam))
diff --git a/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs b/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs
index 83eb18e391..d780c09130 100644
--- a/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs
+++ b/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs
@@ -4,12 +4,14 @@ using System.Windows.Forms;
 
 using BizHawk.Common;
 using BizHawk.Client.Common;
+using BizHawk.Emulation.Cores.Nintendo.Gameboy;
+using BizHawk.Emulation.Cores.Nintendo.GBA;
 
 namespace BizHawk.Client.EmuHawk
 {
 	public partial class GBAGPUView : Form, IToolForm
 	{
-		Emulation.Consoles.Nintendo.GBA.GBA gba;
+		GBA gba;
 
 		// emulator memory areas
 		private IntPtr vram;
@@ -31,7 +33,7 @@ namespace BizHawk.Client.EmuHawk
 			InitializeComponent();
 			// TODO: hook up something
 			// we do this twice to avoid having to & 0x7fff with every color
-			int[] tmp = Emulation.Consoles.GB.GBColors.GetLut(Emulation.Consoles.GB.GBColors.ColorType.vivid);
+			int[] tmp = GBColors.GetLut(GBColors.ColorType.vivid);
 			ColorConversion = new int[65536];
 			Buffer.BlockCopy(tmp, 0, ColorConversion, 0, sizeof(int) * tmp.Length);
 			Buffer.BlockCopy(tmp, 0, ColorConversion, sizeof(int) * tmp.Length, sizeof(int) * tmp.Length);
@@ -678,7 +680,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public void Restart()
 		{
-			gba = Global.Emulator as Emulation.Consoles.Nintendo.GBA.GBA;
+			gba = Global.Emulator as GBA;
 			if (gba != null)
 			{
 				gba.GetGPUMemoryAreas(out vram, out palram, out oam, out mmio);
diff --git a/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs b/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs
index 229b0fb6de..048078e96d 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.Cores.Calculator;
+using BizHawk.Emulation.Cores.Calculators;
 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 ea5f4f4b01..36a1c3b5d6 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.Cores.Calculator;
+using BizHawk.Emulation.Cores.Calculators;
 using BizHawk.Emulation.Consoles.Nintendo.SNES;
 using BizHawk.Emulation.Consoles.Sega;
 
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadForm.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadForm.cs
index d71d2b0f21..2d1803e363 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadForm.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadForm.cs
@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 
-using BizHawk.Emulation.Consoles.Nintendo.N64;
 using BizHawk.Client.Common;
+using BizHawk.Emulation.Cores.Nintendo.N64;
+
 
 namespace BizHawk.Client.EmuHawk
 {
diff --git a/BizHawk.Emulation/Calculator/TI83.cs b/BizHawk.Emulation/Calculator/TI83.cs
index 16dd7f9a04..51ef59257f 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.Cores.Calculator
+namespace BizHawk.Emulation.Cores.Calculators
 {
 	public class TI83 : IEmulator
 	{
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.Core.cs b/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.Core.cs
index 07fe043fcf..2b4ebfd509 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.Core.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.Core.cs
@@ -1,11 +1,10 @@
 using System;
 
-using BizHawk.Emulation.CPUs.M6502;
-using BizHawk.Emulation.Consoles.Atari;
-using BizHawk.Emulation.Consoles.Atari._2600;
 using BizHawk.Common;
+using BizHawk.Emulation.CPUs.M6502;
 
-namespace BizHawk
+
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	partial class Atari2600
 	{
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.cs b/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.cs
index 17db7e3aed..a8f45ba8b1 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Atari2600.cs
@@ -5,7 +5,7 @@ using System.IO;
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
 
-namespace BizHawk
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	public partial class Atari2600 : IEmulator
 	{
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/M6532.cs b/BizHawk.Emulation/Consoles/Atari/2600/M6532.cs
index 7834435203..587e48d508 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/M6532.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/M6532.cs
@@ -1,6 +1,6 @@
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Consoles.Atari
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	// Emulates the M6532 RIOT Chip
 	public class M6532
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m0840.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m0840.cs
index 7f40ba088b..3fb3ea6070 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m0840.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m0840.cs
@@ -1,4 +1,4 @@
-namespace BizHawk.Emulation.Consoles.Atari._2600
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	/*
 	This is another 8K bankswitching method with two 4K banks.  The rationale is that it's
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m2K.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m2K.cs
index e457ac95c0..d6fb45c455 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m2K.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m2K.cs
@@ -1,4 +1,4 @@
-namespace BizHawk
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	partial class Atari2600
 	{
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3E.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3E.cs
index fd81bf627c..5b89be1f6a 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3E.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3E.cs
@@ -1,6 +1,6 @@
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Consoles.Atari._2600
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	/*
 	3E (Boulderdash
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3F.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3F.cs
index 520c5ae9b1..b4b2076401 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3F.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3F.cs
@@ -1,6 +1,6 @@
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Consoles.Atari._2600
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	/*
 	3F (Tigervision)
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3Fe.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3Fe.cs
index b1e36677e7..8c3627ac7e 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3Fe.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m3Fe.cs
@@ -1,4 +1,4 @@
-namespace BizHawk.Emulation.Consoles.Atari._2600
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	class m3Fe : MapperBase
 	{
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4A50.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4A50.cs
index ff82acbe87..26d5b6ea51 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4A50.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4A50.cs
@@ -1,6 +1,6 @@
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Consoles.Atari._2600
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	/*
 	4A50 (no name)
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4K.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4K.cs
index 3dd7f218da..f676f34c98 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4K.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/m4K.cs
@@ -1,4 +1,4 @@
-namespace BizHawk
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	partial class Atari2600
 	{
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mCV.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mCV.cs
index 3bb9271cc0..7f2dcf412e 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mCV.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mCV.cs
@@ -1,6 +1,6 @@
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Consoles.Atari._2600
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	/*
 	This was used by Commavid.  It allowed for both ROM and RAM on the cartridge,
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mDPC.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mDPC.cs
index 6bda94d9e4..7b19acee40 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mDPC.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mDPC.cs
@@ -1,6 +1,6 @@
 using BizHawk.Common;
 
-namespace BizHawk
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	partial class Atari2600
 	{
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE0.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE0.cs
index 486ceb3b68..d4c365a11d 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE0.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE0.cs
@@ -1,6 +1,6 @@
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Consoles.Atari._2600
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	/*
 	E0 (Parker Bros)
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE7.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE7.cs
index d4ad6088fd..3dd79b091d 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE7.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE7.cs
@@ -1,6 +1,6 @@
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Consoles.Atari._2600
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	/*
 	E7 (M-Network)
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mEF.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mEF.cs
index f00bf49054..d6bd81abfc 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mEF.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mEF.cs
@@ -1,6 +1,6 @@
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Consoles.Atari._2600
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	/*
 	EF (no name?)
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF0.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF0.cs
index 8898c17cf5..8aefa0d837 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF0.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF0.cs
@@ -1,6 +1,6 @@
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Consoles.Atari._2600
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	/*
 	F0 (Megaboy)
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF4.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF4.cs
index ab63dfe82e..3276ff4df7 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF4.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF4.cs
@@ -1,6 +1,6 @@
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Consoles.Atari._2600
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	/*
 	F4 (Atari style 32K)
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF6.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF6.cs
index a76c65959c..e54f33d322 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF6.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF6.cs
@@ -1,6 +1,6 @@
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Consoles.Atari._2600
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	/*
 	F6 (Atari style 16K)
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF8.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF8.cs
index 24c03cd2e0..70fd2c6770 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF8.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mF8.cs
@@ -1,6 +1,6 @@
 using BizHawk.Common;
 
-namespace BizHawk
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	partial class Atari2600
 	{
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFA.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFA.cs
index 71b63fe533..b0cecdd05e 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFA.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFA.cs
@@ -1,6 +1,6 @@
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Consoles.Atari._2600
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	/*
 	FA (RAM Plus)
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFE.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFE.cs
index b2817ba126..b2aad4381e 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFE.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFE.cs
@@ -1,4 +1,4 @@
-namespace BizHawk.Emulation.Consoles.Atari._2600
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	/*
 	FE (Activision special)
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mMC.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mMC.cs
index 8f5fb5c800..6a880861e4 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mMC.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mMC.cs
@@ -1,4 +1,4 @@
-namespace BizHawk.Emulation.Consoles.Atari._2600
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	/*
 	MC (Megacart)
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mUA.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mUA.cs
index 6ee4a66c81..329151cb9b 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mUA.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mUA.cs
@@ -1,6 +1,6 @@
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Consoles.Atari._2600
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	/*
 	UA (UA Ltd)
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mX07.cs b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mX07.cs
index 9abfebbeaf..245c113806 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mX07.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/Mappers/mX07.cs
@@ -1,6 +1,6 @@
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Consoles.Atari._2600
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	/*
 	X07 (Atariage)
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/TIA.cs b/BizHawk.Emulation/Consoles/Atari/2600/TIA.cs
index bc6d904b4b..8e37344942 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/TIA.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/TIA.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Emulation.Consoles.Atari
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	// Emulates the TIA
 	public class TIA : IVideoProvider, ISoundProvider
diff --git a/BizHawk.Emulation/Consoles/Atari/2600/oldTIA.cs b/BizHawk.Emulation/Consoles/Atari/2600/oldTIA.cs
index 915c878430..981ee9ed44 100644
--- a/BizHawk.Emulation/Consoles/Atari/2600/oldTIA.cs
+++ b/BizHawk.Emulation/Consoles/Atari/2600/oldTIA.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace BizHawk.Emulation.Consoles.Atari
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
 {
 	// Emulates the TIA
 	public class oldTIA
diff --git a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.Core.cs b/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.Core.cs
index 69ef41fe19..c7ca4abe69 100644
--- a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.Core.cs
+++ b/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.Core.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using EMU7800.Core;
 
-namespace BizHawk.Emulation
+namespace BizHawk.Emulation.Cores.Atari.Atari7800
 {
 	partial class Atari7800
 	{
diff --git a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs b/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs
index 1ea5bab616..5e43ceedaf 100644
--- a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs
+++ b/BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs
@@ -6,7 +6,7 @@ using BizHawk.Common;
 using BizHawk.Emulation.Common;
 using EMU7800.Core;
 
-namespace BizHawk.Emulation
+namespace BizHawk.Emulation.Cores.Atari.Atari7800
 {
 	public partial class Atari7800 : IEmulator
 	{
diff --git a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800Control.cs b/BizHawk.Emulation/Consoles/Atari/7800/Atari7800Control.cs
index 8fb4c95ee9..19df307978 100644
--- a/BizHawk.Emulation/Consoles/Atari/7800/Atari7800Control.cs
+++ b/BizHawk.Emulation/Consoles/Atari/7800/Atari7800Control.cs
@@ -3,7 +3,7 @@
 using EMU7800.Core;
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Emulation
+namespace BizHawk.Emulation.Cores.Atari.Atari7800
 {
 	public class Atari7800Control
 	{
diff --git a/BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs b/BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs
index dc2e005c34..e62a4464fb 100644
--- a/BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs
+++ b/BizHawk.Emulation/Consoles/Coleco/ColecoVision.cs
@@ -7,7 +7,7 @@ using BizHawk.Emulation.Common;
 using BizHawk.Emulation.CPUs.Z80;
 using BizHawk.Emulation.Sound;
 
-namespace BizHawk.Emulation.Consoles.Coleco
+namespace BizHawk.Emulation.Cores.ColecoVision
 {
 	public sealed partial class ColecoVision : IEmulator
 	{
diff --git a/BizHawk.Emulation/Consoles/Coleco/Input.cs b/BizHawk.Emulation/Consoles/Coleco/Input.cs
index 717ee203c2..532ed039fc 100644
--- a/BizHawk.Emulation/Consoles/Coleco/Input.cs
+++ b/BizHawk.Emulation/Consoles/Coleco/Input.cs
@@ -1,6 +1,6 @@
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Emulation.Consoles.Coleco
+namespace BizHawk.Emulation.Cores.ColecoVision
 {
 	public partial class ColecoVision
 	{
diff --git a/BizHawk.Emulation/Consoles/Coleco/MemoryMap.cs b/BizHawk.Emulation/Consoles/Coleco/MemoryMap.cs
index 41959cf582..d84f8266e7 100644
--- a/BizHawk.Emulation/Consoles/Coleco/MemoryMap.cs
+++ b/BizHawk.Emulation/Consoles/Coleco/MemoryMap.cs
@@ -1,29 +1,29 @@
-namespace BizHawk.Emulation.Consoles.Coleco
+namespace BizHawk.Emulation.Cores.ColecoVision
 {
-    public partial class ColecoVision
-    {
-        public byte ReadMemory(ushort addr)
-        {
-            if (addr >= 0x8000)
-                return RomData[addr & 0x7FFF];
-            if (addr >= 0x6000)
-                return Ram[addr & 1023];
-            if (addr < 0x2000)
-                return BiosRom[addr];
+	public partial class ColecoVision
+	{
+		public byte ReadMemory(ushort addr)
+		{
+			if (addr >= 0x8000)
+				return RomData[addr & 0x7FFF];
+			if (addr >= 0x6000)
+				return Ram[addr & 1023];
+			if (addr < 0x2000)
+				return BiosRom[addr];
 
-            //Console.WriteLine("Unhandled read at {0:X4}", addr);
-            return 0xFF;
-        }
+			//Console.WriteLine("Unhandled read at {0:X4}", addr);
+			return 0xFF;
+		}
 
-        public void WriteMemory(ushort addr, byte value)
-        {
-            if (addr >= 0x6000 && addr < 0x8000)
-            {
-                Ram[addr & 1023] = value;
-                return;
-            }
+		public void WriteMemory(ushort addr, byte value)
+		{
+			if (addr >= 0x6000 && addr < 0x8000)
+			{
+				Ram[addr & 1023] = value;
+				return;
+			}
 
-            //Console.WriteLine("Unhandled write at {0:X4}:{1:X2}", addr, value);
-        }
-    }
+			//Console.WriteLine("Unhandled write at {0:X4}:{1:X2}", addr, value);
+		}
+	}
 }
diff --git a/BizHawk.Emulation/Consoles/Coleco/TMS9918A.cs b/BizHawk.Emulation/Consoles/Coleco/TMS9918A.cs
index b9570989e7..20900a7e23 100644
--- a/BizHawk.Emulation/Consoles/Coleco/TMS9918A.cs
+++ b/BizHawk.Emulation/Consoles/Coleco/TMS9918A.cs
@@ -6,7 +6,7 @@ using BizHawk.Common;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.CPUs.Z80;
 
-namespace BizHawk.Emulation.Consoles.Coleco
+namespace BizHawk.Emulation.Cores.ColecoVision
 {
 	public sealed class TMS9918A : IVideoProvider
 	{
diff --git a/BizHawk.Emulation/Consoles/Intellivision/Cartridge.cs b/BizHawk.Emulation/Consoles/Intellivision/Cartridge.cs
index 5a1423ec90..6f1ebeddeb 100644
--- a/BizHawk.Emulation/Consoles/Intellivision/Cartridge.cs
+++ b/BizHawk.Emulation/Consoles/Intellivision/Cartridge.cs
@@ -1,4 +1,4 @@
-namespace BizHawk.Emulation.Consoles.Intellivision
+namespace BizHawk.Emulation.Cores.Intellivision
 {
 	public sealed class Cartridge : ICart
 	{
diff --git a/BizHawk.Emulation/Consoles/Intellivision/ICart.cs b/BizHawk.Emulation/Consoles/Intellivision/ICart.cs
index 7acd1d3ac8..a1590a9472 100644
--- a/BizHawk.Emulation/Consoles/Intellivision/ICart.cs
+++ b/BizHawk.Emulation/Consoles/Intellivision/ICart.cs
@@ -1,4 +1,4 @@
-namespace BizHawk.Emulation.Consoles.Intellivision
+namespace BizHawk.Emulation.Cores.Intellivision
 {
 	public interface ICart
 	{
diff --git a/BizHawk.Emulation/Consoles/Intellivision/Intellicart.cs b/BizHawk.Emulation/Consoles/Intellivision/Intellicart.cs
index 67f49aab80..7a0bdac8af 100644
--- a/BizHawk.Emulation/Consoles/Intellivision/Intellicart.cs
+++ b/BizHawk.Emulation/Consoles/Intellivision/Intellicart.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace BizHawk.Emulation.Consoles.Intellivision
+namespace BizHawk.Emulation.Cores.Intellivision
 {
 	public sealed class Intellicart : ICart
 	{
diff --git a/BizHawk.Emulation/Consoles/Intellivision/Intellivision.cs b/BizHawk.Emulation/Consoles/Intellivision/Intellivision.cs
index 57b6893b50..3d64959664 100644
--- a/BizHawk.Emulation/Consoles/Intellivision/Intellivision.cs
+++ b/BizHawk.Emulation/Consoles/Intellivision/Intellivision.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.CPUs.CP1610;
 
-namespace BizHawk.Emulation.Consoles.Intellivision
+namespace BizHawk.Emulation.Cores.Intellivision
 {
 	public sealed partial class Intellivision : IEmulator
 	{
diff --git a/BizHawk.Emulation/Consoles/Intellivision/MemoryMap.cs b/BizHawk.Emulation/Consoles/Intellivision/MemoryMap.cs
index b1673262dc..ce5bb4bd1e 100644
--- a/BizHawk.Emulation/Consoles/Intellivision/MemoryMap.cs
+++ b/BizHawk.Emulation/Consoles/Intellivision/MemoryMap.cs
@@ -1,4 +1,4 @@
-namespace BizHawk.Emulation.Consoles.Intellivision
+namespace BizHawk.Emulation.Cores.Intellivision
 {
 	public sealed partial class Intellivision
 	{
diff --git a/BizHawk.Emulation/Consoles/Intellivision/PSG.cs b/BizHawk.Emulation/Consoles/Intellivision/PSG.cs
index 18c71f7daf..3591e57ac5 100644
--- a/BizHawk.Emulation/Consoles/Intellivision/PSG.cs
+++ b/BizHawk.Emulation/Consoles/Intellivision/PSG.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace BizHawk.Emulation.Consoles.Intellivision
+namespace BizHawk.Emulation.Cores.Intellivision
 {
 	public sealed class PSG
 	{
diff --git a/BizHawk.Emulation/Consoles/Intellivision/STIC.cs b/BizHawk.Emulation/Consoles/Intellivision/STIC.cs
index 0a26acd629..c572819c29 100644
--- a/BizHawk.Emulation/Consoles/Intellivision/STIC.cs
+++ b/BizHawk.Emulation/Consoles/Intellivision/STIC.cs
@@ -1,7 +1,7 @@
 using System;
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Emulation.Consoles.Intellivision
+namespace BizHawk.Emulation.Cores.Intellivision
 {
 	public sealed class STIC : IVideoProvider
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/GBA/LibMeteor.cs b/BizHawk.Emulation/Consoles/Nintendo/GBA/LibMeteor.cs
index 56c34226cb..4f4dc96f68 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/GBA/LibMeteor.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/GBA/LibMeteor.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace BizHawk.Emulation.Consoles.Nintendo.GBA
+namespace BizHawk.Emulation.Cores.Nintendo.GBA
 {
 	/// <summary>
 	/// bindings into libmeteor.dll
diff --git a/BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs b/BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs
index 96da565af5..80907743fb 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/GBA/Meteor.cs
@@ -6,7 +6,7 @@ using System.IO;
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Emulation.Consoles.Nintendo.GBA
+namespace BizHawk.Emulation.Cores.Nintendo.GBA
 {
 	public class GBA : IEmulator, IVideoProvider, ISyncSoundProvider
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/GBColors.cs b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/GBColors.cs
index af4ec37ae4..953ca3c3d0 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/GBColors.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/GBColors.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace BizHawk.Emulation.Consoles.GB
+namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 {
 	public class GBColors
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs
index 35affbfbf4..c9f685ede4 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs
@@ -5,7 +5,7 @@ using System.IO;
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Emulation.Consoles.GB
+namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 {
 	/// <summary>
 	/// a gameboy/gameboy color emulator wrapped around native C++ libgambatte
diff --git a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/GambatteLink.cs b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/GambatteLink.cs
index a0bafd81f2..db03aa8eee 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/GambatteLink.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/GambatteLink.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Emulation.Consoles.GB
+namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 {
 	public class GambatteLink : IEmulator, IVideoProvider, ISyncSoundProvider
 	{
@@ -31,8 +31,8 @@ namespace BizHawk.Emulation.Consoles.GB
 
 		const int SampPerFrame = 35112;
 
-		Consoles.Nintendo.SNES.LibsnesCore.SnesSaveController LCont = new Nintendo.SNES.LibsnesCore.SnesSaveController(Gameboy.GbController);
-		Consoles.Nintendo.SNES.LibsnesCore.SnesSaveController RCont = new Nintendo.SNES.LibsnesCore.SnesSaveController(Gameboy.GbController);
+		Consoles.Nintendo.SNES.LibsnesCore.SnesSaveController LCont = new BizHawk.Emulation.Consoles.Nintendo.SNES.LibsnesCore.SnesSaveController(Gameboy.GbController);
+		Consoles.Nintendo.SNES.LibsnesCore.SnesSaveController RCont = new BizHawk.Emulation.Consoles.Nintendo.SNES.LibsnesCore.SnesSaveController(Gameboy.GbController);
 
 		public GambatteLink(CoreComm comm, GameInfo leftinfo, byte[] leftrom, GameInfo rightinfo, byte[] rightrom)
 		{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/LibGambatte.cs b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/LibGambatte.cs
index 03a2ed20bb..caba667895 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/LibGambatte.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/LibGambatte.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace BizHawk.Emulation.Consoles.GB
+namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 {
 	/// <summary>
 	/// static bindings into libgambatte.dll
diff --git a/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
index 161058922f..de4ed22ada 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs
@@ -7,7 +7,7 @@ using System.Threading;
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Emulation.Consoles.Nintendo.N64
+namespace BizHawk.Emulation.Cores.Nintendo.N64
 {
 	public class N64 : IEmulator, IVideoProvider
 	{
diff --git a/BizHawk.Emulation/Consoles/Nintendo/N64/mupen64plusApi.cs b/BizHawk.Emulation/Consoles/Nintendo/N64/mupen64plusApi.cs
index f867aabc55..cc1c86e2b3 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/N64/mupen64plusApi.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/N64/mupen64plusApi.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
 
-namespace BizHawk.Emulation.Consoles.Nintendo.N64
+namespace BizHawk.Emulation.Cores.Nintendo.N64
 {
 	public class mupen64plusApi : IDisposable
 	{