diff --git a/demos/TODO/Contest thing 2025.fur b/demos/TODO/Contest thing 2025.fur
deleted file mode 100644
index 8c81f6d4e..000000000
Binary files a/demos/TODO/Contest thing 2025.fur and /dev/null differ
diff --git a/demos/TODO/Furnace-tan VS the spirit of the Mask.fur b/demos/TODO/Furnace-tan VS the spirit of the Mask.fur
deleted file mode 100644
index b52f39cf3..000000000
Binary files a/demos/TODO/Furnace-tan VS the spirit of the Mask.fur and /dev/null differ
diff --git a/demos/TODO/REPROGRAMMED.fur b/demos/TODO/REPROGRAMMED.fur
deleted file mode 100644
index b8fcb9f7d..000000000
Binary files a/demos/TODO/REPROGRAMMED.fur and /dev/null differ
diff --git a/demos/TODO/SHIN_YA.fur b/demos/TODO/SHIN_YA.fur
deleted file mode 100644
index 7a15a513a..000000000
Binary files a/demos/TODO/SHIN_YA.fur and /dev/null differ
diff --git a/demos/TODO/Slow Brew.fur b/demos/TODO/Slow Brew.fur
deleted file mode 100644
index d42962d14..000000000
Binary files a/demos/TODO/Slow Brew.fur and /dev/null differ
diff --git a/demos/TODO/evilevilsong.fur b/demos/TODO/evilevilsong.fur
deleted file mode 100644
index 46fbfdcaf..000000000
Binary files a/demos/TODO/evilevilsong.fur and /dev/null differ
diff --git a/demos/TODO/hittingtherevlimiter.fur b/demos/TODO/hittingtherevlimiter.fur
deleted file mode 100644
index f3f2ab189..000000000
Binary files a/demos/TODO/hittingtherevlimiter.fur and /dev/null differ
diff --git a/demos/TODO/notreallyfm.fur b/demos/TODO/notreallyfm.fur
deleted file mode 100644
index 5fcd96af0..000000000
Binary files a/demos/TODO/notreallyfm.fur and /dev/null differ
diff --git a/demos/TODO/tech_low_qual_era.fur b/demos/TODO/tech_low_qual_era.fur
deleted file mode 100644
index b2cc74125..000000000
Binary files a/demos/TODO/tech_low_qual_era.fur and /dev/null differ
diff --git a/demos/TODO/Crystal Dimension Section 2 WSG Mix.fur b/demos/arcade/Crystal Dimension Section 2 WSG Mix.fur
similarity index 100%
rename from demos/TODO/Crystal Dimension Section 2 WSG Mix.fur
rename to demos/arcade/Crystal Dimension Section 2 WSG Mix.fur
diff --git a/demos/TODO/JoyfulStart_Seta.fur b/demos/arcade/JoyfulStart_Seta.fur
similarity index 100%
rename from demos/TODO/JoyfulStart_Seta.fur
rename to demos/arcade/JoyfulStart_Seta.fur
diff --git a/demos/arcade/REPROGRAMMED.fur b/demos/arcade/REPROGRAMMED.fur
new file mode 100644
index 000000000..0764b4133
Binary files /dev/null and b/demos/arcade/REPROGRAMMED.fur differ
diff --git a/demos/arcade/SHIN_YA.fur b/demos/arcade/SHIN_YA.fur
new file mode 100644
index 000000000..423564e15
Binary files /dev/null and b/demos/arcade/SHIN_YA.fur differ
diff --git a/demos/arcade/Slow Brew.fur b/demos/arcade/Slow Brew.fur
new file mode 100644
index 000000000..f8038040e
Binary files /dev/null and b/demos/arcade/Slow Brew.fur differ
diff --git a/demos/TODO/living crystal cave.fur b/demos/arcade/living crystal cave.fur
similarity index 100%
rename from demos/TODO/living crystal cave.fur
rename to demos/arcade/living crystal cave.fur
diff --git a/demos/TODO/Back_In_Detroit_Supervision.fur b/demos/misc/Back_In_Detroit_Supervision.fur
similarity index 100%
rename from demos/TODO/Back_In_Detroit_Supervision.fur
rename to demos/misc/Back_In_Detroit_Supervision.fur
diff --git a/demos/TODO/david.fur b/demos/misc/david.fur
similarity index 100%
rename from demos/TODO/david.fur
rename to demos/misc/david.fur
diff --git a/demos/misc/hittingtherevlimiter_RF5C68.fur b/demos/misc/hittingtherevlimiter_RF5C68.fur
new file mode 100644
index 000000000..87bcb7929
Binary files /dev/null and b/demos/misc/hittingtherevlimiter_RF5C68.fur differ
diff --git a/demos/TODO/sawmen break.fur b/demos/misc/sawmen_break_SM8521.fur
similarity index 100%
rename from demos/TODO/sawmen break.fur
rename to demos/misc/sawmen_break_SM8521.fur
diff --git a/demos/TODO/spite is the best motivator.fur b/demos/misc/spite_is_the_best_motivator_PV1000.fur
similarity index 100%
rename from demos/TODO/spite is the best motivator.fur
rename to demos/misc/spite_is_the_best_motivator_PV1000.fur
diff --git a/demos/misc/tech_low_qual_era_RF5C68.fur b/demos/misc/tech_low_qual_era_RF5C68.fur
new file mode 100644
index 000000000..487d2adfa
Binary files /dev/null and b/demos/misc/tech_low_qual_era_RF5C68.fur differ
diff --git a/demos/TODO/CR_yasui_cs.fur b/demos/multichip/CR_yasui_cs.fur
similarity index 100%
rename from demos/TODO/CR_yasui_cs.fur
rename to demos/multichip/CR_yasui_cs.fur
diff --git a/demos/multichip/Furnace-tan VS the spirit of the Mask.fur b/demos/multichip/Furnace-tan VS the spirit of the Mask.fur
new file mode 100644
index 000000000..558ab829b
Binary files /dev/null and b/demos/multichip/Furnace-tan VS the spirit of the Mask.fur differ
diff --git a/demos/TODO/multichip/Melancholy_Girl_multichip.fur b/demos/multichip/Melancholy_Girl_multichip.fur
similarity index 100%
rename from demos/TODO/multichip/Melancholy_Girl_multichip.fur
rename to demos/multichip/Melancholy_Girl_multichip.fur
diff --git a/demos/TODO/WakeUpAndDance_MMC5_SM8521.fur b/demos/multichip/WakeUpAndDance_MMC5_SM8521.fur
similarity index 100%
rename from demos/TODO/WakeUpAndDance_MMC5_SM8521.fur
rename to demos/multichip/WakeUpAndDance_MMC5_SM8521.fur
diff --git a/demos/TODO/blanketcritter release ver.fur b/demos/nes/blanketcritter release ver.fur
similarity index 100%
rename from demos/TODO/blanketcritter release ver.fur
rename to demos/nes/blanketcritter release ver.fur
diff --git a/demos/TODO/opl/Air_Combat_Over_the_Vast_Mountain.fur b/demos/opl/Air_Combat_Over_the_Vast_Mountain.fur
similarity index 100%
rename from demos/TODO/opl/Air_Combat_Over_the_Vast_Mountain.fur
rename to demos/opl/Air_Combat_Over_the_Vast_Mountain.fur
diff --git a/demos/TODO/opl/[OPL]_One_Sided_Love_(Again).fur b/demos/opl/One_Sided_Love_Again.fur
similarity index 100%
rename from demos/TODO/opl/[OPL]_One_Sided_Love_(Again).fur
rename to demos/opl/One_Sided_Love_Again.fur
diff --git a/demos/TODO/opl/femteknyl.fur b/demos/opl/femteknyl.fur
similarity index 100%
rename from demos/TODO/opl/femteknyl.fur
rename to demos/opl/femteknyl.fur
diff --git a/demos/TODO/'90 lost media.fur b/demos/opz/'90 lost media.fur
similarity index 100%
rename from demos/TODO/'90 lost media.fur
rename to demos/opz/'90 lost media.fur
diff --git a/demos/TODO/Clashing Angels.fur b/demos/opz/Clashing Angels.fur
similarity index 100%
rename from demos/TODO/Clashing Angels.fur
rename to demos/opz/Clashing Angels.fur
diff --git a/demos/TODO/opz/Fly to the Leaden Sky.fur b/demos/opz/Fly to the Leaden Sky.fur
similarity index 100%
rename from demos/TODO/opz/Fly to the Leaden Sky.fur
rename to demos/opz/Fly to the Leaden Sky.fur
diff --git a/demos/TODO/opz/Glacier BM0.fur b/demos/opz/Glacier BM0.fur
similarity index 100%
rename from demos/TODO/opz/Glacier BM0.fur
rename to demos/opz/Glacier BM0.fur
diff --git a/demos/TODO/The Hedgehog Knows One Thing.fur b/demos/opz/The Hedgehog Knows One Thing.fur
similarity index 100%
rename from demos/TODO/The Hedgehog Knows One Thing.fur
rename to demos/opz/The Hedgehog Knows One Thing.fur
diff --git a/demos/TODO/opz/The bongos and teh base OPZx2.fur b/demos/opz/The bongos and teh base OPZx2.fur
similarity index 100%
rename from demos/TODO/opz/The bongos and teh base OPZx2.fur
rename to demos/opz/The bongos and teh base OPZx2.fur
diff --git a/demos/TODO/boost.fur b/demos/opz/boost.fur
similarity index 100%
rename from demos/TODO/boost.fur
rename to demos/opz/boost.fur
diff --git a/demos/TODO/goodbye my dreams.fur b/demos/opz/goodbye my dreams.fur
similarity index 100%
rename from demos/TODO/goodbye my dreams.fur
rename to demos/opz/goodbye my dreams.fur
diff --git a/demos/misc/massive_x_opz.fur b/demos/opz/massive_x_opz.fur
similarity index 100%
rename from demos/misc/massive_x_opz.fur
rename to demos/opz/massive_x_opz.fur
diff --git a/demos/TODO/myst_grove.fur b/demos/opz/myst_grove.fur
similarity index 100%
rename from demos/TODO/myst_grove.fur
rename to demos/opz/myst_grove.fur
diff --git a/demos/TODO/opz/only_dream_opz.fur b/demos/opz/only_dream_opz.fur
similarity index 100%
rename from demos/TODO/opz/only_dream_opz.fur
rename to demos/opz/only_dream_opz.fur
diff --git a/demos/TODO/opz/sea of crises.fur b/demos/opz/sea of crises.fur
similarity index 100%
rename from demos/TODO/opz/sea of crises.fur
rename to demos/opz/sea of crises.fur
diff --git a/demos/pce/Contest thing 2025.fur b/demos/pce/Contest thing 2025.fur
new file mode 100644
index 000000000..5bd126248
Binary files /dev/null and b/demos/pce/Contest thing 2025.fur differ
diff --git a/demos/TODO/Peace.fur b/demos/pce/Peace.fur
similarity index 100%
rename from demos/TODO/Peace.fur
rename to demos/pce/Peace.fur
diff --git a/demos/TODO/pce/Processing Plant 2025 Edit.fur b/demos/pce/Processing Plant 2025 Edit.fur
similarity index 100%
rename from demos/TODO/pce/Processing Plant 2025 Edit.fur
rename to demos/pce/Processing Plant 2025 Edit.fur
diff --git a/demos/TODO/fd_PCB.fur b/demos/pce/fd_PCB.fur
similarity index 100%
rename from demos/TODO/fd_PCB.fur
rename to demos/pce/fd_PCB.fur
diff --git a/demos/TODO/pce/pcengineasdmo.fur b/demos/pce/pcengineasdmo.fur
similarity index 100%
rename from demos/TODO/pce/pcengineasdmo.fur
rename to demos/pce/pcengineasdmo.fur
diff --git a/demos/misc/BlueBolt_VIC20.fur b/demos/vic20/BlueBolt.fur
similarity index 100%
rename from demos/misc/BlueBolt_VIC20.fur
rename to demos/vic20/BlueBolt.fur
diff --git a/demos/TODO/h.fur b/demos/vic20/h.fur
similarity index 100%
rename from demos/TODO/h.fur
rename to demos/vic20/h.fur
diff --git a/demos/TODO/wonderswan/Space Station of Enormous Proportions.fur b/demos/wonderswan/Space Station of Enormous Proportions.fur
similarity index 100%
rename from demos/TODO/wonderswan/Space Station of Enormous Proportions.fur
rename to demos/wonderswan/Space Station of Enormous Proportions.fur
diff --git a/demos/ymz280b/evilevilsong.fur b/demos/ymz280b/evilevilsong.fur
new file mode 100644
index 000000000..4db9098cf
Binary files /dev/null and b/demos/ymz280b/evilevilsong.fur differ
diff --git a/demos/ymz280b/notreallyfm.fur b/demos/ymz280b/notreallyfm.fur
new file mode 100644
index 000000000..f6756a6bb
Binary files /dev/null and b/demos/ymz280b/notreallyfm.fur differ