diff --git a/demos/TODO/Melancholy_Girl_multichip.fur b/demos/TODO/multichip/Melancholy_Girl_multichip.fur
similarity index 100%
rename from demos/TODO/Melancholy_Girl_multichip.fur
rename to demos/TODO/multichip/Melancholy_Girl_multichip.fur
diff --git a/demos/TODO/Air_Combat_Over_the_Vast_Mountain.fur b/demos/TODO/opl/Air_Combat_Over_the_Vast_Mountain.fur
similarity index 100%
rename from demos/TODO/Air_Combat_Over_the_Vast_Mountain.fur
rename to demos/TODO/opl/Air_Combat_Over_the_Vast_Mountain.fur
diff --git a/demos/TODO/[OPL]_One_Sided_Love_(Again).fur b/demos/TODO/opl/[OPL]_One_Sided_Love_(Again).fur
similarity index 100%
rename from demos/TODO/[OPL]_One_Sided_Love_(Again).fur
rename to demos/TODO/opl/[OPL]_One_Sided_Love_(Again).fur
diff --git a/demos/TODO/femteknyl.fur b/demos/TODO/opl/femteknyl.fur
similarity index 100%
rename from demos/TODO/femteknyl.fur
rename to demos/TODO/opl/femteknyl.fur
diff --git a/demos/TODO/Fly to the Leaden Sky.fur b/demos/TODO/opz/Fly to the Leaden Sky.fur
similarity index 100%
rename from demos/TODO/Fly to the Leaden Sky.fur
rename to demos/TODO/opz/Fly to the Leaden Sky.fur
diff --git a/demos/TODO/Glacier BM0.fur b/demos/TODO/opz/Glacier BM0.fur
similarity index 100%
rename from demos/TODO/Glacier BM0.fur
rename to demos/TODO/opz/Glacier BM0.fur
diff --git a/demos/TODO/The bongos and teh base OPZx2.fur b/demos/TODO/opz/The bongos and teh base OPZx2.fur
similarity index 100%
rename from demos/TODO/The bongos and teh base OPZx2.fur
rename to demos/TODO/opz/The bongos and teh base OPZx2.fur
diff --git a/demos/TODO/only_dream_opz.fur b/demos/TODO/opz/only_dream_opz.fur
similarity index 100%
rename from demos/TODO/only_dream_opz.fur
rename to demos/TODO/opz/only_dream_opz.fur
diff --git a/demos/TODO/sea of crises.fur b/demos/TODO/opz/sea of crises.fur
similarity index 100%
rename from demos/TODO/sea of crises.fur
rename to demos/TODO/opz/sea of crises.fur
diff --git a/demos/TODO/Processing Plant 2025 Edit.fur b/demos/TODO/pce/Processing Plant 2025 Edit.fur
similarity index 100%
rename from demos/TODO/Processing Plant 2025 Edit.fur
rename to demos/TODO/pce/Processing Plant 2025 Edit.fur
diff --git a/demos/TODO/pcengineasdmo.fur b/demos/TODO/pce/pcengineasdmo.fur
similarity index 100%
rename from demos/TODO/pcengineasdmo.fur
rename to demos/TODO/pce/pcengineasdmo.fur
diff --git a/demos/TODO/Space Station of Enormous Proportions.fur b/demos/TODO/wonderswan/Space Station of Enormous Proportions.fur
similarity index 100%
rename from demos/TODO/Space Station of Enormous Proportions.fur
rename to demos/TODO/wonderswan/Space Station of Enormous Proportions.fur