diff --git a/_posts/2014-09-13-the-ibm-pc-at-alive-and-booting.md b/_posts/2014-09-13-the-ibm-pc-at-alive-and-booting.md
index 26593c0bf..566aa6e27 100644
--- a/_posts/2014-09-13-the-ibm-pc-at-alive-and-booting.md
+++ b/_posts/2014-09-13-the-ibm-pc-at-alive-and-booting.md
@@ -7,7 +7,7 @@ permalink: /blog/2014/09/13/
---
My first IBM PC AT (Model 5170) [Test Configuration](/devices/pc/machine/5170/ega/640kb/rev1/debugger/) finally
-boots to a PC-DOS prompt. The configuration uses the original [IBM Model 5170 ROM BIOS](/devices/pc/bios/5170/),
+boots to a PC-DOS prompt. The configuration uses the original [IBM Model 5170 ROM BIOS](/devices/pc/rom/5170/),
dated January 10, 1984.
Getting through the BIOS "POST" (Power-On Self Test) diagnostics was like running an obstacle course, with various
diff --git a/_posts/2014-10-13-the-8mhz-ibm-pc-at-5170.md b/_posts/2014-10-13-the-8mhz-ibm-pc-at-5170.md
index 3eb1562e7..fdf9581af 100644
--- a/_posts/2014-10-13-the-8mhz-ibm-pc-at-5170.md
+++ b/_posts/2014-10-13-the-8mhz-ibm-pc-at-5170.md
@@ -10,7 +10,7 @@ I just added my first [8Mhz IBM PC AT](/devices/pc/machine/5170/ega/1152kb/rev3/
to the list of [IBM PC Machine Configurations](/devices/pc/machine/), and not surprisingly, the new machine
fails to boot.
-This machine uses the 3rd [ROM BIOS](/devices/pc/bios/5170/) that IBM released for the PC AT, a revision that
+This machine uses the 3rd [ROM BIOS](/devices/pc/rom/5170/) that IBM released for the PC AT, a revision that
included support for 3.5-inch 1.44Mb diskettes -- which will be nice, because I have a number of 1.44Mb diskette
images I would like to be able to read in a PCjs machine.
diff --git a/_posts/2014-10-23-improved-pc-dos-700-support.md b/_posts/2014-10-23-improved-pc-dos-700-support.md
index 14f32d3f8..0e115a3b9 100644
--- a/_posts/2014-10-23-improved-pc-dos-700-support.md
+++ b/_posts/2014-10-23-improved-pc-dos-700-support.md
@@ -21,7 +21,7 @@ through "PC-DOS 7.00 (Disk 5)", so your best bet is to boot from the 1.44Mb "PC-
Note that you must also use a fairly new 80286 machine configuration, like this
[8Mhz IBM PC AT](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/),
in order to use 1.44Mb diskette images; previous models did not support 3.5-inch diskette drives, unless they had been
-retrofitted with a newer [BIOS](/devices/pc/bios/5170/).
+retrofitted with a newer [BIOS](/devices/pc/rom/5170/).
*[@jeffpar](http://twitter.com/jeffpar)*
*October 23, 2014*
diff --git a/_posts/2015-02-22-compaq-deskpro-386.md b/_posts/2015-02-22-compaq-deskpro-386.md
index 85b807eae..02b5874ac 100644
--- a/_posts/2015-02-22-compaq-deskpro-386.md
+++ b/_posts/2015-02-22-compaq-deskpro-386.md
@@ -12,7 +12,7 @@ machines:
config: /devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml
---
-I finally dumped the [COMPAQ DeskPro 386/16 ROMs](/devices/pc/bios/compaq/deskpro386/) from the motherboard I bought
+I finally dumped the [COMPAQ DeskPro 386/16 ROMs](/devices/pc/rom/compaq/deskpro386/) from the motherboard I bought
on ebay last year, so I'm ready to begin adding 80386 support to PCjs.
I'd also like to locate a copy of the "COMPAQ DeskPro 386 Technical Reference Guide, Volumes 1 and 2". It's not hard
diff --git a/_posts/2015-04-16-compaq-deskpro-386-update.md b/_posts/2015-04-16-compaq-deskpro-386-update.md
index 9a2b15663..943e8b1d1 100644
--- a/_posts/2015-04-16-compaq-deskpro-386-update.md
+++ b/_posts/2015-04-16-compaq-deskpro-386-update.md
@@ -12,15 +12,15 @@ machines:
config: /devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml
---
-PCjs can now boot the [COMPAQ DeskPro 386/16 ROM BIOS](/devices/pc/bios/compaq/deskpro386/).
+PCjs can now boot the [COMPAQ DeskPro 386/16 ROM BIOS](/devices/pc/rom/compaq/deskpro386/).
There's still a problem with the hard disk controller, which I haven't looked into yet,
but booting from a floppy works.
While working through issues with this ROM BIOS, I created some lightly-annotated
-[source code](/devices/pc/bios/compaq/deskpro386/1988-01-28/1988-01-28.asm) that can be re-assembled
+[source code](/devices/pc/rom/compaq/deskpro386/1988-01-28/1988-01-28.asm) that can be re-assembled
with [NASM](http://www.nasm.us/). The initial process of creating the source code is
-explained [here](/devices/pc/bios/compaq/deskpro386/#recreating-rom-source-code).
+explained [here](/devices/pc/rom/compaq/deskpro386/#recreating-rom-source-code).
At the top of the source code, I explain a few important details about ROM addresses that
are worth recapping here:
diff --git a/_posts/2016-02-08-super-bowl-winner-pcjs.md b/_posts/2016-02-08-super-bowl-winner-pcjs.md
index 82bfc79d7..7342150bb 100644
--- a/_posts/2016-02-08-super-bowl-winner-pcjs.md
+++ b/_posts/2016-02-08-super-bowl-winner-pcjs.md
@@ -32,10 +32,10 @@ I've also tidied up a few things in the [Devices](/devices/) folder. ROM images
`/devices/pc/basic/` and `/devices/pc/bios/`, but BASIC and BIOS ROM images aren't actually devices; they are the
*contents* of ROM devices. So, with that in mind, I've made the following rearrangements:
-* `/devices/pc/bios/5150/*` => `/devices/pc/rom/5150/bios/*`
-* `/devices/pc/bios/5160/*` => `/devices/pc/rom/5160/bios/*`
-* `/devices/pc/bios/5170/*` => `/devices/pc/rom/5170/bios/*`
-* `/devices/pc/bios/compaq/*` => `/devices/pc/rom/compaq/bios/*`
+* `/devices/pc/bios/5150/*` => `/devices/pc/rom/5150/*`
+* `/devices/pc/bios/5160/*` => `/devices/pc/rom/5160/*`
+* `/devices/pc/bios/5170/*` => `/devices/pc/rom/5170/*`
+* `/devices/pc/bios/compaq/*` => `/devices/pc/rom/compaq/*`
* `/devices/pc/basic/ibm-basic-1.00.json` => `/devices/pc/rom/5150/basic/BASIC100.json`
* `/devices/pc/basic/ibm-basic-1.10.json` => `/devices/pc/rom/5160/basic/BASIC110.json`
diff --git a/_posts/2016-02-24-remembering-compaq.md b/_posts/2016-02-24-remembering-compaq.md
index 79d11642b..5bca60fd1 100644
--- a/_posts/2016-02-24-remembering-compaq.md
+++ b/_posts/2016-02-24-remembering-compaq.md
@@ -50,7 +50,7 @@ all we have are the memories.
### Speaking of Memories
In particular, Read-Only Memories: we have precious few of those, too. I finally obtained
-a [ROM Dump](/devices/pc/rom/compaq/bios/portable/) from COMPAQ's first machine, the COMPAQ Portable, but I had to buy
+a [ROM Dump](/devices/pc/rom/compaq/portable/) from COMPAQ's first machine, the COMPAQ Portable, but I had to buy
a system board on ebay to get it. Considering all the effort (and money) that COMPAQ invested in writing that code,
it's a bit depressing that these things haven't been properly preserved and memorialized.
diff --git a/apps/pc/1985/rogue/cache.manifest b/apps/pc/1985/rogue/cache.manifest
index c530f72da..c14f43ae6 100644
--- a/apps/pc/1985/rogue/cache.manifest
+++ b/apps/pc/1985/rogue/cache.manifest
@@ -4,7 +4,7 @@ CACHE MANIFEST
/versions/pcjs/1.16.0/common.xsl
/versions/pcjs/1.16.0/components.xsl
/devices/pc/machine/5160/cga/640kb/machine.xml
-/devices/pc/keyboard/keyboard-minimal.xml
+/devices/pc/keyboard/us83-buttons-minimal.xml
/disks/pc/library.xml
/disks/pc/dos/microsoft/3.20/manifest.xml
/disks/pc/dos/microsoft/4.0M/manifest.xml
@@ -25,9 +25,9 @@ CACHE MANIFEST
/versions/pcjs/1.16.0/components.css
/versions/pcjs/1.16.0/pc.js
/devices/pc/hdc/ibm-xebec-1982.json
-/devices/pc/basic/ibm-basic-1.10.json
-/devices/pc/bios/5160/1982-11-08.json
-/devices/pc/video/ibm-mda-cga.json
+/devices/pc/rom/5160/basic/BASIC110.json
+/devices/pc/rom/5160/1982-11-08/XTBIOS-REV1.json
+/devices/pc/video/ibm/cga/ibm-cga.json
/disks/pc/dos/ibm/2.00/PCDOS200-DISK1.json
/disks/pc/dos/ibm/2.00/PCDOS200-DISK2.json
/apps/pc/1985/rogue/state.json
diff --git a/devices/pc/README.md b/devices/pc/README.md
index 8500c0583..325a087dc 100644
--- a/devices/pc/README.md
+++ b/devices/pc/README.md
@@ -36,7 +36,7 @@ For example, here's what the machine located at
-
+
Run
diff --git a/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml b/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml
index 7aeda2d8e..97da29428 100644
--- a/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml
+++ b/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml
@@ -7,7 +7,7 @@
-
+
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 21b116e46..40e2fe258 100644
--- a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml
+++ b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/devices/pc/machine/5150/cga/64kb/donkey/machine.xml b/devices/pc/machine/5150/cga/64kb/donkey/machine.xml
index 23cf80eb2..1afd00836 100644
--- a/devices/pc/machine/5150/cga/64kb/donkey/machine.xml
+++ b/devices/pc/machine/5150/cga/64kb/donkey/machine.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml b/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml
index 5f3894749..702ea8c6e 100644
--- a/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml
+++ b/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/devices/pc/machine/5150/dual/64kb/machine.xml b/devices/pc/machine/5150/dual/64kb/machine.xml
index 65bab73a3..82c4f902d 100644
--- a/devices/pc/machine/5150/dual/64kb/machine.xml
+++ b/devices/pc/machine/5150/dual/64kb/machine.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml
index c9fb37f58..693e8d0e8 100644
--- a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml
+++ b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/devices/pc/machine/5150/mda/64kb/machine.xml b/devices/pc/machine/5150/mda/64kb/machine.xml
index 25a63e752..8137c3c3e 100644
--- a/devices/pc/machine/5150/mda/64kb/machine.xml
+++ b/devices/pc/machine/5150/mda/64kb/machine.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml b/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml
index 9d10288bf..077fcb97e 100644
--- a/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml
+++ b/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/devices/pc/machine/5160/cga/256kb/array/machine.xml b/devices/pc/machine/5160/cga/256kb/array/machine.xml
index 8bc242a31..bf1095ef1 100644
--- a/devices/pc/machine/5160/cga/256kb/array/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/array/machine.xml
@@ -6,7 +6,7 @@
-
+
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 94bb06b1f..16abd12d0 100644
--- a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/devices/pc/machine/5160/cga/256kb/demo/machine.xml b/devices/pc/machine/5160/cga/256kb/demo/machine.xml
index cdb255bbf..724bae444 100644
--- a/devices/pc/machine/5160/cga/256kb/demo/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/demo/machine.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml b/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml
index f49bf93b5..496fe5df8 100644
--- a/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml
@@ -7,7 +7,7 @@
-
+
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 093a64f52..76d858049 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/devices/pc/machine/5160/cga/256kb/win101/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/machine.xml
index baae1c650..dc30f6f87 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/machine.xml
@@ -6,7 +6,7 @@
-
+
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 ed1daae1d..3f5ffccba 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml
@@ -7,7 +7,7 @@
-
+
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 cba28c718..267c92dc2 100644
--- a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/devices/pc/machine/5160/cga/640kb/debugger/machine.xml b/devices/pc/machine/5160/cga/640kb/debugger/machine.xml
index a0767ab04..20c47547c 100644
--- a/devices/pc/machine/5160/cga/640kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/cga/640kb/debugger/machine.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/devices/pc/machine/5160/cga/640kb/machine.xml b/devices/pc/machine/5160/cga/640kb/machine.xml
index e58bc1131..f0d9e245a 100644
--- a/devices/pc/machine/5160/cga/640kb/machine.xml
+++ b/devices/pc/machine/5160/cga/640kb/machine.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/devices/pc/machine/5160/cga/640kb/softkbd/machine.xml b/devices/pc/machine/5160/cga/640kb/softkbd/machine.xml
index a41522daa..06960fbaf 100644
--- a/devices/pc/machine/5160/cga/640kb/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/640kb/softkbd/machine.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
index e25d3257f..8e1c14bac 100644
--- a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/devices/pc/machine/5160/ega/256kb/machine.xml b/devices/pc/machine/5160/ega/256kb/machine.xml
index e9eb64a95..d7492daf2 100644
--- a/devices/pc/machine/5160/ega/256kb/machine.xml
+++ b/devices/pc/machine/5160/ega/256kb/machine.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/devices/pc/machine/5160/ega/640kb/array/machine.xml b/devices/pc/machine/5160/ega/640kb/array/machine.xml
index 808e4a061..38a5f9d9d 100644
--- a/devices/pc/machine/5160/ega/640kb/array/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/array/machine.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
index b4e202888..0b1af3036 100644
--- a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/devices/pc/machine/5160/ega/640kb/machine.xml b/devices/pc/machine/5160/ega/640kb/machine.xml
index a1a6dbaf8..016691ff4 100644
--- a/devices/pc/machine/5160/ega/640kb/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/machine.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/devices/pc/machine/5160/mda/256kb/debugger/machine.xml b/devices/pc/machine/5160/mda/256kb/debugger/machine.xml
index 6c29c4104..be48960ce 100644
--- a/devices/pc/machine/5160/mda/256kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/debugger/machine.xml
@@ -7,7 +7,7 @@
-
+
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 1d4917445..1fee0c1ea 100644
--- a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/devices/pc/machine/5160/mda/256kb/fake188/machine.xml b/devices/pc/machine/5160/mda/256kb/fake188/machine.xml
index 6aac9306d..40e48b921 100644
--- a/devices/pc/machine/5160/mda/256kb/fake188/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/fake188/machine.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/devices/pc/machine/5160/mda/256kb/machine.xml b/devices/pc/machine/5160/mda/256kb/machine.xml
index 339b48e36..491261e32 100644
--- a/devices/pc/machine/5160/mda/256kb/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/machine.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml b/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml
index 22cfdb246..3a2dfb5d6 100644
--- a/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml
+++ b/devices/pc/machine/5160/mda/64kb/softkbd/machine.xml
@@ -7,7 +7,7 @@
-
+
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 1125dc3e5..74356bb08 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml
@@ -6,7 +6,7 @@
-
+
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 5bf3795a8..988f6b876 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
@@ -6,7 +6,7 @@
-
+
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 7466779b9..0c3c3a362 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml
index 9356abbda..99997ce3d 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/machine.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/devices/pc/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml b/devices/pc/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml
index 9a58e257c..a2367dc4e 100644
--- a/devices/pc/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml
+++ b/devices/pc/machine/5170/ega/2048kb/rev3/debugger/backtrack/machine.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.xml b/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.xml
index c639d817b..7ea72def1 100644
--- a/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/devices/pc/machine/5170/ega/2048kb/rev3/machine.xml b/devices/pc/machine/5170/ega/2048kb/rev3/machine.xml
index 09a2b03c7..09d207e20 100644
--- a/devices/pc/machine/5170/ega/2048kb/rev3/machine.xml
+++ b/devices/pc/machine/5170/ega/2048kb/rev3/machine.xml
@@ -6,7 +6,7 @@
-
+
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 a23a0b108..f076cfa5f 100644
--- a/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml
index bc49b5a3f..bf468bf77 100644
--- a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml
+++ b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/devices/pc/machine/5170/vga/2048kb/debugger/machine.xml b/devices/pc/machine/5170/vga/2048kb/debugger/machine.xml
index 5a1f880a6..f0ea508a1 100644
--- a/devices/pc/machine/5170/vga/2048kb/debugger/machine.xml
+++ b/devices/pc/machine/5170/vga/2048kb/debugger/machine.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/devices/pc/machine/5170/vga/2048kb/machine.xml b/devices/pc/machine/5170/vga/2048kb/machine.xml
index 285652b46..8dd0017ff 100644
--- a/devices/pc/machine/5170/vga/2048kb/machine.xml
+++ b/devices/pc/machine/5170/vga/2048kb/machine.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/devices/pc/machine/5170/vga/4096kb/debugger/machine.xml b/devices/pc/machine/5170/vga/4096kb/debugger/machine.xml
index 4a5496327..f9f0e52dd 100644
--- a/devices/pc/machine/5170/vga/4096kb/debugger/machine.xml
+++ b/devices/pc/machine/5170/vga/4096kb/debugger/machine.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/devices/pc/machine/5170/vga/4096kb/machine.xml b/devices/pc/machine/5170/vga/4096kb/machine.xml
index 06c24970b..2c340d388 100644
--- a/devices/pc/machine/5170/vga/4096kb/machine.xml
+++ b/devices/pc/machine/5170/vga/4096kb/machine.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/devices/pc/machine/cdp/mpc1600/cga/640kb/debugger/machine.xml b/devices/pc/machine/cdp/mpc1600/cga/640kb/debugger/machine.xml
index eb8542670..54b49fd25 100644
--- a/devices/pc/machine/cdp/mpc1600/cga/640kb/debugger/machine.xml
+++ b/devices/pc/machine/cdp/mpc1600/cga/640kb/debugger/machine.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/devices/pc/machine/cdp/mpc1600/cga/640kb/machine.xml b/devices/pc/machine/cdp/mpc1600/cga/640kb/machine.xml
index 853ec9cd9..f16216e00 100644
--- a/devices/pc/machine/cdp/mpc1600/cga/640kb/machine.xml
+++ b/devices/pc/machine/cdp/mpc1600/cga/640kb/machine.xml
@@ -4,7 +4,7 @@
Columbia Data Products MPC 1600 with Color Display
-
+
diff --git a/devices/pc/machine/compaq/README.md b/devices/pc/machine/compaq/README.md
index 755244297..5fadfdfae 100644
--- a/devices/pc/machine/compaq/README.md
+++ b/devices/pc/machine/compaq/README.md
@@ -50,7 +50,7 @@ The rest of this page will be used to collect information about the machines lis
COMPAQ Portable
---
-The PCjs Project now has a [ROM Dump](/devices/pc/rom/compaq/bios/portable/) (REV C).
+The PCjs Project now has a [ROM Dump](/devices/pc/rom/compaq/portable/) (REV C).
Reviewed in Byte Magazine, Jan 1983. Reprinted [here](http://blog.modernmechanix.com/byte-reviews-the-compaq-first-pc-clone/).
@@ -135,7 +135,7 @@ COMPAQ DeskPro 386
Released in late 1986.
-PCjs has detailed information about the [DeskPro 386 ROMs](/devices/pc/rom/compaq/bios/deskpro386/) and system boards,
+PCjs has detailed information about the [DeskPro 386 ROMs](/devices/pc/rom/compaq/deskpro386/) and system boards,
along with a number of [DeskPro 386 Machines](/devices/pc/machine/compaq/deskpro386/).
I also have the hard-to-find **COMPAQ Technical Reference Guide** for the DeskPro 386/25 (Vol. 1), which I'll post
@@ -145,7 +145,7 @@ at a later date.
COMPAQ Portable III
---
-The PCjs Project now has a [ROM Dump](/devices/pc/rom/compaq/bios/portable3/) (REV K, 1987-01-29).
+The PCjs Project now has a [ROM Dump](/devices/pc/rom/compaq/portable3/) (REV K, 1987-01-29).
Reportedly intended to be an 80386-based machine, the Portable III was first released in 1987 as a 12Mhz
80286-based system.
diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml
index 57cdac4f4..15b36d689 100644
--- a/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/debugger/machine.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
index 7d4093c92..06866db28 100644
--- a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/devices/pc/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml
index a451cce45..dbdf2ca13 100644
--- a/devices/pc/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/ega/4096kb/debugger/machine.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml
index a7e2a23d7..b36d9d4b0 100644
--- a/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml b/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml
index a8925ed84..641386d6d 100644
--- a/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/backtrack/machine.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml b/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml
index 95dda133b..660c35a51 100644
--- a/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/other/2048kb/debugger/machine.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/devices/pc/machine/compaq/deskpro386/vga/2048kb/debugger/machine.xml b/devices/pc/machine/compaq/deskpro386/vga/2048kb/debugger/machine.xml
index 25853eae5..22896f946 100644
--- a/devices/pc/machine/compaq/deskpro386/vga/2048kb/debugger/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/vga/2048kb/debugger/machine.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml
index 49c421aa0..bfd422352 100644
--- a/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/devices/pc/machine/compaq/deskpro386/vga/4096kb/debugger/machine.xml b/devices/pc/machine/compaq/deskpro386/vga/4096kb/debugger/machine.xml
index 5cd62affc..0bd391836 100644
--- a/devices/pc/machine/compaq/deskpro386/vga/4096kb/debugger/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/vga/4096kb/debugger/machine.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml b/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
index 985007b27..3157468ea 100644
--- a/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/devices/pc/machine/custom/machine.xml b/devices/pc/machine/custom/machine.xml
index f49676fba..46f505c3d 100644
--- a/devices/pc/machine/custom/machine.xml
+++ b/devices/pc/machine/custom/machine.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/devices/pc/machine/zenith/z150/cga/640kb/debugger/machine.xml b/devices/pc/machine/zenith/z150/cga/640kb/debugger/machine.xml
index bb7b46115..78798f934 100644
--- a/devices/pc/machine/zenith/z150/cga/640kb/debugger/machine.xml
+++ b/devices/pc/machine/zenith/z150/cga/640kb/debugger/machine.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/devices/pc/machine/zenith/z150/cga/640kb/machine.xml b/devices/pc/machine/zenith/z150/cga/640kb/machine.xml
index 2ecb35ddb..792826a46 100644
--- a/devices/pc/machine/zenith/z150/cga/640kb/machine.xml
+++ b/devices/pc/machine/zenith/z150/cga/640kb/machine.xml
@@ -4,7 +4,7 @@
Zenith Z-150 with Color Display
-
+
diff --git a/devices/pc/rom/5150/bios/1981-04-24/PCBIOS-REV1.json b/devices/pc/rom/5150/1981-04-24/PCBIOS-REV1.json
similarity index 100%
rename from devices/pc/rom/5150/bios/1981-04-24/PCBIOS-REV1.json
rename to devices/pc/rom/5150/1981-04-24/PCBIOS-REV1.json
diff --git a/devices/pc/rom/5150/bios/1981-04-24/PCBIOS-REV1.rom b/devices/pc/rom/5150/1981-04-24/PCBIOS-REV1.rom
similarity index 100%
rename from devices/pc/rom/5150/bios/1981-04-24/PCBIOS-REV1.rom
rename to devices/pc/rom/5150/1981-04-24/PCBIOS-REV1.rom
diff --git a/devices/pc/rom/5150/bios/1981-10-19/PCBIOS-REV2.json b/devices/pc/rom/5150/1981-10-19/PCBIOS-REV2.json
similarity index 100%
rename from devices/pc/rom/5150/bios/1981-10-19/PCBIOS-REV2.json
rename to devices/pc/rom/5150/1981-10-19/PCBIOS-REV2.json
diff --git a/devices/pc/rom/5150/bios/1981-10-19/PCBIOS-REV2.rom b/devices/pc/rom/5150/1981-10-19/PCBIOS-REV2.rom
similarity index 100%
rename from devices/pc/rom/5150/bios/1981-10-19/PCBIOS-REV2.rom
rename to devices/pc/rom/5150/1981-10-19/PCBIOS-REV2.rom
diff --git a/devices/pc/rom/5150/bios/1982-10-27/PCBIOS-REV3.json b/devices/pc/rom/5150/1982-10-27/PCBIOS-REV3.json
similarity index 100%
rename from devices/pc/rom/5150/bios/1982-10-27/PCBIOS-REV3.json
rename to devices/pc/rom/5150/1982-10-27/PCBIOS-REV3.json
diff --git a/devices/pc/rom/5150/bios/1982-10-27/PCBIOS-REV3.rom b/devices/pc/rom/5150/1982-10-27/PCBIOS-REV3.rom
similarity index 100%
rename from devices/pc/rom/5150/bios/1982-10-27/PCBIOS-REV3.rom
rename to devices/pc/rom/5150/1982-10-27/PCBIOS-REV3.rom
diff --git a/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json b/devices/pc/rom/5160/1982-11-08/XTBIOS-REV1.json
similarity index 100%
rename from devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.json
rename to devices/pc/rom/5160/1982-11-08/XTBIOS-REV1.json
diff --git a/devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.rom b/devices/pc/rom/5160/1982-11-08/XTBIOS-REV1.rom
similarity index 100%
rename from devices/pc/rom/5160/bios/1982-11-08/XTBIOS-REV1.rom
rename to devices/pc/rom/5160/1982-11-08/XTBIOS-REV1.rom
diff --git a/devices/pc/rom/5160/bios/1986-05-09/XTBIOS-REV3.json b/devices/pc/rom/5160/1986-05-09/XTBIOS-REV3.json
similarity index 100%
rename from devices/pc/rom/5160/bios/1986-05-09/XTBIOS-REV3.json
rename to devices/pc/rom/5160/1986-05-09/XTBIOS-REV3.json
diff --git a/devices/pc/rom/5160/bios/1986-05-09/XTBIOS-REV3.rom b/devices/pc/rom/5160/1986-05-09/XTBIOS-REV3.rom
similarity index 100%
rename from devices/pc/rom/5160/bios/1986-05-09/XTBIOS-REV3.rom
rename to devices/pc/rom/5160/1986-05-09/XTBIOS-REV3.rom
diff --git a/devices/pc/rom/5170/bios/1984-01-10/ATBIOS-REV1.json b/devices/pc/rom/5170/1984-01-10/ATBIOS-REV1.json
similarity index 100%
rename from devices/pc/rom/5170/bios/1984-01-10/ATBIOS-REV1.json
rename to devices/pc/rom/5170/1984-01-10/ATBIOS-REV1.json
diff --git a/devices/pc/rom/5170/bios/1984-01-10/ATBIOS-REV1.map b/devices/pc/rom/5170/1984-01-10/ATBIOS-REV1.map
similarity index 100%
rename from devices/pc/rom/5170/bios/1984-01-10/ATBIOS-REV1.map
rename to devices/pc/rom/5170/1984-01-10/ATBIOS-REV1.map
diff --git a/devices/pc/rom/5170/bios/1984-01-10/ATBIOS-REV1.rom b/devices/pc/rom/5170/1984-01-10/ATBIOS-REV1.rom
similarity index 100%
rename from devices/pc/rom/5170/bios/1984-01-10/ATBIOS-REV1.rom
rename to devices/pc/rom/5170/1984-01-10/ATBIOS-REV1.rom
diff --git a/devices/pc/rom/5170/bios/1985-06-10/ATBIOS-REV2.json b/devices/pc/rom/5170/1985-06-10/ATBIOS-REV2.json
similarity index 100%
rename from devices/pc/rom/5170/bios/1985-06-10/ATBIOS-REV2.json
rename to devices/pc/rom/5170/1985-06-10/ATBIOS-REV2.json
diff --git a/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json b/devices/pc/rom/5170/1985-11-15/ATBIOS-REV3.json
similarity index 100%
rename from devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json
rename to devices/pc/rom/5170/1985-11-15/ATBIOS-REV3.json
diff --git a/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.map b/devices/pc/rom/5170/1985-11-15/ATBIOS-REV3.map
similarity index 100%
rename from devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.map
rename to devices/pc/rom/5170/1985-11-15/ATBIOS-REV3.map
diff --git a/devices/pc/rom/5170/bios/README.md b/devices/pc/rom/5170/README.md
similarity index 81%
rename from devices/pc/rom/5170/bios/README.md
rename to devices/pc/rom/5170/README.md
index c799cb517..5642d0ce1 100644
--- a/devices/pc/rom/5170/bios/README.md
+++ b/devices/pc/rom/5170/README.md
@@ -1,8 +1,9 @@
---
layout: page
-title: IBM PC AT (Model 5170) BIOS
-permalink: /devices/pc/rom/5170/bios/
+title: IBM PC AT (Model 5170) ROMs
+permalink: /devices/pc/rom/5170/
redirect_from:
+ - /devices/pc/5170/
- /devices/pc/bios/5170/
---
@@ -31,18 +32,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/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=ATBIOS-REV1.json --overwrite
+ filedump --file=http://archive.pcjs.org/devices/pc/rom/5170/BIOS_5170_10JAN84_U27_6181028_27256_6MHZ.BIN --merge=http://archive.pcjs.org/devices/pc/rom/5170/BIOS_5170_10JAN84_U47_6181029_27256_6MHZ.BIN --output=ATBIOS-REV1.json --overwrite
Since a MAP file ([ATBIOS-REV1.map](1984-01-10/ATBIOS-REV1.map)) exists as well, it is automatically appended to the JSON file
([ATBIOS-REV1.json](1984-01-10/ATBIOS-REV1.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 ([ATBIOS-REV1.rom](http://archive.pcjs.org/devices/pc/rom/5170/bios/ATBIOS-REV1.rom))
+It is also possible to create a merged binary ROM image ([ATBIOS-REV1.rom](http://archive.pcjs.org/devices/pc/rom/5170/ATBIOS-REV1.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/rom/5170/bios/ATBIOS-REV1.rom
+ http://localhost:8088/api/v1/dump/?file=http://archive.pcjs.org/devices/pc/rom/5170/ATBIOS-REV1.rom
---
@@ -72,7 +73,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/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=ATBIOS-REV2.json --overwrite
+ filedump --file=http://archive.pcjs.org/devices/pc/rom/5170/BIOS_5170_10JUN85_U27_6480090_27256.BIN --merge=http://archive.pcjs.org/devices/pc/rom/5170/BIOS_5170_10JUN85_U47_6480091_27256.BIN --output=ATBIOS-REV2.json --overwrite
---
@@ -102,4 +103,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/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=ATBIOS-REV3.json --overwrite
+ filedump --file=http://archive.pcjs.org/devices/pc/rom/5170/BIOS_5170_15NOV85_U27_61X9266_27256.BIN --merge=http://archive.pcjs.org/devices/pc/rom/5170/BIOS_5170_15NOV85_U47_61X9265_27256.BIN --output=ATBIOS-REV3.json --overwrite
diff --git a/devices/pc/rom/README.md b/devices/pc/rom/README.md
index ebd5deab2..d4e231820 100644
--- a/devices/pc/rom/README.md
+++ b/devices/pc/rom/README.md
@@ -3,7 +3,7 @@ layout: page
title: IBM PC ROMs
permalink: /devices/pc/rom/
redirect_from:
- - /devices/pc/bios/
+ - /devices/pc/
---
IBM PC ROMs
@@ -12,7 +12,7 @@ IBM PC ROMs
ROMs are added to machines by including one *[ROM](/docs/pcjs/rom/)* component in the machine XML configuration file
for each ROM in the machine; eg:
-
+
### BASIC ROMs
@@ -25,16 +25,16 @@ The project contains the following IBM PC BASIC ROMs:
The project contains the following IBM PC BIOS ROMs:
- * [Model 5150: Apr 24, 1981](5150/bios/1981-04-24/PCBIOS-REV1.json)
- * [Model 5150: Oct 19, 1981](5150/bios/1981-10-19/PCBIOS-REV2.json)
- * [Model 5150: Oct 27, 1982](5150/bios/1982-10-27/PCBIOS-REV3.json)
- * [Model 5160: Nov 08, 1982](5160/bios/1982-11-08/XTBIOS-REV1.json)
- * [Model 5160: May 09, 1986](5160/bios/1986-05-09/XTBIOS-REV3.json)
+ * [Model 5150: Apr 24, 1981](5150/1981-04-24/PCBIOS-REV1.json)
+ * [Model 5150: Oct 19, 1981](5150/1981-10-19/PCBIOS-REV2.json)
+ * [Model 5150: Oct 27, 1982](5150/1982-10-27/PCBIOS-REV3.json)
+ * [Model 5160: Nov 08, 1982](5160/1982-11-08/XTBIOS-REV1.json)
+ * [Model 5160: May 09, 1986](5160/1986-05-09/XTBIOS-REV3.json)
The project also contains BIOS ROMs, along with more detailed information, for the following machines:
- * [IBM PC AT Model 5170](5170/bios/)
- * [COMPAQ Portable and DeskPro Machines](compaq/bios/)
+ * [IBM PC AT Model 5170](5170/)
+ * [COMPAQ Portable and DeskPro Machines](compaq/)
### Other ROMs
diff --git a/devices/pc/rom/cdp/bios/mpc1600/MPC4.34.json b/devices/pc/rom/cdp/mpc1600/MPC4.34.json
similarity index 100%
rename from devices/pc/rom/cdp/bios/mpc1600/MPC4.34.json
rename to devices/pc/rom/cdp/mpc1600/MPC4.34.json
diff --git a/devices/pc/rom/cdp/bios/mpc1600/mpc-443.xml b/devices/pc/rom/cdp/mpc1600/mpc-443.xml
similarity index 73%
rename from devices/pc/rom/cdp/bios/mpc1600/mpc-443.xml
rename to devices/pc/rom/cdp/mpc1600/mpc-443.xml
index 10c534749..747beebc3 100644
--- a/devices/pc/rom/cdp/bios/mpc1600/mpc-443.xml
+++ b/devices/pc/rom/cdp/mpc1600/mpc-443.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/devices/pc/rom/compaq/bios/README.md b/devices/pc/rom/compaq/README.md
similarity index 93%
rename from devices/pc/rom/compaq/bios/README.md
rename to devices/pc/rom/compaq/README.md
index af34562dd..fc92cda13 100644
--- a/devices/pc/rom/compaq/bios/README.md
+++ b/devices/pc/rom/compaq/README.md
@@ -2,7 +2,7 @@
layout: post
title: COMPAQ BIOS ROMs
date: 2016-02-24 14:00:00
-permalink: /devices/pc/rom/compaq/bios/
+permalink: /devices/pc/rom/compaq/
---
COMPAQ BIOS ROMs
diff --git a/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/109591-001.hex b/devices/pc/rom/compaq/deskpro386/1988-01-28/109591-001.hex
similarity index 100%
rename from devices/pc/rom/compaq/bios/deskpro386/1988-01-28/109591-001.hex
rename to devices/pc/rom/compaq/deskpro386/1988-01-28/109591-001.hex
diff --git a/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/109592-001.hex b/devices/pc/rom/compaq/deskpro386/1988-01-28/109592-001.hex
similarity index 100%
rename from devices/pc/rom/compaq/bios/deskpro386/1988-01-28/109592-001.hex
rename to devices/pc/rom/compaq/deskpro386/1988-01-28/109592-001.hex
diff --git a/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.asm b/devices/pc/rom/compaq/deskpro386/1988-01-28/1988-01-28.asm
similarity index 100%
rename from devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.asm
rename to devices/pc/rom/compaq/deskpro386/1988-01-28/1988-01-28.asm
diff --git a/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json b/devices/pc/rom/compaq/deskpro386/1988-01-28/1988-01-28.json
similarity index 100%
rename from devices/pc/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json
rename to devices/pc/rom/compaq/deskpro386/1988-01-28/1988-01-28.json
diff --git a/devices/pc/rom/compaq/bios/deskpro386/1988-01-28/makefile b/devices/pc/rom/compaq/deskpro386/1988-01-28/makefile
similarity index 100%
rename from devices/pc/rom/compaq/bios/deskpro386/1988-01-28/makefile
rename to devices/pc/rom/compaq/deskpro386/1988-01-28/makefile
diff --git a/devices/pc/rom/compaq/bios/deskpro386/1988-05-10/109591-003.hex b/devices/pc/rom/compaq/deskpro386/1988-05-10/109591-003.hex
similarity index 100%
rename from devices/pc/rom/compaq/bios/deskpro386/1988-05-10/109591-003.hex
rename to devices/pc/rom/compaq/deskpro386/1988-05-10/109591-003.hex
diff --git a/devices/pc/rom/compaq/bios/deskpro386/1988-05-10/109592-003.hex b/devices/pc/rom/compaq/deskpro386/1988-05-10/109592-003.hex
similarity index 100%
rename from devices/pc/rom/compaq/bios/deskpro386/1988-05-10/109592-003.hex
rename to devices/pc/rom/compaq/deskpro386/1988-05-10/109592-003.hex
diff --git a/devices/pc/rom/compaq/bios/deskpro386/1988-05-10/1988-05-10.json b/devices/pc/rom/compaq/deskpro386/1988-05-10/1988-05-10.json
similarity index 100%
rename from devices/pc/rom/compaq/bios/deskpro386/1988-05-10/1988-05-10.json
rename to devices/pc/rom/compaq/deskpro386/1988-05-10/1988-05-10.json
diff --git a/devices/pc/rom/compaq/bios/deskpro386/1988-05-10/makefile b/devices/pc/rom/compaq/deskpro386/1988-05-10/makefile
similarity index 100%
rename from devices/pc/rom/compaq/bios/deskpro386/1988-05-10/makefile
rename to devices/pc/rom/compaq/deskpro386/1988-05-10/makefile
diff --git a/devices/pc/rom/compaq/bios/deskpro386/1989-04-14/1989-04-14.json b/devices/pc/rom/compaq/deskpro386/1989-04-14/1989-04-14.json
similarity index 100%
rename from devices/pc/rom/compaq/bios/deskpro386/1989-04-14/1989-04-14.json
rename to devices/pc/rom/compaq/deskpro386/1989-04-14/1989-04-14.json
diff --git a/devices/pc/rom/compaq/bios/deskpro386/1989-04-14/makefile b/devices/pc/rom/compaq/deskpro386/1989-04-14/makefile
similarity index 100%
rename from devices/pc/rom/compaq/bios/deskpro386/1989-04-14/makefile
rename to devices/pc/rom/compaq/deskpro386/1989-04-14/makefile
diff --git a/devices/pc/rom/compaq/bios/deskpro386/README.md b/devices/pc/rom/compaq/deskpro386/README.md
similarity index 97%
rename from devices/pc/rom/compaq/bios/deskpro386/README.md
rename to devices/pc/rom/compaq/deskpro386/README.md
index f87053670..0ca96fd46 100644
--- a/devices/pc/rom/compaq/bios/deskpro386/README.md
+++ b/devices/pc/rom/compaq/deskpro386/README.md
@@ -1,9 +1,9 @@
---
layout: page
title: COMPAQ DeskPro 386 ROMs
-permalink: /devices/pc/rom/compaq/bios/deskpro386/
+permalink: /devices/pc/rom/compaq/deskpro386/
redirect_from:
- - /devices/pc/bios/compaq/deskpro386/
+ - /devices/pc/compaq/deskpro386/
---
COMPAQ DeskPro 386 ROMs
@@ -48,7 +48,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/rom/compaq/bios/deskpro386/1988-01-28/1988-01-28.json&format=rom
+ http://localhost:8088/api/v1/dump?file=http://localhost:8088/devices/pc/rom/compaq/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/rom/compaq/bios/portable/100666-001-REVC.hex b/devices/pc/rom/compaq/portable/100666-001-REVC.hex
similarity index 100%
rename from devices/pc/rom/compaq/bios/portable/100666-001-REVC.hex
rename to devices/pc/rom/compaq/portable/100666-001-REVC.hex
diff --git a/devices/pc/rom/compaq/bios/portable/100666-001-REVC.json b/devices/pc/rom/compaq/portable/100666-001-REVC.json
similarity index 100%
rename from devices/pc/rom/compaq/bios/portable/100666-001-REVC.json
rename to devices/pc/rom/compaq/portable/100666-001-REVC.json
diff --git a/devices/pc/rom/compaq/bios/portable/README.md b/devices/pc/rom/compaq/portable/README.md
similarity index 97%
rename from devices/pc/rom/compaq/bios/portable/README.md
rename to devices/pc/rom/compaq/portable/README.md
index 57701a4ca..50df346de 100644
--- a/devices/pc/rom/compaq/bios/portable/README.md
+++ b/devices/pc/rom/compaq/portable/README.md
@@ -1,7 +1,7 @@
---
layout: page
title: Compaq Portable Computer ROMs
-permalink: /devices/pc/rom/compaq/bios/portable/
+permalink: /devices/pc/rom/compaq/portable/
---
Compaq Portable Computer ROMs
diff --git a/devices/pc/rom/compaq/bios/portable/cpqpatch/CPQPATCH.C b/devices/pc/rom/compaq/portable/cpqpatch/CPQPATCH.C
similarity index 100%
rename from devices/pc/rom/compaq/bios/portable/cpqpatch/CPQPATCH.C
rename to devices/pc/rom/compaq/portable/cpqpatch/CPQPATCH.C
diff --git a/devices/pc/rom/compaq/bios/portable/cpqpatch/CPQPATCH.EXE b/devices/pc/rom/compaq/portable/cpqpatch/CPQPATCH.EXE
similarity index 100%
rename from devices/pc/rom/compaq/bios/portable/cpqpatch/CPQPATCH.EXE
rename to devices/pc/rom/compaq/portable/cpqpatch/CPQPATCH.EXE
diff --git a/devices/pc/rom/compaq/bios/portable/cpqpatch/CPQPATCH.TXT b/devices/pc/rom/compaq/portable/cpqpatch/CPQPATCH.TXT
similarity index 100%
rename from devices/pc/rom/compaq/bios/portable/cpqpatch/CPQPATCH.TXT
rename to devices/pc/rom/compaq/portable/cpqpatch/CPQPATCH.TXT
diff --git a/devices/pc/rom/compaq/bios/portable3/1987-01-29.json b/devices/pc/rom/compaq/portable3/1987-01-29.json
similarity index 100%
rename from devices/pc/rom/compaq/bios/portable3/1987-01-29.json
rename to devices/pc/rom/compaq/portable3/1987-01-29.json
diff --git a/devices/pc/rom/compaq/bios/portable3/README.md b/devices/pc/rom/compaq/portable3/README.md
similarity index 82%
rename from devices/pc/rom/compaq/bios/portable3/README.md
rename to devices/pc/rom/compaq/portable3/README.md
index e05cdc55e..9c2a0a0f0 100644
--- a/devices/pc/rom/compaq/bios/portable3/README.md
+++ b/devices/pc/rom/compaq/portable3/README.md
@@ -1,9 +1,9 @@
---
layout: page
title: COMPAQ Portable III ROMs
-permalink: /devices/pc/rom/compaq/bios/portable3/
+permalink: /devices/pc/rom/compaq/portable3/
redirect_from:
- - /devices/pc/bios/compaq/portable3/
+ - /devices/pc/compaq/portable3/
---
COMPAQ Portable III ROMs
diff --git a/devices/pc/rom/zenith/bios/z150/Z150-1988.json b/devices/pc/rom/zenith/z150/Z150-1988.json
similarity index 100%
rename from devices/pc/rom/zenith/bios/z150/Z150-1988.json
rename to devices/pc/rom/zenith/z150/Z150-1988.json
diff --git a/devices/pc/rom/zenith/bios/z150/z150-1988.xml b/devices/pc/rom/zenith/z150/z150-1988.xml
similarity index 72%
rename from devices/pc/rom/zenith/bios/z150/z150-1988.xml
rename to devices/pc/rom/zenith/z150/z150-1988.xml
index eeb79fa46..c574194b0 100644
--- a/devices/pc/rom/zenith/bios/z150/z150-1988.xml
+++ b/devices/pc/rom/zenith/z150/z150-1988.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/devices/pc/video/compaq/vga/README.md b/devices/pc/video/compaq/vga/README.md
index c0f01cbc5..e7893205c 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/rom/compaq/bios/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/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/rom/compaq/bios/deskpro386/).
+[DeskPro 386 ROM BIOS](/devices/pc/rom/compaq/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 824871527..7308feabc 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
[
](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/rom/compaq/bios/deskpro386/#dumping-the-roms)
+A copy of the board's [ROM BIOS](1988-05-23.json) was created by [dumping](/devices/pc/rom/compaq/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 a63b3b1bf..1d8afb508 100644
--- a/disks/pc/cpm/1.1b/machine.xml
+++ b/disks/pc/cpm/1.1b/machine.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/disks/pc/diags/ibm/2.20/machine.xml b/disks/pc/diags/ibm/2.20/machine.xml
index 0158ac0f9..0753d6fba 100644
--- a/disks/pc/diags/ibm/2.20/machine.xml
+++ b/disks/pc/diags/ibm/2.20/machine.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/disks/pc/games/infocom/machine-debug.xml b/disks/pc/games/infocom/machine-debug.xml
index e3c323f81..05bd3bd87 100644
--- a/disks/pc/games/infocom/machine-debug.xml
+++ b/disks/pc/games/infocom/machine-debug.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/disks/pc/games/infocom/machine.xml b/disks/pc/games/infocom/machine.xml
index 43cd88a5e..6a7657fe3 100644
--- a/disks/pc/games/infocom/machine.xml
+++ b/disks/pc/games/infocom/machine.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/disks/pc/games/infocom/zork1/debugger/machine.xml b/disks/pc/games/infocom/zork1/debugger/machine.xml
index 6959c1aca..cd2988820 100644
--- a/disks/pc/games/infocom/zork1/debugger/machine.xml
+++ b/disks/pc/games/infocom/zork1/debugger/machine.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/disks/pc/games/microsoft/adventure/machine.xml b/disks/pc/games/microsoft/adventure/machine.xml
index 8be79201e..46e6ee169 100644
--- a/disks/pc/games/microsoft/adventure/machine.xml
+++ b/disks/pc/games/microsoft/adventure/machine.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/docs/pcjs/hdc/README.md b/docs/pcjs/hdc/README.md
index 14bbfc8dc..64919bbdd 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:
-
+
The default *type* setting is *'xt'*.
diff --git a/modules/build/lib/build.js b/modules/build/lib/build.js
index 220c17367..6d451dd87 100644
--- a/modules/build/lib/build.js
+++ b/modules/build/lib/build.js
@@ -227,7 +227,7 @@ var machineElements = {
'id': "romBIOS",
'addr': "0xfe000",
'size': "0x2000",
- 'file': "/devices/pc/rom/5150/bios/1981-04-24/PCBIOS-REV1.json"
+ 'file': "/devices/pc/rom/5150/1981-04-24/PCBIOS-REV1.json"
}
],
'addr': {
diff --git a/modules/pcjs/bin/ibm5150.json b/modules/pcjs/bin/ibm5150.json
index 0e4980ca9..18251606c 100644
--- a/modules/pcjs/bin/ibm5150.json
+++ b/modules/pcjs/bin/ibm5150.json
@@ -28,7 +28,7 @@
"name": "",
"addr": 0xfe000,
"size": 0x02000,
- "file": "/devices/pc/rom/5150/bios/1981-04-24/PCBIOS-REV1.json",
+ "file": "/devices/pc/rom/5150/1981-04-24/PCBIOS-REV1.json",
"notify": ""
}
],
diff --git a/modules/shared/lib/dumpapi.js b/modules/shared/lib/dumpapi.js
index 7b26cbf53..877eb371a 100644
--- a/modules/shared/lib/dumpapi.js
+++ b/modules/shared/lib/dumpapi.js
@@ -43,11 +43,11 @@
*
* Similarly, our "FileDump API" used to look like:
*
- * http://jsmachines.net/bin/convrom.php?rom=/devices/pc/bios/5150/1981-04-24.rom&format=json
+ * http://jsmachines.net/bin/convrom.php?rom=/devices/pc/rom/5150/1981-04-24/PCBIOS-REV1.rom&format=json
*
* and that request now looks like:
*
- * http://www.pcjs.org/api/v1/dump?file=/devices/pc/bios/5150/1981-04-24.rom&format=json
+ * http://www.pcjs.org/api/v1/dump?file=/devices/pc/rom/5150/1981-04-24/PCBIOS-REV1.rom&format=json
*
* I don't think it makes sense to avoid "query" parameters, because blending the path of a disk image with the
* the rest of the URL would be (a) confusing, and (b) more work to parse.
diff --git a/modules/textout/lib/textout.js b/modules/textout/lib/textout.js
index 4f5cfa5c3..5851f0869 100644
--- a/modules/textout/lib/textout.js
+++ b/modules/textout/lib/textout.js
@@ -88,7 +88,7 @@ TextOut.asTargetRefs = ["call", "jmp", "jz", "jnz", "jc", "jnc", "ja", "jna", "j
*
* Examples
* ---
- * node modules/textout/bin/textout --file=devices/pc/bios/compaq/deskpro386/1988-01-28.nasm --nasm
+ * node modules/textout/bin/textout --file=devices/pc/rom/compaq/deskpro386/1988-01-28/1988-01-28.asm --nasm
*/
TextOut.CLI = function()
{