diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Disassembler.cs b/src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Disassembler.cs
similarity index 99%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Disassembler.cs
rename to src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Disassembler.cs
index e434a68f99..985ad532ed 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Disassembler.cs
+++ b/src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Disassembler.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Emulation.Cores.Consoles.ChannelF
+namespace BizHawk.Emulation.Cores.Components.FairchildF8
 {
 	/// <summary>
 	/// Disassembler
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Execute.cs b/src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Execute.cs
similarity index 99%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Execute.cs
rename to src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Execute.cs
index 7ac428a37d..23ca5e4c62 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Execute.cs
+++ b/src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Execute.cs
@@ -1,4 +1,4 @@
-namespace BizHawk.Emulation.Cores.Consoles.ChannelF
+namespace BizHawk.Emulation.Cores.Components.FairchildF8
 {
 	public sealed partial class F3850
 	{
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Operations.cs b/src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Operations.cs
similarity index 99%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Operations.cs
rename to src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Operations.cs
index 053e661d2b..28f136eb78 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Operations.cs
+++ b/src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Operations.cs
@@ -1,6 +1,6 @@
 using BizHawk.Common.NumberExtensions;
 
-namespace BizHawk.Emulation.Cores.Consoles.ChannelF
+namespace BizHawk.Emulation.Cores.Components.FairchildF8
 {
 	/// <summary>
 	/// ALU Operations
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Registers.cs b/src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Registers.cs
similarity index 99%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Registers.cs
rename to src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Registers.cs
index c1bba9231b..c0c9dc82c8 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Registers.cs
+++ b/src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Registers.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Emulation.Cores.Consoles.ChannelF
+namespace BizHawk.Emulation.Cores.Components.FairchildF8
 {
 	/// <summary>
 	/// Internal Registers
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Tables.cs b/src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Tables.cs
similarity index 99%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Tables.cs
rename to src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Tables.cs
index 8c78614b39..613a8b4d0e 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Tables.cs
+++ b/src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Tables.cs
@@ -1,4 +1,4 @@
-namespace BizHawk.Emulation.Cores.Consoles.ChannelF
+namespace BizHawk.Emulation.Cores.Components.FairchildF8
 {
 	/// <summary>
 	/// Vectors of Instruction Operations
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.cs b/src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.cs
similarity index 98%
rename from src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.cs
rename to src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.cs
index 1178e3692d..cbfb452a68 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.cs
+++ b/src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.cs
@@ -3,10 +3,10 @@ using BizHawk.Common;
 using BizHawk.Common.NumberExtensions;
 using BizHawk.Emulation.Common;
 
-namespace BizHawk.Emulation.Cores.Consoles.ChannelF
+namespace BizHawk.Emulation.Cores.Components.FairchildF8
 {
 	/// <summary>
-	/// Fairchild F3850 (F8) CPU (Channel F-specific implementation)
+	/// Fairchild F3850 (F8) CPU
 	/// 
 	/// The F8 microprocessor is made up of separate interchangeable devices
 	/// The Channel F has:
@@ -28,8 +28,7 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF
 	///		* Programmable timer
 	///		* Interrupt logic
 	///
-	/// However, the Channel F does not use the timer or interrupt logic at all (as far as I can see) so we can hopefully just
-	/// maintain the PC and DC here in the CPU and move the ROMs into the core.
+	/// Note: Programmable timer and interrupt logic from the F3851 is not currently emulated
 	/// </summary>
 	public sealed partial class F3850
 	{
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.cs b/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.cs
index c3938a7e4d..b6ecbceba7 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using BizHawk.Emulation.Common;
+using BizHawk.Emulation.Cores.Components.FairchildF8;
 
 namespace BizHawk.Emulation.Cores.Consoles.ChannelF
 {