From c9eda9685849562f0fa387fbddba7cafbe64be85 Mon Sep 17 00:00:00 2001
From: Jeff Parsons <Jeff@pcjs.org>
Date: Sat, 6 Feb 2016 12:20:53 -0800
Subject: [PATCH] Reorganized the BASIC and BIOS ROMs into the ROM folder

---
 devices/pc/README.md                          |  6 ++--
 devices/pc/bios/README.md                     | 21 -------------
 .../5150/cga/384kb/softkbd/machine.xml        |  4 +--
 .../5150/cga/64kb/donkey/debugger/machine.xml |  4 +--
 .../machine/5150/cga/64kb/donkey/machine.xml  |  4 +--
 .../machine/5150/cga/64kb/softkbd/machine.xml |  4 +--
 devices/pc/machine/5150/dual/64kb/machine.xml |  4 +--
 .../5150/mda/64kb/debugger/machine.xml        |  4 +--
 devices/pc/machine/5150/mda/64kb/machine.xml  |  4 +--
 .../machine/5150/mda/64kb/softkbd/machine.xml |  4 +--
 .../machine/5160/cga/256kb/array/machine.xml  |  4 +--
 .../5160/cga/256kb/demo/debugger/machine.xml  |  4 +--
 .../machine/5160/cga/256kb/demo/machine.xml   |  4 +--
 .../5160/cga/256kb/softkbd/machine.xml        |  4 +--
 .../machine/5160/cga/256kb/win101/README.md   |  2 ++
 .../cga/256kb/win101/debugger/machine.xml     |  4 +--
 .../machine/5160/cga/256kb/win101/machine.xml |  4 +--
 .../5160/cga/256kb/win101/softkbd/machine.xml |  4 +--
 .../5160/cga/512kb/win101/softkbd/machine.xml |  4 +--
 .../5160/cga/640kb/debugger/machine.xml       |  4 +--
 .../5160/cga/640kb/dos400m/machine.xml        |  4 +--
 devices/pc/machine/5160/cga/640kb/machine.xml |  4 +--
 .../5160/ega/256kb/debugger/machine.xml       |  4 +--
 .../machine/5160/ega/640kb/array/machine.xml  |  4 +--
 .../5160/ega/640kb/debugger/machine.xml       |  4 +--
 devices/pc/machine/5160/ega/640kb/machine.xml |  4 +--
 .../ega/640kb/win101/debugger/machine.xml     |  4 +--
 .../machine/5160/ega/640kb/win101/machine.xml |  4 +--
 .../5160/mda/256kb/debugger/machine.xml       |  4 +--
 .../mda/256kb/fake188/debugger/machine.xml    |  4 +--
 .../5160/mda/256kb/fake188/machine.xml        |  4 +--
 devices/pc/machine/5160/mda/256kb/machine.xml |  4 +--
 .../machine/5160/mda/64kb/softkbd/machine.xml |  4 +--
 .../5170/ega/1152kb/rev1/debugger/machine.xml |  2 +-
 .../rev3/debugger/backtrack/machine.xml       |  2 +-
 .../5170/ega/1152kb/rev3/debugger/machine.xml |  6 ++--
 .../5170/ega/640kb/rev1/debugger/machine.xml  |  2 +-
 .../machine/5170/ega/640kb/rev1/machine.xml   |  2 +-
 .../compaq/deskpro386/ega/2048kb/machine.xml  |  2 +-
 .../compaq/deskpro386/ega/4096kb/machine.xml  |  2 +-
 .../deskpro386/other/2048kb/machine.xml       |  2 +-
 .../compaq/deskpro386/vga/2048kb/machine.xml  |  2 +-
 .../compaq/deskpro386/vga/4096kb/machine.xml  |  2 +-
 .../5150/basic/BASIC100.json}                 |  0
 devices/pc/{ => rom/5150}/basic/README.md     | 10 +++---
 .../5150 => rom/5150/bios}/1981-04-24.json    |  0
 .../5150 => rom/5150/bios}/1981-10-19.json    |  0
 .../5150 => rom/5150/bios}/1982-10-27.json    |  0
 .../5160/basic/BASIC110.json}                 |  0
 .../5160 => rom/5160/bios}/1982-11-08.json    |  0
 .../5160 => rom/5160/bios}/1986-05-09.json    |  0
 .../5170 => rom/5170/bios}/1984-01-10.json    |  0
 .../5170 => rom/5170/bios}/1984-01-10.map     |  0
 .../5170 => rom/5170/bios}/1985-06-10.json    |  0
 .../5170 => rom/5170/bios}/1985-11-15.json    |  0
 .../5170 => rom/5170/bios}/1985-11-15.map     |  0
 .../pc/{bios/5170 => rom/5170/bios}/README.md | 14 +++++----
 devices/pc/rom/README.md                      | 31 +++++++++++++++++++
 .../deskpro386/1988-01-28/109591-001.hex      |  0
 .../deskpro386/1988-01-28/109592-001.hex      |  0
 .../deskpro386/1988-01-28/1988-01-28.json     |  0
 .../deskpro386/1988-01-28/1988-01-28.nasm     |  0
 .../bios}/deskpro386/1988-01-28/makefile      |  0
 .../deskpro386/1988-05-10/109591-003.hex      |  0
 .../deskpro386/1988-05-10/109592-003.hex      |  0
 .../deskpro386/1988-05-10/1988-05-10.json     |  0
 .../bios}/deskpro386/1988-05-10/makefile      |  0
 .../deskpro386/1989-04-14/1989-04-14.json     |  0
 .../bios}/deskpro386/1989-04-14/makefile      |  0
 .../compaq/bios}/deskpro386/README.md         |  6 ++--
 .../compaq/bios}/portable3/1987-01-29.json    |  0
 .../compaq/bios}/portable3/README.md          |  4 ++-
 devices/pc/video/compaq/vga/README.md         |  4 +--
 devices/pc/video/paradise/vga/README.md       |  2 +-
 disks/pc/cpm/1.1b/machine.xml                 |  4 +--
 disks/pc/diags/ibm/2.20/machine.xml           |  4 +--
 disks/pc/dos/compaq/3.10/README.md            |  3 ++
 disks/pc/games/infocom/machine-debug.xml      |  4 +--
 disks/pc/games/infocom/machine.xml            |  4 +--
 .../games/infocom/zork1/debugger/machine.xml  |  4 +--
 .../pc/games/microsoft/adventure/machine.xml  |  4 +--
 disks/pc/os2/ibm/1.0/machine.xml              |  2 +-
 docs/pcjs/hdc/README.md                       |  2 +-
 docs/pcjs/rom/README.md                       |  2 +-
 .../demos/machine-debugger.xml                |  4 +--
 .../Graphics_for_the_IBM_PC/demos/machine.xml |  4 +--
 86 files changed, 154 insertions(+), 131 deletions(-)
 delete mode 100644 devices/pc/bios/README.md
 rename devices/pc/{basic/ibm-basic-1.00.json => rom/5150/basic/BASIC100.json} (100%)
 rename devices/pc/{ => rom/5150}/basic/README.md (75%)
 rename devices/pc/{bios/5150 => rom/5150/bios}/1981-04-24.json (100%)
 rename devices/pc/{bios/5150 => rom/5150/bios}/1981-10-19.json (100%)
 rename devices/pc/{bios/5150 => rom/5150/bios}/1982-10-27.json (100%)
 rename devices/pc/{basic/ibm-basic-1.10.json => rom/5160/basic/BASIC110.json} (100%)
 rename devices/pc/{bios/5160 => rom/5160/bios}/1982-11-08.json (100%)
 rename devices/pc/{bios/5160 => rom/5160/bios}/1986-05-09.json (100%)
 rename devices/pc/{bios/5170 => rom/5170/bios}/1984-01-10.json (100%)
 rename devices/pc/{bios/5170 => rom/5170/bios}/1984-01-10.map (100%)
 rename devices/pc/{bios/5170 => rom/5170/bios}/1985-06-10.json (100%)
 rename devices/pc/{bios/5170 => rom/5170/bios}/1985-11-15.json (100%)
 rename devices/pc/{bios/5170 => rom/5170/bios}/1985-11-15.map (100%)
 rename devices/pc/{bios/5170 => rom/5170/bios}/README.md (81%)
 create mode 100644 devices/pc/rom/README.md
 rename devices/pc/{bios/compaq => rom/compaq/bios}/deskpro386/1988-01-28/109591-001.hex (100%)
 rename devices/pc/{bios/compaq => rom/compaq/bios}/deskpro386/1988-01-28/109592-001.hex (100%)
 rename devices/pc/{bios/compaq => rom/compaq/bios}/deskpro386/1988-01-28/1988-01-28.json (100%)
 rename devices/pc/{bios/compaq => rom/compaq/bios}/deskpro386/1988-01-28/1988-01-28.nasm (100%)
 rename devices/pc/{bios/compaq => rom/compaq/bios}/deskpro386/1988-01-28/makefile (100%)
 rename devices/pc/{bios/compaq => rom/compaq/bios}/deskpro386/1988-05-10/109591-003.hex (100%)
 rename devices/pc/{bios/compaq => rom/compaq/bios}/deskpro386/1988-05-10/109592-003.hex (100%)
 rename devices/pc/{bios/compaq => rom/compaq/bios}/deskpro386/1988-05-10/1988-05-10.json (100%)
 rename devices/pc/{bios/compaq => rom/compaq/bios}/deskpro386/1988-05-10/makefile (100%)
 rename devices/pc/{bios/compaq => rom/compaq/bios}/deskpro386/1989-04-14/1989-04-14.json (100%)
 rename devices/pc/{bios/compaq => rom/compaq/bios}/deskpro386/1989-04-14/makefile (100%)
 rename devices/pc/{bios/compaq => rom/compaq/bios}/deskpro386/README.md (96%)
 rename devices/pc/{bios/compaq => rom/compaq/bios}/portable3/1987-01-29.json (100%)
 rename devices/pc/{bios/compaq => rom/compaq/bios}/portable3/README.md (80%)

