diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b695c8d9..e13bc573 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -58,12 +58,12 @@ set(
   app/emu/audio/spc700.cc
   app/emu/audio/dsp.cc
   app/emu/audio/internal/addressing.cc
-  app/emu/cpu/instructions.cc
-  app/emu/cpu/addressing.cc
+  app/emu/cpu/internal/instructions.cc
+  app/emu/cpu/internal/addressing.cc
+  app/emu/cpu/cpu.cc
   app/emu/video/ppu.cc
   app/emu/memory/dma.cc
   app/emu/memory/memory.cc
-  app/emu/cpu.cc
   app/emu/snes.cc
 )
 
diff --git a/src/app/emu/audio/apu.cc b/src/app/emu/audio/apu.cc
index faf2d3aa..439487b3 100644
--- a/src/app/emu/audio/apu.cc
+++ b/src/app/emu/audio/apu.cc
@@ -7,7 +7,7 @@
 
 #include "app/emu/audio/dsp.h"
 #include "app/emu/audio/spc700.h"
-#include "app/emu/clock.h"
+#include "app/emu/cpu/clock.h"
 #include "app/emu/memory/memory.h"
 
 namespace yaze {
diff --git a/src/app/emu/audio/apu.h b/src/app/emu/audio/apu.h
index 3c85d2ff..a0b4da25 100644
--- a/src/app/emu/audio/apu.h
+++ b/src/app/emu/audio/apu.h
@@ -7,7 +7,7 @@
 
 #include "app/emu/audio/dsp.h"
 #include "app/emu/audio/spc700.h"
-#include "app/emu/clock.h"
+#include "app/emu/cpu/clock.h"
 #include "app/emu/memory/memory.h"
 
 namespace yaze {
diff --git a/src/app/emu/clock.h b/src/app/emu/cpu/clock.h
similarity index 100%
rename from src/app/emu/clock.h
rename to src/app/emu/cpu/clock.h
diff --git a/src/app/emu/cpu.cc b/src/app/emu/cpu/cpu.cc
similarity index 100%
rename from src/app/emu/cpu.cc
rename to src/app/emu/cpu/cpu.cc
diff --git a/src/app/emu/cpu.h b/src/app/emu/cpu/cpu.h
similarity index 99%
rename from src/app/emu/cpu.h
rename to src/app/emu/cpu/cpu.h
index 584ae8a1..84aae02a 100644
--- a/src/app/emu/cpu.h
+++ b/src/app/emu/cpu/cpu.h
@@ -8,9 +8,9 @@
 #include <vector>
 
 #include "app/core/common.h"
-#include "app/emu/clock.h"
+#include "app/emu/cpu/clock.h"
+#include "app/emu/cpu/internal/opcodes.h"
 #include "app/emu/debug/log.h"
-#include "app/emu/internal/opcodes.h"
 #include "app/emu/memory/memory.h"
 
 namespace yaze {
diff --git a/src/app/emu/cpu/addressing.cc b/src/app/emu/cpu/internal/addressing.cc
similarity index 99%
rename from src/app/emu/cpu/addressing.cc
rename to src/app/emu/cpu/internal/addressing.cc
index ebf77d0b..b8e2fa51 100644
--- a/src/app/emu/cpu/addressing.cc
+++ b/src/app/emu/cpu/internal/addressing.cc
@@ -1,4 +1,4 @@
-#include "app/emu/cpu.h"
+#include "app/emu/cpu/cpu.h"
 
 namespace yaze {
 namespace app {
diff --git a/src/app/emu/cpu/instructions.cc b/src/app/emu/cpu/internal/instructions.cc
similarity index 99%
rename from src/app/emu/cpu/instructions.cc
rename to src/app/emu/cpu/internal/instructions.cc
index b735e339..ee41748d 100644
--- a/src/app/emu/cpu/instructions.cc
+++ b/src/app/emu/cpu/internal/instructions.cc
@@ -2,7 +2,7 @@
 #include <string>
 #include <vector>
 
-#include "app/emu/cpu.h"
+#include "app/emu/cpu/cpu.h"
 
 namespace yaze {
 namespace app {
diff --git a/src/app/emu/internal/opcodes.h b/src/app/emu/cpu/internal/opcodes.h
similarity index 100%
rename from src/app/emu/internal/opcodes.h
rename to src/app/emu/cpu/internal/opcodes.h
diff --git a/src/app/emu/internal/asm_parser.h b/src/app/emu/debug/asm_parser.h
similarity index 98%
rename from src/app/emu/internal/asm_parser.h
rename to src/app/emu/debug/asm_parser.h
index 48c765bb..5ea1fe07 100644
--- a/src/app/emu/internal/asm_parser.h
+++ b/src/app/emu/debug/asm_parser.h
@@ -8,7 +8,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "app/emu/internal/opcodes.h"
+#include "app/emu/cpu/internal/opcodes.h"
 
 namespace yaze {
 namespace app {
diff --git a/src/app/emu/debug/debugger.h b/src/app/emu/debug/debugger.h
index 61c40f84..a6a4dc3e 100644
--- a/src/app/emu/debug/debugger.h
+++ b/src/app/emu/debug/debugger.h
@@ -2,7 +2,7 @@
 #define YAZE_APP_EMU_DEBUG_DEBUGGER_H_
 
 #include "app/emu/audio/apu.h"
-#include "app/emu/cpu.h"
+#include "app/emu/cpu/cpu.h"
 #include "app/emu/video/ppu.h"
 
 namespace yaze {
diff --git a/src/app/emu/memory/mock_memory.h b/src/app/emu/memory/mock_memory.h
index 5d7ee7a5..30b1feb1 100644
--- a/src/app/emu/memory/mock_memory.h
+++ b/src/app/emu/memory/mock_memory.h
@@ -4,8 +4,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "app/emu/clock.h"
-#include "app/emu/cpu.h"
+#include "app/emu/cpu/clock.h"
+#include "app/emu/cpu/cpu.h"
 #include "app/emu/memory/memory.h"
 
 using yaze::app::emu::Clock;
diff --git a/src/app/emu/snes.cc b/src/app/emu/snes.cc
index 6ceabb61..6617be78 100644
--- a/src/app/emu/snes.cc
+++ b/src/app/emu/snes.cc
@@ -9,8 +9,8 @@
 
 #include "app/emu/audio/apu.h"
 #include "app/emu/audio/spc700.h"
-#include "app/emu/clock.h"
-#include "app/emu/cpu.h"
+#include "app/emu/cpu/clock.h"
+#include "app/emu/cpu/cpu.h"
 #include "app/emu/debug/debugger.h"
 #include "app/emu/memory/memory.h"
 #include "app/emu/video/ppu.h"
diff --git a/src/app/emu/snes.h b/src/app/emu/snes.h
index 69d65ba5..a2c39d4f 100644
--- a/src/app/emu/snes.h
+++ b/src/app/emu/snes.h
@@ -8,8 +8,8 @@
 
 #include "app/emu/audio/apu.h"
 #include "app/emu/audio/spc700.h"
-#include "app/emu/clock.h"
-#include "app/emu/cpu.h"
+#include "app/emu/cpu/clock.h"
+#include "app/emu/cpu/cpu.h"
 #include "app/emu/debug/debugger.h"
 #include "app/emu/memory/dma.h"
 #include "app/emu/memory/memory.h"
diff --git a/src/app/emu/video/ppu.h b/src/app/emu/video/ppu.h
index cfcb978a..def76a17 100644
--- a/src/app/emu/video/ppu.h
+++ b/src/app/emu/video/ppu.h
@@ -5,7 +5,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "app/emu/clock.h"
+#include "app/emu/cpu/clock.h"
 #include "app/emu/memory/memory.h"
 #include "app/emu/video/ppu_registers.h"
 #include "app/rom.h"
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d3707a84..dbd54e7f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -22,9 +22,9 @@ add_executable(
   ../src/cli/patch.cc
   ../src/cli/command_handler.cc
   ../src/app/rom.cc
-  ../src/app/emu/cpu.cc
-  ../src/app/emu/cpu/instructions.cc
-  ../src/app/emu/cpu/addressing.cc
+  ../src/app/emu/cpu/cpu.cc
+  ../src/app/emu/cpu/internal/instructions.cc
+  ../src/app/emu/cpu/internal/addressing.cc
   ../src/app/emu/audio/internal/addressing.cc
   ../src/app/emu/audio/apu.cc
   ../src/app/emu/video/ppu.cc
diff --git a/test/emu/cpu_test.cc b/test/emu/cpu_test.cc
index ed1c8a99..073527dc 100644
--- a/test/emu/cpu_test.cc
+++ b/test/emu/cpu_test.cc
@@ -1,11 +1,11 @@
-#include "app/emu/cpu.h"
+#include "app/emu/cpu/cpu.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "app/emu/clock.h"
-#include "app/emu/internal/asm_parser.h"
-#include "app/emu/internal/opcodes.h"
+#include "app/emu/cpu/clock.h"
+#include "app/emu/cpu/internal/opcodes.h"
+#include "app/emu/debug/asm_parser.h"
 #include "app/emu/memory/memory.h"
 #include "app/emu/memory/mock_memory.h"
 
@@ -4172,7 +4172,6 @@ TEST_F(CPUTest, XCESwitchBackAndForth) {
   EXPECT_FALSE(cpu.E);           // Emulation mode flag should be cleared
 }
 
-
 }  // namespace emu
 }  // namespace app
 }  // namespace yaze
diff --git a/test/emu/ppu_test.cc b/test/emu/ppu_test.cc
index 62d1d9f6..ef28eaa7 100644
--- a/test/emu/ppu_test.cc
+++ b/test/emu/ppu_test.cc
@@ -2,7 +2,7 @@
 
 #include <gmock/gmock.h>
 
-#include "app/emu/clock.h"
+#include "app/emu/cpu/clock.h"
 #include "app/emu/memory/memory.h"
 #include "app/emu/memory/mock_memory.h"
 
diff --git a/test/room_object_test.cc b/test/room_object_test.cc
index 29549906..dfd5a58c 100644
--- a/test/room_object_test.cc
+++ b/test/room_object_test.cc
@@ -3,7 +3,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "app/emu/cpu.h"
+#include "app/emu/cpu/cpu.h"
+#include "app/emu/memory/memory.h"
 #include "app/emu/memory/mock_memory.h"
 #include "app/emu/video/ppu.h"
 #include "app/gfx/bitmap.h"
@@ -14,10 +15,10 @@ namespace test {
 
 TEST(DungeonObjectTest, RenderObjectsAsBitmaps) {
   app::ROM rom;
-  rom.LoadFromFile("/Users/scawful/Code/yaze/build/bin/zelda3.sfc");
+  //     rom.LoadFromFile("/Users/scawful/Code/yaze/build/bin/zelda3.sfc"));
+  // EXPECT_EQ(rom_status, absl::Status::ok());
 
   app::zelda3::dungeon::DungeonObjectRenderer renderer;
-
 }
 
 }  // namespace test