diff --git a/SabreTools.Helper/Mappings/Good.xml b/SabreTools.Helper/Mappings/Good.xml
deleted file mode 100644
index c6902cb0..00000000
--- a/SabreTools.Helper/Mappings/Good.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<mappings>
-	<mapping from="Good2600" to="Atari - 2600" />
-	<mapping from="Good5200" to="Atari - 5200" />
-	<mapping from="Good7800" to="Atari - 7800" />
-	<mapping from="GoodChaF" to="Fairchild - Channel F" />
-	<mapping from="GoodCoCo" to="Tandy Radio Shack - TRS-80 Color Computer" />
-	<mapping from="GoodCol" to="Coleco - ColecoVision, ColecoVision ADAM" />
-	<mapping from="GoodCPC" to="Amstrad - CPC" />
-	<mapping from="GoodGB64" to="Commodore - 64" />
-	<mapping from="GoodGBA" to="Nintendo - Game Boy Advance" />
-	<mapping from="GoodGBx" to="Nintendo - Game Boy, Game Boy Color" />
-	<mapping from="GoodGCom" to="Tiger Electronics - Game.com" />
-	<mapping from="GoodGen" to="Sega - Mega Drive, Genesis" />
-	<mapping from="GoodGG" to="Sega - Game Gear" />
-	<mapping from="GoodINTV" to="Mattel - Intellivision" />
-	<mapping from="GoodJag" to="Atari - Jaguar" />
-	<mapping from="GoodLynx" to="Atari - Lynx" />
-	<mapping from="GoodMO5" to="Thomson - 8bit" />
-	<mapping from="GoodMSX1" to="Microsoft - MSX, MSX 2" />
-	<mapping from="GoodMSX2" to="Microsoft - MSX, MSX 2" />
-	<mapping from="GoodMTX" to="Memotech - MTX512" />
-	<mapping from="GoodN64" to="Nintendo - Nintendo 64" />
-	<mapping from="GoodNES" to="Nintendo - Nintendo Entertainment System" />
-	<mapping from="GoodNGPx" to="SNK - Neo Geo Pocket, Neo Geo Pocket Color" />
-	<mapping from="GoodOric" to="Tangerine - Oric-1, Oric Atmos" />
-	<mapping from="GoodPCE" to="NEC - PC Engine, TurboGrafx 16" />
-	<mapping from="GoodPico" to="Sega - PICO" />
-	<mapping from="GoodSAMC" to="MGT - Sam Coupe" />
-	<mapping from="GoodSMS" to="Sega - Master System, Mark III" />
-	<mapping from="GoodSNES" to="Nintendo - Super Nintendo Entertainment System" />
-	<mapping from="GoodSV" to="Watara - Supervision" />
-	<mapping from="GoodVBoy" to="Nintendo - Virtual Boy" />
-	<mapping from="GoodVect" to="GCE - Vectrex" />
-	<mapping from="GoodWSx" to="Bandai - WonderSwan, WonderSwan Color" />
-</mappings>
\ No newline at end of file
diff --git a/SabreTools.Helper/Mappings/MAME.xml b/SabreTools.Helper/Mappings/MAME.xml
deleted file mode 100644
index d3df2e6c..00000000
--- a/SabreTools.Helper/Mappings/MAME.xml
+++ /dev/null
@@ -1,445 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<mappings>
-	<mapping from="32x" to="Sega - 32X" />
-	<mapping from="3do_m2" to="Panasonic - 3DO M2" />
-	<mapping from="a2600" to="Atari - 2600" />
-	<mapping from="a2600_cass" to="Atari - 2600" />
-	<mapping from="a5200" to="Atari - 5200" />
-	<mapping from="a7800" to="Atari - 7800" />
-	<mapping from="a800" to="Atari - 8bit" />
-	<mapping from="a800_flop" to="Atari - 8bit" />
-	<mapping from="abc1600" to="Luxor - ABC 1600" />
-	<mapping from="abc800" to="Luxor - ABC 800" />
-	<mapping from="abc800_hdd" to="Luxor - ABC 800" />
-	<mapping from="abc806" to="Luxor - ABC 806" />
-	<mapping from="abc80_cass" to="Luxor - ABC 80" />
-	<mapping from="abc80_flop" to="Luxor - ABC 80" />
-	<mapping from="adam_cart" to="Coleco - ColecoVision, ColecoVision ADAM" />
-	<mapping from="adam_cass" to="Coleco - ColecoVision, ColecoVision ADAM" />
-	<mapping from="adam_flop" to="Coleco - ColecoVision, ColecoVision ADAM" />
-	<mapping from="advantage" to="NorthStar - Advantage" />
-	<mapping from="advision" to="Entex - Adventure Vision" />
-	<mapping from="aim65_cart" to="Rockwell - AIM 65" />
-	<mapping from="aleste" to="Patisonic - Aleste 520EX" />
-	<mapping from="alice32" to="Matra Hachette - Alice 32 &amp; 90" />
-	<mapping from="alice90" to="Matra Hachette - Alice 32 &amp; 90" />
-	<mapping from="alphatro_flop" to="Triumph-Adler - Alphatronic PC" />
-	<mapping from="altos5" to="Altos Computer Systems - Series 5" />
-	<mapping from="amiga_a1000" to="Commodore - Amiga" />
-	<mapping from="amiga_a3000" to="Commodore - Amiga" />
-	<mapping from="amiga_apps" to="Commodore - Amiga" />
-	<mapping from="amiga_flop" to="Commodore - Amiga" />
-	<mapping from="amiga_hardware" to="Commodore - Amiga" />
-	<mapping from="amiga_workbench" to="Commodore - Amiga" />
-	<mapping from="amigaaga_flop" to="Commodore - Amiga" />
-	<mapping from="amigaecs_flop" to="Commodore - Amiga" />
-	<mapping from="amigaocs_flop" to="Commodore - Amiga" />
-	<mapping from="ampro" to="Ampro - Little Board" />
-	<mapping from="apc" to="NEC - Advanced Personal Computer" />
-	<mapping from="apfimag_cass" to="APF - M-1000" />
-	<mapping from="apfm1000" to="APF - M-1000" />
-	<mapping from="apogee" to="Radio-86RK - Apogej BK-01" />
-	<mapping from="apollo_ctape" to="Hewlett-Packard - Apollo" />
-	<mapping from="apple1" to="Apple - I" />
-	<mapping from="apple2" to="Apple - II" />
-	<mapping from="apple2gs" to="Apple - II" />
-	<mapping from="apple3" to="Apple - III" />
-	<mapping from="aquarius" to="Mattel - Aquarius" />
-	<mapping from="arcadia" to="Emerson - Arcadia 2001" />
-	<mapping from="archimedes" to="Acorn - Archimedes" />
-	<mapping from="astrocde" to="Bally Professional - Arcade, Astrocade" />
-	<mapping from="atom" to="Acorn - Atom" />
-	<mapping from="atom_cass" to="Acorn - Atom" />
-	<mapping from="atom_flop" to="Acorn - Atom" />
-	<mapping from="atom_rom" to="Acorn - Atom" />
-	<mapping from="attache" to="Otrona - Attache" />
-	<mapping from="b2m" to="BNPO - Bashkiria-2M" />
-	<mapping from="bbc_32016_flop" to="Acorn - BBC, Electron" />
-	<mapping from="bbc_65c102_flop" to="Acorn - BBC, Electron" />
-	<mapping from="bbc_68000_flop" to="Acorn - BBC, Electron" />
-	<mapping from="bbc_80186_flop" to="Acorn - BBC, Electron" />
-	<mapping from="bbc_arm_flop" to="Acorn - BBC, Electron" />
-	<mapping from="bbc_flop_32016" to="Acorn - BBC, Electron" />
-	<mapping from="bbc_flop_6502" to="Acorn - BBC, Electron" />
-	<mapping from="bbc_flop_65c102" to="Acorn - BBC, Electron" />
-	<mapping from="bbc_flop_68000" to="Acorn - BBC, Electron" />
-	<mapping from="bbc_flop_80186" to="Acorn - BBC, Electron" />
-	<mapping from="bbc_flop_arm" to="Acorn - BBC, Electron" />
-	<mapping from="bbc_flop_torch" to="Acorn - BBC, Electron" />
-	<mapping from="bbc_flop_z80" to="Acorn - BBC, Electron" />
-	<mapping from="bbc_torch_flop" to="Acorn - BBC, Electron" />
-	<mapping from="bbc_z80_flop" to="Acorn - BBC, Electron" />
-	<mapping from="bbca_cass" to="Acorn - BBC, Electron" />
-	<mapping from="bbcb_cass" to="Acorn - BBC, Electron" />
-	<mapping from="bbcb_cass_de" to="Acorn - BBC, Electron" />
-	<mapping from="bbcb_de_cass" to="Acorn - BBC, Electron" />
-	<mapping from="bbcb_flop" to="Acorn - BBC, Electron" />
-	<mapping from="bbcb_flop_orig" to="Acorn - BBC, Electron" />
-	<mapping from="bbcb_flop_us" to="Acorn - BBC, Electron" />
-	<mapping from="bbcb_orig_flop" to="Acorn - BBC, Electron" />
-	<mapping from="bbcb_us_flop" to="Acorn - BBC, Electron" />
-	<mapping from="bbcbc" to="BBC - Bridge Companion" />
-	<mapping from="bbcm_cart" to="Acorn - BBC, Electron" />
-	<mapping from="bbcm_cass" to="Acorn - BBC, Electron" />
-	<mapping from="bbcm_flop" to="Acorn - BBC, Electron" />
-	<mapping from="bbcmc_flop" to="Acorn - BBC, Electron" />
-	<mapping from="bk0010" to="Elektronika - BK-0010" />
-	<mapping from="bml3_flop" to="Hitachi - Basic Master Level 3" />
-	<mapping from="bw12" to="Bondwell - 12" />
-	<mapping from="bw14" to="Bondwell - 14" />
-	<mapping from="bw2" to="Bondwell - 2" />
-	<mapping from="bx256hp_flop" to="Commodore - BX256-80HP, CBM 730" />
-	<mapping from="c128_cart" to="Commodore - 128" />
-	<mapping from="c128_flop" to="Commodore - 128" />
-	<mapping from="c128_rom" to="Commodore - 128" />
-	<mapping from="c64_cart" to="Commodore - 64" />
-	<mapping from="c64_cass" to="Commodore - 64" />
-	<mapping from="c64_flop" to="Commodore - 64" />
-	<mapping from="c65_flop" to="Commodore - 65" />
-	<mapping from="casloopy" to="Casio - Loopy" />
-	<mapping from="cbm2_cart" to="Commodore - CBM-II" />
-	<mapping from="cbm2_flop" to="Commodore - CBM-II" />
-	<mapping from="cbm8096_flop" to="Commodore - 8096" />
-	<mapping from="cbm8296_flop" to="Commodore - 8296" />
-	<mapping from="cc40_cart" to="Texas Instruments - CC-40" />
-	<mapping from="cd32" to="Commodore - Amiga" />
-	<mapping from="cdi" to="Philips - CD-i" />
-	<mapping from="cdtv" to="Commodore - Amiga" />
-	<mapping from="cgenie_cart" to="EACA - EG2000 Colour Genie" />
-	<mapping from="cgenie_cass" to="EACA - EG2000 Colour Genie" />
-	<mapping from="channelf" to="Fairchild - Channel F" />
-	<mapping from="coco_cart" to="Tandy Radio Shack - TRS-80 Color Computer" />
-	<mapping from="coco_flop" to="Tandy Radio Shack - TRS-80 Color Computer" />
-	<mapping from="coleco" to="Coleco - ColecoVision, ColecoVision ADAM" />
-	<mapping from="compclr2_flop" to="ISC - Compucolor II" />
-	<mapping from="compis" to="Telenova - Compis" />
-	<mapping from="comx35_flop" to="COMX - COMX-35" />
-	<mapping from="copera" to="Sega - PICO" />
-	<mapping from="cpc_cass" to="Amstrad - CPC" />
-	<mapping from="cpc_flop" to="Amstrad - CPC" />
-	<mapping from="crvision" to="VTech - CreatiVision" />
-	<mapping from="cx3000tc" to="Palson - CX 3000 Tele Computer" />
-	<mapping from="dai_cass" to="DAI - Personal Computer" />
-	<mapping from="database" to="Voltmace - Database" />
-	<mapping from="dim68k" to="Dimension - 68000" />
-	<mapping from="dmv" to="NCR - Decision Mate V" />
-	<mapping from="dps1" to="Ithaca InterSystems - DPS-1" />
-	<mapping from="ec1841" to="MPO BT - EC 1841" />
-	<mapping from="einstein" to="Tatung - Einstein TC-01" />
-	<mapping from="electron_cart" to="Acorn - BBC, Electron" />
-	<mapping from="electron_cass" to="Acorn - BBC, Electron" />
-	<mapping from="ep64_cart" to="Enterprise - 64, 128" />
-	<mapping from="ep64_cass" to="Enterprise - 64, 128" />
-	<mapping from="ep64_flop" to="Enterprise - 64, 128" />
-	<mapping from="epson_cpm" to="Epson - CPM" />
-	<mapping from="exl100" to="Exelvision - Exeltel, EXL100" />
-	<mapping from="famicom_cass" to="Nintendo - Famicom BASIC" />
-	<mapping from="famicom_flop" to="Nintendo - Famicom Disk System" />
-	<mapping from="fidel_scc" to="Fidelity - SCC" />
-	<mapping from="fm77av" to="Fujitsu - FM-77AV" />
-	<mapping from="fm7_cass" to="Fujitsu - FM-7" />
-	<mapping from="fm7_disk" to="Fujitsu - FM-7" />
-	<mapping from="fmtowns_cd" to="Fujitsu - FM Towns" />
-	<mapping from="g7400" to="Philips - Videopac+, Odyssey2" />
-	<mapping from="galaxy" to="Galaksija - Galaksija, Galaksija Plus" />
-	<mapping from="gamate" to="Bit Corp - Gamate" />
-	<mapping from="gameboy" to="Nintendo - Game Boy, Game Boy Color" />
-	<mapping from="gamecom" to="Tiger Electronics - Game.com" />
-	<mapping from="gamegear" to="Sega - Game Gear" />
-	<mapping from="gameking" to="TimeTop - GameKing" />
-	<mapping from="gameking3" to="TimeTop - GameKing" />
-	<mapping from="gamepock" to="Epoch - Game Pocket Computer" />
-	<mapping from="gba" to="Nintendo - Game Boy Advance" />
-	<mapping from="gbcolor" to="Nintendo - Game Boy, Game Boy Color" />
-	<mapping from="genius" to="VTech - Genius" />
-	<mapping from="gimix" to="Gimix - 6809" />
-	<mapping from="gjmovie" to="VTech - Genius" />
-	<mapping from="gl2000" to="VTech - Genius" />
-	<mapping from="gl6000sl" to="VTech - Genius" />
-	<mapping from="glcolor" to="VTech - Genius" />
-	<mapping from="gmaster" to="Hartung - Game Master" />
-	<mapping from="gp32" to="GamePark - GP32" />
-	<mapping from="guab" to="JPM - Give us a Break" />
-	<mapping from="gx4000" to="Amstrad - GX4000" />
-	<mapping from="h21" to="TRQ - Video Computer H-21" />
-	<mapping from="horizon" to="NorthStar - Horizon" />
-	<mapping from="hp9835a_rom" to="Hewlett-Packard - 9835" />
-	<mapping from="hp9845a_rom" to="Hewlett-Packard - 9845" />
-	<mapping from="hp9845b_rom" to="Hewlett-Packard - 9845" />
-	<mapping from="ht68k" to="Hawthorne Technologies - HT68K" />
-	<mapping from="i7000_card" to="Itautec - I-7000" />
-	<mapping from="ibm5140" to="IBM - PC Compatibles" />
-	<mapping from="ibm5150" to="IBM - PC Compatibles" />
-	<mapping from="ibm5150_cass" to="IBM - PC Compatibles" />
-	<mapping from="ibm5160_flop" to="IBM - PC Compatibles" />
-	<mapping from="ibm5170" to="IBM - PC Compatibles" />
-	<mapping from="ibm5170_cdrom" to="IBM - PC Compatibles" />
-	<mapping from="ibmpcjr_cart" to="IBM - PC Jr" />
-	<mapping from="ibmpcjr_flop" to="IBM - PC Jr" />
-	<mapping from="interact" to="Interact - Family Computer" />
-	<mapping from="intv" to="Mattel - Intellivision" />
-	<mapping from="intvecs" to="Mattel - Intellivision" />
-	<mapping from="iq128" to="VTech - Genius" />
-	<mapping from="iq151_cart" to="ZPA Novy Bor - IQ-151" />
-	<mapping from="iq151_flop" to="ZPA Novy Bor - IQ-151" />
-	<mapping from="jaguar" to="Atari - Jaguar" />
-	<mapping from="juicebox" to="Mattel - Juice Box" />
-	<mapping from="jupace_cass" to="Jupiter Cantab - Jupiter Ace" />
-	<mapping from="k28m2" to="Tiger Electronics - K28" />
-	<mapping from="kayproii" to="Kaypro - II" />
-	<mapping from="kc_cart" to="Robotron - KC85" />
-	<mapping from="kc_cass" to="Robotron - KC85" />
-	<mapping from="kc_flop" to="Robotron - KC85" />
-	<mapping from="korvet_flop" to="Moscow State University - Korvet" />
-	<mapping from="lantutor" to="Texas Instruments - Language Tutor" />
-	<mapping from="leapster" to="LeapFrog - Leapster Learning Game System" />
-	<mapping from="lisa" to="Apple - Lisa" />
-	<mapping from="lisa2" to="Apple - Lisa 2" />
-	<mapping from="lviv" to="Lviv - PC-01" />
-	<mapping from="lynx" to="Atari - Lynx" />
-	<mapping from="m20" to="Olivetti - M20" />
-	<mapping from="m5_cart" to="Sord - M5" />
-	<mapping from="m5_cass" to="Sord - M5" />
-	<mapping from="m5_flop" to="Sord - M5" />
-	<mapping from="mac_flop" to="Apple - Macintosh" />
-	<mapping from="mac_hdd" to="Apple - Macintosh" />
-	<mapping from="mbc200" to="Sanyo - MBC-200, MBC-1200" />
-	<mapping from="mbc55x" to="Sanyo - MBC-550, MBC-555" />
-	<mapping from="mc10" to="Tandy Radio Shack - TRS-80 MC-10" />
-	<mapping from="mc1000_cass" to="CCE - MC-1000" />
-	<mapping from="mc1502_flop" to="Elektronika - MC 1502" />
-	<mapping from="md2_flop" to="Morrow - Micro Decision MD-2" />
-	<mapping from="megacd" to="Sega - Mega-CD, Sega CD" />
-	<mapping from="megacdj" to="Sega - Mega-CD, Sega CD" />
-	<mapping from="megadriv" to="Sega - Mega Drive, Genesis" />
-	<mapping from="megaduck" to="Creatronic - Mega Duck, Cougar Boy" />
-	<mapping from="megapc" to="Amstrad - Mega PC" />
-	<mapping from="megatech" to="Sega - Megatech" />
-	<mapping from="microvision" to="Milton Bradley - MicroVision" />
-	<mapping from="mikro80" to="Radio-86RK - Mikro-80" />
-	<mapping from="mikrosha_cart" to="Radio-86RK - Mikrosha" />
-	<mapping from="mikrosha_cass" to="Radio-86RK - Mikrosha" />
-	<mapping from="misterx" to="Yeno - MisterX" />
-	<mapping from="mm1_flop" to="Nokia - MikroMikko 1" />
-	<mapping from="mo5_cart" to="Thomson - 8bit" />
-	<mapping from="mo5_cass" to="Thomson - 8bit" />
-	<mapping from="mo5_flop" to="Thomson - 8bit" />
-	<mapping from="mo5_qd" to="Thomson - 8bit" />
-	<mapping from="mo6_cass" to="Thomson - 8bit" />
-	<mapping from="mo6_flop" to="Thomson - 8bit" />
-	<mapping from="mpu1000" to="Acetronic - MPU-1000" />
-	<mapping from="mpz80" to="Morrow - MPZ80" />
-	<mapping from="msx1_cart" to="Microsoft - MSX, MSX 2" />
-	<mapping from="msx1_cass" to="Microsoft - MSX, MSX 2" />
-	<mapping from="msx1_flop" to="Microsoft - MSX, MSX 2" />
-	<mapping from="msx2_cart" to="Microsoft - MSX, MSX 2" />
-	<mapping from="msx2_cass" to="Microsoft - MSX, MSX 2" />
-	<mapping from="msx2_flop" to="Microsoft - MSX, MSX 2" />
-	<mapping from="msx2p_flop" to="Microsoft - MSX, MSX 2" />
-	<mapping from="msxr_flop" to="Microsoft - MSX, MSX 2" />
-	<mapping from="mtx_cass" to="Memotech - MTX512" />
-	<mapping from="myvision" to="Nichibutsu - My Vision" />
-	<mapping from="mz2000_cass" to="Sharp - MZ-2000" />
-	<mapping from="mz2000_flop" to="Sharp - MZ-2000" />
-	<mapping from="mz2500" to="Sharp - MZ-2500" />
-	<mapping from="mz700_cass" to="Sharp - MZ-700" />
-	<mapping from="mz800_cass" to="Sharp - MZ-800, MZ-1500" />
-	<mapping from="n64" to="Nintendo - Nintendo 64" />
-	<mapping from="n64dd" to="Nintendo - Nintendo 64DD" />
-	<mapping from="nascom_flop" to="Nascom - I, II" />
-	<mapping from="nascom_socket" to="Nascom - I, II" />
-	<mapping from="neocd" to="SNK - Neo Geo" />
-	<mapping from="neogeo" to="SNK - Neo Geo" />
-	<mapping from="nes" to="Nintendo - Nintendo Entertainment System" />
-	<mapping from="nes_ade" to="Nintendo - Nintendo Entertainment System" />
-	<mapping from="nes_datach" to="Nintendo - Nintendo Entertainment System" />
-	<mapping from="nes_kstudio" to="Nintendo - Nintendo Entertainment System" />
-	<mapping from="nes_ntbrom" to="Nintendo - Nintendo Entertainment System" />
-	<mapping from="next" to="NeXT - NeXT" />
-	<mapping from="ngp" to="SNK - Neo Geo Pocket, Neo Geo Pocket Color" />
-	<mapping from="ngpc" to="SNK - Neo Geo Pocket, Neo Geo Pocket Color" />
-	<mapping from="nimbus" to="RM - Nimbus PC" />
-	<mapping from="odyssey2" to="Philips - Videopac+, Odyssey2" />
-	<mapping from="ondra" to="Tesla - Ondra, Ondra ViLi" />
-	<mapping from="orao" to="PEL Varazdin - Orao" />
-	<mapping from="orion_cart" to="Orion - Orion 128, OrionPro" />
-	<mapping from="orion_cass" to="Orion - Orion 128, OrionPro" />
-	<mapping from="orion_flop" to="Orion - Orion 128, OrionPro" />
-	<mapping from="orionpro_flop" to="Orion - Orion 128, OrionPro" />
-	<mapping from="osborne1" to="OCC - Osborne 1, 2, 3, 4" />
-	<mapping from="osborne2" to="OCC - Osborne 1, 2, 3, 4" />
-	<mapping from="p500_flop" to="Commodore - P500" />
-	<mapping from="partner_cass" to="Radio-86RK - Partner-01.01" />
-	<mapping from="partner_flop" to="Radio-86RK - Partner-01.01" />
-	<mapping from="pasogo" to="Koei - PasoGo" />
-	<mapping from="pb2000c" to="Casio - PB-2000C" />
-	<mapping from="pc1000" to="VTech - PreComputer 1000" />
-	<mapping from="pc1512" to="Amstrad - PC1512" />
-	<mapping from="pc1640" to="Amstrad - PC1640" />
-	<mapping from="pc8201" to="NEC - PC-8201" />
-	<mapping from="pc8801_cass" to="NEC - PC-8801" />
-	<mapping from="pc8801_flop" to="NEC - PC-8801" />
-	<mapping from="pc88va" to="NEC - PC-88VA" />
-	<mapping from="pc98" to="NEC - PC-9801" />
-	<mapping from="pce" to="NEC - PC Engine, TurboGrafx 16" />
-	<mapping from="pce_tourvision" to="NEC - PC Engine, TurboGrafx 16" />
-	<mapping from="pcecd" to="NEC - PC Engine, TurboGrafx 16" />
-	<mapping from="pcw" to="Amstrad - PCW" />
-	<mapping from="pcw16" to="Amstrad - PCW" />
-	<mapping from="pecom_cass" to="Elektronska Industrija Nis - PECOM 32, 64" />
-	<mapping from="pegasus_cart" to="Technosys - Aamber Pegasus" />
-	<mapping from="pencil2" to="Hanimex - Pencil II" />
-	<mapping from="pentagon_cass" to="Pentagon - 1024SL" />
-	<mapping from="pet_cass" to="Commodore - PET" />
-	<mapping from="pet_flop" to="Commodore - PET" />
-	<mapping from="pet_hdd" to="Commodore - PET" />
-	<mapping from="pet_rom" to="Commodore - PET" />
-	<mapping from="pico" to="Sega - PICO" />
-	<mapping from="pippin" to="Bandai - Pippin" />
-	<mapping from="pippin_flop" to="Bandai - Pippin" />
-	<mapping from="plus4_cart" to="Commodore - Plus-4" />
-	<mapping from="plus4_cass" to="Commodore - Plus-4" />
-	<mapping from="plus4_flop" to="Commodore - Plus-4" />
-	<mapping from="pmd85_cass" to="Tesla - PMD 85" />
-	<mapping from="pockchalv1" to="Benesse - Pocket Challenge V" />
-	<mapping from="pockchalv2" to="Benesse - Pocket Challenge V" />
-	<mapping from="pockchalw" to="Benesse - Pocket Challenge V" />
-	<mapping from="pokemini" to="Nintendo - Pokemon Mini" />
-	<mapping from="pro128_cart" to="Olivetti - Prodest PC 128" />
-	<mapping from="pro128_cass" to="Olivetti - Prodest PC 128" />
-	<mapping from="pro128_flop" to="Olivetti - Prodest PC 128" />
-	<mapping from="pro128s_flop" to="Olivetti - Prodest PC 128" />
-	<mapping from="prof180" to="Conitec - PROF-180" />
-	<mapping from="prof80" to="Conitec - PROF-80" />
-	<mapping from="psion1" to="Psion - Organiser I" />
-	<mapping from="psion2" to="Psion - Organiser II" />
-	<mapping from="psx" to="Sony - PlayStation" />
-	<mapping from="pt68k2" to="Peripheral Technology - PT68K" />
-	<mapping from="pv1000" to="Casio - PV-1000" />
-	<mapping from="pv2000" to="Casio - PV-2000" />
-	<mapping from="px4_cart" to="Epson - PX-4" />
-	<mapping from="pyl601" to="SASDF - Pyldin-601" />
-	<mapping from="ql_cart" to="Sinclair - QL" />
-	<mapping from="ql_cass" to="Sinclair - QL" />
-	<mapping from="ql_flop" to="Sinclair - QL" />
-	<mapping from="qx10_flop" to="Epson - QX-10" />
-	<mapping from="r9751" to="ROLM - CBX 9751" />
-	<mapping from="radio86_cart" to="Radio-86RK - Radio-86RK" />
-	<mapping from="radio86_cass" to="Radio-86RK - Radio-86RK" />
-	<mapping from="rainbow" to="DEC - Rainbow 100" />
-	<mapping from="rwtrntcs" to="Rowtron - Television Computer System" />
-	<mapping from="rx78" to="Gundam - RX-78" />
-	<mapping from="sage2" to="Sage - Sage II" />
-	<mapping from="samcoupe_cass" to="MGT - Sam Coupe" />
-	<mapping from="samcoupe_flop" to="MGT - Sam Coupe" />
-	<mapping from="sat_cart" to="Sega - Saturn" />
-	<mapping from="sat_vccart" to="Sega - Saturn" />
-	<mapping from="saturn" to="Sega - Saturn" />
-	<mapping from="sawatte" to="Sega - PICO" />
-	<mapping from="sc3000_cart" to="Sega - SG-1000, SC-3000, SF-7000, Othello Multivision" />
-	<mapping from="sc3000_cass" to="Sega - SG-1000, SC-3000, SF-7000, Othello Multivision" />
-	<mapping from="scv" to="Epoch - Super Cassette Vision" />
-	<mapping from="segacd" to="Sega - Mega-CD, Sega CD" />
-	<mapping from="sf7000" to="Sega - SG-1000, SC-3000, SF-7000, Othello Multivision" />
-	<mapping from="sg1000" to="Sega - SG-1000, SC-3000, SF-7000, Othello Multivision" />
-	<mapping from="sgx" to="NEC - Super Grafx" />
-	<mapping from="smc777" to="Sony - SMC777" />
-	<mapping from="sms" to="Sega - Master System, Mark III" />
-	<mapping from="snes" to="Nintendo - Super Nintendo Entertainment System" />
-	<mapping from="snes_bspack" to="Nintendo - Super Nintendo Entertainment System" />
-	<mapping from="snes_strom" to="Nintendo - Super Nintendo Entertainment System" />
-	<mapping from="snes_vkun" to="Nintendo - Super Nintendo Entertainment System" />
-	<mapping from="snotec" to="Bandai - Super Note Club" />
-	<mapping from="snread" to="Texas Instruments - Speak &amp; Read" />
-	<mapping from="snspell" to="Texas Instruments - Speak &amp; Spell" />
-	<mapping from="socrates" to="VTech - Socrates" />
-	<mapping from="softbox" to="SSE - SoftBox" />
-	<mapping from="sol20_cass" to="PTC - Sol Terminal Computer SOL-20" />
-	<mapping from="sorcerer_cart" to="Exidy - Sorcerer" />
-	<mapping from="sorcerer_cass" to="Exidy - Sorcerer" />
-	<mapping from="sorcerer_flop" to="Exidy - Sorcerer" />
-	<mapping from="spc1000_cass" to="Samsung - SPC-1000" />
-	<mapping from="spc1500_cass" to="Samsung - SPC-1500" />
-	<mapping from="special_cass" to="Specialist - Specialist" />
-	<mapping from="special_flop" to="Specialist - Specialist" />
-	<mapping from="specpls3_flop" to="Sinclair - ZX Spectrum" />
-	<mapping from="spectrum_cart" to="Sinclair - ZX Spectrum" />
-	<mapping from="spectrum_cass" to="Sinclair - ZX Spectrum" />
-	<mapping from="st_cart" to="Atari - ST" />
-	<mapping from="st_flop" to="Atari - ST" />
-	<mapping from="studio2" to="RCA - Studio II" />
-	<mapping from="stv" to="Sega - Titan Video" />
-	<mapping from="super6" to="ADC - Super Six" />
-	<mapping from="super80_cass" to="Dick Smith Electronics - Super-80" />
-	<mapping from="superpet_flop" to="Commodore - SuperPET, MMF 9000" />
-	<mapping from="supracan" to="Funtech - Super Acan" />
-	<mapping from="sv8000" to="Bandai - Super Vision 8000" />
-	<mapping from="svi318_cart" to="Spectravideo - SVI-318, SVI-328" />
-	<mapping from="svi318_cass" to="Spectravideo - SVI-318, SVI-328" />
-	<mapping from="svi318_flop" to="Spectravideo - SVI-318, SVI-328" />
-	<mapping from="svision" to="Watara - Supervision" />
-	<mapping from="svmu" to="Sega - Visual Memory System" />
-	<mapping from="tandy200" to="Tandy Radio Shack - TRS-80 Model 200" />
-	<mapping from="tandy2k" to="Tandy Radio Shack - 2000" />
-	<mapping from="tandy6k" to="Tandy Radio Shack - 6000" />
-	<mapping from="tdv2324" to="Tandberg - TDV 2324" />
-	<mapping from="tek4052_cart" to="Tektronix - 4052" />
-	<mapping from="tg16" to="NEC - PC Engine, TurboGrafx 16" />
-	<mapping from="ti74_cart" to="Texas Instruments - TI-74" />
-	<mapping from="ti99_cart" to="Texas Instruments - TI-99 4A" />
-	<mapping from="tiki100" to="Tiki Data - Kontiki-100, Tiki-100" />
-	<mapping from="timex_dock" to="Timex - TS-2068" />
-	<mapping from="tntell" to="Texas Instruments - Touch &amp; Tell" />
-	<mapping from="to_flop" to="Thomson - 8bit" />
-	<mapping from="to770_cart" to="Thomson - 8bit" />
-	<mapping from="to770a_cart" to="Thomson - 8bit" />
-	<mapping from="to7_cart" to="Thomson - 8bit" />
-	<mapping from="to7_cass" to="Thomson - 8bit" />
-	<mapping from="to7_qd" to="Thomson - 8bit" />
-	<mapping from="to8_cass" to="Thomson - 8bit" />
-	<mapping from="to8_qd" to="Thomson - 8bit" />
-	<mapping from="trs80m2" to="Tandy Radio Shack - TRS-80 Model II" />
-	<mapping from="trsm100" to="Tandy Radio Shack - TRS-80 Model 100" />
-	<mapping from="tutor" to="Tomy - Tutor, Pyuuta" />
-	<mapping from="tvc_cart" to="Videoton - TV-Computer" />
-	<mapping from="tvc_cass" to="Videoton - TV-Computer" />
-	<mapping from="tvc_flop" to="Videoton - TV-Computer" />
-	<mapping from="unichamp" to="Unisonic - Champion 2711" />
-	<mapping from="ut88" to="Radio-86RK - YuT-88" />
-	<mapping from="uzebox" to="Uzebox - Uzebox" />
-	<mapping from="v1050_flop" to="Visual Technology - Visual 1050" />
-	<mapping from="v1050_hdd" to="Visual Technology - Visual 1050" />
-	<mapping from="vboy" to="Nintendo - Virtual Boy" />
-	<mapping from="vc4000" to="Interton - VC 4000" />
-	<mapping from="vector06_cart" to="Temirazov &amp; Sokolov - Vector-06C" />
-	<mapping from="vectrex" to="GCE - Vectrex" />
-	<mapping from="vg5k" to="Philips - VG 5000" />
-	<mapping from="vic10" to="Commodore - VIC-10" />
-	<mapping from="vic1001_cart" to="Commodore - VIC-20" />
-	<mapping from="vic1001_cass" to="Commodore - VIC-20" />
-	<mapping from="vic1001_flop" to="Commodore - VIC-20" />
-	<mapping from="victor9k_flop" to="Sirius - Victor 9000" />
-	<mapping from="vidbrain" to="VideoBrain - Family Computer" />
-	<mapping from="vii" to="Chintendo - Vii" />
-	<mapping from="vip" to="RCA - Vip" />
-	<mapping from="visicom" to="Toshiba - Visicom" />
-	<mapping from="vixen" to="OCC - Osborne 1, 2, 3, 4" />
-	<mapping from="vreader" to="VTech - V.Reader, Storio" />
-	<mapping from="vsmile_cart" to="VTech - V.Smile, V.Disc" />
-	<mapping from="vsmile_cd" to="VTech - V.Smile, V.Disc" />
-	<mapping from="vz_cass" to="Dick Smith Electronics - VZ-200, VZ-300" />
-	<mapping from="wangpc" to="Wang - PC" />
-	<mapping from="wicat" to="Millennium Systems - Wicat" />
-	<mapping from="wmbullet" to="WaveMate - Bullet" />
-	<mapping from="wscolor" to="Bandai - WonderSwan, WonderSwan Color" />
-	<mapping from="wswan" to="Bandai - WonderSwan, WonderSwan Color" />
-	<mapping from="x07_card" to="Canon - X-07" />
-	<mapping from="x07_cass" to="Canon - X-07" />
-	<mapping from="x1_cass" to="Sharp - X1" />
-	<mapping from="x1_flop" to="Sharp - X1" />
-	<mapping from="x68k_flop" to="Sharp - X68000" />
-	<mapping from="xegs" to="Atari - 8bit" />
-	<mapping from="xerox820" to="Xerox - 820" />
-	<mapping from="xerox820ii" to="Xerox - 820 II" />
-</mappings>
\ No newline at end of file
diff --git a/SabreTools.Helper/Mappings/Mappings.cs b/SabreTools.Helper/Mappings/Mappings.cs
deleted file mode 100644
index 69fc54c9..00000000
--- a/SabreTools.Helper/Mappings/Mappings.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml;
-
-namespace SabreTools.Helper
-{
-	/// <summary>
-	/// Contains all remappings of known import classes
-	/// </summary>
-	public class Mappings
-	{
-		// Local paths
-		private const string _remappersPath = "Mappings";
-
-		// Remapping classes represented by a dictionary of dictionaries (name, (from, to))
-		private static Dictionary<string, Dictionary<string, string>> _datMaps = new Dictionary<string, Dictionary<string, string>>();
-		public static Dictionary<string, Dictionary<string, string>> DatMaps
-		{
-			get
-			{
-				if (_datMaps.Count == 0)
-				{
-					CreateRemappings();
-				}
-				return _datMaps;
-			}
-		}
-
-		#region DAT Name Remappings
-
-		/// <summary>
-		/// Create all remappings to be used by the program
-		/// </summary>
-		private static void CreateRemappings()
-		{
-			// Create array of dictionary names
-			string[] remappings =
-			{
-				"Good", "MAME", "MaybeIntro", "NoIntro", "NonGood", "Redump", "TOSEC", "TruRip",
-			};
-
-			// Loop through and add all remappings
-			foreach (string remapping in remappings)
-			{
-				_datMaps.Add(remapping, new Dictionary<string, string>());
-				RemappingHelper(remapping);
-			}
-		}
-
-		/// <summary>
-		/// Create a remapping from XML
-		/// </summary>
-		/// <param name="mapping">Name of the mapping to be populated</param>
-		private static void RemappingHelper(string mapping)
-		{
-			// Read in remapping from file
-			XmlDocument doc = new XmlDocument();
-			try
-			{
-				doc.LoadXml(File.ReadAllText(Path.Combine(_remappersPath, mapping + ".xml")));
-			}
-			catch (XmlException ex)
-			{
-				Console.WriteLine(mapping + " remappings could not be loaded! " + ex.ToString());
-				return;
-			}
-
-			// Get the mappings parent node
-			XmlNode node = doc.FirstChild;
-			while (node.Name != "mappings")
-			{
-				node = node.NextSibling;
-			}
-
-			// If the node is empty, just return so it doesn't crash
-			if (!node.HasChildNodes)
-			{
-				return;
-			}
-
-			// Get the first mapping node
-			node = node.FirstChild;
-			while (node.NodeType != XmlNodeType.Element && node.Name != "mapping")
-			{
-				node = node.NextSibling;
-			}
-
-			// Now read in the mappings
-			while (node != null && node.Name == "mapping")
-			{
-				_datMaps[mapping].Add(node.Attributes["from"].Value, node.Attributes["to"].Value);
-
-				// Get the next node and skip over anything that's not an element
-				node = node.NextSibling;
-
-				if (node == null)
-				{
-					break;
-				}
-
-				while (node.NodeType != XmlNodeType.Element && node.Name != "mapping")
-				{
-					node = node.NextSibling;
-				}
-			}
-		}
-
-		#endregion
-	}
-}
diff --git a/SabreTools.Helper/Mappings/MaybeIntro.xml b/SabreTools.Helper/Mappings/MaybeIntro.xml
deleted file mode 100644
index 2c88832b..00000000
--- a/SabreTools.Helper/Mappings/MaybeIntro.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<mappings>
-	<mapping from="Bandai WonderSwan Color" to="Bandai - WonderSwan, WonderSwan Color" />
-	<mapping from="Fujitsu FM Towns" to="Fujitsu - FM Towns" />
-	<mapping from="MSX (Cartridges)" to="Microsoft - MSX, MSX 2" />
-	<mapping from="MSX (Disks)" to="Microsoft - MSX, MSX 2" />
-	<mapping from="MSX 2 (Cartridges)" to="Microsoft - MSX, MSX 2" />
-	<mapping from="MSX 2 (Disks)" to="Microsoft - MSX, MSX 2" />
-	<mapping from="MSX Turbo-R (Disks)" to="Microsoft - MSX, MSX 2" />
-	<mapping from="NEC PC Engine CD" to="NEC - PC Engine, TurboGrafx 16" />
-	<mapping from="NEC PC Engine" to="NEC - PC Engine, TurboGrafx 16" />
-	<mapping from="NEC PC-6001" to="NEC - PC-6001" />
-	<mapping from="NEC PC-8801" to="NEC - PC-8801" />
-	<mapping from="NEC PC-9801" to="NEC - PC-9801" />
-	<mapping from="Nintendo 64" to="Nintendo - Nintendo 64" />
-	<mapping from="Nintendo DS" to="Nintendo - Nintendo DS" />
-	<mapping from="Nintendo Famicom Disk System" to="Nintendo - Famicom Disk System" />
-	<mapping from="Nintendo Famicom" to="Nintendo - Nintendo Entertainment System" />
-	<mapping from="Nintendo Game Boy Advance" to="Nintendo - Game Boy Advance" />
-	<mapping from="Nintendo Game Boy Color" to="Nintendo - Game Boy, Game Boy Color" />
-	<mapping from="Nintendo Game Boy" to="Nintendo - Game Boy, Game Boy Color" />
-	<mapping from="Nintendo Super Famicom" to="Nintendo - Super Nintendo Entertainment System" />
-	<mapping from="Nintendo Virtual Boy" to="Nintendo - Virtual Boy" />
-	<mapping from="Sega Dreamcast" to="Sega - Dreamcast" />
-	<mapping from="Sega Game Gear" to="Sega - Game Gear" />
-	<mapping from="Sega Master System" to="Sega - Master System, Mark III" />
-	<mapping from="Sega Mega Drive" to="Sega - Mega Drive, Genesis" />
-	<mapping from="Sega Mega-CD" to="Sega - Mega-CD, Sega CD" />
-	<mapping from="Sega Saturn" to="Sega - Saturn" />
-	<mapping from="Sega SG-1000" to="Sega - SG-1000, SC-3000, SF-7000, Othello Multivision" />
-	<mapping from="Sharp X68000" to="Sharp - X68000" />
-	<mapping from="SNK Neo Geo Pocket Color" to="SNK - Neo Geo Pocket, Neo Geo Pocket Color" />
-	<mapping from="Sony PlayStation 2" to="Sony - PlayStation 2" />
-	<mapping from="Sony PlayStation" to="Sony - PlayStation" />
-</mappings>
\ No newline at end of file
diff --git a/SabreTools.Helper/Mappings/NoIntro.xml b/SabreTools.Helper/Mappings/NoIntro.xml
deleted file mode 100644
index a0a7a919..00000000
--- a/SabreTools.Helper/Mappings/NoIntro.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<mappings>
-	<mapping from="Atari - 5200" to="Atari - 5200" />
-	<mapping from="Atari - 7800" to="Atari - 7800" />
-	<mapping from="Atari - Jaguar" to="Atari - Jaguar" />
-	<mapping from="Atari - Lynx" to="Atari - Lynx" />
-	<mapping from="Atari - ST" to="Atari - ST" />
-	<mapping from="Bandai - WonderSwan" to="Bandai - WonderSwan, WonderSwan Color" />
-	<mapping from="Bandai - WonderSwan Color" to="Bandai - WonderSwan, WonderSwan Color" />
-	<mapping from="Casio - Loopy" to="Casio - Loopy" />
-	<mapping from="Casio - PV-1000" to="Casio - PV-1000" />
-	<mapping from="Coleco - ColecoVision" to="Coleco - ColecoVision, ColecoVision ADAM" />
-	<mapping from="Commodore - 64" to="Commodore - 64" />
-	<mapping from="Commodore - 64 (PP)" to="Commodore - 64" />
-	<mapping from="Commodore - 64 (Tapes)" to="Commodore - 64" />
-	<mapping from="Commodore - Amiga" to="Commodore - Amiga" />
-	<mapping from="Commodore - Plus-4" to="Commodore - Plus-4" />
-	<mapping from="Commodore - VIC-20" to="Commodore - VIC-20" />
-	<mapping from="Emerson - Arcadia 2001" to="Emerson - Arcadia 2001" />
-	<mapping from="Entex - Adventure Vision" to="Entex - Adventure Vision" />
-	<mapping from="Epoch - Super Cassette Vision" to="Epoch - Super Cassette Vision" />
-	<mapping from="Fairchild - Channel F" to="Fairchild - Channel F" />
-	<mapping from="Funtech - Super Acan" to="Funtech - Super Acan" />
-	<mapping from="GamePark - GP32" to="GamePark - GP32" />
-	<mapping from="GCE - Vectrex" to="GCE - Vectrex" />
-	<mapping from="Hartung - Game Master" to="Hartung - Game Master" />
-	<mapping from="LeapFrog - Leapster Learning Game System" to="LeapFrog - Leapster Learning Game System" />
-	<mapping from="Magnavox - Odyssey2" to="Philips - Videopac+, Odyssey2" />
-	<mapping from="Microsoft - MSX" to="Microsoft - MSX, MSX 2" />
-	<mapping from="Microsoft - MSX 2" to="Microsoft - MSX, MSX 2" />
-	<mapping from="Microsoft - XBOX 360 (DLC)" to="Microsoft - Xbox 360" />
-	<mapping from="Microsoft - XBOX 360 (Games on Demand)" to="Microsoft - Xbox 360" />
-	<mapping from="Microsoft - XBOX 360 (Title Updates)" to="Microsoft - Xbox 360" />
-	<mapping from="NEC - PC Engine - TurboGrafx 16" to="NEC - PC Engine, TurboGrafx 16" />
-	<mapping from="NEC - Super Grafx" to="NEC - Super Grafx" />
-	<mapping from="Nintendo - Famicom Disk System" to="Nintendo - Famicom Disk System" />
-	<mapping from="Nintendo - Game Boy" to="Nintendo - Game Boy, Game Boy Color" />
-	<mapping from="Nintendo - Game Boy Advance" to="Nintendo - Game Boy Advance" />
-	<mapping from="Nintendo - Game Boy Advance (e-Cards)" to="Nintendo - Game Boy Advance" />
-	<mapping from="Nintendo - Game Boy Advance MultiBoots" to="Nintendo - Game Boy Advance" />
-	<mapping from="Nintendo - Game Boy Color" to="Nintendo - Game Boy, Game Boy Color" />
-	<mapping from="Nintendo - New Nintendo 3DS" to="Nintendo - Nintendo 3DS, New Nintendo 3DS" />
-	<mapping from="Nintendo - New Nintendo 3DS (DLC)" to="Nintendo - Nintendo 3DS, New Nintendo 3DS" />
-	<mapping from="Nintendo - Nintendo 3DS" to="Nintendo - Nintendo 3DS, New Nintendo 3DS" />
-	<mapping from="Nintendo - Nintendo 3DS (DLC)" to="Nintendo - Nintendo 3DS, New Nintendo 3DS" />
-	<mapping from="Nintendo - Nintendo 64" to="Nintendo - Nintendo 64" />
-	<mapping from="Nintendo - Nintendo 64DD" to="Nintendo - Nintendo 64DD" />
-	<mapping from="Nintendo - Nintendo DS" to="Nintendo - Nintendo DS" />
-	<mapping from="Nintendo - Nintendo DS Decrypted" to="Nintendo - Nintendo DS" />
-	<mapping from="Nintendo - Nintendo DS Encrypted" to="Nintendo - Nintendo DS" />
-	<mapping from="Nintendo - Nintendo DS (Download Play) (BETA)" to="Nintendo - Nintendo DS" />
-	<mapping from="Nintendo - Nintendo DSi" to="Nintendo - Nintendo DSi" />
-	<mapping from="Nintendo - Nintendo DSi Decrypted" to="Nintendo - Nintendo DSi" />
-	<mapping from="Nintendo - Nintendo DSi Encrypted" to="Nintendo - Nintendo DSi" />
-	<mapping from="Nintendo - Nintendo DSi (DLC)" to="Nintendo - Nintendo DSi" />
-	<mapping from="Nintendo - Nintendo Entertainment System" to="Nintendo - Nintendo Entertainment System" />
-	<mapping from="Nintendo - Nintendo Wii (DLC)" to="Nintendo - Nintendo Wii" />
-	<mapping from="Nintendo - Pokemon Mini" to="Nintendo - Pokemon Mini" />
-	<mapping from="Nintendo - Satellaview" to="Nintendo - Super Nintendo Entertainment System" />
-	<mapping from="Nintendo - Sufami Turbo" to="Nintendo - Super Nintendo Entertainment System" />
-	<mapping from="Nintendo - Super Nintendo Entertainment System" to="Nintendo - Super Nintendo Entertainment System" />
-	<mapping from="Nintendo - Virtual Boy" to="Nintendo - Virtual Boy" />
-	<mapping from="Nokia - N-Gage" to="Nokia - N-Gage" />
-	<mapping from="Philips - Videopac+" to="Philips - Videopac+, Odyssey2" />
-	<mapping from="RCA - Studio II" to="RCA - Studio II" />
-	<mapping from="Sega - 32X" to="Sega - 32X" />
-	<mapping from="Sega - Game Gear" to="Sega - Game Gear" />
-	<mapping from="Sega - Master System - Mark III" to="Sega - Master System, Mark III" />
-	<mapping from="Sega - Mega Drive - Genesis" to="Sega - Mega Drive, Genesis" />
-	<mapping from="Sega - PICO" to="Sega - PICO" />
-	<mapping from="Sega - SG-1000" to="Sega - SG-1000, SC-3000, SF-7000, Othello Multivision" />
-	<mapping from="Sinclair - ZX Spectrum +3" to="Sinclair - ZX Spectrum" />
-	<mapping from="Sony - PlayStation 3 (DLC)" to="Sony - PlayStation 3" />
-	<mapping from="Sony - PlayStation 3 (Downloadable)" to="Sony - PlayStation 3" />
-	<mapping from="Sony - PlayStation 3 (PSN)" to="Sony - PlayStation 3" />
-	<mapping from="Sony - PlayStation Portable" to="Sony - PlayStation Portable" />
-	<mapping from="Sony - PlayStation Portable (DLC)" to="Sony - PlayStation Portable" />
-	<mapping from="Sony - PlayStation Portable (PSN)" to="Sony - PlayStation Portable" />
-	<mapping from="Sony - PlayStation Portable (PSX2PSP)" to="Sony - PlayStation Portable" />
-	<mapping from="Sony - PlayStation Portable (UMD Music)" to="Sony - PlayStation Portable" />
-	<mapping from="Sony - PlayStation Portable (UMD Video)" to="Sony - PlayStation Portable" />
-	<mapping from="SNK - Neo Geo Pocket" to="SNK - Neo Geo Pocket, Neo Geo Pocket Color" />
-	<mapping from="SNK - Neo Geo Pocket Color" to="SNK - Neo Geo Pocket, Neo Geo Pocket Color" />
-	<mapping from="Tiger - Game.com" to="Tiger Electronics - Game.com" />
-	<mapping from="Tiger - Gizmondo" to="Tiger Telematics - Gizmondo" />
-	<mapping from="VTech - CreatiVision" to="VTech - CreatiVision" />
-	<mapping from="VTech - V.Smile" to="VTech - V.Smile, V.Disc" />
-	<mapping from="Watara - Supervision" to="Watara - Supervision" />
-</mappings>
\ No newline at end of file
diff --git a/SabreTools.Helper/Mappings/NonGood.xml b/SabreTools.Helper/Mappings/NonGood.xml
deleted file mode 100644
index a6849a2f..00000000
--- a/SabreTools.Helper/Mappings/NonGood.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<mappings>
-	<mapping from="NonGood2600" to="Atari - 2600" />
-	<mapping from="NonGood5200" to="Atari - 5200" />
-	<mapping from="NonGood7800" to="Atari - 7800" />
-	<mapping from="NonGoodCHAF" to="Fairchild - Channel F" />
-	<mapping from="NonGoodCol" to="Coleco - ColecoVision, ColecoVision ADAM" />
-	<mapping from="NonGoodCPC" to="Amstrad - CPC" />
-	<mapping from="NonGoodGBAv4" to="Nintendo - Game Boy Advance" />
-	<mapping from="NonGoodGBX" to="Nintendo - Game Boy, Game Boy Color" />
-	<mapping from="NonGoodGBX.GB" to="Nintendo - Game Boy, Game Boy Color" />
-	<mapping from="NonGoodGBX.GBC" to="Nintendo - Game Boy, Game Boy Color" />
-	<mapping from="NonGoodGCom" to="Tiger Electronics - Game.com" />
-	<mapping from="NonGoodGen" to="Sega - Mega Drive, Genesis" />
-	<mapping from="NonGoodGG" to="Sega - Game Gear" />
-	<mapping from="NonGoodINTV" to="Mattel - Intellivision" />
-	<mapping from="NonGoodJag" to="Atari - Jaguar" /> 
-	<mapping from="NonGoodJAG" to="Atari - Jaguar" />
-	<mapping from="NonGoodLynx" to="Atari - Lynx" />
-	<mapping from="NonGoodMini" to="Nintendo - Pokemon Mini" />
-	<mapping from="NonGoodMSX1" to="Microsoft - MSX, MSX 2" />
-	<mapping from="NonGoodMSX2" to="Microsoft - MSX, MSX 2" />
-	<mapping from="NonGoodN64" to="Nintendo - Nintendo 64" />
-	<mapping from="NonGoodNDS" to="Nintendo - Nintendo DS" />
-	<mapping from="NonGoodNES" to="Nintendo - Nintendo Entertainment System" />
-	<mapping from="NonGoodNES CHINESE" to="Nintendo - Nintendo Entertainment System" />   
-	<mapping from="NonGoodNGPX" to="SNK - Neo Geo Pocket, Neo Geo Pocket Color" />
-	<mapping from="NonGoodNGPX.NGP" to="SNK - Neo Geo Pocket, Neo Geo Pocket Color" />
-	<mapping from="NonGoodNGPX.NGC" to="SNK - Neo Geo Pocket, Neo Geo Pocket Color" />
-	<mapping from="NonGoodOric" to="Tangerine - Oric-1, Oric Atmos" />
-	<mapping from="NonGoodPCE" to="NEC - PC Engine, TurboGrafx 16" />
-	<mapping from="NonGoodPico" to="Sega - PICO" />
-	<mapping from="NonGoodSAMC" to="MGT - Sam Coupe" />
-	<mapping from="NonGoodSMS" to="Sega - Master System, Mark III" />
-	<mapping from="NonGoodSNES" to="Nintendo - Super Nintendo Entertainment System" />
-	<mapping from="NonGoodVboy" to="Nintendo - Virtual Boy" />
-	<mapping from="NonGoodVect" to="GCE - Vectrex" />
-	<mapping from="NonGoodVPac" to="Philips - Videopac+, Odyssey2" />
-	<mapping from="NonGoodWSX" to="Bandai - WonderSwan, WonderSwan Color" />
-	<mapping from="NonGoodWSX.WS" to="Bandai - WonderSwan, WonderSwan Color" />
-	<mapping from="NonGoodWSX.WSC" to="Bandai - WonderSwan, WonderSwan Color" />
-</mappings>
\ No newline at end of file
diff --git a/SabreTools.Helper/Mappings/Redump.xml b/SabreTools.Helper/Mappings/Redump.xml
deleted file mode 100644
index c00a756d..00000000
--- a/SabreTools.Helper/Mappings/Redump.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<mappings>
-	<mapping from="Apple - Macintosh" to="Apple - Macintosh" />
-	<mapping from="Arcade - Namco - Sega - Nintendo - Triforce" to="Namco - Triforce" />
-	<mapping from="Arcade - Sega - Chihiro" to="Sega - Chihiro" />
-	<mapping from="Arcade - Sega - Lindbergh" to="Sega - Lindbergh" />
-	<mapping from="Arcade - Sega - Naomi" to="Sega - Naomi, Naomi 2, Atomiswave" />
-	<mapping from="Bandai - Apple - Pippin" to="Bandai - Pippin" />
-	<mapping from="Bandai - Playdia" to="Bandai - Playdia" />
-	<mapping from="Commodore - Amiga CD" to="Commodore - Amiga" />
-	<mapping from="Commodore - Amiga CD32" to="Commodore - Amiga" />
-	<mapping from="Commodore - Amiga CDTV" to="Commodore - Amiga" />
-	<mapping from="Fujitsu - FM-Towns" to="Fujitsu - FM Towns" />
-	<mapping from="IBM - PC compatible" to="IBM - PC Compatibles" />
-	<mapping from="Mattel - HyperScan" to="Mattel - HyperScan" />
-	<mapping from="Microsoft - Xbox - BIOS Images" to="Microsoft - Xbox" />
-	<mapping from="Microsoft - Xbox" to="Microsoft - Xbox" />
-	<mapping from="Microsoft - Xbox 360" to="Microsoft - Xbox 360" />
-	<mapping from="Microsoft - Xbox One" to="Microsoft - Xbox One" />
-	<mapping from="NEC - PC Engine CD - TurboGrafx-CD" to="NEC - PC Engine, TurboGrafx 16" />
-	<mapping from="NEC - PC-88 series" to="NEC - PC-8801" />
-	<mapping from="NEC - PC-98 series" to="NEC - PC-9801" />
-	<mapping from="NEC - PC-FX - PC-FXGA" to="NEC - PC FX, PC FXGA" />
-	<mapping from="Nintendo - GameCube - BIOS Images" to="Nintendo - GameCube" />
-	<mapping from="Nintendo - GameCube" to="Nintendo - GameCube" />
-	<mapping from="Nintendo - Wii" to="Nintendo - Nintendo Wii" />
-	<mapping from="Nintendo - Wii U" to="Nintendo - Nintendo Wii U" />
-	<mapping from="Palm" to="Hewlett-Packard - Palm" />
-	<mapping from="Panasonic - 3DO Interactive Multiplayer" to="Panasonic - 3DO Interactive Multiplayer" />
-	<mapping from="Philips - CD-i" to="Philips - CD-i" />
-	<mapping from="Sega - Dreamcast" to="Sega - Dreamcast" />
-	<mapping from="Sega - Mega-CD - Sega CD" to="Sega - Mega-CD, Sega CD" />
-	<mapping from="Sega - Saturn" to="Sega - Saturn" />
-	<mapping from="SNK - Neo Geo CD" to="SNK - Neo Geo CD" />
-	<mapping from="Sony - PlayStation - BIOS Images" to="Sony - PlayStation" />
-	<mapping from="Sony - PlayStation" to="Sony - PlayStation" />
-	<mapping from="Sony - PlayStation 2 - BIOS Images" to="Sony - PlayStation 2" />
-	<mapping from="Sony - PlayStation 2" to="Sony - PlayStation 2" />
-	<mapping from="Sony - PlayStation 3" to="Sony - PlayStation 3" />
-	<mapping from="Sony - PlayStation 4" to="Sony - PlayStation 4" />
-	<mapping from="Sony - PlayStation Portable" to="Sony - PlayStation Portable" />
-	<mapping from="VTech - V.Flash" to="VTech - V.Flash Home Edutainment System" />
-</mappings>
\ No newline at end of file
diff --git a/SabreTools.Helper/Mappings/TOSEC.xml b/SabreTools.Helper/Mappings/TOSEC.xml
deleted file mode 100644
index 6ea650e9..00000000
--- a/SabreTools.Helper/Mappings/TOSEC.xml
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<mappings>
-	<mapping from="3DO 3DO Interactive Multiplayer" to="Panasonic - 3DO Interactive Multiplayer" />
-	<mapping from="APF Imagination Machine" to="APF - M-1000" />
-	<mapping from="Acorn Archimedes" to="Acorn - Archimedes" />
-	<mapping from="Acorn BBC" to="Acorn - BBC, Electron" />
-	<mapping from="Acorn BBC Micro" to="Acorn - BBC, Electron" />
-	<mapping from="Acorn Electron" to="Acorn - BBC, Electron" />
-	<mapping from="Altos Computer Systems ACS-186, 586 &amp; 986" to="Altos Computer Systems - ACS-186, 586, 986" />
-	<mapping from="Altos Computer Systems ACS-8000" to="Altos Computer Systems - ACS-8000" />
-	<mapping from="Altos Computer Systems Series 5" to="Altos Computer Systems - Series 5" />
-	<mapping from="American Laser Games CD-ROM System" to="American Laser Games - CD-ROM System" />
-	<mapping from="Amstrad CPC" to="Amstrad - CPC" />
-	<mapping from="Amstrad GX4000" to="Amstrad - GX4000" />
-	<mapping from="Amstrad PCW" to="Amstrad - PCW" />
-	<mapping from="Apple 1" to="Apple - I" />
-	<mapping from="Apple I" to="Apple - I" />
-	<mapping from="Apple II" to="Apple - II" />
-	<mapping from="Apple IIGS" to="Apple - II" />
-	<mapping from="Apple III" to="Apple - III" />
-	<mapping from="Apple Lisa" to="Apple - Lisa" />
-	<mapping from="Apple Macintosh" to="Apple - Macintosh" />
-	<mapping from="Applied Technology MicroBee" to="Applied Technology - MicroBee" />
-	<mapping from="Atari 2600 &amp; VCS" to="Atari - 2600" />
-	<mapping from="Atari 5200" to="Atari - 5200" />
-	<mapping from="Atari 7800" to="Atari - 7800" />
-	<mapping from="Atari 8bit" to="Atari - 8bit" />
-	<mapping from="Atari Jaguar CD" to="Atari - Jaguar" />
-	<mapping from="Atari Jaguar" to="Atari - Jaguar" />
-	<mapping from="Atari Lynx" to="Atari - Lynx" />
-	<mapping from="Atari ST" to="Atari - ST" />
-	<mapping from="Bally Midway Astrocade" to="Bally Professional - Arcade, Astrocade" />
-	<mapping from="Bally Professional Arcade &amp; Astrocade" to="Bally Professional - Arcade, Astrocade" />
-	<mapping from="Bandai Pippin @World &amp; Pippin Atmark" to="Bandai - Pippin" />
-	<mapping from="Bandai Pippin Atmark" to="Bandai - Pippin" />
-	<mapping from="Bandai Playdia" to="Bandai - Playdia" />
-	<mapping from="Bandai WonderSwan Color" to="Bandai - WonderSwan, WonderSwan Color" />
-	<mapping from="Bandai WonderSwan" to="Bandai - WonderSwan, WonderSwan Color" />
-	<mapping from="Bondwell 12" to="Bondwell - 12" />
-	<mapping from="Bondwell 2" to="Bondwell - 2" />
-	<mapping from="Bondwell Model 2" to="Bondwell - 2" />
-	<mapping from="CBS ColecoVision ADAM" to="Coleco - ColecoVision, ColecoVision ADAM" />
-	<mapping from="CBS ColecoVision" to="Coleco - ColecoVision, ColecoVision ADAM" />
-	<mapping from="Cambridge University EDSAC" to="University of Cambridge - EDSAC" />
-	<mapping from="Camputers Lynx" to="Camputers - Lynx" />
-	<mapping from="Capcom CP System III" to="Capcom - CPS III" />
-	<mapping from="Casio CFX-9850" to="Casio - CFX-9850" />
-	<mapping from="Casio Loopy" to="Casio - Loopy" />
-	<mapping from="Casio PB-1000" to="Casio - PB-1000" />
-	<mapping from="Casio PV-2000" to="Casio - PV-2000" />
-	<mapping from="Coleco ColecoVision ADAM" to="Coleco - ColecoVision, ColecoVision ADAM" />
-	<mapping from="Coleco ColecoVision" to="Coleco - ColecoVision, ColecoVision ADAM" />
-	<mapping from="Commodore Amiga CD32" to="Commodore - Amiga" />
-	<mapping from="Commodore Amiga CDTV" to="Commodore - Amiga" />
-	<mapping from="Commodore Amiga" to="Commodore - Amiga" />
-	<mapping from="Commodore C128" to="Commodore - 128" />
-	<mapping from="Commodore C16, C116 &amp; Plus-4" to="Commodore - Plus-4" />
-	<mapping from="Commodore C64" to="Commodore - 64" />
-	<mapping from="Commodore C64DTV" to="Commodore - 64 DTV" />
-	<mapping from="Commodore C65" to="Commodore - 65" />
-	<mapping from="Commodore MAX Machine &amp; VIC10" to="Commodore - VIC-10" />
-	<mapping from="Commodore PET" to="Commodore - PET" />
-	<mapping from="Commodore VIC10" to="Commodore - VIC-10" />
-	<mapping from="Commodore VIC20" to="Commodore - VIC-20" />
-	<mapping from="Creatronic Mega Duck &amp; Cougar Boy" to="Creatronic - Mega Duck, Cougar Boy" />
-	<mapping from="Cybiko Cybiko" to="Cybiko - Cybiko" />
-	<mapping from="Cybiko Xtreme" to="Cybiko - Xtreme" />
-	<mapping from="DEC PDP-1" to="DEC - PDP-1" />
-	<mapping from="DEC PDP-10" to="DEC - PDP-10" />
-	<mapping from="DEC PDP-11" to="DEC - PDP-11" />
-	<mapping from="DEC PDP-12" to="DEC - PDP-12" />
-	<mapping from="DEC PDP-15" to="DEC - PDP-15" />
-	<mapping from="DEC PDP-7" to="DEC - PDP-7" />
-	<mapping from="DEC PDP-8" to="DEC - PDP-8" />
-	<mapping from="DEC PDP-9" to="DEC - PDP-9" />
-	<mapping from="Dragon 32 &amp; 64" to="Dragon Data - Dragon" />
-	<mapping from="Dragon Data Dragon" to="Dragon Data - Dragon" />
-	<mapping from="EACA Colour Genie EG-2000" to="EACA - EG2000 Colour Genie" />
-	<mapping from="EACA EG2000 Colour Genie" to="EACA - EG2000 Colour Genie" />
-	<mapping from="ETL Mark 2" to="ETL - Mark II" />
-	<mapping from="ETL Mark 4" to="ETL - Mark IV" />
-	<mapping from="ETL Mark 4a" to="ETL - Mark IV A" />
-	<mapping from="ETL Mark II" to="ETL - Mark II" />
-	<mapping from="ETL Mark IV A" to="ETL - Mark IV A" />
-	<mapping from="ETL Mark IV" to="ETL - Mark IV" />
-	<mapping from="Elektronika BK-0010-0011M" to="Elektronika - BK-0010" />
-	<mapping from="Elektronika BK-0011-411" to="Elektronika - BK-0011" />
-	<mapping from="Elektronska Industrija Nis PECOM 32 &amp; 64" to="Elektronska Industrija Nis - PECOM 32, 64" />
-	<mapping from="Emerson Arcadia 2001" to="Emerson - Arcadia 2001" />
-	<mapping from="Enterprise 64 &amp; 128" to="Enterprise - 64, 128" />
-	<mapping from="Entex Adventure Vision" to="Entex - Adventure Vision" />
-	<mapping from="Epoch Super Cassette Vision" to="Epoch - Super Cassette Vision" />
-	<mapping from="Epson PX-8, HC-88 &amp; Geneva" to="Epson - PX-8, HC-88, Geneva" />
-	<mapping from="Exelvision EXL100" to="Exelvision - Exeltel, EXL100" />
-	<mapping from="Exelvision Exeltel" to="Exelvision - Exeltel, EXL100" />
-	<mapping from="Exidy Sorcerer" to="Exidy - Sorcerer" />
-	<mapping from="FM Towns Marty" to="Fujitsu - FM Towns" />
-	<mapping from="Fairchild Channel F" to="Fairchild - Channel F" />
-	<mapping from="Fairchild Saba" to="Fairchild - Channel F" />
-	<mapping from="Fairchild VES &amp; Channel F" to="Fairchild - Channel F" />
-	<mapping from="Front Fareast Magic Drive" to="Front Fareast - Magic Drive" />
-	<mapping from="Fuji C" to="Fuji Photo Film - FUJIC" />
-	<mapping from="Fuji Photo Film FUJIC" to="Fuji Photo Film - FUJIC" />
-	<mapping from="Fujitsu FM Towns" to="Fujitsu - FM Towns" />
-	<mapping from="Fujitsu FM-7" to="Fujitsu - FM-7" />
-	<mapping from="Funtech - Super Acan" to="Funtech - Super Acan" />
-	<mapping from="Funtech Super Acan" to="Funtech - Super Acan" />
-	<mapping from="GCE Vectrex" to="GCE - Vectrex" />
-	<mapping from="Galaksija Galaksija Plus" to="Galaksija - Galaksija, Galaksija Plus" />
-	<mapping from="Galaksija Galaksija" to="Galaksija - Galaksija, Galaksija Plus" />
-	<mapping from="Game Park GP32" to="GamePark - GP32" />
-	<mapping from="Hewlett-Packard HP48" to="Hewlett-Packard - HP48" />
-	<mapping from="Hewlett-Packard HP49" to="Hewlett-Packard - HP49" />
-	<mapping from="HomeLab BraiLab" to="HomeLab - BraiLab" />
-	<mapping from="HomeLab HomeLab" to="HomeLab - HomeLab" />
-	<mapping from="IBM PC Compatible" to="IBM - PC Compatibles" />
-	<mapping from="IBM PC Compatibles" to="IBM - PC Compatibles" />
-	<mapping from="IBM PCjr" to="IBM - PC Jr" />
-	<mapping from="Incredible Technologies Eagle" to="Incredible Technologies - Eagle" />
-	<mapping from="Infocom Z-Machine" to="Infocom - Z-Machine" />
-	<mapping from="Interact Family Computer" to="Interact - Family Computer" />
-	<mapping from="Jupiter Cantab Jupiter Ace" to="Jupiter Cantab - Jupiter Ace" />
-	<mapping from="Kaypro II" to="Kaypro - II" />
-	<mapping from="Keio University K-1" to="University of Keio - K-1" />
-	<mapping from="Konami Bemani System 573 Analog" to="Konami - System 573" />
-	<mapping from="Konami Bemani System 573 Digital" to="Konami - System 573" />
-	<mapping from="Konami System 573" to="Konami - System 573" />
-	<mapping from="Luxor ABC 80" to="Luxor - ABC 80" />
-	<mapping from="Luxor ABC 800" to="Luxor - ABC 800" />
-	<mapping from="Luxor Video Entertainment System" to="Luxor - Video Entertainment System" />
-	<mapping from="MGT Sam Coupe" to="MGT - Sam Coupe" />
-	<mapping from="MITS Altair 8800" to="MITS - Altair 8800" />
-	<mapping from="MSX MSX" to="Microsoft - MSX, MSX 2" />
-	<mapping from="MSX MSX2" to="Microsoft - MSX, MSX 2" />
-	<mapping from="MSX MSX2+" to="Microsoft - MSX, MSX 2" />
-	<mapping from="MSX Turbo-R" to="Microsoft - MSX, MSX 2" />
-	<mapping from="MSX TurboR" to="Microsoft - MSX, MSX 2" />
-	<mapping from="Magnavox Odyssey2" to="Philips - Videopac+, Odyssey2" />
-	<mapping from="Matra Hachette Alice 32" to="Matra Hachette - Alice 32 &amp; 90" />
-	<mapping from="Matsushita National JR 200" to="Matsushita National - JR 200" />
-	<mapping from="Mattel Aquarius" to="Mattel - Aquarius" />
-	<mapping from="Mattel HyperScan" to="Mattel - HyperScan" />
-	<mapping from="Mattel Intellivision" to="Mattel - Intellivision" />
-	<mapping from="Memorex Video Information System" to="Memorex - Video Information System" />
-	<mapping from="Memotech MTX" to="Memotech - MTX512" />
-	<mapping from="Memotech MTX512" to="Memotech - MTX512" />
-	<mapping from="MicroBee" to="Applied Technology - MicroBee" />
-	<mapping from="Microkey Primo" to="Microkey - Primo" />
-	<mapping from="Miles Gordon Technology Sam Coupe" to="MGT - Sam Coupe" />
-	<mapping from="NCR Decision Mate V" to="NCR - Decision Mate V" />
-	<mapping from="NCR Decision V" to="NCR - Decision Mate V" />
-	<mapping from="NEC PC-6001" to="NEC - PC-6001" />
-	<mapping from="NEC PC-8001" to="NEC - PC-8001" />
-	<mapping from="NEC PC-8201" to="NEC - PC-8201" />
-	<mapping from="NEC PC-8801" to="NEC - PC-8801" />
-	<mapping from="NEC PC-88VA" to="NEC - PC-88VA" />
-	<mapping from="NEC PC-9801" to="NEC - PC-9801" />
-	<mapping from="NEC PC-9821" to="NEC - PC-9801" />
-	<mapping from="NEC PC-Engine &amp; TurboGrafx-16" to="NEC - PC Engine, TurboGrafx 16" />
-	<mapping from="NEC PC-Engine CD &amp; TurboGrafx-16 CD" to="NEC - PC Engine, TurboGrafx 16" />
-	<mapping from="NEC PC-FX" to="NEC - PC FX, PC FXGA" />
-	<mapping from="NEC PC-FXGA" to="NEC - PC FX, PC FXGA" />
-	<mapping from="NEC PC6001" to="NEC - PC-6001" />
-	<mapping from="NEC SuperGrafx" to="NEC - Super Grafx" />
-	<mapping from="Nascom I &amp; II" to="Nascom - I, II" />
-	<mapping from="Nintendo 64" to="Nintendo - Nintendo 64" />
-	<mapping from="Nintendo 64DD" to="Nintendo - Nintendo 64DD" />
-	<mapping from="Nintendo Famicom &amp; Entertainment System" to="Nintendo - Nintendo Entertainment System" />
-	<mapping from="Nintendo Famicom Disk System" to="Nintendo - Famicom Disk System" />
-	<mapping from="Nintendo Game Boy Advance" to="Nintendo - Game Boy Advance" />
-	<mapping from="Nintendo Game Boy Color" to="Nintendo - Game Boy, Game Boy Color" />
-	<mapping from="Nintendo Game Boy" to="Nintendo - Game Boy, Game Boy Color" />
-	<mapping from="Nintendo GameCube" to="Nintendo - GameCube" />
-	<mapping from="Nintendo N64" to="Nintendo - Nintendo 64" />
-	<mapping from="Nintendo Pokemon Mini" to="Nintendo - Pokemon Mini" />
-	<mapping from="Nintendo Super Famicom &amp; Super Entertainment System" to="Nintendo - Super Nintendo Entertainment System" />
-	<mapping from="Nintendo Super Famicom" to="Nintendo - Super Nintendo Entertainment System" />
-	<mapping from="Nintendo Virtual Boy" to="Nintendo - Virtual Boy" />
-	<mapping from="OCC Osborne 1 &amp; Osborne Executive" to="OCC - Osborne 1, 2, 3, 4" />
-	<mapping from="OpenPandora Pandora" to="OpenPandora - Pandora" />
-	<mapping from="Osborne OSBORNE 1 &amp; Executive" to="OCC - Osborne 1, 2, 3, 4" />
-	<mapping from="Othello Multivision" to="Sega - SG-1000, SC-3000, SF-7000, Othello Multivision" />
-	<mapping from="PEL Varazdin Orao" to="PEL Varazdin - Orao" />
-	<mapping from="PTC Sol Terminal Computer SOL-20" to="PTC - Sol Terminal Computer SOL-20" />
-	<mapping from="Philips CD-i" to="Philips - CD-i" />
-	<mapping from="Philips G7000" to="Philips - Videopac+, Odyssey2" />
-	<mapping from="Philips P2000" to="Philips - P2000" />
-	<mapping from="Philips P2000T" to="Philips - P2000" />
-	<mapping from="Philips VG 5000" to="Philips - VG 5000" />
-	<mapping from="Philips Videopac G7000" to="Philips - Videopac+, Odyssey2" />
-	<mapping from="Philips Videopac+" to="Philips - Videopac+, Odyssey2" />
-	<mapping from="Pioneer LaserActive" to="Pioneer - LaserActive" />
-	<mapping from="RCA Chip-8" to="RCA - Chip-8" />
-	<mapping from="RCA Studio II" to="RCA - Studio II" />
-	<mapping from="RCA Superchip" to="RCA - Superchip" />
-	<mapping from="REAL 3DO Interactive Multiplayer" to="Panasonic - 3DO Interactive Multiplayer" />
-	<mapping from="RM Nimbus PC" to="RM - Nimbus PC" />
-	<mapping from="RM Nimbus PC-186" to="RM - Nimbus PC" />
-	<mapping from="Radica Arcade Legends &amp; Play TV Legends" to="Radica - Arcade Legends, Play TV Legends" />
-	<mapping from="Radio-86RK Apogej BK-01" to="Radio-86RK - Apogej BK-01" />
-	<mapping from="Radio-86RK Mikro-80" to="Radio-86RK - Mikro-80" />
-	<mapping from="Radio-86RK Mikrosha" to="Radio-86RK - Mikrosha" />
-	<mapping from="Radio-86RK Partner-01.01" to="Radio-86RK - Partner-01.01" />
-	<mapping from="Radio-86RK Radio-86RK" to="Radio-86RK - Radio-86RK" />
-	<mapping from="Radio-86RK YuT-88" to="Radio-86RK - YuT-88" />
-	<mapping from="Robotron HC900, KC85 2, KC85 3 &amp; KC85 4" to="Robotron - KC85" />
-	<mapping from="Robotron KC Compact" to="Robotron - KC Compact" />
-	<mapping from="Robotron KC85 2-4" to="Robotron - KC85" />
-	<mapping from="Robotron Z1013" to="Robotron - Z1013" />
-	<mapping from="Robotron Z9001 &amp; KC85 1" to="Robotron - KC85" />
-	<mapping from="Robotron Z9001" to="Robotron - KC85" />
-	<mapping from="SABA Videoplay" to="Fairchild - Channel F" />
-	<mapping from="SNK Hyper Neo-Geo 64" to="SNK - Hyper Neo Geo 64" />
-	<mapping from="SNK Neo-Geo CD" to="SNK - Neo Geo" />
-	<mapping from="SNK Neo-Geo Pocket Color" to="SNK - Neo Geo Pocket, Neo Geo Pocket Color" />
-	<mapping from="SNK Neo-Geo Pocket" to="SNK - Neo Geo Pocket, Neo Geo Pocket Color" />
-	<mapping from="Sega 32X" to="Sega - 32X" />
-	<mapping from="Sega Computer 3000" to="Sega - SG-1000, SC-3000, SF-7000, Othello Multivision" />
-	<mapping from="Sega Dreamcast" to="Sega - Dreamcast" />
-	<mapping from="Sega Game 1000" to="Sega - SG-1000, SC-3000, SF-7000, Othello Multivision" />
-	<mapping from="Sega Game Gear" to="Sega - Game Gear" />
-	<mapping from="Sega Mark III &amp; Master System" to="Sega - Master System, Mark III" />
-	<mapping from="Sega Master System &amp; Mark III" to="Sega - Master System, Mark III" />
-	<mapping from="Sega Mega Drive &amp; Genesis" to="Sega - Mega Drive, Genesis" />
-	<mapping from="Sega Mega-CD &amp; Sega CD" to="Sega - Mega-CD, Sega CD" />
-	<mapping from="Sega Mega-CD and Sega CD" to="Sega - Mega-CD, Sega CD" />
-	<mapping from="Sega NAOMI 2" to="Sega - Naomi, Naomi 2, Atomiswave" />
-	<mapping from="Sega NAOMI" to="Sega - Naomi, Naomi 2, Atomiswave" />
-	<mapping from="Sega NAOMI GD-ROM" to="Sega - Naomi, Naomi 2, Atomiswave" />
-	<mapping from="Sega Pico" to="Sega - PICO" />
-	<mapping from="Sega Saturn" to="Sega - Saturn" />
-	<mapping from="Sega Super Control Station" to="Sega - SG-1000, SC-3000, SF-7000, Othello Multivision" />
-	<mapping from="Sega Visual Memory System" to="Sega - Visual Memory System" />
-	<mapping from="Sega Visual Memory Unit" to="Sega - Visual Memory System" />
-	<mapping from="Sega WonderMega" to="Sega - Mega-CD, Sega CD" />
-	<mapping from="Sharp MZ-700" to="Sharp - MZ-700" />
-	<mapping from="Sharp MZ-800 &amp; MZ-1500" to="Sharp - MZ-800, MZ-1500" />
-	<mapping from="Sharp X1 Turbo" to="Sharp - X1" />
-	<mapping from="Sharp X1" to="Sharp - X1" />
-	<mapping from="Sharp X68000" to="Sharp - X68000" />
-	<mapping from="Sinclair QL" to="Sinclair - QL" />
-	<mapping from="Sinclair ZX Spectrum" to="Sinclair - ZX Spectrum" />
-	<mapping from="Sinclair ZX-81" to="Sinclair - ZX81" />
-	<mapping from="Sinclair ZX81" to="Sinclair - ZX81" />
-	<mapping from="Sony PlayStation 2" to="Sony - PlayStation 2" />
-	<mapping from="Sony PlayStation" to="Sony - PlayStation" />
-	<mapping from="Sony PocketStation" to="Sony - PocketStation" />
-	<mapping from="Sord M5" to="Sord - M5" />
-	<mapping from="Spectravideo SVI 318 &amp; SVI 328" to="Spectravideo - SVI-318, SVI-328" />
-	<mapping from="Spectravideo SVI 318-328" to="Spectravideo - SVI-318, SVI-328" />
-	<mapping from="Spectravideo SVI-318 &amp; SVI-328" to="Spectravideo - SVI-318, SVI-328" />
-	<mapping from="TESLA PMD-85" to="Tesla - PMD 85" />
-	<mapping from="Tandy MC-10" to="Tandy Radio Shack - TRS-80 MC-10" />
-	<mapping from="Tandy Radio Shack - CoCo" to="Tandy Radio Shack - TRS-80 Color Computer" />
-	<mapping from="Tandy Radio Shack - TRS-80 - Model 1" to="Tandy Radio Shack - TRS-80 Model I" />
-	<mapping from="Tandy Radio Shack - TRS-80 - Model 3" to="Tandy Radio Shack - TRS-80 Model III" />
-	<mapping from="Tandy Radio Shack - TRS-80 - Model 4" to="Tandy Radio Shack - TRS-80 Model IV" />
-	<mapping from="Tandy Radio Shack - TRS-80 Color Computer" to="Tandy Radio Shack - TRS-80 Color Computer" />
-	<mapping from="Tandy Radio Shack - TRS-80 MC-10" to="Tandy Radio Shack - TRS-80 MC-10" />
-	<mapping from="Tandy Radio Shack - TRS-80 Model 4" to="Tandy Radio Shack - TRS-80 Model IV" />
-	<mapping from="Tandy Radio Shack - TRS-80 Model I" to="Tandy Radio Shack - TRS-80 Model I" />
-	<mapping from="Tandy Radio Shack - TRS-80 Model III" to="Tandy Radio Shack - TRS-80 Model III" />
-	<mapping from="Tandy Radio Shack TRS-80 Color Computer" to="Tandy Radio Shack - TRS-80 Color Computer" />
-	<mapping from="Tandy Radio Shack TRS-80 MC-10" to="Tandy Radio Shack - TRS-80 MC-10" />
-	<mapping from="Tandy Radio Shack TRS-80 Model 100" to="Tandy Radio Shack - TRS-80 Model 100" />
-	<mapping from="Tandy Radio Shack TRS-80 Model 4" to="Tandy Radio Shack - TRS-80 Model IV" />
-	<mapping from="Tandy Radio Shack TRS-80 Model I" to="Tandy Radio Shack - TRS-80 Model I" />
-	<mapping from="Tandy Radio Shack TRS-80 Model III" to="Tandy Radio Shack - TRS-80 Model III" />
-	<mapping from="Tangerine MICROTAN 65" to="Tangerine - Microtan 65" />
-	<mapping from="Tangerine Microtan 65" to="Tangerine - Microtan 65" />
-	<mapping from="Tangerine ORIC 1-Atmos-Telestrat" to="Tangerine - Oric-1, Oric Atmos" />
-	<mapping from="Tangerine Oric-1 &amp; Atmos" to="Tangerine - Oric-1, Oric Atmos" />
-	<mapping from="Tangerine Oric-1 &amp; Oric Atmos" to="Tangerine - Oric-1, Oric Atmos" />
-	<mapping from="Tatung Einstein TC-01" to="Tatung - Einstein TC-01" />
-	<mapping from="Technosys Aamber Pegasus" to="Technosys - Aamber Pegasus" />
-	<mapping from="Tesla PMD 85" to="Tesla - PMD 85" />
-	<mapping from="Texas Instruments CC-40" to="Texas Instruments - CC-40" />
-	<mapping from="Texas Instruments TI-73" to="Texas Instruments - TI-73" />
-	<mapping from="Texas Instruments TI-80" to="Texas Instruments - TI-80" />
-	<mapping from="Texas Instruments TI-81" to="Texas Instruments - TI-81" />
-	<mapping from="Texas Instruments TI-82" to="Texas Instruments - TI-82" />
-	<mapping from="Texas Instruments TI-83" to="Texas Instruments - TI-83" />
-	<mapping from="Texas Instruments TI-85" to="Texas Instruments - TI-85" />
-	<mapping from="Texas Instruments TI-86" to="Texas Instruments - TI-86" />
-	<mapping from="Texas Instruments TI-89" to="Texas Instruments - TI-89" />
-	<mapping from="Texas Instruments TI-92" to="Texas Instruments - TI-92" />
-	<mapping from="Texas Instruments TI-99 4A" to="Texas Instruments - TI-99 4A" />
-	<mapping from="Texas Instruments TI-99-4A+" to="Texas Instruments - TI-99 4A" />
-	<mapping from="Texas Instruments TI73" to="Texas Instruments - TI-73" />
-	<mapping from="Texas Instruments TI80" to="Texas Instruments - TI-80" />
-	<mapping from="Thomson MO5" to="Thomson - 8bit" />
-	<mapping from="Thomson MO6" to="Thomson - 8bit" />
-	<mapping from="Thomson TO7" to="Thomson - 8bit" />
-	<mapping from="Thomson TO8" to="Thomson - 8bit" />
-	<mapping from="Thomson TO9+" to="Thomson - 8bit" />
-	<mapping from="Tiger Game.com" to="Tiger Electronics - Game.com" />
-	<mapping from="Tiki Data Kontiki-100 &amp; Tiki-100" to="Tiki Data - Kontiki-100, Tiki-100" />
-	<mapping from="Tomy KISS-Site" to="Tomy - Kiss-site" />
-	<mapping from="Tomy Tutor &amp; Pyuuta" to="Tomy - Tutor, Pyuuta" />
-	<mapping from="Tsukuda Original Othello Multivision" to="Sega - SG-1000, SC-3000, SF-7000, Othello Multivision" />
-	<mapping from="Tsukuda Othello Multivision" to="Sega - SG-1000, SC-3000, SF-7000, Othello Multivision" />
-	<mapping from="University of Cambridge EDSAC" to="University of Cambridge - EDSAC" />
-	<mapping from="University of Tokyo PC-1" to="University of Tokyo - PC-1" />
-	<mapping from="VM Labs Nuon" to="VM Labs - Nuon" />
-	<mapping from="VTech Creativision" to="VTech - CreatiVision" />
-	<mapping from="VTech Laser 200" to="VTech - Laser" />
-	<mapping from="VTech Laser 2001 &amp; CreatiVision" to="VTech - CreatiVision" />
-	<mapping from="VTech Laser 310" to="VTech - Laser" />
-	<mapping from="VTech V.Flash Home Edutainment System" to="VTech - V.Flash Home Edutainment System" />
-	<mapping from="Videoton TV Computer 64" to="Videoton - TV-Computer" />
-	<mapping from="Videoton TV-Computer" to="Videoton - TV-Computer" />
-	<mapping from="Visual Technology Visual 1050" to="Visual Technology - Visual 1050" />
-	<mapping from="Wang VS" to="Wang - VS" />
-	<mapping from="Watara Supervision" to="Watara - Supervision" />
-	<mapping from="ZAPiT Games Game Wave Family Entertainment System" to="ZAPiT Games - Game Wave Family Entertainment System" />
-</mappings>
\ No newline at end of file
diff --git a/SabreTools.Helper/Mappings/TruRip.xml b/SabreTools.Helper/Mappings/TruRip.xml
deleted file mode 100644
index 76b5e3d1..00000000
--- a/SabreTools.Helper/Mappings/TruRip.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<mappings>
-	<mapping from="Acorn Archimedes" to="Acorn - Archimedes" />
-	<mapping from="Acorn Archimedes CD" to="Acorn - Archimedes" />
-	<mapping from="Acorn BBC Microcomputer System" to="Acorn - BBC, Electron" />
-	<mapping from="American Laser Games American Laser Games (Arcade)" to="American Laser Games - CD-ROM System" />
-	<mapping from="Amstrad GX4000" to="Amstrad - GX4000" />
-	<mapping from="Andamiro Pump It Up (Arcade)" to="Andamiro - Pump It Up" />
-	<mapping from="Apple Macintosh CD" to="Apple - Macintosh" />
-	<mapping from="Atari 5200" to="Atari - 5200" />
-	<mapping from="Atari 7800" to="Atari - 7800" />
-	<mapping from="Atari Jaguar CD" to="Atari - Jaguar" />
-	<mapping from="Atari Lynx" to="Atari - Lynx" />
-	<mapping from="Bandai Pippin @World &amp; Atmark" to="Bandai - Pippin" />
-	<mapping from="Bandai Playdia" to="Bandai - Playdia" />
-	<mapping from="Bandai WonderSwan Color (SwanCrystal)" to="Bandai - WonderSwan, WonderSwan Color" />
-	<mapping from="Bandai WonderSwan" to="Bandai - WonderSwan, WonderSwan Color" />
-	<mapping from="Capcom CP SYSTEM III" to="Capcom - CPS III" />
-	<mapping from="Capcom CP SYSTEM III (CPS3)" to="Capcom - CPS III" />
-	<mapping from="Commodore Amiga CD" to="Commodore - Amiga" />
-	<mapping from="Commodore Amiga CD32" to="Commodore - Amiga" />
-	<mapping from="Commodore Amiga CDTV" to="Commodore - Amiga" />
-	<mapping from="Fairchild Channel F (Video Entertainment System)" to="Fairchild - Channel F" />
-	<mapping from="Fujitsu FM Towns (Marty)" to="Fujitsu - FM Towns" />
-	<mapping from="IBM Compatible IBM PC compatible" to="IBM - PC Compatibles" />
-	<mapping from="IBM PC Compatible IBM PC compatible" to="IBM - PC Compatibles" />
-	<mapping from="Incredible Technologies IT Eagle" to="Incredible Technologies - Eagle" />
-	<mapping from="Incredible Technologies IT PC" to="Incredible Technologies - PC" />
-	<mapping from="Konami Bemani FireBeat" to="Konami - Bemani FireBeat" />
-	<mapping from="Konami Bemani Twinkle" to="Konami - Bemani Twinkle" />
-	<mapping from="Konami M2" to="Panasonic - 3DO M2" />
-	<mapping from="Konami System 573" to="Konami - System 573" />
-	<mapping from="Mattel HyperScan" to="Mattel - HyperScan" />
-	<mapping from="Memorex VIS interactive Video Information" to="Memorex - Video Information System" />
-	<mapping from="MSX MSX CD" to="Microsoft - MSX, MSX 2" />
-	<mapping from="Namco - Sega - Nintendo Triforce" to="Namco - Triforce" />
-	<mapping from="Namco System 2x6" to="Namco - System 246, System 256" />
-	<mapping from="NCR Decision Mate V" to="NCR - Decision Mate V" />
-	<mapping from="NEC PC Engine CD &amp; TurboGrafx CD" to="NEC - PC Engine, TurboGrafx 16" />
-	<mapping from="NEC PC-FX" to="NEC - PC FX, PC FXGA" />
-	<mapping from="NEC PC-FXGA" to="NEC - PC FX, PC FXGA" />
-	<mapping from="Panasonic 3DO Interactive Multiplayer" to="Panasonic - 3DO Interactive Multiplayer" />
-	<mapping from="Philips CD-i &amp; VCD" to="Philips - CD-i" />
-	<mapping from="Philips Videopac + G7400" to="Philips - Videopac+, Odyssey2" />
-	<mapping from="Sega Chihiro" to="Sega - Chihiro" />
-	<mapping from="Sega Dreamcast" to="Sega - Dreamcast" />
-	<mapping from="Sega Lindbergh" to="Sega - Lindbergh" />
-	<mapping from="Sega Mega-CD &amp; Sega CD" to="Sega - Mega-CD, Sega CD" />
-	<mapping from="Sega Mega-CD &amp; Sega CD - Games" to="Sega - Mega-CD, Sega CD" />
-	<mapping from="Sega NAOMI 2" to="Sega - Naomi, Naomi 2, Atomiswave" />
-	<mapping from="Sega NAOMI" to="Sega - Naomi, Naomi 2, Atomiswave" />
-	<mapping from="Sega RingWide" to="Sega - RingWide" />
-	<mapping from="Sega Saturn" to="Sega - Saturn" />
-	<mapping from="Sharp X1" to="Sharp - X1" />
-	<mapping from="SNK Neo-Geo CD" to="SNK - Neo Geo" />
-	<mapping from="Sony PlayStation &amp; PSone" to="Sony - PlayStation" />
-	<mapping from="Sord CGL M 5 (M 5, Game M 5)" to="Sord - M5" />
-	<mapping from="Spectravideo SV-318 &amp; SV-328" to="Spectravideo - SVI-318, SVI-328" />
-	<mapping from="Tesla PMD-85" to="Tesla - PMD 85" />
-	<mapping from="Tiger Game.com" to="Tiger Electronics - Game.com" />
-	<mapping from="Tomy Grandstand Tutor (Tutor, Pyuuta)" to="Tomy - Tutor, Pyuuta" />
-	<mapping from="Tomy Kiss-site" to="Tomy - Kiss-site" />
-	<mapping from="Tsukuda Original Othello Multivision" to="Sega - SG-1000, SC-3000, SF-7000, Othello Multivision" />
-	<mapping from="Videoton TV-Computer" to="Videoton - TV-Computer" />
-	<mapping from="VM Labs Nuon" to="VM Labs - Nuon" />
-	<mapping from="VTech V.Flash Home Edutainment System" to="VTech - V.Flash Home Edutainment System" />
-	<mapping from="Wang VS" to="Wang - VS" />
-	<mapping from="Watara SuperVision (Quickshot, Hartung SV-100, HiperVision, Tiger Boy)" to="Watara - Supervision" />
-	<mapping from="ZAPiT Games Game Wave Family Entertainment System" to="ZAPiT Games - Game Wave Family Entertainment System" />
-</mappings>
\ No newline at end of file
diff --git a/SabreTools.Helper/SabreTools.Helper.csproj b/SabreTools.Helper/SabreTools.Helper.csproj
index 78743a54..2f036a93 100644
--- a/SabreTools.Helper/SabreTools.Helper.csproj
+++ b/SabreTools.Helper/SabreTools.Helper.csproj
@@ -138,7 +138,6 @@
     <Compile Include="Data\Enums.cs" />
     <Compile Include="Objects\Logger.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Mappings\Mappings.cs" />
     <Compile Include="Data\Structs.cs" />
     <Compile Include="Tools\Style.cs" />
     <Compile Include="Data\Build.cs" />
@@ -155,7 +154,28 @@
   <ItemGroup>
     <Content Include="LICENSE.jzlib.txt" />
     <Content Include="License.zlib.txt" />
-    <Content Include="Mappings\*.xml">
+    <Content Include="Mappings\Good.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Mappings\MAME.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Mappings\MaybeIntro.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Mappings\NoIntro.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Mappings\NonGood.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Mappings\Redump.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Mappings\TOSEC.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Mappings\TruRip.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Skippers\*.xml">