diff --git a/devices/pc/README.md b/devices/pc/README.md
index e411f7b9d..5dec0eb80 100644
--- a/devices/pc/README.md
+++ b/devices/pc/README.md
@@ -11,7 +11,7 @@ IBM PC Device Configurations
 
 * CPU
 * RAM
-* ROMs (eg, [BASIC](basic/), [BIOS](bios/))
+* [ROMs](rom/)
 * [Keyboards](keyboard/)
 * [Video Adapters](video/)
 * Floppy Disk Controllers
@@ -35,8 +35,8 @@ looks like:
 		<name pos="center">IBM PC (Model 5150) with Monochrome Display</name>
 		<computer id="pc-mda-64k" name="IBM PC" resume="1"/>
 		<ram id="ramLow" addr="0x00000"/>
-		<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
-		<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+		<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
+		<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24.json"/>
 		<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 		<cpu id="cpu8088" model="8088" autostart="true" padleft="8px">
 			<control type="button" binding="run">Run</control>
diff --git a/devices/pc/bios/README.md b/devices/pc/bios/README.md
deleted file mode 100644
index 4e0470594..000000000
--- a/devices/pc/bios/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-layout: page
-title: IBM PC BIOS ROMs
-permalink: /devices/pc/bios/
----
-
-BIOS ROMs
----
-
-The project contains the following IBM PC BIOS ROMs:
-
-* [Model 5150: Apr 24, 1981](5150/1981-04-24.json)
-* [Model 5150: Oct 19, 1981](5150/1981-10-19.json)
-* [Model 5150: Oct 27, 1982](5150/1982-10-27.json)
-* [Model 5160: Nov 08, 1982](5160/1982-11-08.json)
-* [Model 5160: May 09, 1986](5160/1986-05-09.json)
-
-As well as BIOS ROMs, with more detailed information, for the following machines:
-
-* [Model 5170](5170/)
-* [Compaq DeskPro 386](compaq/deskpro386/)
diff --git a/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml b/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml
index d5c3c3e4a..fc8df424d 100644
--- a/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml
+++ b/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml
@@ -6,8 +6,8 @@
 	<cpu id="cpu8088" model="8088"/>
 	<debugger id="debugger"/>
 	<ram id="ramLow" addr="0x00000" test="false" comment="no memory test"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
diff --git a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml
index 82d3bd84e..b14182445 100644
--- a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml
+++ b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml
@@ -4,8 +4,8 @@
 	<name pos="center">IBM PC (Model 5150), CGA, 64K</name>
 	<computer id="pc-cga-64k" name="IBM PC" state="/devices/pc/machine/5150/cga/64kb/donkey/state.json"/>
 	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
diff --git a/devices/pc/machine/5150/cga/64kb/donkey/machine.xml b/devices/pc/machine/5150/cga/64kb/donkey/machine.xml
index 972455d60..d016c06f8 100644
--- a/devices/pc/machine/5150/cga/64kb/donkey/machine.xml
+++ b/devices/pc/machine/5150/cga/64kb/donkey/machine.xml
@@ -4,8 +4,8 @@
 	<name pos="center">IBM PC (Model 5150), CGA, 64K</name>
 	<computer id="pc-cga-64k" name="IBM PC" state="/devices/pc/machine/5150/cga/64kb/donkey/state.json"/>
 	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" padleft="8px">
 		<control type="button" binding="run">Run</control>
diff --git a/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml b/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml
index 51e39c58d..9079766c9 100644
--- a/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml
+++ b/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml
@@ -5,8 +5,8 @@
 	<computer id="pc-cga-64k" name="IBM PC"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5150/dual/64kb/machine.xml b/devices/pc/machine/5150/dual/64kb/machine.xml
index d7eec91c4..f75cf602b 100644
--- a/devices/pc/machine/5150/dual/64kb/machine.xml
+++ b/devices/pc/machine/5150/dual/64kb/machine.xml
@@ -4,8 +4,8 @@
 	<name pos="center">IBM PC (Model 5150) with Dual Display</name>
 	<computer id="pc-dual-64k" name="IBM PC" resume="1"/>
 	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda-dual.xml"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-dual.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" padleft="8px">
