diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b920b491..0ca99b15 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -68,15 +68,15 @@ if(APPLE)
 endif()
 
 if (YAZE_BUILD_APP)
-  include(app/CMakeLists.txt)
+  include(app/app.cmake)
 endif()
 
 if (YAZE_BUILD_Z3ED)
-  include(cli/CMakeLists.txt) 
+  include(cli/z3ed.cmake) 
 endif()
 
 if (YAZE_BUILD_EXTENSIONS)
-  include(ext/CMakeLists.txt)
+  include(ext/ext.cmake)
 endif()
 
 if (YAZE_BUILD_PYTHON)
diff --git a/src/app/CMakeLists.txt b/src/app/app.cmake
similarity index 91%
rename from src/app/CMakeLists.txt
rename to src/app/app.cmake
index 54bfda43..6d3e4d8d 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/app.cmake
@@ -1,5 +1,5 @@
-include(app/editor/CMakeLists.txt)
-include(app/zelda3/CMakeLists.txt)
+include(app/editor/editor.cmake)
+include(app/zelda3/zelda3.cmake)
 
 add_executable(
   yaze
diff --git a/src/app/editor/CMakeLists.txt b/src/app/editor/editor.cmake
similarity index 94%
rename from src/app/editor/CMakeLists.txt
rename to src/app/editor/editor.cmake
index 99469da2..fd2f2011 100644
--- a/src/app/editor/CMakeLists.txt
+++ b/src/app/editor/editor.cmake
@@ -2,7 +2,6 @@ set(
   YAZE_APP_EDITOR_SRC
   app/editor/editor_manager.cc
   app/editor/dungeon/dungeon_editor.cc
-  app/editor/settings_editor.cc
   app/editor/overworld/overworld_editor.cc
   app/editor/sprite/sprite_editor.cc
   app/editor/music/music_editor.cc
@@ -16,5 +15,6 @@ set(
   app/editor/utils/gfx_context.cc
   app/editor/overworld/refresh.cc
   app/editor/overworld/entity.cc
+  app/editor/system/settings_editor.cc
   app/editor/system/extension_manager.cc
 )
\ No newline at end of file
diff --git a/src/app/editor/editor_manager.h b/src/app/editor/editor_manager.h
index 355b5965..ad27d3ef 100644
--- a/src/app/editor/editor_manager.h
+++ b/src/app/editor/editor_manager.h
@@ -18,7 +18,7 @@
 #include "app/editor/message/message_editor.h"
 #include "app/editor/music/music_editor.h"
 #include "app/editor/overworld/overworld_editor.h"
-#include "app/editor/settings_editor.h"
+#include "app/editor/system/settings_editor.h"
 #include "app/editor/sprite/sprite_editor.h"
 #include "app/editor/system/extension_manager.h"
 #include "app/editor/utils/gfx_context.h"
diff --git a/src/app/editor/settings_editor.cc b/src/app/editor/system/settings_editor.cc
similarity index 96%
rename from src/app/editor/settings_editor.cc
rename to src/app/editor/system/settings_editor.cc
index d93658eb..38f50e9d 100644
--- a/src/app/editor/settings_editor.cc
+++ b/src/app/editor/system/settings_editor.cc
@@ -1,10 +1,9 @@
 
-#include "imgui/imgui.h"
+#include "app/editor/system/settings_editor.h"
 
 #include "absl/status/status.h"
 #include "app/editor/utils/flags.h"
-#include "app/editor/settings_editor.h"
-#include "app/editor/utils/flags.h"
+#include "imgui/imgui.h"
 
 namespace yaze {
 namespace app {
diff --git a/src/app/editor/settings_editor.h b/src/app/editor/system/settings_editor.h
similarity index 100%
rename from src/app/editor/settings_editor.h
rename to src/app/editor/system/settings_editor.h
diff --git a/src/app/zelda3/CMakeLists.txt b/src/app/zelda3/zelda3.cmake
similarity index 100%
rename from src/app/zelda3/CMakeLists.txt
rename to src/app/zelda3/zelda3.cmake
diff --git a/src/cli/CMakeLists.txt b/src/cli/z3ed.cmake
similarity index 100%
rename from src/cli/CMakeLists.txt
rename to src/cli/z3ed.cmake
diff --git a/src/ext/CMakeLists.txt b/src/ext/ext.cmake
similarity index 100%
rename from src/ext/CMakeLists.txt
rename to src/ext/ext.cmake