diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 13e6755a..ed86fa64 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,7 +13,7 @@ set(
   app/editor/overworld_editor.cc
   app/editor/screen_editor.cc
   app/editor/sprite/sprite_editor.cc
-  app/editor/modules/music_editor.cc
+  app/editor/music/music_editor.cc
   app/editor/modules/palette_editor.cc
   app/editor/code/assembly_editor.cc
   app/editor/modules/tile16_editor.cc
diff --git a/src/app/editor/master_editor.cc b/src/app/editor/master_editor.cc
index afc005a6..fefc362e 100644
--- a/src/app/editor/master_editor.cc
+++ b/src/app/editor/master_editor.cc
@@ -17,8 +17,8 @@
 #include "app/editor/code/assembly_editor.h"
 #include "app/editor/dungeon_editor.h"
 #include "app/editor/graphics_editor.h"
-#include "app/editor/modules/music_editor.h"
 #include "app/editor/modules/palette_editor.h"
+#include "app/editor/music/music_editor.h"
 #include "app/editor/overworld_editor.h"
 #include "app/editor/screen_editor.h"
 #include "app/editor/sprite/sprite_editor.h"
diff --git a/src/app/editor/master_editor.h b/src/app/editor/master_editor.h
index 8ddd9f26..2df323d6 100644
--- a/src/app/editor/master_editor.h
+++ b/src/app/editor/master_editor.h
@@ -17,8 +17,8 @@
 #include "app/editor/context/gfx_context.h"
 #include "app/editor/dungeon_editor.h"
 #include "app/editor/graphics_editor.h"
-#include "app/editor/modules/music_editor.h"
 #include "app/editor/modules/palette_editor.h"
+#include "app/editor/music/music_editor.h"
 #include "app/editor/overworld_editor.h"
 #include "app/editor/screen_editor.h"
 #include "app/editor/sprite/sprite_editor.h"
diff --git a/src/app/editor/modules/music_editor.cc b/src/app/editor/music/music_editor.cc
similarity index 100%
rename from src/app/editor/modules/music_editor.cc
rename to src/app/editor/music/music_editor.cc
diff --git a/src/app/editor/modules/music_editor.h b/src/app/editor/music/music_editor.h
similarity index 100%
rename from src/app/editor/modules/music_editor.h
rename to src/app/editor/music/music_editor.h