diff --git a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml
index 90b414d30..b9cce4ae6 100644
--- a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml
+++ b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml
@@ -4,8 +4,8 @@
 	<name pos="center">IBM PC Model 5150 with Monochrome Display</name>
 	<computer id="pc-mda-64k" name="IBM PC" resume="1"/>
 	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
diff --git a/devices/pc/machine/5150/mda/64kb/machine.xml b/devices/pc/machine/5150/mda/64kb/machine.xml
index a36ad9b25..bd808081d 100644
--- a/devices/pc/machine/5150/mda/64kb/machine.xml
+++ b/devices/pc/machine/5150/mda/64kb/machine.xml
@@ -4,8 +4,8 @@
 	<name pos="center">IBM PC (Model 5150) with Monochrome Display</name>
 	<computer id="pc-mda-64k" name="IBM PC" resume="1"/>
 	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" padleft="8px">
 		<control type="button" binding="run">Run</control>
diff --git a/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml b/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml
index 2f8cabfc0..ac2e12180 100644
--- a/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml
+++ b/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml
@@ -5,8 +5,8 @@
 	<computer id="pc-mda-64k" name="IBM PC"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5160/cga/256kb/array/machine.xml b/devices/pc/machine/5160/cga/256kb/array/machine.xml
index 5946183dd..737fc7a76 100644
--- a/devices/pc/machine/5160/cga/256kb/array/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/array/machine.xml
@@ -5,8 +5,8 @@
 	<computer id="xt-cga-256k" name="IBM PC XT"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
 		<control type="button" binding="run">Run</control>
diff --git a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml
index de5ee1c7a..a899a88bf 100644
--- a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml
@@ -5,8 +5,8 @@
 	<computer id="xt-cga-256k" name="IBM PC XT" resume="1"/>
 	<ram id="ramLow" addr="0x00000" test="false" comment="ROM BIOS memory test has been disabled"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
diff --git a/devices/pc/machine/5160/cga/256kb/demo/machine.xml b/devices/pc/machine/5160/cga/256kb/demo/machine.xml
index 70119db6a..3b8d6633d 100644
--- a/devices/pc/machine/5160/cga/256kb/demo/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/demo/machine.xml
@@ -5,8 +5,8 @@
 	<computer id="xt-cga-256k" name="IBM PC XT" resume="1"/>
 	<ram id="ramLow" addr="0x00000"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
 		<control type="button" binding="run">Run</control>
diff --git a/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml b/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml
index 6b44d96fd..39d1571ee 100644
--- a/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml
@@ -6,8 +6,8 @@
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5160/cga/256kb/win101/README.md b/devices/pc/machine/5160/cga/256kb/win101/README.md
index 7e952d91d..9a59bef13 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/README.md
+++ b/devices/pc/machine/5160/cga/256kb/win101/README.md
@@ -4,6 +4,8 @@ title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display running Win
 permalink: /devices/pc/machine/5160/cga/256kb/win101/
 redirect_from:
   - /configs/pc/machines/5160/cga/256kb/win101/
+  - /demos/pc/cga-win101/xt-cga-win101.xml
+  - /demos/pc/cga-win101/
 machines:
   - type: pc
     id: ibm5160
diff --git a/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml
index 16b634c2d..9d1bcd6f5 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml
@@ -5,8 +5,8 @@
 	<computer id="xt-cga-win101" name="IBM PC XT" state="/devices/pc/machine/5160/cga/256kb/win101/state.json" resume="1"/>
 	<ram id="ramLow" addr="0x00000"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-lock.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="false"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
diff --git a/devices/pc/machine/5160/cga/256kb/win101/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/machine.xml
index 665675787..9ed1ab15c 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/machine.xml
@@ -5,8 +5,8 @@
 	<computer id="xt-cga-win101" name="IBM PC XT" state="/devices/pc/machine/5160/cga/256kb/win101/state.json"/>
 	<ram id="ramLow" addr="0x00000"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-lock.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
 		<control type="button" binding="run">Run</control>
