diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0cbd2ac8..c0cf634e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1038,10 +1038,10 @@ source_group("Application\\Testing" FILES
 # CLI Tools
 source_group("CLI" FILES
   cli/cli_main.cc
-  cli/tui.cc
-  cli/tui.h
-  cli/z3ed.cc
-  cli/z3ed.h
+  cli/tui/tui.cc
+  cli/tui/tui.h
+  cli/cli.cc
+  cli/cli.h
 )
 
 source_group("CLI\\Handlers" FILES
diff --git a/src/cli/handlers/agent.cc b/src/cli/handlers/agent.cc
index 5c4879b1..5ea4bd14 100644
--- a/src/cli/handlers/agent.cc
+++ b/src/cli/handlers/agent.cc
@@ -1,6 +1,6 @@
 #include "cli/handlers/agent/commands.h"
 #include "cli/handlers/agent/todo_commands.h"
-#include "cli/z3ed.h"
+#include "cli/cli.h"
 
 #include <string>
 #include <vector>
diff --git a/src/cli/handlers/agent/general_commands.cc b/src/cli/handlers/agent/general_commands.cc
index de027d54..0b248d1a 100644
--- a/src/cli/handlers/agent/general_commands.cc
+++ b/src/cli/handlers/agent/general_commands.cc
@@ -38,7 +38,7 @@
 #include "cli/service/resources/resource_context_builder.h"
 #include "cli/service/rom/rom_sandbox_manager.h"
 #include "cli/tui/chat_tui.h"
-#include "cli/z3ed.h"
+#include "cli/cli.h"
 #include "util/macro.h"
 
 ABSL_DECLARE_FLAG(std::string, rom);
diff --git a/src/cli/handlers/command_palette.cc b/src/cli/handlers/command_palette.cc
index 95eb30ca..b0c0703d 100644
--- a/src/cli/handlers/command_palette.cc
+++ b/src/cli/handlers/command_palette.cc
@@ -1,4 +1,4 @@
-#include "cli/z3ed.h"
+#include "cli/cli.h"
 #include "cli/tui/command_palette.h"
 
 namespace yaze {
diff --git a/src/cli/handlers/compress.cc b/src/cli/handlers/compress.cc
index 676a37c1..13bde943 100644
--- a/src/cli/handlers/compress.cc
+++ b/src/cli/handlers/compress.cc
@@ -1,4 +1,4 @@
-#include "cli/z3ed.h"
+#include "cli/cli.h"
 
 namespace yaze {
 namespace cli {
diff --git a/src/cli/handlers/dungeon.cc b/src/cli/handlers/dungeon.cc
index a81fcac8..f5cbcc4d 100644
--- a/src/cli/handlers/dungeon.cc
+++ b/src/cli/handlers/dungeon.cc
@@ -1,4 +1,4 @@
-#include "cli/z3ed.h"
+#include "cli/cli.h"
 #include "app/zelda3/dungeon/dungeon_editor_system.h"
 #include "app/zelda3/dungeon/room.h"
 #include "absl/flags/flag.h"
diff --git a/src/cli/handlers/gfx.cc b/src/cli/handlers/gfx.cc
index fb907c38..1879f4d9 100644
--- a/src/cli/handlers/gfx.cc
+++ b/src/cli/handlers/gfx.cc
@@ -1,4 +1,4 @@
-#include "cli/z3ed.h"
+#include "cli/cli.h"
 #include "app/gfx/scad_format.h"
 #include "app/gfx/arena.h"
 #include "absl/flags/flag.h"
diff --git a/src/cli/handlers/overworld.cc b/src/cli/handlers/overworld.cc
index e1eecf2f..a0c34797 100644
--- a/src/cli/handlers/overworld.cc
+++ b/src/cli/handlers/overworld.cc
@@ -1,4 +1,4 @@
-#include "cli/z3ed.h"
+#include "cli/cli.h"
 #include "app/zelda3/overworld/overworld.h"
 #include "cli/handlers/overworld_inspect.h"
 
diff --git a/src/cli/handlers/palette.cc b/src/cli/handlers/palette.cc
index f4090672..4d708a91 100644
--- a/src/cli/handlers/palette.cc
+++ b/src/cli/handlers/palette.cc
@@ -1,4 +1,4 @@
-#include "cli/z3ed.h"
+#include "cli/cli.h"
 #include "cli/tui/palette_editor.h"
 
 #include "app/gfx/scad_format.h"
diff --git a/src/cli/handlers/patch.cc b/src/cli/handlers/patch.cc
index 02027fc1..181aa719 100644
--- a/src/cli/handlers/patch.cc
+++ b/src/cli/handlers/patch.cc
@@ -1,7 +1,7 @@
 #include <fstream>
 
 #include "asar-dll-bindings/c/asar.h"
-#include "cli/z3ed.h"
+#include "cli/cli.h"
 #include "cli/tui/asar_patch.h"
 #include "util/bps.h"
 #include "app/core/asar_wrapper.h"
diff --git a/src/cli/handlers/project.cc b/src/cli/handlers/project.cc
index d5a467c9..df27e034 100644
--- a/src/cli/handlers/project.cc
+++ b/src/cli/handlers/project.cc
@@ -1,5 +1,5 @@
 #include "app/core/project.h"
-#include "cli/z3ed.h"
+#include "cli/cli.h"
 #include "util/file_util.h"
 #include "util/bps.h"
 #include <filesystem>
diff --git a/src/cli/handlers/rom.cc b/src/cli/handlers/rom.cc
index 4ebd650e..4e4190f4 100644
--- a/src/cli/handlers/rom.cc
+++ b/src/cli/handlers/rom.cc
@@ -1,4 +1,4 @@
-#include "cli/z3ed.h"
+#include "cli/cli.h"
 
 #include <fstream>
 
diff --git a/src/cli/handlers/sprite.cc b/src/cli/handlers/sprite.cc
index 059f76b8..42cc66bf 100644
--- a/src/cli/handlers/sprite.cc
+++ b/src/cli/handlers/sprite.cc
@@ -1,4 +1,4 @@
-#include "cli/z3ed.h"
+#include "cli/cli.h"
 #include "app/zelda3/sprite/sprite_builder.h"
 #include "absl/flags/flag.h"
 
diff --git a/src/cli/handlers/tile16_transfer.cc b/src/cli/handlers/tile16_transfer.cc
index 144745a3..2b164f12 100644
--- a/src/cli/handlers/tile16_transfer.cc
+++ b/src/cli/handlers/tile16_transfer.cc
@@ -3,7 +3,7 @@
 
 #include "absl/status/status.h"
 #include "app/rom.h"
-#include "cli/z3ed.h"
+#include "cli/cli.h"
 #include "util/macro.h"
 
 namespace yaze {
diff --git a/src/cli/tui/tui.cc b/src/cli/tui/tui.cc
index 90c5a8ba..816c9a5e 100644
--- a/src/cli/tui/tui.cc
+++ b/src/cli/tui/tui.cc
@@ -13,7 +13,7 @@
 #include "util/file_util.h"
 #include "app/core/asar_wrapper.h"
 #include "app/zelda3/overworld/overworld.h"
-#include "cli/modern_cli.h"
+#include "cli/cli.h"
 #include "cli/tui/command_palette.h"
 #include "cli/z3ed_ascii_logo.h"
 #include "cli/service/agent/simple_chat_session.h"