diff --git a/demos/misc/Eternal_Forest_Taito_Arcade.fur b/demos/arcade/Eternal_Forest_TaitoArcade.fur
similarity index 100%
rename from demos/misc/Eternal_Forest_Taito_Arcade.fur
rename to demos/arcade/Eternal_Forest_TaitoArcade.fur
diff --git a/demos/multichip/Ice_Wind_OPMSPCM.fur b/demos/arcade/Ice_Wind_SegaPCM.fur
similarity index 100%
rename from demos/multichip/Ice_Wind_OPMSPCM.fur
rename to demos/arcade/Ice_Wind_SegaPCM.fur
diff --git a/demos/namco/Mars_Bar_On_Mars.fur b/demos/arcade/Mars_Bar_On_Mars_NamcoWSG.fur
similarity index 100%
rename from demos/namco/Mars_Bar_On_Mars.fur
rename to demos/arcade/Mars_Bar_On_Mars_NamcoWSG.fur
diff --git a/demos/misc/Neo_Seaside_Volley_Court_NeoGeo.fur b/demos/arcade/Neo_Seaside_Volley_Court_NeoGeo.fur
similarity index 100%
rename from demos/misc/Neo_Seaside_Volley_Court_NeoGeo.fur
rename to demos/arcade/Neo_Seaside_Volley_Court_NeoGeo.fur
diff --git a/demos/namco/Phoenix_cover.fur b/demos/arcade/Phoenix_cover_NamcoWSG.fur
similarity index 100%
rename from demos/namco/Phoenix_cover.fur
rename to demos/arcade/Phoenix_cover_NamcoWSG.fur
diff --git a/demos/multichip/The_Good_Times_Arcade.fur b/demos/arcade/The_Good_Times_SegaPCM.fur
similarity index 100%
rename from demos/multichip/The_Good_Times_Arcade.fur
rename to demos/arcade/The_Good_Times_SegaPCM.fur
diff --git a/demos/multichip/Tubelectric_Fictional_Arcade.fur b/demos/arcade/Tubelectric_Fictional_Arcade.fur
similarity index 100%
rename from demos/multichip/Tubelectric_Fictional_Arcade.fur
rename to demos/arcade/Tubelectric_Fictional_Arcade.fur
diff --git a/demos/misc/UT99_Run_Taito_Arcade.fur b/demos/arcade/UT99_Run_TaitoArcade.fur
similarity index 100%
rename from demos/misc/UT99_Run_Taito_Arcade.fur
rename to demos/arcade/UT99_Run_TaitoArcade.fur
diff --git a/demos/misc/Utter Determination YM2610B.fur b/demos/arcade/Utter_Determination_TaitoArcade.fur
similarity index 100%
rename from demos/misc/Utter Determination YM2610B.fur
rename to demos/arcade/Utter_Determination_TaitoArcade.fur
diff --git a/demos/namco/ice-cap-nc30.fur b/demos/arcade/ice_cap_NamcoC30.fur
similarity index 100%
rename from demos/namco/ice-cap-nc30.fur
rename to demos/arcade/ice_cap_NamcoC30.fur
diff --git a/demos/multichip/iji_tor.fur b/demos/arcade/iji_tor_SegaPCM.fur
similarity index 100%
rename from demos/multichip/iji_tor.fur
rename to demos/arcade/iji_tor_SegaPCM.fur
diff --git a/demos/multichip/the_machines_are_socialising.fur b/demos/arcade/the_machines_are_socialising_SegaPCM.fur
similarity index 100%
rename from demos/multichip/the_machines_are_socialising.fur
rename to demos/arcade/the_machines_are_socialising_SegaPCM.fur
diff --git a/demos/opl/OPL3_SegaPCM_Xeno_Crisis_-_Facility_Area_2.fur b/demos/multichip/OPL3_SegaPCM_Xeno_Crisis_-_Facility_Area_2.fur
similarity index 100%
rename from demos/opl/OPL3_SegaPCM_Xeno_Crisis_-_Facility_Area_2.fur
rename to demos/multichip/OPL3_SegaPCM_Xeno_Crisis_-_Facility_Area_2.fur