diff --git a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml
index aea0b966a..aa5fdbe18 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml
@@ -6,8 +6,8 @@
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-lock.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml
index 8dd98191c..143658e22 100644
--- a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml
@@ -6,8 +6,8 @@
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0x80000" comment="0x80000 (512Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-lock.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5160/cga/640kb/debugger/machine.xml b/devices/pc/machine/5160/cga/640kb/debugger/machine.xml
index 15f82caab..9df5b767d 100644
--- a/devices/pc/machine/5160/cga/640kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/cga/640kb/debugger/machine.xml
@@ -6,8 +6,8 @@
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960-keygrid.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml b/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
index 8f7ceb5cb..92e99376d 100644
--- a/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
+++ b/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
@@ -6,8 +6,8 @@
 	<cpu id="cpu8088" model="8088" autostart="true"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-lock.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5160/cga/640kb/machine.xml b/devices/pc/machine/5160/cga/640kb/machine.xml
index 039552f72..c8a91d4fe 100644
--- a/devices/pc/machine/5160/cga/640kb/machine.xml
+++ b/devices/pc/machine/5160/cga/640kb/machine.xml
@@ -5,8 +5,8 @@
 	<computer id="xt-cga-640k" name="IBM PC XT"/>
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960-keygrid.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
 		<control type="button" binding="run">Run</control>
diff --git a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
index 53aba8dd2..603e0bc79 100644
--- a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
@@ -7,8 +7,8 @@
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-64kb.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5160/ega/640kb/array/machine.xml b/devices/pc/machine/5160/ega/640kb/array/machine.xml
index 105fb63a3..77cea44a2 100644
--- a/devices/pc/machine/5160/ega/640kb/array/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/array/machine.xml
@@ -6,8 +6,8 @@
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolock640.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<cpu id="cpu8088" model="8088">
diff --git a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
index 330a236fd..8e2ea5760 100644
--- a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
@@ -7,8 +7,8 @@
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5160/ega/640kb/machine.xml b/devices/pc/machine/5160/ega/640kb/machine.xml
index 5f19ee4c9..92455356c 100644
--- a/devices/pc/machine/5160/ega/640kb/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/machine.xml
@@ -7,8 +7,8 @@
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
diff --git a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml b/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml
index 4d1f9ab90..b216aa76c 100644
--- a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml
@@ -7,8 +7,8 @@
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5160/ega/640kb/win101/machine.xml b/devices/pc/machine/5160/ega/640kb/win101/machine.xml
index ff6a6ef98..f18fd2808 100644
--- a/devices/pc/machine/5160/ega/640kb/win101/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/win101/machine.xml
@@ -6,8 +6,8 @@
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="0xa0000 (640Kb) size overrides SW1|ROM BIOS memory test has been disabled"/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<cpu id="cpu8088" model="8088">
diff --git a/devices/pc/machine/5160/mda/256kb/debugger/machine.xml b/devices/pc/machine/5160/mda/256kb/debugger/machine.xml
index 897e628ab..1a2ca8a85 100644
--- a/devices/pc/machine/5160/mda/256kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/debugger/machine.xml
@@ -6,8 +6,8 @@
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml
index 2281d5b8a..70d324b01 100644
--- a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml
@@ -6,8 +6,8 @@
 	<cpu id="cpu80188" model="80188"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5160/mda/256kb/fake188/machine.xml b/devices/pc/machine/5160/mda/256kb/fake188/machine.xml
index 234a47d04..680bab42c 100644
--- a/devices/pc/machine/5160/mda/256kb/fake188/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/fake188/machine.xml
@@ -5,8 +5,8 @@
 	<computer id="xt188-mda-256k" name="IBM PC XT"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 	<cpu id="cpu80188" model="80188" autostart="true" padleft="8px">
 		<control type="button" binding="run">Run</control>
diff --git a/devices/pc/machine/5160/mda/256kb/machine.xml b/devices/pc/machine/5160/mda/256kb/machine.xml
index 746d165a1..6bc8e9ee0 100644
--- a/devices/pc/machine/5160/mda/256kb/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/machine.xml
@@ -6,8 +6,8 @@
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml"/>
diff --git a/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml b/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml
index d320b5f8f..b8e508956 100644
--- a/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml
+++ b/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml
@@ -6,8 +6,8 @@
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-us83.xml"/>
 	<debugger id="debugger"/>
diff --git a/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml
index 990c0291b..1c3f26773 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml
@@ -7,7 +7,7 @@
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
-	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/bios/5170/1984-01-10.json"/>
+	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1984-01-10.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
index 6d2c4a4af..7e1c865c3 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
@@ -7,7 +7,7 @@
 	<ram id="ramLow" addr="0x00000" test="true" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
-	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/bios/5170/1985-11-15.json"/>
+	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
index 1a71f56b5..0dbfce135 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
@@ -7,15 +7,15 @@
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
 	<ram id="ramExt" addr="0x100000" size="0x80000" comment=""/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
-	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/bios/5170/1985-11-15.json"/>
+	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/disks/pc/library.xml" automount='{A: {name: "PC-DOS 3.20 (Disk 1)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK1.json"}, B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
+	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.20 (Disk 1)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK1.json"}, B: {name: "PC-DOS 3.20 (Disk 2)", path: "/disks/pc/dos/ibm/3.20/PCDOS320-DISK2.json"}}'/>
 	<hdc id="hdcAT" type="at" drives='[{name:"20Mb Hard Disk",type:2}]'/>
 	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
 	<serial id="com1" adapter="1"/>
-	<serial id="com2" adapter="2" binding="print" tabsize="8"/>
+	<serial id="com2" adapter="2" binding="print"/>
 	<mouse serial="com1"/>
 </machine>
diff --git a/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml
index 4fc57bac7..c2dddfbe3 100644
--- a/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml
@@ -6,7 +6,7 @@
 	<cpu id="cpu286" model="80286"/>
 	<ram id="ramLow" addr="0x00000" size="0xa0000"/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
-	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/bios/5170/1984-01-10.json"/>
+	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1984-01-10.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
diff --git a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml
index d6ab4220d..fb39394e1 100644
--- a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml
+++ b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml
@@ -6,7 +6,7 @@
 	<cpu id="cpu286" model="80286"/>
 	<ram id="ramLow" addr="0x00000" size="0xa0000"/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
-	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/bios/5170/1984-01-10.json"/>
+	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1984-01-10.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" pos="right" automount='{A: {name: "MS-DOS 4.00 (Disk 1)", path: "/disks/pc/dos/microsoft/4.00/MSDOS400-DISK1.json"}}'/>
diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
index b842e5901..a5055827f 100644
--- a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
@@ -8,7 +8,7 @@
 	<ram id="ramCPQ" addr="0xfa0000" size="0x60000" comment="Compaq memory at 0xFA0000"/>
 	<ram id="ramExt" addr="0x100000" size="0x100000" comment="Extended memory at 0x100000"/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
-	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/bios/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
+	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
 	<debugger id="debugger" messages="" commands=""/>
diff --git a/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml
index 69c0e0187..b9c14269d 100644
--- a/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml
@@ -8,7 +8,7 @@
 	<ram id="ramCPQ" addr="0xfa0000" size="0x60000" comment="Compaq memory at 0xFA0000"/>
 	<ram id="ramExt" addr="0x100000" size="0x300000" comment="Extended memory at 0x100000"/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
-	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/bios/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
+	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-256kb-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-arrows.xml"/>
 	<debugger id="debugger" messages="" commands=""/>
diff --git a/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml
index 5e2e3cfd2..c7d068b4f 100644
--- a/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml
@@ -8,7 +8,7 @@
 	<ram id="ramCPQ" addr="0xfa0000" size="0x60000" comment="Compaq memory at 0xFA0000"/>
 	<ram id="ramExt" addr="0x100000" size="0x100000" comment="Extended memory at 0x100000"/>
 	<rom id="romVGA" addr="0xc0000" size="0x8000" file="/devices/pc/video/compaq/vga/109360-001/1987-10-27.json" notify="videoVGA"/>
-	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/bios/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
+	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pc/video/compaq/vga/compaq-vga-lock.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger" messages="fault|port" commands=""/>
diff --git a/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml
index 5f6ff393f..aba4e6fb3 100644
--- a/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml
@@ -8,7 +8,7 @@
 	<ram id="ramCPQ" addr="0xfa0000" size="0x60000" comment="Compaq memory at 0xFA0000"/>
 	<ram id="ramExt" addr="0x100000" size="0x100000" comment="Extended memory at 0x100000"/>
 	<rom id="romVGA" addr="0xc0000" size="0x6000" file="/devices/pc/video/ibm/vga/ibm-vga.json" notify="videoVGA[0x378d,0x3f8d]"/>
-	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/bios/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
+	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pc/video/ibm/vga/ibm-vga-autolockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pc/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "VGA Tests (Black Book)", path: "/tests/pc/vga/VGABIN.json"}}'/>
diff --git a/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml b/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
index b75c2c659..884ddeb08 100644
--- a/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
@@ -8,7 +8,7 @@
 	<ram id="ramCPQ" addr="0xfa0000" size="0x60000" comment="Compaq memory at 0xFA0000"/>
 	<ram id="ramExt" addr="0x100000" size="0x300000" comment="Extended memory at 0x100000"/>
 	<rom id="romVGA" addr="0xc0000" size="0x6000" file="/devices/pc/video/ibm/vga/ibm-vga.json" notify="videoVGA[0x378d,0x3f8d]"/>
-	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/bios/compaq/deskpro386/1988-01-28/1988-01-28.json"/>
+	<rom id="romBIOS" addr="0xf8000" size="0x8000" alias="[0xf0000,0xffff0000,0xffff8000]" file="/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json"/>
 	<video ref="/devices/pc/video/ibm/vga/ibm-vga-lockfs.xml"/>
 	<keyboard id="keyboard"/>
 	<fdc ref="/disks/pc/compiled/library.xml" automount=''/>
