diff --git a/database.json b/database.json
index 4053d2b9..9c74872d 100644
--- a/database.json
+++ b/database.json
@@ -1,5 +1,5 @@
 {
-  "generated_at": "2026-03-22T13:37:37Z",
+  "generated_at": "2026-03-22T18:53:30Z",
   "total_files": 6733,
   "total_size": 5288642642,
   "files": {
diff --git a/emulators/mame2000.yml b/emulators/mame2000.yml
index d996b39d..b41acd42 100644
--- a/emulators/mame2000.yml
+++ b/emulators/mame2000.yml
@@ -1,8 +1,76 @@
-emulator: "mame2000"
-type: alias
-alias_of: "mame2003_plus"
-profiled_date: "2026-03-18"
+emulator: MAME 2000
+type: libretro
+core_classification: frozen_snapshot
+source: "https://github.com/libretro/mame2000-libretro"
+upstream: "https://www.mamedev.org"
+profiled_date: "2026-03-22"
 core_version: "0.37b5"
 display_name: "Arcade (MAME 2000)"
-note: "This core uses the same BIOS/firmware as mame2003_plus. See emulators/mame2003_plus.yml for details."
-files: []
+
+cores:
+  - mame2000
+
+systems:
+  - snk-neogeo-mvs
+  - deco-cassette
+
+notes: |
+  Frozen snapshot of MAME 0.37b5 via iMAME4All (David Valdeita). Fastest and
+  least accurate MAME core. Supports ~2000 arcade games from the 0.37b5 ROM set.
+
+  BIOS handling follows MAME 0.37b5 conventions. Shared BIOS files are packaged
+  as parent ROM ZIPs (e.g. neogeo.zip) and placed in the ROM directory alongside
+  game ROMs. The core searches only the ROM directory for ROMs and BIOS sets.
+
+  Samples (per-game WAV files) are loaded from system_dir/mame2000/samples/.
+  They provide sound effects for certain games and are optional.
+
+  hiscore.dat and cheat.dat are loaded from the ROM directory (not system_dir).
+  Both are bundled in the repo's metadata/ directory.
+
+files:
+  - name: hiscore.dat
+    required: false
+    category: game_data
+    source_ref: "src/hiscore.c:18,252-254"
+    note: "high score definitions, loaded from ROM directory"
+
+  - name: cheat.dat
+    required: false
+    category: game_data
+    source_ref: "src/cheat.c:210,618,830-831"
+    note: "cheat definitions, loaded from ROM directory, cheats disabled by default"
+
+  - name: neogeo.zip
+    required: true
+    category: bios_zip
+    system: snk-neogeo-mvs
+    source_ref: "src/drivers/neogeo.c:4499-4508"
+    contents:
+      - name: neo-geo.rom
+        description: 68K BIOS
+        size: 131072
+        crc32: "9036d879"
+      - name: ng-sm1.rom
+        description: Z80 sound BIOS
+        size: 131072
+        crc32: "97cf998b"
+      - name: ng-sfix.rom
+        description: fix layer tiles
+        size: 131072
+        crc32: "354029fc"
+
+  - name: decocass.zip
+    required: true
+    category: bios_zip
+    system: deco-cassette
+    source_ref: "src/drivers/btime.c:1996-2005"
+    contents:
+      - name: rms8.cpu
+        description: 6502 BIOS
+        size: 4096
+        crc32: "23d929b7"
+      - name: rms8.snd
+        description: audio CPU
+        size: 2048
+        crc32: "b66b2c2a"
diff --git a/emulators/mame2003_plus.yml b/emulators/mame2003_plus.yml
index b721873a..b6078858 100644
--- a/emulators/mame2003_plus.yml
+++ b/emulators/mame2003_plus.yml
@@ -56,228 +56,320 @@ notes: |
   games work well. PGM and ST-V have partial support. Most ZN-based games are
   flagged NOT_WORKING due to incomplete PlayStation emulation in 0.78.
 
-bios_zips:
+files:
   # ---------------------------------------------------------
   # SNK Neo Geo MVS/AES (neogeo.zip)
   # ---------------------------------------------------------
   - name: neogeo.zip
-    system: snk-neogeo-mvs
     required: true
+    category: bios_zip
+    system: snk-neogeo-mvs
     note: "MVS/AES BIOS, 15 variants including Universe BIOS 4.0"
     source_ref: "src/drivers/neogeo.c:1677-1714"
-    key_files:
+    contents:
       # 68K BIOS variants (one active at a time via dipswitch)
-      - "sp-s2.sp1 (Europe MVS v2, default)"
-      - "sp-s.sp1 (Europe MVS v1)"
-      - "usa_2slt.bin (US MVS v2)"
-      - "sp-e.sp1 (US MVS v1)"
-      - "asia-s3.rom (Asia MVS v3)"
-      - "vs-bios.rom (Japan MVS v6)"
-      - "sp-j2.sp1 (Japan MVS v2)"
-      - "uni-bios_4_0.rom (Universe BIOS 4.0, hack)"
-      - "uni-bios_3_3.rom (Universe BIOS 3.3, hack)"
-      - "uni-bios_2_0.rom (Universe BIOS 2.0, hack)"
-      - "uni-bios_1_3.rom (Universe BIOS 1.3, hack)"
-      - "uni-bios_1_1.rom (Universe BIOS 1.1, hack)"
-      - "uni-bios_1_0.rom (Universe BIOS 1.0, hack)"
-      - "neodebug.rom (Debug MVS)"
-      - "neo-epo.bin (Asia AES)"
+      - name: sp-s2.sp1
+        description: Europe MVS v2, default
+      - name: sp-s.sp1
+        description: Europe MVS v1
+      - name: usa_2slt.bin
+        description: US MVS v2
+      - name: sp-e.sp1
+        description: US MVS v1
+      - name: asia-s3.rom
+        description: Asia MVS v3
+      - name: vs-bios.rom
+        description: Japan MVS v6
+      - name: sp-j2.sp1
+        description: Japan MVS v2
+      - name: uni-bios_4_0.rom
+        description: Universe BIOS 4.0, hack
+      - name: uni-bios_3_3.rom
+        description: Universe BIOS 3.3, hack
+      - name: uni-bios_2_0.rom
+        description: Universe BIOS 2.0, hack
+      - name: uni-bios_1_3.rom
+        description: Universe BIOS 1.3, hack
+      - name: uni-bios_1_1.rom
+        description: Universe BIOS 1.1, hack
+      - name: uni-bios_1_0.rom
+        description: Universe BIOS 1.0, hack
+      - name: neodebug.rom
+        description: Debug MVS
+      - name: neo-epo.bin
+        description: Asia AES
       # Z80 sound BIOS (always required)
-      - "mame.sm1 (Z80 sound BIOS, 128KB)"
+      - name: mame.sm1
+        description: Z80 sound BIOS
+        size: 131072
       # Fix tiles (always required)
-      - "sfix.sfx (fix layer tiles, 128KB)"
+      - name: sfix.sfx
+        description: fix layer tiles
+        size: 131072
       # Zoom table (always required)
-      - "mamelo.lo (Y zoom control, 64KB)"
-
-  # Irritating Maze special BIOS (separate from standard neogeo)
-  # - name: irrmaze.zip (uses 236-bios.bin, Asia-only dedicated cabinet)
+      - name: mamelo.lo
+        description: Y zoom control
+        size: 65536
 
   # ---------------------------------------------------------
   # IGS PGM (pgm.zip)
   # ---------------------------------------------------------
   - name: pgm.zip
-    system: igs-pgm
     required: true
+    category: bios_zip
+    system: igs-pgm
     note: "PGM system BIOS - 68K program, text tiles, samples"
     source_ref: "src/drivers/pgm.c:3459-3468"
-    key_files:
-      - "pgm_p01s.rom (68K BIOS, 128KB)"
-      - "pgm_t01s.rom (text tiles, 2MB)"
-      - "pgm_m01s.rom (samples, 2MB)"
+    contents:
+      - name: pgm_p01s.rom
+        description: 68K BIOS
+        size: 131072
+      - name: pgm_t01s.rom
+        description: text tiles
+        size: 2097152
+      - name: pgm_m01s.rom
+        description: samples
+        size: 2097152
 
   # ---------------------------------------------------------
   # Sega ST-V (stvbios.zip)
   # ---------------------------------------------------------
   - name: stvbios.zip
-    system: sega-stv
     required: true
+    category: bios_zip
+    system: sega-stv
     note: "ST-V (Saturn-based arcade) BIOS, 6 region variants"
     source_ref: "src/drivers/stv.c:3741-3767"
-    key_files:
-      - "epr19730.ic8 (Japan)"
-      - "mp17951a.s (Japan alt)"
-      - "mp17952a.s (USA)"
-      - "20091.bin (Japan alt 2)"
-      - "mp17953a.ic8 (Taiwan)"
-      - "mp17954a.s (Europe)"
+    contents:
+      - name: epr19730.ic8
+        description: Japan
+      - name: mp17951a.s
+        description: Japan alt
+      - name: mp17952a.s
+        description: USA
+      - name: 20091.bin
+        description: Japan alt 2
+      - name: mp17953a.ic8
+        description: Taiwan
+      - name: mp17954a.s
+        description: Europe
 
   # ---------------------------------------------------------
   # Sega Mega Play (megaplay.zip)
   # ---------------------------------------------------------
   - name: megaplay.zip
-    system: sega-megaplay
     required: true
+    category: bios_zip
+    system: sega-megaplay
     note: "Mega Play BIOS, 2 versions"
     source_ref: "src/drivers/segac2.c:5794-5804"
-    key_files:
-      - "ep15294.ic2 (Mega Play BIOS v1)"
-      - "megaplay.bin (Mega Play BIOS v2)"
+    contents:
+      - name: ep15294.ic2
+        description: Mega Play BIOS v1
+      - name: megaplay.bin
+        description: Mega Play BIOS v2
 
   # ---------------------------------------------------------
   # Sega Mega Tech (megatech.zip)
   # ---------------------------------------------------------
   - name: megatech.zip
-    system: sega-megatech
     required: true
+    category: bios_zip
+    system: sega-megatech
     note: "Mega Tech BIOS - menu/instruction screen processor"
     source_ref: "src/drivers/segac2.c:5434-5437"
-    key_files:
-      - "epr12664.20 (Mega Tech BIOS, 32KB)"
+    contents:
+      - name: epr12664.20
+        description: Mega Tech BIOS
+        size: 32768
 
   # ---------------------------------------------------------
   # DECO Cassette (decocass.zip)
   # ---------------------------------------------------------
   - name: decocass.zip
-    system: deco-cassette
     required: true
+    category: bios_zip
+    system: deco-cassette
     note: "DECO Cassette shared BIOS - 6502 CPU, sound, MCU, PROMs"
     source_ref: "src/drivers/decocass.c:696-727"
-    key_files:
-      # BIOS variant A
-      - "v0a-.7e (6502 BIOS variant A)"
-      # BIOS variant B
-      - "rms8.cpu (6502 BIOS variant B)"
-      # Shared across both variants
-      - "rms8.snd (audio CPU, 2KB)"
-      - "cass8041.bin (MCU, 1KB)"
-      - "dsp8.3m (PROM)"
-      - "dsp8.10d (PROM)"
-      - "rms8.j3 (DRAM banking PROM)"
+    contents:
+      - name: v0a-.7e
+        description: 6502 BIOS variant A
+      - name: rms8.cpu
+        description: 6502 BIOS variant B
+      - name: rms8.snd
+        description: audio CPU
+        size: 2048
+      - name: cass8041.bin
+        description: MCU
+        size: 1024
+      - name: dsp8.3m
+        description: PROM
+      - name: dsp8.10d
+        description: PROM
+      - name: rms8.j3
+        description: DRAM banking PROM
 
   # ---------------------------------------------------------
   # Nintendo PlayChoice-10 (playch10.zip)
   # ---------------------------------------------------------
   - name: playch10.zip
-    system: nintendo-playch10
     required: true
+    category: bios_zip
+    system: nintendo-playch10
     note: "PlayChoice-10 BIOS - Z80 main CPU + character ROMs + PROMs"
     source_ref: "src/drivers/playch10.c:815-827"
-    key_files:
-      - "pch1-c.8t (Z80 BIOS, 16KB)"
-      - "pch1-c.8p (character ROM)"
-      - "pch1-c.8m (character ROM)"
-      - "pch1-c.8k (character ROM)"
-      - "82s129.6f (color PROM)"
-      - "82s129.6e (color PROM)"
-      - "82s129.6d (color PROM)"
+    contents:
+      - name: pch1-c.8t
+        description: Z80 BIOS
+        size: 16384
+      - name: pch1-c.8p
+        description: character ROM
+      - name: pch1-c.8m
+        description: character ROM
+      - name: pch1-c.8k
+        description: character ROM
+      - name: 82s129.6f
+        description: color PROM
+      - name: 82s129.6e
+        description: color PROM
+      - name: 82s129.6d
+        description: color PROM
 
   # ---------------------------------------------------------
   # Nintendo Super System (nss.zip)
   # ---------------------------------------------------------
   - name: nss.zip
-    system: nintendo-nss
     required: true
+    category: bios_zip
+    system: nintendo-nss
     note: "Nintendo Super System BIOS - SPC700 boot ROM + BIOS CPU"
     source_ref: "src/drivers/nss.c:260-269"
-    key_files:
-      - "spc700.rom (SPC700 boot ROM, 64 bytes)"
-      - "nss-c.dat (NSS BIOS CPU, 32KB)"
-      - "nss-ic14.02 (NSS BIOS CPU alt, 32KB)"
+    contents:
+      - name: spc700.rom
+        description: SPC700 boot ROM
+        size: 64
+      - name: nss-c.dat
+        description: NSS BIOS CPU
+        size: 32768
+      - name: nss-ic14.02
+        description: NSS BIOS CPU alt
+        size: 32768
 
   # ---------------------------------------------------------
   # Super Kaneko Nova System (skns.zip)
   # ---------------------------------------------------------
   - name: skns.zip
-    system: super-kaneko-nova
     required: true
+    category: bios_zip
+    system: super-kaneko-nova
     note: "Super Kaneko Nova System BIOS, 4 region variants"
     source_ref: "src/drivers/suprnova.c:1226-1229"
-    key_files:
-      - "sknsj1.u10 (Japan BIOS, 512KB)"
-      - "sknse1.u10 (Europe BIOS, 512KB)"
-      - "sknsa1.u10 (Asia BIOS, 512KB)"
-      - "sknsu1.u10 (USA BIOS, 512KB)"
+    contents:
+      - name: sknsj1.u10
+        description: Japan BIOS
+        size: 524288
+      - name: sknse1.u10
+        description: Europe BIOS
+        size: 524288
+      - name: sknsa1.u10
+        description: Asia BIOS
+        size: 524288
+      - name: sknsu1.u10
+        description: USA BIOS
+        size: 524288
 
   # ---------------------------------------------------------
   # Konami GX (konamigx.zip)
   # ---------------------------------------------------------
   - name: konamigx.zip
-    system: konami-gx
     required: true
+    category: bios_zip
+    system: konami-gx
     note: "Konami System GX BIOS"
     source_ref: "src/drivers/konamigx.c:2404"
-    key_files:
-      - "300a01.34k (GX BIOS, 128KB)"
+    contents:
+      - name: 300a01.34k
+        description: GX BIOS
+        size: 131072
 
   # ---------------------------------------------------------
   # ZN-1/ZN-2 PlayStation-based arcade boards
-  # These are mostly NOT_WORKING in mame2003-plus due to
+  # Most are NOT_WORKING in mame2003-plus due to
   # incomplete PS1 emulation in the 0.78 codebase
   # ---------------------------------------------------------
 
   # Capcom ZN-1
   - name: cpzn1.zip
-    system: zn1-capcom
     required: true
+    category: bios_zip
+    system: zn1-capcom
     note: "Capcom ZN-1 BIOS (PS1-based). Most games NOT_WORKING"
     source_ref: "src/drivers/zn.c:1016-1018"
-    key_files:
-      - "coh1002c.bin (Capcom ZN-1 BIOS, 512KB)"
+    contents:
+      - name: coh1002c.bin
+        description: Capcom ZN-1 BIOS
+        size: 524288
 
   # Capcom ZN-2
   - name: cpzn2.zip
-    system: zn2-capcom
     required: true
+    category: bios_zip
+    system: zn2-capcom
     note: "Capcom ZN-2 BIOS (PS1-based). Most games NOT_WORKING"
     source_ref: "src/drivers/zn.c:1274-1276"
-    key_files:
-      - "coh3002c.bin (Capcom ZN-2 BIOS, 512KB)"
+    contents:
+      - name: coh3002c.bin
+        description: Capcom ZN-2 BIOS
+        size: 524288
 
   # Taito FX-1
   - name: taitofx1.zip
-    system: zn1-taito
     required: true
+    category: bios_zip
+    system: zn1-taito
     note: "Taito FX-1 BIOS (PS1-based). Most games NOT_WORKING"
     source_ref: "src/drivers/zn.c:1579-1581"
-    key_files:
-      - "coh1002t.bin (Taito FX-1 BIOS, 512KB)"
+    contents:
+      - name: coh1002t.bin
+        description: Taito FX-1 BIOS
+        size: 524288
 
   # Tecmo TPS
   - name: tps.zip
-    system: zn1-tecmo
     required: true
+    category: bios_zip
+    system: zn1-tecmo
     note: "Tecmo TPS BIOS (PS1-based). Most games NOT_WORKING"
     source_ref: "src/drivers/zn.c:1466-1468"
-    key_files:
-      - "coh1002m.bin (Tecmo TPS BIOS, 512KB)"
+    contents:
+      - name: coh1002m.bin
+        description: Tecmo TPS BIOS
+        size: 524288
 
-  # Video System / Taito KN (sncwgltd uses this)
+  # Video System / Taito KN
   - name: sncwgltd.zip
-    system: zn1-video-system
     required: false
+    category: bios_zip
+    system: zn1-video-system
     note: "Video System KN BIOS (PS1-based). NOT_WORKING"
     source_ref: "src/drivers/zn.c:1555-1557"
-    key_files:
-      - "coh1002v.bin (KN BIOS, 512KB)"
+    contents:
+      - name: coh1002v.bin
+        description: KN BIOS
+        size: 524288
 
   # Acclaim PSX
   - name: acpsx.zip
-    system: zn1-acclaim
     required: true
+    category: bios_zip
+    system: zn1-acclaim
     note: "Acclaim PSX BIOS (PS1-based). NOT_WORKING"
     source_ref: "src/drivers/zn.c:1815-1817"
-    key_files:
-      - "coh1000a.bin (Acclaim PSX BIOS, 512KB)"
+    contents:
+      - name: coh1000a.bin
+        description: Acclaim PSX BIOS
+        size: 524288
 
   # Atlus PSX (PSARC95) - BIOS ROM is NO_DUMP
   # - name: psarc95.zip
diff --git a/emulators/mame2010.yml b/emulators/mame2010.yml
index 1a36facc..40c2a095 100644
--- a/emulators/mame2010.yml
+++ b/emulators/mame2010.yml
@@ -61,212 +61,257 @@ notes: |
   versions may not match expected CRC32/SHA1 values. Use a 0.139-specific
   romset for full compatibility.
 
-bios_zips:
+files:
   # SNK Neo Geo MVS/AES
   - name: neogeo.zip
-    system: snk-neogeo-mvs
     required: true
+    category: bios_zip
+    system: snk-neogeo-mvs
     note: "MVS/AES BIOS, 21 variants (11 official + 10 Universe BIOS up to 2.3)"
     source_ref: "src/mame/drivers/neodrvr.c:565-614"
-    key_files:
-      - "sp-s2.sp1 (Europe, default)"
-      - "usa_2slt.bin (US, 2 slot)"
-      - "asia-s3.rom (Asia)"
-      - "vs-bios.rom (Japan VS)"
-      - "sp-45.sp1 (MV1C Asia, 512KB)"
-      - "sm1.sm1 (Z80 sound, always required)"
-      - "sfix.sfix (fix tiles, always required)"
-      - "000-lo.lo (zoom table, always required)"
+    contents:
+      - name: sp-s2.sp1
+        description: Europe, default
+      - name: usa_2slt.bin
+        description: US, 2 slot
+      - name: asia-s3.rom
+        description: Asia
+      - name: vs-bios.rom
+        description: Japan VS
+      - name: sp-45.sp1
+        description: MV1C Asia
+        size: 524288
+      - name: sm1.sm1
+        description: Z80 sound, always required
+      - name: sfix.sfix
+        description: fix tiles, always required
+      - name: 000-lo.lo
+        description: zoom table, always required
 
   # IGS PGM
   - name: pgm.zip
-    system: igs-pgm
     required: true
+    category: bios_zip
+    system: igs-pgm
     note: "PGM system BIOS, 2 program ROM versions + shared tiles/samples"
     source_ref: "src/mame/drivers/pgm.c:1525-1533"
-    key_files:
-      - "pgm_p02s.u20 (68K BIOS v2, default)"
-      - "pgm_p01s.u20 (68K BIOS v1)"
-      - "pgm_t01s.rom (text tiles, 2MB)"
-      - "pgm_m01s.rom (samples, 2MB)"
+    contents:
+      - name: pgm_p02s.u20
+        description: 68K BIOS v2, default
+      - name: pgm_p01s.u20
+        description: 68K BIOS v1
+      - name: pgm_t01s.rom
+        description: text tiles
+        size: 2097152
+      - name: pgm_m01s.rom
+        description: samples
+        size: 2097152
 
   # Sega Naomi / Naomi 2 / Naomi GD-ROM / Atomiswave
   - name: naomi.zip
-    system: sega-naomi
     required: true
+    category: bios_zip
+    system: sega-naomi
     note: "Naomi BIOS, multiple region variants"
     source_ref: "src/mame/drivers/naomi.c"
 
   - name: naomi2.zip
-    system: sega-naomi2
     required: true
+    category: bios_zip
+    system: sega-naomi2
     note: "Naomi 2 BIOS"
     source_ref: "src/mame/drivers/naomi.c"
 
   - name: naomigd.zip
-    system: sega-naomigd
     required: true
+    category: bios_zip
+    system: sega-naomigd
     note: "Naomi GD-ROM BIOS"
     source_ref: "src/mame/drivers/naomi.c"
 
   - name: awbios.zip
-    system: sammy-atomiswave
     required: true
+    category: bios_zip
+    system: sammy-atomiswave
     note: "Atomiswave BIOS (Sammy)"
     source_ref: "src/mame/drivers/naomi.c"
 
   # Sega ST-V (Saturn-based arcade)
   - name: stvbios.zip
-    system: sega-stv
     required: true
+    category: bios_zip
+    system: sega-stv
     note: "ST-V BIOS, multiple region variants"
     source_ref: "src/mame/drivers/stv.c"
 
   # Sega Hikaru / Chihiro / Triforce
   - name: hikaru.zip
-    system: sega-hikaru
     required: true
+    category: bios_zip
+    system: sega-hikaru
     note: "Hikaru BIOS (not working in 0.139)"
     source_ref: "src/mame/drivers/hikaru.c"
 
   - name: chihiro.zip
-    system: sega-chihiro
     required: true
+    category: bios_zip
+    system: sega-chihiro
     note: "Chihiro BIOS (Xbox-based, not working in 0.139)"
     source_ref: "src/mame/drivers/chihiro.c"
 
   - name: triforce.zip
-    system: sega-triforce
     required: true
+    category: bios_zip
+    system: sega-triforce
     note: "Triforce BIOS (GameCube-based, not working in 0.139)"
     source_ref: "src/mame/drivers/triforce.c"
 
   # DECO Cassette
   - name: decocass.zip
-    system: deco-cassette
     required: true
+    category: bios_zip
+    system: deco-cassette
     note: "DECO Cassette BIOS, 4 regions (Japan/USA/UK/Europe) x old/new"
     source_ref: "src/mame/drivers/decocass.c"
 
   # Nintendo arcade
   - name: playch10.zip
-    system: nintendo-playch10
     required: true
+    category: bios_zip
+    system: nintendo-playch10
     note: "PlayChoice-10 BIOS"
     source_ref: "src/mame/drivers/playch10.c"
 
   - name: nss.zip
-    system: nintendo-nss
     required: true
+    category: bios_zip
+    system: nintendo-nss
     note: "Nintendo Super System BIOS"
     source_ref: "src/mame/drivers/nss.c"
 
   - name: sfcbox.zip
-    system: nintendo-sfcbox
     required: true
+    category: bios_zip
+    system: nintendo-sfcbox
     note: "Super Famicom Box BIOS"
     source_ref: "src/mame/drivers/sfcbox.c"
 
   # Sega Mega Drive arcade
   - name: megaplay.zip
-    system: sega-megaplay
     required: true
+    category: bios_zip
+    system: sega-megaplay
     note: "Mega Play BIOS (Mega Drive arcade)"
     source_ref: "src/mame/drivers/megaplay.c"
 
   - name: megatech.zip
-    system: sega-megatech
     required: true
+    category: bios_zip
+    system: sega-megatech
     note: "Mega-Tech BIOS (Mega Drive arcade)"
     source_ref: "src/mame/drivers/megatech.c"
 
   # Commodore CD32
   - name: cd32.zip
-    system: commodore-cd32
     required: true
+    category: bios_zip
+    system: commodore-cd32
     note: "Amiga CD32 BIOS"
     source_ref: "src/mame/drivers/cubocd32.c"
 
-  # Philips CD-i (new vs mame2003)
+  # Philips CD-i
   - name: cdi.zip
-    system: philips-cdi
     required: true
+    category: bios_zip
+    system: philips-cdi
     note: "CD-i BIOS (not in mame2003)"
     source_ref: "src/mame/drivers/cdi.c"
 
-  # Namco boards (new vs mame2003)
+  # Namco boards
   - name: sys246.zip
-    system: namco-system246
     required: true
+    category: bios_zip
+    system: namco-system246
     note: "Namco System 246 BIOS (PS2-based, not in mame2003)"
     source_ref: "src/mame/drivers/namcops2.c"
 
   - name: sys256.zip
-    system: namco-system256
     required: true
+    category: bios_zip
+    system: namco-system256
     note: "Namco System 256 BIOS (PS2-based, not in mame2003)"
     source_ref: "src/mame/drivers/namcops2.c"
 
   - name: sys573.zip
-    system: namco-system573
     required: true
+    category: bios_zip
+    system: namco-system573
     note: "Namco System 573 BIOS (PSX-based)"
     source_ref: "src/mame/drivers/ksys573.c"
 
-  # Konami Viper (new vs mame2003)
+  # Konami Viper
   - name: kviper.zip
-    system: konami-viper
     required: true
+    category: bios_zip
+    system: konami-viper
     note: "Konami Viper BIOS (3dfx-based, not working in 0.139)"
     source_ref: "src/mame/drivers/viper.c"
 
   # Taito
   - name: taitogn.zip
-    system: taito-type-x
     required: true
+    category: bios_zip
+    system: taito-type-x
     note: "Taito G-Net BIOS (PSX-based)"
     source_ref: "src/mame/drivers/taitogn.c"
 
   # PSX-based arcade boards
   - name: cpzn1.zip
-    system: capcom-zn1
     required: true
+    category: bios_zip
+    system: capcom-zn1
     note: "Capcom ZN-1 BIOS (PSX-based)"
     source_ref: "src/mame/drivers/zn.c"
 
   - name: cpzn2.zip
-    system: capcom-zn2
     required: true
+    category: bios_zip
+    system: capcom-zn2
     note: "Capcom ZN-2 BIOS (PSX-based)"
     source_ref: "src/mame/drivers/zn.c"
 
   - name: konamigv.zip
-    system: konami-gv
     required: true
+    category: bios_zip
+    system: konami-gv
     note: "Konami GV BIOS (PSX-based)"
     source_ref: "src/mame/drivers/konamigv.c"
 
   # Other notable BIOS sets
   - name: skns.zip
-    system: super-kaneko-nova
     required: true
+    category: bios_zip
+    system: super-kaneko-nova
     note: "Super Kaneko Nova System BIOS, 5 regions"
     source_ref: "src/mame/drivers/suprnova.c"
 
   - name: alg_bios.zip
-    system: alg-laserdisc
     required: true
+    category: bios_zip
+    system: alg-laserdisc
     note: "American Laser Games BIOS (Amiga-based laserdisc)"
     source_ref: "src/mame/drivers/alg.c"
 
   - name: maxaflex.zip
-    system: exidy-maxaflex
     required: true
+    category: bios_zip
+    system: exidy-maxaflex
     note: "Exidy Max-A-Flex BIOS (Atari 600XL-based)"
     source_ref: "src/mame/drivers/maxaflex.c"
 
   - name: hng64.zip
-    system: hyper-neogeo64
     required: true
+    category: bios_zip
+    system: hyper-neogeo64
     note: "Hyper Neo-Geo 64 BIOS (not working in 0.139)"
     source_ref: "src/mame/drivers/hng64.c"
diff --git a/emulators/mame2016.yml b/emulators/mame2016.yml
index d0f51d26..37e655f1 100644
--- a/emulators/mame2016.yml
+++ b/emulators/mame2016.yml
@@ -75,274 +75,340 @@ notes: |
   ROM naming follows MAME 0.174 conventions. Use a 0.174-specific romset for
   full compatibility.
 
-bios_zips:
+files:
   # SNK Neo Geo MVS/AES
   - name: neogeo.zip
-    system: snk-neogeo-mvs
     required: true
+    category: bios_zip
+    system: snk-neogeo-mvs
     note: "MVS/AES BIOS, 25+ variants (12 official + 13 Universe BIOS up to 3.2)"
     source_ref: "src/mame/drivers/neogeo.cpp"
-    key_files:
-      - "sp-s2.sp1 (Europe MVS v2, default)"
-      - "sp-u2.sp1 (US MVS v2)"
-      - "asia-s3.rom (Asia MVS v3)"
-      - "vs-bios.rom (Japan MVS v6 VS)"
-      - "sp-45.sp1 (MV1C Asia, 512KB)"
-      - "sm1.sm1 (Z80 sound, always required)"
-      - "sfix.sfix (fix tiles, always required)"
-      - "000-lo.lo (zoom table, always required)"
-      - "uni-bios_3_2.rom (Universe BIOS 3.2, newest hack)"
+    contents:
+      - name: sp-s2.sp1
+        description: Europe MVS v2, default
+      - name: sp-u2.sp1
+        description: US MVS v2
+      - name: asia-s3.rom
+        description: Asia MVS v3
+      - name: vs-bios.rom
+        description: Japan MVS v6 VS
+      - name: sp-45.sp1
+        description: MV1C Asia
+        size: 524288
+      - name: sm1.sm1
+        description: Z80 sound, always required
+      - name: sfix.sfix
+        description: fix tiles, always required
+      - name: 000-lo.lo
+        description: zoom table, always required
+      - name: uni-bios_3_2.rom
+        description: Universe BIOS 3.2, newest hack
 
   # Neo Geo CD
   - name: neocdz.zip
-    system: snk-neogeo-cd
     required: true
+    category: bios_zip
+    system: snk-neogeo-cd
     note: "Neo Geo CDZ BIOS"
     source_ref: "src/mame/drivers/neogeocd.cpp"
-    key_files:
-      - "neocd.bin (CDZ BIOS, 512KB)"
-      - "000-lo.lo (zoom table)"
+    contents:
+      - name: neocd.bin
+        description: CDZ BIOS
+        size: 524288
+      - name: 000-lo.lo
+        description: zoom table
 
   # IGS PGM
   - name: pgm.zip
-    system: igs-pgm
     required: true
+    category: bios_zip
+    system: igs-pgm
     note: "PGM system BIOS, 2 program ROM versions + shared tiles/samples"
     source_ref: "src/mame/drivers/pgm.cpp"
-    key_files:
-      - "pgm_p02s.u20 (68K BIOS v2, default)"
-      - "pgm_p01s.u20 (68K BIOS v1)"
-      - "pgm_t01s.rom (text tiles, 2MB)"
-      - "pgm_m01s.rom (samples, 2MB)"
+    contents:
+      - name: pgm_p02s.u20
+        description: 68K BIOS v2, default
+      - name: pgm_p01s.u20
+        description: 68K BIOS v1
+      - name: pgm_t01s.rom
+        description: text tiles
+        size: 2097152
+      - name: pgm_m01s.rom
+        description: samples
+        size: 2097152
 
   # Sega NAOMI / NAOMI 2 / GD-ROM / Atomiswave
   - name: naomi.zip
-    system: sega-naomi
     required: true
+    category: bios_zip
+    system: sega-naomi
     note: "NAOMI BIOS, 23 variants: 8 Japan + 6 Export + 6 USA + 2 Korea + 1 Dev"
     source_ref: "src/mame/drivers/naomi.cpp:2904-2951"
-    key_files:
-      - "epr-21576h.ic27 (Japan, latest)"
-      - "epr-21578h.ic27 (Export, latest)"
-      - "epr-21577h.ic27 (USA, latest)"
+    contents:
+      - name: epr-21576h.ic27
+        description: Japan, latest
+      - name: epr-21578h.ic27
+        description: Export, latest
+      - name: epr-21577h.ic27
+        description: USA, latest
 
   - name: naomi2.zip
-    system: sega-naomi2
     required: true
+    category: bios_zip
+    system: sega-naomi2
     note: "NAOMI 2 BIOS, same EPR structure as NAOMI"
     source_ref: "src/mame/drivers/naomi.cpp:3046-3072"
 
   - name: naomigd.zip
-    system: sega-naomigd
     required: true
+    category: bios_zip
+    system: sega-naomigd
     note: "NAOMI GD-ROM BIOS, requires rev E or higher"
     source_ref: "src/mame/drivers/naomi.cpp:2994-3044"
 
   - name: awbios.zip
-    system: sammy-atomiswave
     required: true
+    category: bios_zip
+    system: sammy-atomiswave
     note: "Atomiswave BIOS (Sammy)"
     source_ref: "src/mame/drivers/naomi.cpp:3073-3088"
 
   # Dedicated NAOMI game BIOS sets
   - name: hod2bios.zip
-    system: sega-naomi
     required: false
+    category: bios_zip
+    system: sega-naomi
     note: "House of the Dead 2 dedicated BIOS, 3 variants"
     source_ref: "src/mame/drivers/naomi.cpp:2963-2971"
 
   - name: f355dlx.zip
-    system: sega-naomi
     required: false
+    category: bios_zip
+    system: sega-naomi
     note: "Ferrari F355 Deluxe dedicated BIOS"
     source_ref: "src/mame/drivers/naomi.cpp:2973-2976"
 
   - name: f355bios.zip
-    system: sega-naomi
     required: false
+    category: bios_zip
+    system: sega-naomi
     note: "Ferrari F355 Challenge dedicated BIOS, 2 variants"
     source_ref: "src/mame/drivers/naomi.cpp:2978-2983"
 
   - name: airlbios.zip
-    system: sega-naomi
     required: false
+    category: bios_zip
+    system: sega-naomi
     note: "Airline Pilots Deluxe dedicated BIOS, 2 variants"
     source_ref: "src/mame/drivers/naomi.cpp:2985-2990"
 
   # Sega ST-V
   - name: stvbios.zip
-    system: sega-stv
     required: true
+    category: bios_zip
+    system: sega-stv
     note: "ST-V BIOS, 10+ region variants (JP/US/EU/TW/Dev)"
     source_ref: "src/mame/drivers/stv.cpp"
-    key_files:
-      - "epr-20091.ic8 (Japan 97/08/21, default)"
-      - "epr-19730.ic8 (Japan 97/02/17)"
+    contents:
+      - name: epr-20091.ic8
+        description: Japan 97/08/21, default
+      - name: epr-19730.ic8
+        description: Japan 97/02/17
 
   # Sega Lindbergh (new vs mame2010)
   - name: lindbios.zip
-    system: sega-lindbergh
     required: true
+    category: bios_zip
+    system: sega-lindbergh
     note: "Lindbergh BIOS, 3 PC BIOS versions + MPC firmware + GPU BIOS"
     source_ref: "src/mame/drivers/lindbergh.cpp"
-    key_files:
-      - "6.0.0010a.bin (PC BIOS v6.0.0010 alt)"
-      - "6.0.0009.bin (PC BIOS v6.0.0009)"
-      - "fpr-24370b.ic6 (MPC firmware, 4MB)"
-      - "vid_bios.u504 (GeForce BIOS)"
+    contents:
+      - name: 6.0.0010a.bin
+        description: PC BIOS v6.0.0010 alt
+      - name: 6.0.0009.bin
+        description: PC BIOS v6.0.0009
+      - name: fpr-24370b.ic6
+        description: MPC firmware
+        size: 4194304
+      - name: vid_bios.u504
+        description: GeForce BIOS
 
   # Sega Model 2
   - name: model2.zip
-    system: sega-model2
     required: true
+    category: bios_zip
+    system: sega-model2
     note: "Model 2 BIOS"
     source_ref: "src/mame/drivers/model2.cpp"
 
   # Sega Hikaru / Chihiro / Triforce
   - name: hikaru.zip
-    system: sega-hikaru
     required: true
+    category: bios_zip
+    system: sega-hikaru
     note: "Hikaru BIOS (limited functionality in 0.174)"
     source_ref: "src/mame/drivers/hikaru.cpp"
 
   - name: chihiro.zip
-    system: sega-chihiro
     required: true
+    category: bios_zip
+    system: sega-chihiro
     note: "Chihiro BIOS (Xbox-based, limited in 0.174)"
     source_ref: "src/mame/drivers/chihiro.cpp"
 
   - name: triforce.zip
-    system: sega-triforce
     required: true
+    category: bios_zip
+    system: sega-triforce
     note: "Triforce BIOS (GameCube-based, limited in 0.174)"
     source_ref: "src/mame/drivers/triforce.cpp"
 
   # DECO Cassette
   - name: decocass.zip
-    system: deco-cassette
     required: true
+    category: bios_zip
+    system: deco-cassette
     note: "DECO Cassette BIOS"
     source_ref: "src/mame/drivers/decocass.cpp"
 
   # Nintendo arcade
   - name: playch10.zip
-    system: nintendo-playch10
     required: true
+    category: bios_zip
+    system: nintendo-playch10
     note: "PlayChoice-10 BIOS"
     source_ref: "src/mame/drivers/playch10.cpp"
 
   - name: nss.zip
-    system: nintendo-nss
     required: true
+    category: bios_zip
+    system: nintendo-nss
     note: "Nintendo Super System BIOS"
     source_ref: "src/mame/drivers/nss.cpp"
 
   - name: sfcbox.zip
-    system: nintendo-sfcbox
     required: true
+    category: bios_zip
+    system: nintendo-sfcbox
     note: "Super Famicom Box BIOS"
     source_ref: "src/mame/drivers/sfcbox.cpp"
 
   # Sega Mega Drive arcade
   - name: megaplay.zip
-    system: sega-megaplay
     required: true
+    category: bios_zip
+    system: sega-megaplay
     note: "Mega Play BIOS (Mega Drive arcade)"
     source_ref: "src/mame/drivers/megaplay.cpp"
 
   - name: megatech.zip
-    system: sega-megatech
     required: true
+    category: bios_zip
+    system: sega-megatech
     note: "Mega-Tech BIOS (Mega Drive arcade)"
     source_ref: "src/mame/drivers/megatech.cpp"
 
   # Philips CD-i
   - name: cdi.zip
-    system: philips-cdi
     required: true
+    category: bios_zip
+    system: philips-cdi
     note: "CD-i BIOS"
     source_ref: "src/mame/drivers/cdi.cpp"
 
   # Commodore CD32
   - name: cd32.zip
-    system: commodore-cd32
     required: true
+    category: bios_zip
+    system: commodore-cd32
     note: "Amiga CD32 BIOS"
     source_ref: "src/mame/drivers/cubocd32.cpp"
 
   # Namco boards
   - name: sys246.zip
-    system: namco-system246
     required: true
+    category: bios_zip
+    system: namco-system246
     note: "Namco System 246 BIOS (PS2-based)"
     source_ref: "src/mame/drivers/namcops2.cpp"
 
   - name: sys256.zip
-    system: namco-system256
     required: true
+    category: bios_zip
+    system: namco-system256
     note: "Namco System 256 BIOS (PS2-based)"
     source_ref: "src/mame/drivers/namcops2.cpp"
 
   - name: sys573.zip
-    system: namco-system573
     required: true
+    category: bios_zip
+    system: namco-system573
     note: "Konami System 573 BIOS (PSX-based)"
     source_ref: "src/mame/drivers/ksys573.cpp"
 
   # Konami Viper
   - name: kviper.zip
-    system: konami-viper
     required: true
+    category: bios_zip
+    system: konami-viper
     note: "Konami Viper BIOS (3dfx-based, limited in 0.174)"
     source_ref: "src/mame/drivers/viper.cpp"
 
   # Taito G-NET
   - name: taitogn.zip
-    system: taito-gnet
     required: true
+    category: bios_zip
+    system: taito-gnet
     note: "Taito G-Net BIOS (PSX-based)"
     source_ref: "src/mame/drivers/taitogn.cpp"
 
   # PSX-based arcade boards
   - name: cpzn1.zip
-    system: capcom-zn1
     required: true
+    category: bios_zip
+    system: capcom-zn1
     note: "Capcom ZN-1 BIOS (PSX-based)"
     source_ref: "src/mame/drivers/zn.cpp"
 
   - name: cpzn2.zip
-    system: capcom-zn2
     required: true
+    category: bios_zip
+    system: capcom-zn2
     note: "Capcom ZN-2 BIOS (PSX-based)"
     source_ref: "src/mame/drivers/zn.cpp"
 
   - name: konamigv.zip
-    system: konami-gv
     required: true
+    category: bios_zip
+    system: konami-gv
     note: "Konami GV BIOS (PSX-based)"
     source_ref: "src/mame/drivers/konamigv.cpp"
 
   # Other notable BIOS sets
   - name: skns.zip
-    system: super-kaneko-nova
     required: true
+    category: bios_zip
+    system: super-kaneko-nova
     note: "Super Kaneko Nova System BIOS, 5 regions"
     source_ref: "src/mame/drivers/suprnova.cpp"
 
   - name: alg_bios.zip
-    system: alg-laserdisc
     required: true
+    category: bios_zip
+    system: alg-laserdisc
     note: "American Laser Games BIOS (Amiga-based laserdisc)"
     source_ref: "src/mame/drivers/alg.cpp"
 
   - name: hng64.zip
-    system: hyper-neogeo64
     required: true
+    category: bios_zip
+    system: hyper-neogeo64
     note: "Hyper Neo-Geo 64 BIOS (limited in 0.174)"
     source_ref: "src/mame/drivers/hng64.cpp"
 
   - name: isgsm.zip
-    system: isg-selection-master
     required: true
+    category: bios_zip
+    system: isg-selection-master
     note: "ISG Selection Master BIOS (Sega System 16 conversion)"
     source_ref: "src/mame/drivers/isgsm.cpp"