diff --git a/Makefile b/Makefile
index 4b097cc1a0..1954b43e21 100644
--- a/Makefile
+++ b/Makefile
@@ -154,9 +154,7 @@ build/src/code/jpegdecoder.o: CC := $(CC_OLD)
 
 build/src/boot/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
 build/src/code/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
-build/src/overlays/actors/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
-build/src/overlays/effects/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
-build/src/overlays/gamestates/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
+build/src/overlays/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
 
 build/assets/%.o: CC := python3 tools/asm_processor/build.py $(CC) -- $(AS) $(ASFLAGS) --
 
diff --git a/spec b/spec
index 55c3ed5155..4b4521d2a3 100644
--- a/spec
+++ b/spec
@@ -556,16 +556,16 @@ endseg
 
 beginseg
     name "ovl_kaleido_scope"
-    include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_collect.o"
-    include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_debug.o"
-    include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_equipment.o"
-    include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_item.o"
-    include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_map_PAL.o"
-    include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_prompt.o"
-    include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.o"
-    include "build/src/overlays/actors/ovl_kaleido_scope/z_lmap_mark.o"
-    include "build/src/overlays/actors/ovl_kaleido_scope/z_lmap_mark_data.o"
-    include "build/src/overlays/actors/ovl_kaleido_scope/ovl_kaleido_scope_reloc.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.o"
+    include "build/src/overlays/misc/ovl_kaleido_scope/ovl_kaleido_scope_reloc.o"
 endseg
 
 beginseg
@@ -576,8 +576,8 @@ endseg
 
 beginseg
     name "ovl_map_mark_data"
-    include "build/src/overlays/ovl_map_mark_data/z_map_mark_data.o"
-    include "build/src/overlays/ovl_map_mark_data/ovl_map_mark_data_reloc.o"
+    include "build/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.o"
+    include "build/src/overlays/misc/ovl_map_mark_data/ovl_map_mark_data_reloc.o"
 endseg
 
 beginseg
diff --git a/src/overlays/actors/ovl_kaleido_scope/overlay.cfg b/src/overlays/misc/ovl_kaleido_scope/overlay.cfg
similarity index 100%
rename from src/overlays/actors/ovl_kaleido_scope/overlay.cfg
rename to src/overlays/misc/ovl_kaleido_scope/overlay.cfg
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_collect.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
similarity index 100%
rename from src/overlays/actors/ovl_kaleido_scope/z_kaleido_collect.c
rename to src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_debug.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
similarity index 100%
rename from src/overlays/actors/ovl_kaleido_scope/z_kaleido_debug.c
rename to src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_equipment.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
similarity index 100%
rename from src/overlays/actors/ovl_kaleido_scope/z_kaleido_equipment.c
rename to src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_item.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
similarity index 100%
rename from src/overlays/actors/ovl_kaleido_scope/z_kaleido_item.c
rename to src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_map_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
similarity index 100%
rename from src/overlays/actors/ovl_kaleido_scope/z_kaleido_map_PAL.c
rename to src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_prompt.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c
similarity index 100%
rename from src/overlays/actors/ovl_kaleido_scope/z_kaleido_prompt.c
rename to src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope.h b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
similarity index 100%
rename from src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope.h
rename to src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
similarity index 100%
rename from src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c
rename to src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_lmap_mark.c b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
similarity index 100%
rename from src/overlays/actors/ovl_kaleido_scope/z_lmap_mark.c
rename to src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_lmap_mark_data.c b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.c
similarity index 100%
rename from src/overlays/actors/ovl_kaleido_scope/z_lmap_mark_data.c
rename to src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.c
diff --git a/src/overlays/ovl_map_mark_data/overlay.cfg b/src/overlays/misc/ovl_map_mark_data/overlay.cfg
similarity index 100%
rename from src/overlays/ovl_map_mark_data/overlay.cfg
rename to src/overlays/misc/ovl_map_mark_data/overlay.cfg
diff --git a/src/overlays/ovl_map_mark_data/z_map_mark_data.c b/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c
similarity index 100%
rename from src/overlays/ovl_map_mark_data/z_map_mark_data.c
rename to src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c