diff --git a/devices/pc/basic/ibm-basic-1.00.json b/devices/pc/rom/5150/basic/BASIC100.json
similarity index 100%
rename from devices/pc/basic/ibm-basic-1.00.json
rename to devices/pc/rom/5150/basic/BASIC100.json
diff --git a/devices/pc/basic/README.md b/devices/pc/rom/5150/basic/README.md
similarity index 75%
rename from devices/pc/basic/README.md
rename to devices/pc/rom/5150/basic/README.md
index ad3c317ab..07551cdbd 100644
--- a/devices/pc/basic/README.md
+++ b/devices/pc/rom/5150/basic/README.md
@@ -1,7 +1,9 @@
 ---
 layout: page
 title: IBM PC BASIC ROMs
-permalink: /devices/pc/basic/
+permalink: /devices/pc/rom/5150/basic/
+redirect_from:
+  - /devices/pc/basic/
 ---
 
 BASIC ROMs
@@ -9,8 +11,8 @@ BASIC ROMs
 
 The project contains the following BASIC ROMs:
 
-* [BASIC 1.00](ibm-basic-1.00.json)
-* [BASIC 1.10](ibm-basic-1.10.json)
+* [BASIC 1.00](BASIC100.json)
+* [BASIC 1.10](../../5160/basic/BASIC110.json)
 
 These built-in versions of BASIC were also referred to as *Cassette BASIC*, because no disk drive was required.
 Only the original IBM PC (Model 5150) actually provided a cassette interface, but IBM continued to use that
