diff --git a/acorn_bbc/acorn_bbc_ascii.draw b/acorn/acorn_bbc_ascii.draw
similarity index 100%
rename from acorn_bbc/acorn_bbc_ascii.draw
rename to acorn/acorn_bbc_ascii.draw
diff --git a/acorn_bbc/acorn_bbc_modelb.draw b/acorn/acorn_bbc_modelb.draw
similarity index 100%
rename from acorn_bbc/acorn_bbc_modelb.draw
rename to acorn/acorn_bbc_modelb.draw
diff --git a/acorn_bbc/acorn_bbc_teletext_alphanumeric.draw b/acorn/acorn_bbc_teletext_alphanumeric.draw
similarity index 100%
rename from acorn_bbc/acorn_bbc_teletext_alphanumeric.draw
rename to acorn/acorn_bbc_teletext_alphanumeric.draw
diff --git a/acorn_bbc/acorn_bbc_teletext_graphics_contiguous.draw b/acorn/acorn_bbc_teletext_graphics_contiguous.draw
similarity index 100%
rename from acorn_bbc/acorn_bbc_teletext_graphics_contiguous.draw
rename to acorn/acorn_bbc_teletext_graphics_contiguous.draw
diff --git a/acorn_bbc/acorn_bbc_teletext_graphics_noncontiguous.draw b/acorn/acorn_bbc_teletext_graphics_noncontiguous.draw
similarity index 100%
rename from acorn_bbc/acorn_bbc_teletext_graphics_noncontiguous.draw
rename to acorn/acorn_bbc_teletext_graphics_noncontiguous.draw
diff --git a/acorn_bbc/custom/README.md b/acorn/custom/README.md
similarity index 100%
rename from acorn_bbc/custom/README.md
rename to acorn/custom/README.md
diff --git a/acorn_bbc/custom/acorn_bbc_custom_altsysfnt.draw b/acorn/custom/acorn_bbc_custom_altsysfnt.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_altsysfnt.draw
rename to acorn/custom/acorn_bbc_custom_altsysfnt.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_arcfont.draw b/acorn/custom/acorn_bbc_custom_arcfont.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_arcfont.draw
rename to acorn/custom/acorn_bbc_custom_arcfont.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_arcturus.draw b/acorn/custom/acorn_bbc_custom_arcturus.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_arcturus.draw
rename to acorn/custom/acorn_bbc_custom_arcturus.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_bold.draw b/acorn/custom/acorn_bbc_custom_bold.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_bold.draw
rename to acorn/custom/acorn_bbc_custom_bold.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_boldtype.draw b/acorn/custom/acorn_bbc_custom_boldtype.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_boldtype.draw
rename to acorn/custom/acorn_bbc_custom_boldtype.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_bubble.draw b/acorn/custom/acorn_bbc_custom_bubble.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_bubble.draw
rename to acorn/custom/acorn_bbc_custom_bubble.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_caesar.draw b/acorn/custom/acorn_bbc_custom_caesar.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_caesar.draw
rename to acorn/custom/acorn_bbc_custom_caesar.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_courier.draw b/acorn/custom/acorn_bbc_custom_courier.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_courier.draw
rename to acorn/custom/acorn_bbc_custom_courier.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_deskfont.draw b/acorn/custom/acorn_bbc_custom_deskfont.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_deskfont.draw
rename to acorn/custom/acorn_bbc_custom_deskfont.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_giraffe.draw b/acorn/custom/acorn_bbc_custom_giraffe.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_giraffe.draw
rename to acorn/custom/acorn_bbc_custom_giraffe.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_helvetica.draw b/acorn/custom/acorn_bbc_custom_helvetica.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_helvetica.draw
rename to acorn/custom/acorn_bbc_custom_helvetica.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_hitech.draw b/acorn/custom/acorn_bbc_custom_hitech.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_hitech.draw
rename to acorn/custom/acorn_bbc_custom_hitech.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_irem.draw b/acorn/custom/acorn_bbc_custom_irem.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_irem.draw
rename to acorn/custom/acorn_bbc_custom_irem.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_jaguar.draw b/acorn/custom/acorn_bbc_custom_jaguar.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_jaguar.draw
rename to acorn/custom/acorn_bbc_custom_jaguar.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_large.draw b/acorn/custom/acorn_bbc_custom_large.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_large.draw
rename to acorn/custom/acorn_bbc_custom_large.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_latin1.draw b/acorn/custom/acorn_bbc_custom_latin1.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_latin1.draw
rename to acorn/custom/acorn_bbc_custom_latin1.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_mathsymb.draw b/acorn/custom/acorn_bbc_custom_mathsymb.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_mathsymb.draw
rename to acorn/custom/acorn_bbc_custom_mathsymb.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_nicefont.draw b/acorn/custom/acorn_bbc_custom_nicefont.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_nicefont.draw
rename to acorn/custom/acorn_bbc_custom_nicefont.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_oblique.draw b/acorn/custom/acorn_bbc_custom_oblique.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_oblique.draw
rename to acorn/custom/acorn_bbc_custom_oblique.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_panelfont.draw b/acorn/custom/acorn_bbc_custom_panelfont.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_panelfont.draw
rename to acorn/custom/acorn_bbc_custom_panelfont.draw
diff --git a/acorn_bbc/custom/acorn_bbc_custom_starch.draw b/acorn/custom/acorn_bbc_custom_starch.draw
similarity index 100%
rename from acorn_bbc/custom/acorn_bbc_custom_starch.draw
rename to acorn/custom/acorn_bbc_custom_starch.draw
diff --git a/acorn_bbc/philips_p2000t.draw b/acorn/philips_p2000t.draw
similarity index 100%
rename from acorn_bbc/philips_p2000t.draw
rename to acorn/philips_p2000t.draw
diff --git a/acorn_bbc/riscos/acorn_riscos_1_20_arthur.draw b/acorn/riscos/acorn_riscos_1_20_arthur.draw
similarity index 100%
rename from acorn_bbc/riscos/acorn_riscos_1_20_arthur.draw
rename to acorn/riscos/acorn_riscos_1_20_arthur.draw
diff --git a/acorn_bbc/riscos/acorn_riscos_2.draw b/acorn/riscos/acorn_riscos_2.draw
similarity index 100%
rename from acorn_bbc/riscos/acorn_riscos_2.draw
rename to acorn/riscos/acorn_riscos_2.draw
diff --git a/acorn_bbc/riscos/acorn_riscos_3_00.draw b/acorn/riscos/acorn_riscos_3_00.draw
similarity index 100%
rename from acorn_bbc/riscos/acorn_riscos_3_00.draw
rename to acorn/riscos/acorn_riscos_3_00.draw
diff --git a/acorn_bbc/riscos/acorn_riscos_3_10.draw b/acorn/riscos/acorn_riscos_3_10.draw
similarity index 100%
rename from acorn_bbc/riscos/acorn_riscos_3_10.draw
rename to acorn/riscos/acorn_riscos_3_10.draw
diff --git a/acorn_bbc/riscos/acorn_riscos_3_19.draw b/acorn/riscos/acorn_riscos_3_19.draw
similarity index 100%
rename from acorn_bbc/riscos/acorn_riscos_3_19.draw
rename to acorn/riscos/acorn_riscos_3_19.draw
diff --git a/acorn_bbc/riscos/acorn_riscos_3_71_8x10.draw b/acorn/riscos/acorn_riscos_3_71_8x10.draw
similarity index 100%
rename from acorn_bbc/riscos/acorn_riscos_3_71_8x10.draw
rename to acorn/riscos/acorn_riscos_3_71_8x10.draw
diff --git a/acorn_bbc/riscos/acorn_riscos_3_71_8x8.draw b/acorn/riscos/acorn_riscos_3_71_8x8.draw
similarity index 100%
rename from acorn_bbc/riscos/acorn_riscos_3_71_8x8.draw
rename to acorn/riscos/acorn_riscos_3_71_8x8.draw
diff --git a/acorn_bbc/saa5050.draw b/acorn/saa5050.draw
similarity index 100%
rename from acorn_bbc/saa5050.draw
rename to acorn/saa5050.draw
diff --git a/acorn_bbc/saa5051.draw b/acorn/saa5051.draw
similarity index 100%
rename from acorn_bbc/saa5051.draw
rename to acorn/saa5051.draw
diff --git a/acorn_bbc/saa5052.draw b/acorn/saa5052.draw
similarity index 100%
rename from acorn_bbc/saa5052.draw
rename to acorn/saa5052.draw
diff --git a/acorn_bbc/saa5053.draw b/acorn/saa5053.draw
similarity index 100%
rename from acorn_bbc/saa5053.draw
rename to acorn/saa5053.draw
diff --git a/acorn_bbc/saa5054.draw b/acorn/saa5054.draw
similarity index 100%
rename from acorn_bbc/saa5054.draw
rename to acorn/saa5054.draw
diff --git a/acorn_bbc/saa5055.draw b/acorn/saa5055.draw
similarity index 100%
rename from acorn_bbc/saa5055.draw
rename to acorn/saa5055.draw
diff --git a/acorn_bbc/saa5056.draw b/acorn/saa5056.draw
similarity index 100%
rename from acorn_bbc/saa5056.draw
rename to acorn/saa5056.draw
diff --git a/acorn_bbc/saa5057.draw b/acorn/saa5057.draw
similarity index 100%
rename from acorn_bbc/saa5057.draw
rename to acorn/saa5057.draw
diff --git a/amstrad_cpc.draw b/amstrad/amstrad_cpc.draw
similarity index 100%
rename from amstrad_cpc.draw
rename to amstrad/amstrad_cpc.draw
diff --git a/amstrad_pcw/amstrad_pcw.draw b/amstrad/amstrad_pcw.draw
similarity index 100%
rename from amstrad_pcw/amstrad_pcw.draw
rename to amstrad/amstrad_pcw.draw
diff --git a/amstrad_pcw/custom_letafont/ARMY.draw b/amstrad/custom_letafont/ARMY.draw
similarity index 100%
rename from amstrad_pcw/custom_letafont/ARMY.draw
rename to amstrad/custom_letafont/ARMY.draw
diff --git a/amstrad_pcw/custom_letafont/ARTY.draw b/amstrad/custom_letafont/ARTY.draw
similarity index 100%
rename from amstrad_pcw/custom_letafont/ARTY.draw
rename to amstrad/custom_letafont/ARTY.draw
diff --git a/amstrad_pcw/custom_letafont/ARTY1.draw b/amstrad/custom_letafont/ARTY1.draw
similarity index 100%
rename from amstrad_pcw/custom_letafont/ARTY1.draw
rename to amstrad/custom_letafont/ARTY1.draw
diff --git a/amstrad_pcw/custom_letafont/BOLD.draw b/amstrad/custom_letafont/BOLD.draw
similarity index 100%
rename from amstrad_pcw/custom_letafont/BOLD.draw
rename to amstrad/custom_letafont/BOLD.draw
diff --git a/amstrad_pcw/custom_letafont/CHUNKEE.draw b/amstrad/custom_letafont/CHUNKEE.draw
similarity index 100%
rename from amstrad_pcw/custom_letafont/CHUNKEE.draw
rename to amstrad/custom_letafont/CHUNKEE.draw
diff --git a/amstrad_pcw/custom_letafont/DATA1.draw b/amstrad/custom_letafont/DATA1.draw
similarity index 100%
rename from amstrad_pcw/custom_letafont/DATA1.draw
rename to amstrad/custom_letafont/DATA1.draw
diff --git a/amstrad_pcw/custom_letafont/DATA2.draw b/amstrad/custom_letafont/DATA2.draw
similarity index 100%
rename from amstrad_pcw/custom_letafont/DATA2.draw
rename to amstrad/custom_letafont/DATA2.draw
diff --git a/amstrad_pcw/custom_letafont/GOTHIC.draw b/amstrad/custom_letafont/GOTHIC.draw
similarity index 100%
rename from amstrad_pcw/custom_letafont/GOTHIC.draw
rename to amstrad/custom_letafont/GOTHIC.draw
diff --git a/amstrad_pcw/custom_letafont/HANDY1.draw b/amstrad/custom_letafont/HANDY1.draw
similarity index 100%
rename from amstrad_pcw/custom_letafont/HANDY1.draw
rename to amstrad/custom_letafont/HANDY1.draw
diff --git a/amstrad_pcw/custom_letafont/HANDY2.draw b/amstrad/custom_letafont/HANDY2.draw
similarity index 100%
rename from amstrad_pcw/custom_letafont/HANDY2.draw
rename to amstrad/custom_letafont/HANDY2.draw
diff --git a/amstrad_pcw/custom_letafont/NEAT1.draw b/amstrad/custom_letafont/NEAT1.draw
similarity index 100%
rename from amstrad_pcw/custom_letafont/NEAT1.draw
rename to amstrad/custom_letafont/NEAT1.draw
diff --git a/amstrad_pcw/custom_letafont/NEAT2.draw b/amstrad/custom_letafont/NEAT2.draw
similarity index 100%
rename from amstrad_pcw/custom_letafont/NEAT2.draw
rename to amstrad/custom_letafont/NEAT2.draw
diff --git a/amstrad_pcw/custom_letafont/README.md b/amstrad/custom_letafont/README.md
similarity index 100%
rename from amstrad_pcw/custom_letafont/README.md
rename to amstrad/custom_letafont/README.md
diff --git a/amstrad_pcw/custom_letafont/SANSERIF.draw b/amstrad/custom_letafont/SANSERIF.draw
similarity index 100%
rename from amstrad_pcw/custom_letafont/SANSERIF.draw
rename to amstrad/custom_letafont/SANSERIF.draw
diff --git a/amstrad_pcw/custom_letafont/SMALL1.draw b/amstrad/custom_letafont/SMALL1.draw
similarity index 100%
rename from amstrad_pcw/custom_letafont/SMALL1.draw
rename to amstrad/custom_letafont/SMALL1.draw
diff --git a/amstrad_pcw/custom_letafont/SMALL2.draw b/amstrad/custom_letafont/SMALL2.draw
similarity index 100%
rename from amstrad_pcw/custom_letafont/SMALL2.draw
rename to amstrad/custom_letafont/SMALL2.draw
diff --git a/amstrad_pcw/custom_letafont/SQUARE.draw b/amstrad/custom_letafont/SQUARE.draw
similarity index 100%
rename from amstrad_pcw/custom_letafont/SQUARE.draw
rename to amstrad/custom_letafont/SQUARE.draw
diff --git a/apple_ii/apple_ii.draw b/apple/apple_ii.draw
similarity index 100%
rename from apple_ii/apple_ii.draw
rename to apple/apple_ii.draw
diff --git a/apple_ii/apple_ii_custom_improved_german.draw b/apple/apple_ii_custom_improved_german.draw
similarity index 100%
rename from apple_ii/apple_ii_custom_improved_german.draw
rename to apple/apple_ii_custom_improved_german.draw
diff --git a/apple_ii/apple_ii_custom_pig_font.draw b/apple/apple_ii_custom_pig_font.draw
similarity index 100%
rename from apple_ii/apple_ii_custom_pig_font.draw
rename to apple/apple_ii_custom_pig_font.draw
diff --git a/apple_ii/apple_ii_custom_reactive.draw b/apple/apple_ii_custom_reactive.draw
similarity index 100%
rename from apple_ii/apple_ii_custom_reactive.draw
rename to apple/apple_ii_custom_reactive.draw
diff --git a/apple_ii/apple_ii_enhanced.draw b/apple/apple_ii_enhanced.draw
similarity index 100%
rename from apple_ii/apple_ii_enhanced.draw
rename to apple/apple_ii_enhanced.draw
diff --git a/apple_ii/apple_ii_french.draw b/apple/apple_ii_french.draw
similarity index 100%
rename from apple_ii/apple_ii_french.draw
rename to apple/apple_ii_french.draw
diff --git a/apple_ii/apple_ii_french_canadian.draw b/apple/apple_ii_french_canadian.draw
similarity index 100%
rename from apple_ii/apple_ii_french_canadian.draw
rename to apple/apple_ii_french_canadian.draw
diff --git a/apple_ii/apple_ii_french_canadian_enhanced.draw b/apple/apple_ii_french_canadian_enhanced.draw
similarity index 100%
rename from apple_ii/apple_ii_french_canadian_enhanced.draw
rename to apple/apple_ii_french_canadian_enhanced.draw
diff --git a/apple_ii/apple_ii_german.draw b/apple/apple_ii_german.draw
similarity index 100%
rename from apple_ii/apple_ii_german.draw
rename to apple/apple_ii_german.draw
diff --git a/apple_ii/apple_ii_uk.draw b/apple/apple_ii_uk.draw
similarity index 100%
rename from apple_ii/apple_ii_uk.draw
rename to apple/apple_ii_uk.draw
diff --git a/apple_ii/apple_ii_uk_enhanced.draw b/apple/apple_ii_uk_enhanced.draw
similarity index 100%
rename from apple_ii/apple_ii_uk_enhanced.draw
rename to apple/apple_ii_uk_enhanced.draw
diff --git a/apple_ii/pravetz_82.draw b/apple/pravetz_82.draw
similarity index 100%
rename from apple_ii/pravetz_82.draw
rename to apple/pravetz_82.draw
diff --git a/apple_ii/pravetz_8c.draw b/apple/pravetz_8c.draw
similarity index 100%
rename from apple_ii/pravetz_8c.draw
rename to apple/pravetz_8c.draw
diff --git a/apple_ii/pravetz_8m.draw b/apple/pravetz_8m.draw
similarity index 100%
rename from apple_ii/pravetz_8m.draw
rename to apple/pravetz_8m.draw
diff --git a/atari_st_8x16.draw b/atari/atari_st_8x16.draw
similarity index 100%
rename from atari_st_8x16.draw
rename to atari/atari_st_8x16.draw
diff --git a/atari_st_8x8.draw b/atari/atari_st_8x8.draw
similarity index 100%
rename from atari_st_8x8.draw
rename to atari/atari_st_8x8.draw
diff --git a/atascii.draw b/atari/atascii.draw
similarity index 100%
rename from atascii.draw
rename to atari/atascii.draw
diff --git a/sharp_mz80a.draw b/sharp/sharp_mz80a.draw
similarity index 100%
rename from sharp_mz80a.draw
rename to sharp/sharp_mz80a.draw
diff --git a/sharp_mz80b.draw b/sharp/sharp_mz80b.draw
similarity index 100%
rename from sharp_mz80b.draw
rename to sharp/sharp_mz80b.draw
diff --git a/sharp_mz80k2e_japanese.draw b/sharp/sharp_mz80k2e_japanese.draw
similarity index 100%
rename from sharp_mz80k2e_japanese.draw
rename to sharp/sharp_mz80k2e_japanese.draw