diff --git a/src/app/editor/editor_manager.cc b/src/app/editor/editor_manager.cc
index d03467b2..64fbfeb7 100644
--- a/src/app/editor/editor_manager.cc
+++ b/src/app/editor/editor_manager.cc
@@ -25,7 +25,7 @@
 #include "app/gui/input.h"
 #include "app/gui/style.h"
 #include "app/rom.h"
-#include "base/extension.h"
+#include "incl/extension.h"
 #include "imgui/backends/imgui_impl_sdl2.h"
 #include "imgui/backends/imgui_impl_sdlrenderer2.h"
 #include "imgui/imgui.h"
diff --git a/src/app/editor/editor_manager.h b/src/app/editor/editor_manager.h
index 56b2d148..11838de3 100644
--- a/src/app/editor/editor_manager.h
+++ b/src/app/editor/editor_manager.h
@@ -30,7 +30,7 @@
 #include "app/gui/icons.h"
 #include "app/gui/input.h"
 #include "app/rom.h"
-#include "base/extension.h"
+#include "incl/extension.h"
 #include "imgui/imgui.h"
 #include "imgui/misc/cpp/imgui_stdlib.h"
 #include "imgui_memory_editor.h"
diff --git a/src/app/editor/system/extension_manager.cc b/src/app/editor/system/extension_manager.cc
index 3f8d25d0..250271b5 100644
--- a/src/app/editor/system/extension_manager.cc
+++ b/src/app/editor/system/extension_manager.cc
@@ -8,7 +8,7 @@
 #include <iostream>
 #include <vector>
 
-#include "base/extension.h"
+#include "incl/extension.h"
 
 namespace yaze {
 namespace app {
diff --git a/src/app/editor/system/extension_manager.h b/src/app/editor/system/extension_manager.h
index 7b8456bd..c215041c 100644
--- a/src/app/editor/system/extension_manager.h
+++ b/src/app/editor/system/extension_manager.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "base/extension.h"
+#include "incl/extension.h"
 
 namespace yaze {
 namespace app {
diff --git a/src/app/gfx/snes_color.h b/src/app/gfx/snes_color.h
index 16ce43eb..61e8d13c 100644
--- a/src/app/gfx/snes_color.h
+++ b/src/app/gfx/snes_color.h
@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "base/snes_color.h"
+#include "incl/snes_color.h"
 #include "imgui/imgui.h"
 
 namespace yaze {
diff --git a/src/app/gfx/snes_palette.h b/src/app/gfx/snes_palette.h
index 538dc760..00377a98 100644
--- a/src/app/gfx/snes_palette.h
+++ b/src/app/gfx/snes_palette.h
@@ -13,7 +13,7 @@
 #include "absl/status/statusor.h"
 #include "app/core/constants.h"
 #include "app/gfx/snes_color.h"
-#include "base/snes_color.h"
+#include "incl/snes_color.h"
 #include "imgui/imgui.h"
 
 namespace yaze {
diff --git a/src/base/extension.h b/src/incl/extension.h
similarity index 100%
rename from src/base/extension.h
rename to src/incl/extension.h
diff --git a/src/base/extension_sample.c b/src/incl/extension_sample.c
similarity index 98%
rename from src/base/extension_sample.c
rename to src/incl/extension_sample.c
index 1abb6265..4cedb8e8 100644
--- a/src/base/extension_sample.c
+++ b/src/incl/extension_sample.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#include "base/extension.h"
+#include "incl/extension.h"
 #include "yaze.h"
 
 void my_extension_initialize(yaze_editor_context* context) {
diff --git a/src/base/overworld.h b/src/incl/overworld.h
similarity index 100%
rename from src/base/overworld.h
rename to src/incl/overworld.h
diff --git a/src/base/snes_color.h b/src/incl/snes_color.h
similarity index 100%
rename from src/base/snes_color.h
rename to src/incl/snes_color.h
diff --git a/src/base/sprite.h b/src/incl/sprite.h
similarity index 100%
rename from src/base/sprite.h
rename to src/incl/sprite.h
diff --git a/src/py/yaze_py.cc b/src/py/yaze_py.cc
index a45b37c4..582283a7 100644
--- a/src/py/yaze_py.cc
+++ b/src/py/yaze_py.cc
@@ -1,9 +1,9 @@
 #include <boost/python.hpp>
 
-#include "base/extension.h"
-#include "base/overworld.h"
-#include "base/snes_color.h"
-#include "base/sprite.h"
+#include "incl/extension.h"
+#include "incl/overworld.h"
+#include "incl/snes_color.h"
+#include "incl/sprite.h"
 #include "yaze.h"
 
 BOOST_PYTHON_MODULE(yaze_py) {
diff --git a/src/test/core/message_test.cc b/src/test/core/message_test.cc
index 05f1a1d9..ae5eb3fa 100644
--- a/src/test/core/message_test.cc
+++ b/src/test/core/message_test.cc
@@ -4,7 +4,7 @@
 
 namespace yaze {
 namespace test {
-namespace message_system {
+namespace message {
 
 using app::core::IMessageListener;
 using app::core::IMessageProtocol;
@@ -119,6 +119,6 @@ TEST_F(MessageDispatcherTest, FilteredMessageHandling) {
   EXPECT_EQ(listener1_.message_count(), 1);
 }
 
-}  // namespace message_system
+}  // namespace message
 }  // namespace test
 }  // namespace yaze
diff --git a/src/test/emu/cpu_test.cc b/src/test/emu/cpu_test.cc
index 93cc46ef..027af6f3 100644
--- a/src/test/emu/cpu_test.cc
+++ b/src/test/emu/cpu_test.cc
@@ -7,7 +7,7 @@
 #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"
+#include "test/mocks/mock_memory.h"
 
 namespace yaze {
 namespace test {
diff --git a/src/test/emu/ppu_test.cc b/src/test/emu/ppu_test.cc
index 801a0c7b..3099f801 100644
--- a/src/test/emu/ppu_test.cc
+++ b/src/test/emu/ppu_test.cc
@@ -4,7 +4,7 @@
 
 #include "app/emu/cpu/clock.h"
 #include "app/emu/memory/memory.h"
-#include "app/emu/memory/mock_memory.h"
+#include "test/mocks/mock_memory.h"
 
 namespace yaze {
 namespace test {
diff --git a/src/app/emu/memory/mock_memory.h b/src/test/mocks/mock_memory.h
similarity index 100%
rename from src/app/emu/memory/mock_memory.h
rename to src/test/mocks/mock_memory.h
diff --git a/src/yaze.h b/src/yaze.h
index c85a8225..cb6f0ae0 100644
--- a/src/yaze.h
+++ b/src/yaze.h
@@ -8,9 +8,9 @@ extern "C" {
 #include <stddef.h>
 #include <stdint.h>
 
-#include "base/overworld.h"
-#include "base/snes_color.h"
-#include "base/sprite.h"
+#include "incl/overworld.h"
+#include "incl/snes_color.h"
+#include "incl/sprite.h"
 
 typedef struct z3_rom z3_rom;
 typedef struct yaze_flags yaze_flags;