diff --git a/src/nostalgia/modules/gfx/src/studio/paletteeditor/CMakeLists.txt b/src/nostalgia/modules/gfx/src/studio/paletteeditor/CMakeLists.txt
index 9ec397bf..25e3a79c 100644
--- a/src/nostalgia/modules/gfx/src/studio/paletteeditor/CMakeLists.txt
+++ b/src/nostalgia/modules/gfx/src/studio/paletteeditor/CMakeLists.txt
@@ -1,19 +1,6 @@
-target_sources(
-	NostalgiaCore-Studio PRIVATE
-		commands/addcolorcommand.cpp
-		commands/addpagecommand.cpp
-		commands/applycolorallpagescommand.cpp
-		commands/duplicatepagecommand.cpp
-		commands/movecolorcommand.cpp
-		commands/movepagecommand.cpp
-		commands/removecolorcommand.cpp
-		commands/removepagecommand.cpp
-		commands/renamepagecommand.cpp
-		commands/updatecolorcommand.cpp
-		commands/updatecolorinfocommand.cpp
-)
-
 target_sources(
 	NostalgiaCore-Studio-ImGui PRIVATE
 		paletteeditor-imgui.cpp
 )
+
+add_subdirectory(commands)
\ No newline at end of file
diff --git a/src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/CMakeLists.txt b/src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/CMakeLists.txt
new file mode 100644
index 00000000..42c4cd54
--- /dev/null
+++ b/src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+target_sources(
+    NostalgiaCore-Studio PRIVATE
+        addcolorcommand.cpp
+        addpagecommand.cpp
+        applycolorallpagescommand.cpp
+        duplicatepagecommand.cpp
+        movecolorcommand.cpp
+        movepagecommand.cpp
+        removecolorcommand.cpp
+        removepagecommand.cpp
+        renamepagecommand.cpp
+        updatecolorcommand.cpp
+        updatecolorinfocommand.cpp
+)