@@ -18,4 +20,4 @@ name to describe the built-in BASIC at least up through the IBM PC AT (Model 517
 
 Here's an [IBM PC Machine](/devices/pc/machine/) XML excerpt that shows how to include a BASIC ROM:
 
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
diff --git a/devices/pc/bios/5150/1981-04-24.json b/devices/pc/rom/5150/bios/1981-04-24.json
similarity index 100%
rename from devices/pc/bios/5150/1981-04-24.json
rename to devices/pc/rom/5150/bios/1981-04-24.json
diff --git a/devices/pc/bios/5150/1981-10-19.json b/devices/pc/rom/5150/bios/1981-10-19.json
similarity index 100%
rename from devices/pc/bios/5150/1981-10-19.json
rename to devices/pc/rom/5150/bios/1981-10-19.json
diff --git a/devices/pc/bios/5150/1982-10-27.json b/devices/pc/rom/5150/bios/1982-10-27.json
similarity index 100%
rename from devices/pc/bios/5150/1982-10-27.json
rename to devices/pc/rom/5150/bios/1982-10-27.json
diff --git a/devices/pc/basic/ibm-basic-1.10.json b/devices/pc/rom/5160/basic/BASIC110.json
similarity index 100%
rename from devices/pc/basic/ibm-basic-1.10.json
rename to devices/pc/rom/5160/basic/BASIC110.json
diff --git a/devices/pc/bios/5160/1982-11-08.json b/devices/pc/rom/5160/bios/1982-11-08.json
similarity index 100%
rename from devices/pc/bios/5160/1982-11-08.json
rename to devices/pc/rom/5160/bios/1982-11-08.json
diff --git a/devices/pc/bios/5160/1986-05-09.json b/devices/pc/rom/5160/bios/1986-05-09.json
similarity index 100%
rename from devices/pc/bios/5160/1986-05-09.json
rename to devices/pc/rom/5160/bios/1986-05-09.json
diff --git a/devices/pc/bios/5170/1984-01-10.json b/devices/pc/rom/5170/bios/1984-01-10.json
similarity index 100%
rename from devices/pc/bios/5170/1984-01-10.json
rename to devices/pc/rom/5170/bios/1984-01-10.json
diff --git a/devices/pc/bios/5170/1984-01-10.map b/devices/pc/rom/5170/bios/1984-01-10.map
similarity index 100%
rename from devices/pc/bios/5170/1984-01-10.map
rename to devices/pc/rom/5170/bios/1984-01-10.map
diff --git a/devices/pc/bios/5170/1985-06-10.json b/devices/pc/rom/5170/bios/1985-06-10.json
similarity index 100%
rename from devices/pc/bios/5170/1985-06-10.json
rename to devices/pc/rom/5170/bios/1985-06-10.json
diff --git a/devices/pc/bios/5170/1985-11-15.json b/devices/pc/rom/5170/bios/1985-11-15.json
similarity index 100%
rename from devices/pc/bios/5170/1985-11-15.json
rename to devices/pc/rom/5170/bios/1985-11-15.json
diff --git a/devices/pc/bios/5170/1985-11-15.map b/devices/pc/rom/5170/bios/1985-11-15.map
similarity index 100%
rename from devices/pc/bios/5170/1985-11-15.map
rename to devices/pc/rom/5170/bios/1985-11-15.map
diff --git a/devices/pc/bios/5170/README.md b/devices/pc/rom/5170/bios/README.md
similarity index 81%
rename from devices/pc/bios/5170/README.md
rename to devices/pc/rom/5170/bios/README.md
index 100e5df44..b2cbee679 100644
--- a/devices/pc/bios/5170/README.md
+++ b/devices/pc/rom/5170/bios/README.md
@@ -1,7 +1,9 @@
 ---
 layout: page
 title: IBM PC AT (Model 5170) BIOS
-permalink: /devices/pc/bios/5170/
+permalink: /devices/pc/rom/5170/bios/
+redirect_from:
+  - /devices/pc/bios/5170/
 ---
 
 IBM PC AT (Model 5170) BIOS
@@ -29,18 +31,18 @@ From [http://minuszerodegrees.net/bios/BIOS_5170_10JAN84_6MHZ.zip](http://minusz
 
 The JSON-encoded ROM image that PCjs uses was created using the *FileDump* command-line *merge* option:
 
-	filedump --file=http://archive.pcjs.org/devices/pc/bios/5170/BIOS_5170_10JAN84_U27_6181028_27256_6MHZ.BIN --merge=http://archive.pcjs.org/devices/pc/bios/5170/BIOS_5170_10JAN84_U47_6181029_27256_6MHZ.BIN --output=1984-01-10.json --overwrite
+	filedump --file=http://archive.pcjs.org/devices/pc/rom/5170/bios/BIOS_5170_10JAN84_U27_6181028_27256_6MHZ.BIN --merge=http://archive.pcjs.org/devices/pc/rom/5170/bios/BIOS_5170_10JAN84_U47_6181029_27256_6MHZ.BIN --output=1984-01-10.json --overwrite
 	
 Since a MAP file ([1984-01-10.map](1984-01-10.map)) exists as well, it is automatically appended to the JSON file
 ([1984-01-10.json](1984-01-10.json)) when using a ROM input file (or JSON output file) with a matching filename.
 
-It is also possible to create a merged binary ROM image ([1984-01-10.rom](http://archive.pcjs.org/devices/pc/bios/5170/1984-01-10.rom))
+It is also possible to create a merged binary ROM image ([1984-01-10.rom](http://archive.pcjs.org/devices/pc/rom/5170/bios/1984-01-10.rom))
 by adding *--format=rom* to the command-line (the default is *--format=json*).
 
 These operations can only be performed using the *FileDump* command-line interface; the *FileDump* API does not support
 either the *merge* option or the appending of MAP data.  For the moment, the API can only dump unadorned ROM images; eg:
 
-	http://localhost:8088/api/v1/dump/?file=http://archive.pcjs.org/devices/pc/bios/5170/1984-01-10.rom
+	http://localhost:8088/api/v1/dump/?file=http://archive.pcjs.org/devices/pc/rom/5170/bios/1984-01-10.rom
 
 ---
 
@@ -70,7 +72,7 @@ From [http://minuszerodegrees.net/bios/BIOS_5170_10JUN85_6MHZ.zip](http://minusz
 
 The JSON-encoded ROM image that PCjs uses was created using the *FileDump* command-line *merge* option:
 
-	filedump --file=http://archive.pcjs.org/devices/pc/bios/5170/BIOS_5170_10JUN85_U27_6480090_27256.BIN --merge=http://archive.pcjs.org/devices/pc/bios/5170/BIOS_5170_10JUN85_U47_6480091_27256.BIN --output=1985-06-10.json --overwrite
+	filedump --file=http://archive.pcjs.org/devices/pc/rom/5170/bios/BIOS_5170_10JUN85_U27_6480090_27256.BIN --merge=http://archive.pcjs.org/devices/pc/rom/5170/bios/BIOS_5170_10JUN85_U47_6480091_27256.BIN --output=1985-06-10.json --overwrite
 
 ---
 
@@ -100,4 +102,4 @@ From [http://minuszerodegrees.net/bios/BIOS_5170_15NOV85_8MHZ_VARIATION_2.zip](h
 
 The JSON-encoded ROM image that PCjs uses was created using the *FileDump* command-line *merge* option:
 
-	filedump --file=http://archive.pcjs.org/devices/pc/bios/5170/BIOS_5170_15NOV85_U27_61X9266_27256.BIN --merge=http://archive.pcjs.org/devices/pc/bios/5170/BIOS_5170_15NOV85_U47_61X9265_27256.BIN --output=1985-11-15.json --overwrite
+	filedump --file=http://archive.pcjs.org/devices/pc/rom/5170/bios/BIOS_5170_15NOV85_U27_61X9266_27256.BIN --merge=http://archive.pcjs.org/devices/pc/rom/5170/bios/BIOS_5170_15NOV85_U47_61X9265_27256.BIN --output=1985-11-15.json --overwrite
diff --git a/devices/pc/rom/README.md b/devices/pc/rom/README.md
new file mode 100644
index 000000000..2d2991213
--- /dev/null
+++ b/devices/pc/rom/README.md
@@ -0,0 +1,31 @@
+---
+layout: page
+title: IBM PC ROMs
+permalink: /devices/pc/rom/
+redirect_from:
+  - /devices/pc/bios/
+---
+
+BASIC ROMs
+---
+
+The project contains the following IBM PC BASIC ROMs:
+
+* [IBM BASIC 1.00](5150/basic/BASIC100.json)
+* [IBM BASIC 1.10](5160/basic/BASIC110.json)
+
+BIOS ROMs
+---
+
+The project contains the following IBM PC BIOS ROMs:
+
+* [Model 5150: Apr 24, 1981](5150/bios/1981-04-24.json)
+* [Model 5150: Oct 19, 1981](5150/bios/1981-10-19.json)
+* [Model 5150: Oct 27, 1982](5150/bios/1982-10-27.json)
+* [Model 5160: Nov 08, 1982](5160/bios/1982-11-08.json)
+* [Model 5160: May 09, 1986](5160/bios/1986-05-09.json)
+
+As well as BIOS ROMs, with more detailed information, for the following machines:
+
+* [Model 5170](5170/bios/)
+* [Compaq DeskPro 386](compaq/deskpro386/)
diff --git a/devices/pc/bios/compaq/deskpro386/1988-01-28/109591-001.hex b/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/109591-001.hex
similarity index 100%
rename from devices/pc/bios/compaq/deskpro386/1988-01-28/109591-001.hex
rename to devices/pc/rom/compaq/bios/deskpro386/1988-01-28/109591-001.hex
diff --git a/devices/pc/bios/compaq/deskpro386/1988-01-28/109592-001.hex b/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/109592-001.hex
similarity index 100%
rename from devices/pc/bios/compaq/deskpro386/1988-01-28/109592-001.hex
rename to devices/pc/rom/compaq/bios/deskpro386/1988-01-28/109592-001.hex
diff --git a/devices/pc/bios/compaq/deskpro386/1988-01-28/1988-01-28.json b/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json
similarity index 100%
rename from devices/pc/bios/compaq/deskpro386/1988-01-28/1988-01-28.json
rename to devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json
diff --git a/devices/pc/bios/compaq/deskpro386/1988-01-28/1988-01-28.nasm b/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.nasm
similarity index 100%
rename from devices/pc/bios/compaq/deskpro386/1988-01-28/1988-01-28.nasm
rename to devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.nasm
diff --git a/devices/pc/bios/compaq/deskpro386/1988-01-28/makefile b/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/makefile
similarity index 100%
rename from devices/pc/bios/compaq/deskpro386/1988-01-28/makefile
rename to devices/pc/rom/compaq/bios/deskpro386/1988-01-28/makefile
diff --git a/devices/pc/bios/compaq/deskpro386/1988-05-10/109591-003.hex b/devices/pc/rom/compaq/bios/deskpro386/1988-05-10/109591-003.hex
similarity index 100%
rename from devices/pc/bios/compaq/deskpro386/1988-05-10/109591-003.hex
rename to devices/pc/rom/compaq/bios/deskpro386/1988-05-10/109591-003.hex
diff --git a/devices/pc/bios/compaq/deskpro386/1988-05-10/109592-003.hex b/devices/pc/rom/compaq/bios/deskpro386/1988-05-10/109592-003.hex
similarity index 100%
rename from devices/pc/bios/compaq/deskpro386/1988-05-10/109592-003.hex
rename to devices/pc/rom/compaq/bios/deskpro386/1988-05-10/109592-003.hex
diff --git a/devices/pc/bios/compaq/deskpro386/1988-05-10/1988-05-10.json b/devices/pc/rom/compaq/bios/deskpro386/1988-05-10/1988-05-10.json
similarity index 100%
rename from devices/pc/bios/compaq/deskpro386/1988-05-10/1988-05-10.json
rename to devices/pc/rom/compaq/bios/deskpro386/1988-05-10/1988-05-10.json
diff --git a/devices/pc/bios/compaq/deskpro386/1988-05-10/makefile b/devices/pc/rom/compaq/bios/deskpro386/1988-05-10/makefile
similarity index 100%
rename from devices/pc/bios/compaq/deskpro386/1988-05-10/makefile
rename to devices/pc/rom/compaq/bios/deskpro386/1988-05-10/makefile
diff --git a/devices/pc/bios/compaq/deskpro386/1989-04-14/1989-04-14.json b/devices/pc/rom/compaq/bios/deskpro386/1989-04-14/1989-04-14.json
similarity index 100%
rename from devices/pc/bios/compaq/deskpro386/1989-04-14/1989-04-14.json
rename to devices/pc/rom/compaq/bios/deskpro386/1989-04-14/1989-04-14.json
diff --git a/devices/pc/bios/compaq/deskpro386/1989-04-14/makefile b/devices/pc/rom/compaq/bios/deskpro386/1989-04-14/makefile
similarity index 100%
rename from devices/pc/bios/compaq/deskpro386/1989-04-14/makefile
rename to devices/pc/rom/compaq/bios/deskpro386/1989-04-14/makefile
diff --git a/devices/pc/bios/compaq/deskpro386/README.md b/devices/pc/rom/compaq/bios/deskpro386/README.md
similarity index 96%
rename from devices/pc/bios/compaq/deskpro386/README.md
rename to devices/pc/rom/compaq/bios/deskpro386/README.md
index 280f05d02..b85c36e27 100644
--- a/devices/pc/bios/compaq/deskpro386/README.md
+++ b/devices/pc/rom/compaq/bios/deskpro386/README.md
@@ -1,7 +1,9 @@
 ---
 layout: page
 title: Compaq DeskPro 386 ROMs
-permalink: /devices/pc/bios/compaq/deskpro386/
+permalink: /devices/pc/rom/compaq/bios/deskpro386/
+redirect_from:
+  - /devices/pc/bios/compaq/deskpro386/
 ---
 
 Compaq DeskPro 386 ROMs
@@ -45,7 +47,7 @@ For a more human-readable dump, use the `--comments` option:
 
 And for those who want a binary file, the FileDump API can be used to recreate binary data from JSON data:
 
-	http://localhost:8088/api/v1/dump?file=http://localhost:8088/devices/pc/bios/compaq/deskpro386/1988-01-28/1988-01-28.json&format=rom
+	http://localhost:8088/api/v1/dump?file=http://localhost:8088/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json&format=rom
 
 Similarly, [1989-04-14.json](1989-04-14/1989-04-14.json) was generated by first creating **1989-04-14.rom**
 from the two 16Kb BIN files provided by [Al Kossow](http://www.vintage-computer.com/vcforum/member.php?2256-Al-Kossow):
diff --git a/devices/pc/bios/compaq/portable3/1987-01-29.json b/devices/pc/rom/compaq/bios/portable3/1987-01-29.json
similarity index 100%
rename from devices/pc/bios/compaq/portable3/1987-01-29.json
rename to devices/pc/rom/compaq/bios/portable3/1987-01-29.json
diff --git a/devices/pc/bios/compaq/portable3/README.md b/devices/pc/rom/compaq/bios/portable3/README.md
similarity index 80%
rename from devices/pc/bios/compaq/portable3/README.md
rename to devices/pc/rom/compaq/bios/portable3/README.md
index 8dd162244..0f266370c 100644
--- a/devices/pc/bios/compaq/portable3/README.md
+++ b/devices/pc/rom/compaq/bios/portable3/README.md
@@ -1,7 +1,9 @@
 ---
 layout: page
 title: Compaq Portable III Information
-permalink: /devices/pc/bios/compaq/portable3/
+permalink: /devices/pc/rom/compaq/bios/portable3/
+redirect_from:
+  - /devices/pc/bios/compaq/portable3/
 ---
 
 Compaq Portable III Information
diff --git a/devices/pc/video/compaq/vga/README.md b/devices/pc/video/compaq/vga/README.md
index e2d455516..a62bdd3e0 100644
--- a/devices/pc/video/compaq/vga/README.md
+++ b/devices/pc/video/compaq/vga/README.md
@@ -47,7 +47,7 @@ a way of getting the sharpest and fastest graphics without abandoning your commi
 As such, this board is in perfect accord with the Compaq philosophy, and it may be the best way available
 for mating a VGA-style monitor and VGA graphics to your AT.
 
-A copy of the board's [VGA ROM BIOS](109360-001/1988-05-18.json) was created by [dumping](/devices/pc/bios/compaq/deskpro386/#dumping-the-roms)
+A copy of the board's [VGA ROM BIOS](109360-001/1988-05-18.json) was created by [dumping](/devices/pc/rom/compaq/bios/deskpro386/#dumping-the-roms)
 the contents of each EPROM chip to a *.hex* file, and then merging the *.hex* files with the following
 [FileDump](/modules/filedump/) command:
 
@@ -70,7 +70,7 @@ The Compaq VGA ROM BIOS concludes with the usual copyright string and author ini
 	05/18/88
 
 Four of the authors -- **RWS**, **NPB**, **DJC**, and **CAB** -- are also listed as authors of the
-[DeskPro 386 ROM BIOS](/devices/pc/bios/compaq/deskpro386/).
+[DeskPro 386 ROM BIOS](/devices/pc/rom/compaq/bios/deskpro386/).
 
 An older version of the VGA ROM BIOS, [1987-10-27.json](109360-001/1987-10-27.json), is also available online.  It comes
 from an [earlier revision](http://bitsavers.trailing-edge.com/pdf/compaq/firmware/109360-001_VGA/) of the same board, with
diff --git a/devices/pc/video/paradise/vga/README.md b/devices/pc/video/paradise/vga/README.md
index c6fb47608..824871527 100644
--- a/devices/pc/video/paradise/vga/README.md
+++ b/devices/pc/video/paradise/vga/README.md
@@ -11,7 +11,7 @@ This Paradise VGA board was manufactured in 1988 and sold by Western Digital Cor
  
 [<img src="http://archive.pcjs.org/devices/pc/video/paradise/vga/Paradise_VGA_1988-640.jpg" alt="Paradise VGA Board"/>](http://archive.pcjs.org/devices/pc/video/paradise/vga/Paradise_VGA_1988.jpg)
 
-A copy of the board's [ROM BIOS](1988-05-23.json) was created by [dumping](/devices/pc/bios/compaq/deskpro386/#dumping-the-roms)
+A copy of the board's [ROM BIOS](1988-05-23.json) was created by [dumping](/devices/pc/rom/compaq/bios/deskpro386/#dumping-the-roms)
 the contents of each of the board's two M27128AZB PROMs to a *.hex* file, and then merging the *.hex* files with the following
 [FileDump](/modules/filedump/) command:
 
diff --git a/disks/pc/cpm/1.1b/machine.xml b/disks/pc/cpm/1.1b/machine.xml
index ec3f4a6f5..5cf7f981e 100644
--- a/disks/pc/cpm/1.1b/machine.xml
+++ b/disks/pc/cpm/1.1b/machine.xml
@@ -4,8 +4,8 @@
 	<name pos="center">IBM PC (Model 5150) running CP/M-86</name>
 	<computer id="cpm-mda-64k" name="IBM PC" resume="1"/>
 	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
-	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
+	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px" padbottom="8px">
 		<control type="button" binding="run">Run</control>
diff --git a/disks/pc/diags/ibm/2.20/machine.xml b/disks/pc/diags/ibm/2.20/machine.xml
index 0ed7c5a04..ca0e1a913 100644
--- a/disks/pc/diags/ibm/2.20/machine.xml
+++ b/disks/pc/diags/ibm/2.20/machine.xml
@@ -4,8 +4,8 @@
 	<name pos="center">IBM PC (Model 5150) running IBM Advanced Diagnostics 2.20</name>
 	<computer id="pc-mda-64k" name="IBM PC"/>
 	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
-	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
+	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px" padbottom="8px">
 		<control type="button" binding="run">Run</control>
diff --git a/disks/pc/dos/compaq/3.10/README.md b/disks/pc/dos/compaq/3.10/README.md
index 89de7ca84..5ed4f04f9 100644
--- a/disks/pc/dos/compaq/3.10/README.md
+++ b/disks/pc/dos/compaq/3.10/README.md
@@ -4,6 +4,9 @@ title: COMPAQ MS-DOS 3.10
 permalink: /disks/pc/dos/compaq/3.10/
 ---
 
+COMPAQ MS-DOS 3.10
+---
+
 This directory contains two different releases of COMPAQ MS-DOS 3.10:
 
 * [COMPAQ MS-DOS 3.10 (dated 10-31-86)](#compaq-ms-dos-310-10-31-86)
diff --git a/disks/pc/games/infocom/machine-debug.xml b/disks/pc/games/infocom/machine-debug.xml
index d110f78bf..5669d1d8c 100644
--- a/disks/pc/games/infocom/machine-debug.xml
+++ b/disks/pc/games/infocom/machine-debug.xml
@@ -5,8 +5,8 @@
 	<computer id="infocom-cga-64k" name="IBM PC" resume="1"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/static/ibm-basic-1.00.rom"/>
-	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/static/1981-04-24.rom"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/static/BASIC100.rom"/>
+	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/static/1981-04-24.rom"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga.xml"/>
 	<keyboard id="keyboard" pos="left" padleft="8px">
 		<control type="button" binding="esc">ESC</control>
diff --git a/disks/pc/games/infocom/machine.xml b/disks/pc/games/infocom/machine.xml
index 3a1d0345f..916534805 100644
--- a/disks/pc/games/infocom/machine.xml
+++ b/disks/pc/games/infocom/machine.xml
@@ -4,8 +4,8 @@
 	<name pos="center">IBM PC Model 5150 (CGA, 64K)</name>
 	<computer id="infocom-cga-64k" name="IBM PC" resume="1"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
-	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
+	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px" padbottom="8px">
 		<control type="button" binding="run">Run</control>
diff --git a/disks/pc/games/infocom/zork1/debugger/machine.xml b/disks/pc/games/infocom/zork1/debugger/machine.xml
index 7053ec677..fcca2ed49 100644
--- a/disks/pc/games/infocom/zork1/debugger/machine.xml
+++ b/disks/pc/games/infocom/zork1/debugger/machine.xml
@@ -5,8 +5,8 @@
 	<computer id="zork-cga-64k" name="IBM PC"/>
 	<cpu id="cpu8088" model="8088"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
-	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
+	<rom id="romBIOS"  addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga.xml"/>
 	<keyboard id="keyboard" pos="left" padleft="8px">
 		<control type="button" binding="esc">ESC</control>
diff --git a/disks/pc/games/microsoft/adventure/machine.xml b/disks/pc/games/microsoft/adventure/machine.xml
index 16b04b2d2..ac14ebbe0 100644
--- a/disks/pc/games/microsoft/adventure/machine.xml
+++ b/disks/pc/games/microsoft/adventure/machine.xml
@@ -4,8 +4,8 @@
 	<name pos="center">IBM PC (Model 5150) running Microsoft Adventure</name>
 	<computer id="msadv-mda-64k" name="IBM PC" resume="1"/>
 	<ram id="ramLow" addr="0x00000"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.00.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5150/basic/BASIC100.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5150/bios/1981-04-24.json"/>
 	<video ref="/devices/pc/video/ibm/mda/ibm-mda.xml"/>
 	<cpu id="cpu8088" model="8088" autostart="true" pos="left" padleft="8px">
 		<control type="button" binding="run">Run</control>
diff --git a/disks/pc/os2/ibm/1.0/machine.xml b/disks/pc/os2/ibm/1.0/machine.xml
index baa188548..98a2012fe 100644
--- a/disks/pc/os2/ibm/1.0/machine.xml
+++ b/disks/pc/os2/ibm/1.0/machine.xml
@@ -7,7 +7,7 @@
 	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
 	<ram id="ramExt" addr="0x100000" size="0x160000" comment=""/>
 	<rom id="romEGA" addr="0xc0000" size="0x4000" file="/devices/pc/video/ibm/ega/ibm-ega.json" notify="videoEGA"/>
-	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/bios/5170/1985-11-15.json"/>
+	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15.json"/>
 	<video ref="/devices/pc/video/ibm/ega/ibm-ega-128kb-lockfs.xml"/>
 	<keyboard ref="/devices/pc/keyboard/keyboard-minimal-functions.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
diff --git a/docs/pcjs/hdc/README.md b/docs/pcjs/hdc/README.md
index b593a93b1..1fa1c964a 100644
--- a/docs/pcjs/hdc/README.md
+++ b/docs/pcjs/hdc/README.md
@@ -50,7 +50,7 @@ Attributes
 
 	For the Western Digital (*'at'*) controller, use a Model 5170 (or newer) ROM module; eg:
 
-		<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/bios/5170/1984-01-10.json"/>
+		<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1984-01-10.json"/>
 
 	The default *type* setting is *'xt'*.
 
diff --git a/docs/pcjs/rom/README.md b/docs/pcjs/rom/README.md
index 3ae952c18..cd6a84c74 100644
--- a/docs/pcjs/rom/README.md
+++ b/docs/pcjs/rom/README.md
@@ -43,7 +43,7 @@ None.
 
 Example
 ---
-	<rom id="romBIOS" addr="0xfe000" size="0x02000" file="/devices/pc/bios/5150/1981-04-24.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x02000" file="/devices/pc/rom/5150/bios/1981-04-24.json"/>
 
 Output
 ---
diff --git a/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine-debugger.xml b/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine-debugger.xml
index 97b71db84..198a3414b 100644
--- a/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine-debugger.xml
+++ b/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine-debugger.xml
@@ -5,8 +5,8 @@
 	<computer id="xt-cga-256k" name="IBM PC XT" resume="1"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960.xml"/>
 	<keyboard id="keyboard" padleft="8px">
 		<control type="button" binding="esc">ESC</control>
diff --git a/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine.xml b/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine.xml
index d0c5137e6..ff4974ac1 100644
--- a/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine.xml
+++ b/pubs/pc/programming/Graphics_for_the_IBM_PC/demos/machine.xml
@@ -5,8 +5,8 @@
 	<computer id="xt-cga-256k" name="IBM PC XT"/>
 	<ram id="ramLow" addr="0x00000" test="false"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
-	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/basic/ibm-basic-1.10.json"/>
-	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/bios/5160/1982-11-08.json"/>
+	<rom id="romBASIC" addr="0xf6000" size="0x8000" file="/devices/pc/rom/5160/basic/BASIC110.json"/>
+	<rom id="romBIOS" addr="0xfe000" size="0x2000" file="/devices/pc/rom/5160/bios/1982-11-08.json"/>
 	<video ref="/devices/pc/video/ibm/cga/ibm-cga-960.xml"/>
 	<keyboard id="keyboard" padleft="8px">
 		<control type="button" binding="esc">ESC</control>