Collapsed /configs into /devices (or in some cases, /apps or /disks), simplifying the structure a bit

Gruntfile.js

@@ -415,7 +415,7 @@ module.exports = function(grunt) {
                 ]
             },
             "promote_to_version": {
-                src: ["apps/**/*.xml", "configs/**/*.xml", "disks/**/*.xml", "pubs/**/*.xml"],
+                src: ["apps/**/*.xml", "devices/**/*.xml", "disks/**/*.xml", "pubs/**/*.xml"],
                 overwrite: true,
                 replacements: [
                     {

README.md

@@ -12,11 +12,11 @@ All the simulations are written entirely in JavaScript.  No Flash, Java or other
 Supported browsers include recent versions of Internet Explorer (v9.0 or later), Safari, Chrome, Firefox and various
 mobile browsers.
 
-[Embedded IBM PC](/configs/pc/machines/5150/mda/64kb/ "PCjs:ibm5150")
+[Embedded IBM PC](/devices/pc/machine/5150/mda/64kb/ "PCjs:ibm5150")
 
-The [simulation](/configs/pc/machines/5150/mda/64kb/) above features an Intel 8088 running at 4.77Mhz,
+The [simulation](/devices/pc/machine/5150/mda/64kb/) above features an Intel 8088 running at 4.77Mhz,
 with 64Kb of RAM and an IBM Monochrome Display Adapter.  For more control, there are also
-[Control Panel](/configs/pc/machines/5150/mda/64kb/debugger/) and [Soft Keyboard](/configs/pc/machines/5150/mda/64kb/softkbd/)
+[Control Panel](/devices/pc/machine/5150/mda/64kb/debugger/) and [Soft Keyboard](/devices/pc/machine/5150/mda/64kb/softkbd/)
 configurations, featuring the built-in PCjs Debugger.  For even greater control, build your own PC. The
 [PCjs Documentation](/docs/pcjs/) will help you get started.
 
@@ -28,17 +28,17 @@ Demos
 ---
 Some pre-configured machines are shown below, ready to run BASIC, DOS, Windows 1.01, and assorted non-DOS software.
 
-![IBM PC running DONKEY.BAS](/configs/pc/machines/5150/cga/64kb/donkey/thumbnail.jpg "link:/configs/pc/machines/5150/cga/64kb/donkey/:200:100")
+![IBM PC running DONKEY.BAS](/devices/pc/machine/5150/cga/64kb/donkey/thumbnail.jpg "link:/devices/pc/machine/5150/cga/64kb/donkey/:200:100")
-![IBM PC XT w/CGA, 10Mb Hard Drive](/configs/pc/machines/5160/cga/256kb/demo/thumbnail.jpg "link:/configs/pc/machines/5160/cga/256kb/demo/:200:100")
+![IBM PC XT w/CGA, 10Mb Hard Drive](/devices/pc/machine/5160/cga/256kb/demo/thumbnail.jpg "link:/devices/pc/machine/5160/cga/256kb/demo/:200:100")
-![IBM PC XT w/CGA, Windows 1.01](/configs/pc/machines/5160/cga/256kb/win101/thumbnail.jpg "link:/configs/pc/machines/5160/cga/256kb/win101/:200:100")
+![IBM PC XT w/CGA, Windows 1.01](/devices/pc/machine/5160/cga/256kb/win101/thumbnail.jpg "link:/devices/pc/machine/5160/cga/256kb/win101/:200:100")
-![IBM PC XT w/EGA, Windows 1.01](/configs/pc/machines/5160/ega/640kb/win101/thumbnail.jpg "link:/configs/pc/machines/5160/ega/640kb/win101/:200:100")
+![IBM PC XT w/EGA, Windows 1.01](/devices/pc/machine/5160/ega/640kb/win101/thumbnail.jpg "link:/devices/pc/machine/5160/ega/640kb/win101/:200:100")
 ![IBM PC w/MDA, CP/M-86](/disks/pc/cpm/thumbnail.jpg "link:/disks/pc/cpm/:200:100")
 ![IBM PC w/MDA, Microsoft Adventure](/disks/pc/games/microsoft/adventure/thumbnail.jpg "link:/disks/pc/games/microsoft/adventure/:200:100")
 ![IBM PC w/CGA, Zork I](/disks/pc/games/infocom/zork1/thumbnail.jpg "link:/disks/pc/games/infocom/zork1/:200:100")
 
-Check out the rest of the PCjs [Application](/apps/pc/), [Boot Disk](/disks/pc/) and [Machine](/configs/pc/machines/)
+Check out the rest of the PCjs [Application](/apps/pc/), [Boot Disk](/disks/pc/) and [Machine](/devices/pc/machine/)
-demos, including the [IBM PC XT "Server Array"](/configs/pc/machines/5160/cga/256kb/array/) and
+demos, including the [IBM PC XT "Server Array"](/devices/pc/machine/5160/cga/256kb/array/) and
-[Windows 1.01 "Server Array"](/configs/pc/machines/5160/ega/640kb/array/) demos of multiple PCs running side-by-side.
+[Windows 1.01 "Server Array"](/devices/pc/machine/5160/ega/640kb/array/) demos of multiple PCs running side-by-side.
 
 C1Pjs
 ---
@@ -46,7 +46,7 @@ Below is the [OSI Challenger C1P](/docs/c1pjs/), another simulation in the JavaS
 It simulates Ohio Scientific's 6502-based microcomputer, released in 1978.  More details about this simulation
 and the original machine are available in the [C1Pjs Documentation](/docs/c1pjs/).
 
-[Embedded OSI Challenger C1P](/configs/c1p/machines/8kb/large/ "C1Pjs:demoC1P")
+[Embedded OSI Challenger C1P](/devices/c1p/machine/8kb/large/ "C1Pjs:demoC1P")
 
 <!--BEGIN:EXCLUDE-->
 
@@ -64,7 +64,7 @@ The project includes:
 
 + A simple Node-based web server ([server.js](server.js))
 + Custom Node modules used by the web server ([HTMLOut](my_modules/htmlout/), [MarkOut](my_modules/markout/), [DiskDump](my_modules/diskdump/), [FileDump](my_modules/filedump/))
-+ An assortment of IBM PC and C1P machine XML files (see [/apps](apps/), [/configs](configs/) and [/disks](disks/))
++ An assortment of IBM PC and C1P machine XML files (see [/apps](apps/), [/devices](devices/) and [/disks](disks/))
 + The [PCjs](my_modules/pcjs-client/lib/) and [C1Pjs](my_modules/c1pjs-client/lib/) client applications, both "compiled" and uncompiled
 + A smattering of [PCjs](docs/pcjs/) and [C1Pjs](docs/c1pjs/) documentation, along with [blog posts](blog/), related [publications](pubs/) and more
 
@@ -206,7 +206,7 @@ If no Debugger component has been created yet, or if the Debugger didn't recogni
 like a good little REPL.
 
 Use the "load" command to load a JSON machine configuration file.  A sample [machine.json](my_modules/pcjs-client/bin/machine.json)
-is provided in the *bin* directory, which is a "JSON-ified" version of the [machine.xml](configs/pc/machines/5150/mda/64kb/machine.xml)
+is provided in the *bin* directory, which is a "JSON-ified" version of the [machine.xml](devices/pc/machine/5150/mda/64kb/machine.xml)
 displayed on the [pcjs.org](/) home page.
 
 The command-line loader creates all the JSON-defined machine components in the same order that the browser creates

apps/README.md

@@ -41,7 +41,7 @@ described by <file> entries in its [manifest](/apps/pc/1981/visicalc/manif
 		<category>Productivity</category>
 		<company>Software Arts</company>
     	<releaseDate>December 16, 1981</releaseDate>
-		<machine href="/configs/pc/machines/5150/mda/64kb/machine.xml" state="/apps/pc/1981/visicalc/state.json"/>
+		<machine href="/devices/pc/machine/5150/mda/64kb/machine.xml" state="/apps/pc/1981/visicalc/state.json"/>
 		<disk id="disk" dir="/apps/pc/1981/visicalc/bin/">
 			<file>VC.COM</file>
 			<file dir="../">README.md</file>
@@ -51,13 +51,13 @@ described by &lt;file&gt; entries in its [manifest](/apps/pc/1981/visicalc/manif
 
 Since this [manifest](/apps/pc/1981/visicalc/manifest.xml) also contains a &lt;machine&gt; entry,
 the default manifest stylesheet will automatically load and launch the associated
-[PCjs machine](/configs/pc/machines/5150/mda/64kb/machine.xml).  The machine will boot or resume according
+[PCjs machine](/devices/pc/machine/5150/mda/64kb/machine.xml).  The machine will boot or resume according
 to its own &lt;[computer](/docs/pcjs/computer/)&gt; settings, unless the manifest overrides the machine's
 default state with its own *state* setting; eg:
 
-	<machine href="/configs/pc/machines/5150/mda/64kb/machine.xml" state="/apps/pc/1981/visicalc/state.json"/>
+	<machine href="/devices/pc/machine/5150/mda/64kb/machine.xml" state="/apps/pc/1981/visicalc/state.json"/>
 
-The machine.xml file, in turn, refers to a [sample set](/configs/pc/disks/samples.xml) of disk images, one of which is:
+The machine.xml file, in turn, refers to a [sample set](/disks/pc/samples.xml) of disk images, one of which is:
  
 	<manifest ref="/apps/pc/1981/visicalc/manifest.xml" disk="*"/>
  	
@@ -121,4 +121,4 @@ and if it wanted to use all the disks listed in the manifest, it would specify:
 
 	<manifest ref="/disks/pc/cpm/manifest.xml" disk="*"/>
 
-which is what our [CP/M Machine Configuration](/disks/pc/cpm/machine.xml) does.
+which is what our [CP/M Machine Configuration](/disks/pc/cpm/machine.xml) does.

apps/pc/1981/visicalc/manifest.xml

@@ -11,7 +11,7 @@
 	<author href="http://www.frankston.com/public/?name=ImplementingVisiCalc">Bob Frankston</author>
 	<releaseDate>December 16, 1981</releaseDate>
 	<license href="http://www.bricklin.com/history/vclicense.htm">Lotus Development</license>
-	<machine href="/configs/pc/machines/5150/mda/64kb/machine.xml" state="/apps/pc/1981/visicalc/state.json"/>
+	<machine href="/devices/pc/machine/5150/mda/64kb/machine.xml" state="/apps/pc/1981/visicalc/state.json"/>
 	<disk id="disk01" size="163840" chs="40:1:8" dir="private/" href="/apps/pc/1981/visicalc/disk.json" md5="61494f998d5fb0e31e7b8bd99f1cc588" md5json="3ad82ed815725e6bd786f92a4714e84f">
 		<file size="27520" time="1981-12-16 23:00:00" attr="0x20" md5="28997dfedb2440c6054d8be835be8634">VC.COM</file>
 		<file dir="../">README.md</file>

apps/pc/1982/esuite/manifest.xml

@@ -7,7 +7,7 @@
 	<category>Text Simulation</category>
 	<author>Armonk Corporation</author>
 	<releaseDate>1982</releaseDate>
-	<machine href="/configs/pc/machines/5160/mda/256kb/fake188/machine.xml" state="/apps/pc/1982/esuite/state.json"/>
+	<machine href="/devices/pc/machine/5160/mda/256kb/fake188/machine.xml" state="/apps/pc/1982/esuite/state.json"/>
 	<disk id="disk01" size="368640" chs="40:2:9" dir="private/" href="/apps/pc/1982/esuite/disk.json" md5="7721a7bc9fcbd0005e7c1d87ecc055c5" md5json="dbf0a2c0176b8128d87e2465794764f4">
 		<name>Executive Suite (1982)</name>
 		<file size="384" time="2000-02-29 08:04:48" attr="0x20" md5="3e638560a5f483cdbd1be486b07c767e">ESUITE.COM</file>

apps/pc/1985/rogue/cache.manifest

@@ -3,9 +3,9 @@ CACHE MANIFEST
 /versions/pcjs/1.13.6/manifest.xsl
 /versions/pcjs/1.13.6/common.xsl
 /versions/pcjs/1.13.6/components.xsl
-/configs/pc/machines/5160/cga/640kb/machine.xml
+/devices/pc/machine/5160/cga/640kb/machine.xml
-/configs/pc/keyboards/minimal-f1-f10.xml
+/devices/pc/keyboard/minimal-f1-f10.xml
-/configs/pc/disks/library.xml
+/disks/pc/library.xml
 /disks/pc/dos/microsoft/3.20/manifest.xml
 /disks/pc/dos/microsoft/4.0M/manifest.xml
 /disks/pc/tools/microsoft/BASIC/manifest.xml

apps/pc/1985/rogue/manifest.xml

@@ -21,5 +21,5 @@
 		<file size="16391" time="1985-03-25 16:53:10" attr="0x20" md5="afb883b611c35f79f2a5168365349ba7">ROGUE.PIC</file>
 		<file size="0" time="1995-08-26 12:11:38" attr="0x20">ROGUE.SCR</file>
 	</disk>
-	<machine href="/configs/pc/machines/5160/cga/640kb/machine.xml" state="/apps/pc/1985/rogue/state.json"/>
+	<machine href="/devices/pc/machine/5160/cga/640kb/machine.xml" state="/apps/pc/1985/rogue/state.json"/>
 </manifest>

apps/pc/1987/thinktank/manifest.xml

@@ -49,5 +49,5 @@
 		<file size="512" time="2012-11-20 15:32:46" attr="0x20" md5="05f711f1c096454617eb18b31a48905f" dir="TMPLATES/">UPGRADE.TXT</file>
 		<file size="3072" time="2012-11-20 15:32:11" attr="0x20" md5="20ded226630726d7b26d0ec7832753d0" dir="TMPLATES/">WTMEASUR.TXT</file>
 	</disk>
-	<machine href="/configs/pc/machines/5160/cga/640kb/machine.xml" state="/apps/pc/1987/thinktank/state.json"/>
+	<machine href="/devices/pc/machine/5160/cga/640kb/machine.xml" state="/apps/pc/1987/thinktank/state.json"/>
 </manifest>

apps/pc/1992/moria/manifest.xml

@@ -108,5 +108,5 @@
 		<file size="2193" time="1992-11-01 23:15:44" attr="0x20" md5="cac18aa1420a33b231295f468c360f96">VERSION.HLP</file>
 		<file size="423" time="1992-11-01 23:15:44" attr="0x20" md5="07fdaebf594f9b34d54544c2b6aa36d8">WELCOME.HLP</file>
 	</disk>
-	<machine href="/configs/pc/machines/5160/cga/640kb/machine.xml" state="/apps/pc/1992/moria/state.json"/>
+	<machine href="/devices/pc/machine/5160/cga/640kb/machine.xml" state="/apps/pc/1992/moria/state.json"/>
 </manifest>

blog/2013/11/README.md

@@ -20,7 +20,7 @@ syntax, which is more than sufficient to handle all the site's **README.md** fil
 have used a third-party Markdown library, but this was more educational, and it was easy to add extra features,
 like the ability to embed JavaScript machines with a single Markdown-style link; eg:
 
-	[IBM PC](/configs/pc/machines/5150/mda/64kb/ "PCjs:ibm5150")
+	[IBM PC](/devices/pc/machine/5150/mda/64kb/ "PCjs:ibm5150")
 
 The script takes care of the rest, adding the appropriate stylesheets and PCjs scripts automatically.
 
@@ -28,7 +28,7 @@ I had more grandiose plans, including a command-line prompt written in JavaScrip
 navigate the site exactly as you would an IBM PC hard drive from a "DOS prompt", and I may try something
 like that later, but don't hold your breath.
 
-I've tried to improve the organization of all the [Machine Configuration Files](/configs/pc/machines/) as well.
+I've tried to improve the organization of all the [Machine Configuration Files](/devices/pc/machine/) as well.
 The variety of configurations was getting out of hand.  It's a bit tidier now, but there's still room for
 improvement.
 

blog/2014/03/30/README.md

@@ -15,7 +15,7 @@ while I can understand some whitespace inconsistencies across web servers, I wou
 on the server to modify file contents.
 
 I finally confirmed that the files were indeed modified on the server, by using Azure's FTP browser.  For example,
-[minimal.xml](/configs/pc/keyboards/minimal.xml) is currently 622 bytes locally, but on the Azure server, the
+[minimal.xml](/devices/pc/keyboard/minimal.xml) is currently 622 bytes locally, but on the Azure server, the
 reported size is 632 bytes -- one extra CR for each of the file's 10 lines.  After a little more digging, I
 [learned something new](http://git-scm.com/book/ch7-1.html#Formatting-and-Whitespace) about **Git**: it has a
 setting called `core.autocrlf` which, for me on OS X, defaults to `input` (meaning "convert CR/LF to LF on commit
@@ -47,4 +47,4 @@ but it would NEVER display anything but deployment information.  Instead, I had
 Sigh. But at least the site is up and fully operational now.
 
 *[@jeffpar](http://twitter.com/jeffpar)*  
-*March 30, 2014*
+*March 30, 2014*

blog/2014/04/14/README.md

@@ -7,7 +7,7 @@ Don't believe me?  Just ask [Google](https://www.google.com/#q=node+express+safa
 stylesheets.  And occasionally Safari -- and ONLY Safari -- will render those XML files as blank pages.
 
 For example, here's the
-[machine.xml](/configs/pc/machines/5150/mda/64kb/machine.xml) file that's also embedded on the
+[machine.xml](/devices/pc/machine/5150/mda/64kb/machine.xml) file that's also embedded on the
 [pcjs.org](http://www.pcjs.org/) home page.
 
 When Safari fetched that XML file from an Apache web server (what I used before switching to Node),

blog/2014/07/30/README.md

@@ -1,8 +1,8 @@
 EGA Support
 ---
 PCjs v1.14.0 now includes basic EGA support.  It emulates the EGA hardware well enough to pass the IBM EGA BIOS
-diagnostics and run [Windows 1.01](/configs/pc/machines/5160/ega/640kb/win101/) in color.  Check out our
+diagnostics and run [Windows 1.01](/devices/pc/machine/5160/ega/640kb/win101/) in color.  Check out our
-[Windows 1.01 "Server Array"](/configs/pc/machines/5160/ega/640kb/array/) demo.
+[Windows 1.01 "Server Array"](/devices/pc/machine/5160/ega/640kb/array/) demo.
 
 ![Windows 1.01 "Server Array" Demo](/blog/2014/07/30/win101-array-demo-small.jpg "link:/blog/2014/07/30/win101-array-demo.jpg")
 

blog/2014/09/13/README.md

@@ -1,7 +1,7 @@
 The IBM PC AT: Alive and Booting
 ---
 
-My first IBM PC AT (Model 5170) [Test Configuration](/configs/pc/machines/5170/ega/640kb/debugger/) finally
+My first IBM PC AT (Model 5170) [Test Configuration](/devices/pc/machine/5170/ega/640kb/rev1/) finally
 boots to a PC-DOS prompt.  The configuration uses the original [IBM Model 5170 ROM BIOS](/devices/pc/bios/5170/),
 dated January 10, 1984.
  
@@ -63,4 +63,4 @@ unnecessarily.  And even though the test machine is configured with 640Kb of RAM
 Hmmmm.
  
 *[@jeffpar](http://twitter.com/jeffpar)*  
-*September 13, 2014*
+*September 13, 2014*

blog/2014/10/13/README.md

@@ -1,7 +1,7 @@
 The 8Mhz IBM PC AT 5170 
 ---
-I just added my first [IBM PC AT "Rev 3"](/configs/pc/machines/5170/ega/1152kb/rev3/) machine configuration
+I just added my first [IBM PC AT "Rev 3"](/devices/pc/machine/5170/ega/1152kb/rev3/) machine configuration
-to the list of [IBM PC Machine Configurations](/configs/pc/machines/), and not surprisingly, the new machine
+to the list of [IBM PC Machine Configurations](/devices/pc/machine/), and not surprisingly, the new machine
 fails to boot.
 
 I call it "Rev 3" because it uses the 3rd [ROM BIOS](/devices/pc/bios/5170/) that IBM released for the PC AT,

blog/2014/10/17/README.md

@@ -1,7 +1,7 @@
 Release of PCjs v1.15.5
 ---
 
-The [IBM PC AT "Rev 3"](/configs/pc/machines/5170/ega/1152kb/rev3/) machine configuration boots in
+The [IBM PC AT "Rev 3"](/devices/pc/machine/5170/ega/1152kb/rev3/) machine configuration boots in
 v1.15.5 of PCjs now, which includes the following fixes:
 
 + The BIOS expects memory refresh to occur roughly every 16us, which I've resolved by tying the state

blog/2014/10/23/README.md

@@ -11,7 +11,7 @@ PC-DOS 7.00 still can't be setup from its specially-formatted 1.84Mb [XDF](http:
 distribution disk images, "PC-DOS 7.00 (SETUP Disk 2)" through "PC-DOS 7.00 (SETUP Disk 5)", so your best bet is to boot
 from the 1.44Mb "PC-DOS 7.00 (Boot Disk)".
 
-Note that you must also use a fairly new 80286 machine configuration, like this [8Mhz IBM PC AT](/configs/pc/machines/5170/ega/1152kb/rev3/),
+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/),
 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/).
 

configs/README.md

@@ -1,4 +0,0 @@
-Machine Configurations
----
-
-Browse [IBM PC](/configs/pc/machines/) and [Challenger 1P](/configs/c1p/machines/) machine configurations.

configs/c1p/README.md

@@ -1,5 +0,0 @@
-Challenger 1P Configurations
----
-
-This folder contains Challenger 1P [Machine Configurations](machines/), along with a variety of component configurations,
-such as [Control Panels](panels/), [Disk Sets](disks/) and [Serial Program Sets](serial/).

configs/c1p/machines/8kb/array/README.md

@@ -1,12 +0,0 @@
-Challenger 1P (8Kb) "Server Array"
----
-
-[Machine #1](/configs/c1p/machines/8kb/small/ "C1Pjs:OSI1")
-[Machine #2](/configs/c1p/machines/8kb/small/ "C1Pjs:OSI2")
-[Machine #3](/configs/c1p/machines/8kb/small/ "C1Pjs:OSI3")
-[Machine #4](/configs/c1p/machines/8kb/small/ "C1Pjs:OSI4")
-[Machine #5](/configs/c1p/machines/8kb/small/ "C1Pjs:OSI5")
-[Machine #6](/configs/c1p/machines/8kb/small/ "C1Pjs:OSI6")
-[Machine #7](/configs/c1p/machines/8kb/small/ "C1Pjs:OSI7")
-[Machine #8](/configs/c1p/machines/8kb/small/ "C1Pjs:OSI8")
-[Machine #9](/configs/c1p/machines/8kb/small/ "C1Pjs:OSI9")

configs/c1p/machines/8kb/array/machine.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="/versions/c1pjs/1.15.8/outline.xsl"?>
-<outline>
-	<title>Challenger 1P (8Kb) "Server Array"</title>
-	<machine id="OSI1" ref="/configs/c1p/machines/8kb/small/machine.xml"/>
-	<machine id="OSI2" ref="/configs/c1p/machines/8kb/small/machine.xml"/>
-	<machine id="OSI3" ref="/configs/c1p/machines/8kb/small/machine.xml"/>
-	<machine id="OSI4" ref="/configs/c1p/machines/8kb/small/machine.xml"/>
-	<machine id="OSI5" ref="/configs/c1p/machines/8kb/small/machine.xml"/>
-	<machine id="OSI6" ref="/configs/c1p/machines/8kb/small/machine.xml"/>
-	<machine id="OSI7" ref="/configs/c1p/machines/8kb/small/machine.xml"/>
-	<machine id="OSI8" ref="/configs/c1p/machines/8kb/small/machine.xml"/>
-	<machine id="OSI9" ref="/configs/c1p/machines/8kb/small/machine.xml"/>
-</outline>

configs/pc/README.md

@@ -1,6 +0,0 @@
-IBM PC Configurations
----
-
-Here you'll find [Machine Configurations](/configs/pc/machines/), along with a variety of other component configurations
-that are used by the machines, such as [Control Panels](/configs/pc/panels/), [Disk Sets](/configs/pc/disks/) and
-[Keyboard Layouts](/configs/pc/keyboards/).

configs/pc/disks/README.md

@@ -1,59 +0,0 @@
-IBM PC Disk Sets
----
-
-An assortment of IBM PC Disk Sets, for use by [IBM PC Machine Configurations](../machines/).
-
-### Example
-
-An FDC (Floppy Disk Controller) XML file, such as [samples.xml](samples.xml), typically contains <disk> entries like:
-
-	<disk path="/disks/pc/dos/ibm/1.00/PCDOS100.json">PC-DOS 1.0</disk>
-	<disk path="/disks/pc/dos/ibm/1.10/PCDOS110.json">PC-DOS 1.1</disk>
-	<disk path="/disks/pc/dos/ibm/2.00/PCDOS200-DISK1.json">PC-DOS 2.0 (Disk 1)</disk>
-	<disk path="/disks/pc/dos/ibm/2.00/PCDOS200-DISK2.json">PC-DOS 2.0 (Disk 2)</disk>
-	<disk path="/disks/pc/games/microsoft/adventure/adventure-1981.json">Microsoft Adventure</disk>
-	<disk path="/apps/pc/1981/visicalc/disk.json" href="http://www.bricklin.com/history/vclicense.htm" desc="VisiCalc License">VisiCalc</disk>
-
-However, if you wanted to load VisiCalc directly from the /apps folder, rather than using a pre-generated disk image,
-you could do that with an &lt;manifest&gt; entry that references the application's manifest.xml:
-
-	<manifest ref="/apps/pc/1981/visicalc/manifest.xml" disk="disk"/>
-
-The application must have a **manifest.xml** with &lt;disk&gt; section containing an *id* value that matches the *disk* value
-specified above:
-
-    <disk id="disk" dir="/apps/pc/1981/visicalc/bin/">
-        <file>VC.COM</file>
-        <file dir="../">README.md</file>
-        <link href="http://www.bricklin.com/history/vclicense.htm">VisiCalc License</link>
-    </disk>
-
-If multiple disks are defined in the manifest, and you want to include them all, you can set the *disk* value to '*', as in:
-
-	<manifest ref="/apps/pc/1981/visicalc/manifest.xml" disk="*"/>
-
-As an added bonus, PCjs will automatically display the descriptive &lt;link&gt; whenever this item is selected, and it will
-dynamically generate a disk image containing all the specified &lt;file&gt; entries when the selected item is loaded.
-
-Pre-generated images are still preferred, and you can now include those in the application **manifest.xml** as well, by adding
-an *href* value to the &lt;disk&gt; section that was used to create the image: 
-
-    <disk id="disk" dir="/apps/pc/1981/visicalc/bin/" href="/apps/pc/1981/visicalc/disk.json">
-        <file>VC.COM</file>
-        <file dir="../">README.md</file>
-        <link href="http://www.bricklin.com/history/vclicense.htm">VisiCalc License</link>
-    </disk>
-
-The PCjs DiskDump module is used to create all our pre-generated JSON-encoded disk images.  In the above example, a
-pre-generated disk image could be created from the command-line with either the "--dir" option (which will traverse all
-subdirectories as well): 
-
-	node diskdump --dir=./apps/pc/1981/visicalc/bin/ --format=json --output=./apps/pc/1981/visicalc/disk.json
-	
-or with the "--path" option, which specifies either a single file or a set files separated by semi-colons:
-
-	node diskdump "--path=./apps/pc/1981/visicalc/bin/vc.com;../readme.md" --format=json --output=./apps/pc/1981/visicalc/disk.json
-	
-or via the PCjs server's DiskDump API:
-
-	http://www.pcjs.org/api/v1/dump?path=/apps/pc/1981/visicalc/bin/vc.com&format=json

configs/pc/machines/README.md

@@ -1,48 +0,0 @@
-IBM PC Machine Configurations
----
-
-Here you'll find sample Machine Configurations for all the IBM PC models that PCjs currently supports:
-
-* [Model 5150](/configs/pc/machines/5150/)
-* [Model 5160](/configs/pc/machines/5160/)
-* [Model 5170](/configs/pc/machines/5170/)
-
-Model 5150 Machine Configurations include:
-
-* [IBM PC, MDA, 64K](/configs/pc/machines/5150/mda/64kb/)
-* [IBM PC, MDA, 64K, Debugger](/configs/pc/machines/5150/mda/64kb/debugger/)
-* [IBM PC, CGA, 64K, DONKEY.BAS](/configs/pc/machines/5150/cga/64kb/donkey/)
-* [IBM PC, CGA, 64K, DONKEY.BAS, Debugger](/configs/pc/machines/5150/cga/64kb/donkey/debugger/)
-
-Model 5160 Machine Configurations include:
-
-* [IBM PC XT, CGA, 256K, 10Mb Drive](/configs/pc/machines/5160/cga/256kb/demo/)
-* [IBM PC XT, CGA, 256K, 10Mb Drive, Debugger](/configs/pc/machines/5160/cga/256kb/demo/debugger/)
-* [IBM PC XT, CGA, 256K, Windows 1.01](/configs/pc/machines/5160/cga/256kb/win101/)
-* [IBM PC XT, CGA, 256K, Windows 1.01, Debugger](/configs/pc/machines/5160/cga/256kb/win101/debugger/)
-* [IBM PC XT, CGA, 640K, 10Mb Drive](/configs/pc/machines/5160/cga/640kb/)
-* [IBM PC XT, CGA, 640K, 10Mb Drive, Debugger](/configs/pc/machines/5160/cga/640kb/debugger/)
-* [IBM PC XT, CGA, 640K, "Multitasking" MS-DOS 4.00](/configs/pc/machines/5160/cga/640kb/dos400m/)
-* [IBM PC XT, CGA "Server Array" Demo](/configs/pc/machines/5160/cga/256kb/array/)
-* [IBM PC XT, EGA, 256K, 10Mb Drive, Debugger](/configs/pc/machines/5160/ega/256kb/debugger/)
-* [IBM PC XT, EGA, 640K, 10Mb Drive, Debugger](/configs/pc/machines/5160/ega/640kb/debugger/)
-* [IBM PC XT, EGA, 640K, Windows 1.01](/configs/pc/machines/5160/ega/640kb/win101/)
-* [IBM PC XT, EGA "Server Array" Demo](/configs/pc/machines/5160/ega/640kb/array/)
-
-Model 5170 Machine Configurations include:
-
-* [IBM PC AT (6Mhz), EGA, 640K, Debugger](/configs/pc/machines/5170/ega/640kb/rev1/)
-* [IBM PC AT (6Mhz), EGA, 1152Kb, 20Mb Drive, Debugger](/configs/pc/machines/5170/ega/1152kb/rev1/)
-* [IBM PC AT (8Mhz), EGA, 1152Kb, 20Mb Drive, Debugger](/configs/pc/machines/5170/ega/1152kb/rev3/)
-
-These Machine Configurations also include a "Soft Keyboard":
-
-* [IBM PC, MDA, 64K](/configs/pc/machines/5150/mda/64kb/softkbd/)
-* [IBM PC, CGA, 64K](/configs/pc/machines/5150/cga/64kb/softkbd/)
-* [IBM PC, CGA, 384K](/configs/pc/machines/5150/cga/384kb/softkbd/)
-* [IBM PC XT, MDA, 64K, 10Mb Drive](/configs/pc/machines/5160/mda/64kb/softkbd/)
-* [IBM PC XT, CGA, 256K, 10Mb Drive](/configs/pc/machines/5160/cga/256kb/softkbd/)
-* [IBM PC XT, CGA, 256K, Windows 1.01](/configs/pc/machines/5160/cga/256kb/win101/softkbd/)
-* [IBM PC XT, CGA, 512K, Windows 1.01](/configs/pc/machines/5160/cga/512kb/win101/softkbd/)
-
-There are also some pre-built Machine Configurations for selected [IBM PC Disk Sets](/disks/pc/).

devices/README.md

@@ -1,3 +1,4 @@
-Device Resource Files
+Device Configurations
 ---
-Copies of device resources (principally ROM images) are stored here.
+
+Browse [IBM PC](/devices/pc/machine/) and [Challenger 1P](/devices/c1p/machine/) machine configurations.

devices/c1p/README.md

@@ -0,0 +1,7 @@
+Challenger 1P Configurations
+---
+
+This folder contains Challenger 1P [Machine Configurations](machine/), along with of component configurations,
+such as [Control Panels](panel/).
+
+[Applications](/apps/c1p/) and [Disk Images](/disks/c1p/) are also available.

devices/c1p/machine/32kb/machine.xml

@@ -17,8 +17,8 @@
 	<debugger id="debugger"/>
 	<ram id="ram32K" size="0x8000"/>
 	<rom id="romNull" size="0x2000"/>
-	<rom id="romBasic" size="0x2000" image="/devices/c1p/roms/basic-gcpatch.hex"/>
+	<rom id="romBasic" size="0x2000" image="/devices/c1p/rom/basic-gcpatch.hex"/>
-	<rom id="romSystem" size="0x0800" image="/devices/c1p/roms/system.hex"/>
+	<rom id="romSystem" size="0x0800" image="/devices/c1p/rom/system.hex"/>
 	<video id="video" screenwidth="512" screenheight="384" cols="32" rows="32" charset="/devices/c1p/video/chargen2x.png" width="512px" padding="8px">
 		<name>Video Display</name>
 	</video>
@@ -27,7 +27,7 @@
 		<control type="button" class="input" binding="ctrl-o">CTRL-O</control>
 		<control type="button" class="input" binding="break">BREAK</control>
 	</keyboard>
-	<serial ref="/configs/c1p/serial/samples.xml"/>
+	<serial ref="/apps/c1p/samples.xml"/>
-	<disk ref="/configs/c1p/disks/samples.xml"/>
+	<disk ref="/disks/c1p/samples.xml"/>
-	<panel ref="/configs/c1p/panels/default.xml"/>
+	<panel ref="/devices/c1p/panel/default.xml"/>
 </machine>

devices/c1p/machine/8kb/all/debugger/machine.xml

@@ -16,8 +16,8 @@
 	<debugger id="debugger"/>
 	<ram id="ram8K" size="0x2000"/>
 	<rom id="romNull" size="0x8000"/>
-	<rom id="romBasic" size="0x2000" image="/devices/c1p/roms/basic-gcpatch.hex"/>
+	<rom id="romBasic" size="0x2000" image="/devices/c1p/rom/basic-gcpatch.hex"/>
-	<rom id="romSystem" size="0x0800" image="/devices/c1p/roms/system.hex"/>
+	<rom id="romSystem" size="0x0800" image="/devices/c1p/rom/system.hex"/>
 	<video id="video" screenwidth="512" screenheight="384" cols="32" rows="32" charset="/devices/c1p/video/chargen2x.png" width="512px" padding="8px">
 		<name>Video Display</name>
 	</video>
@@ -26,6 +26,6 @@
 		<control type="button" class="input" binding="ctrl-o">CTRL-O</control>
 		<control type="button" class="input" binding="break">BREAK</control>
 	</keyboard>
-	<serial ref="/configs/c1p/serial/all.xml"/>
+	<serial ref="/apps/c1p/all.xml"/>
-	<panel ref="/configs/c1p/panels/default.xml"/>
+	<panel ref="/devices/c1p/panel/default.xml"/>
 </machine>

devices/c1p/machine/8kb/array/README.md

@@ -0,0 +1,12 @@
+Challenger 1P (8Kb) "Server Array"
+---
+
+[Machine #1](/devices/c1p/machine/8kb/small/ "C1Pjs:OSI1")
+[Machine #2](/devices/c1p/machine/8kb/small/ "C1Pjs:OSI2")
+[Machine #3](/devices/c1p/machine/8kb/small/ "C1Pjs:OSI3")
+[Machine #4](/devices/c1p/machine/8kb/small/ "C1Pjs:OSI4")
+[Machine #5](/devices/c1p/machine/8kb/small/ "C1Pjs:OSI5")
+[Machine #6](/devices/c1p/machine/8kb/small/ "C1Pjs:OSI6")
+[Machine #7](/devices/c1p/machine/8kb/small/ "C1Pjs:OSI7")
+[Machine #8](/devices/c1p/machine/8kb/small/ "C1Pjs:OSI8")
+[Machine #9](/devices/c1p/machine/8kb/small/ "C1Pjs:OSI9")

devices/c1p/machine/8kb/array/machine.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="/versions/c1pjs/1.15.8/outline.xsl"?>
+<outline>
+	<title>Challenger 1P (8Kb) "Server Array"</title>
+	<machine id="OSI1" ref="/devices/c1p/machine/8kb/small/machine.xml"/>
+	<machine id="OSI2" ref="/devices/c1p/machine/8kb/small/machine.xml"/>
+	<machine id="OSI3" ref="/devices/c1p/machine/8kb/small/machine.xml"/>
+	<machine id="OSI4" ref="/devices/c1p/machine/8kb/small/machine.xml"/>
+	<machine id="OSI5" ref="/devices/c1p/machine/8kb/small/machine.xml"/>
+	<machine id="OSI6" ref="/devices/c1p/machine/8kb/small/machine.xml"/>
+	<machine id="OSI7" ref="/devices/c1p/machine/8kb/small/machine.xml"/>
+	<machine id="OSI8" ref="/devices/c1p/machine/8kb/small/machine.xml"/>
+	<machine id="OSI9" ref="/devices/c1p/machine/8kb/small/machine.xml"/>
+</outline>

devices/c1p/machine/8kb/embed/machine.xml

@@ -13,8 +13,8 @@
 	<cpu id="cpu6502"/>
 	<ram id="ram8K" size="0x2000"/>
 	<rom id="romNull" size="0x8000"/>
-	<rom id="romBasic" size="0x2000" image="/devices/c1p/roms/basic-gcpatch.hex"/>
+	<rom id="romBasic" size="0x2000" image="/devices/c1p/rom/basic-gcpatch.hex"/>
-	<rom id="romSystem" size="0x0800" image="/devices/c1p/roms/system.hex"/>
+	<rom id="romSystem" size="0x0800" image="/devices/c1p/rom/system.hex"/>
 	<video id="video" screenwidth="256" screenheight="192" cols="32" rows="32" charset="/devices/c1p/video/chargen1x.png" width="256px" padding="8px"/>
 	<keyboard id="keyboard" pos="center">
 		<control type="button" class="input" binding="ctrl-c">CTRL-C</control>

devices/c1p/machine/8kb/large/debugger/local.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html style="background-color: #1d1d1d">
 <head>
-	<title>pcjs.org | /configs/c1p/machines/8kb/large/debugger/</title>
+	<title>pcjs.org | /devices/c1p/machine/8kb/large/debugger/</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<meta charset="utf-8">
 	<meta name="viewport" content="initial-scale=1">
@@ -16,13 +16,13 @@
 		<div class="common-top-left">
 			<ul>
 				<li><a href="../../../../../../">Home</a></li>
-				<li><a href="../../../../../../apps/pc/">Apps</a></li>
+				<li><a href="../../../../../../apps/pc">Apps</a></li>
-				<li><a href="../../../../../../disks/pc/">Disks</a></li>
+				<li><a href="../../../../../../disks/pc">Disks</a></li>
-				<li><a href="../../../../../../configs/">Machines</a></li>
+				<li><a href="../../../../../../devices">Machines</a></li>
-				<li><a href="../../../../../../docs/">Docs</a></li>
+				<li><a href="../../../../../../docs">Docs</a></li>
-				<li><a href="../../../../../../pubs/">Pubs</a></li>
+				<li><a href="../../../../../../pubs">Pubs</a></li>
-				<li><a href="../../../../../../blog/">Blog</a></li>
+				<li><a href="../../../../../../blog">Blog</a></li>
-				<li><a href="../../../../../../docs/about/">About</a></li>
+				<li><a href="../../../../../../docs/about">About</a></li>
 			</ul>
 		</div>
 		<div class="common-top-right">
@@ -30,13 +30,13 @@
 		</div>
 	</div>
 	<div class="common-middle">
-		<h4>Directory of C:\<a href="../../../../../../">PCJS.ORG</a>\CONFIGS\C1P\MACHINES\8KB\LARGE\DEBUGGER</h4>
+		<h4>Directory of C:\<a href="../../../../../../">PCJS.ORG</a>\DEVICES\C1P\MACHINE\8KB\LARGE\DEBUGGER</h4>
 		<div class="common-sidebar">
 			<ul class="common-list">
-				<li><a href="../../../../../../configs/c1p/machines/8kb/large">\..</a></li>
+				<li><a href="../">\..</a></li>
-				<li><a href="../../../../../../configs/c1p/machines/8kb/large/debugger/local.html">\LOCAL.HTML</a></li>
+				<li><a href="local.html">\LOCAL.HTML</a></li>
-				<li><a href="../../../../../../configs/c1p/machines/8kb/large/debugger/local.xml">\LOCAL.XML</a></li>
+				<li><a href="local.xml">\LOCAL.XML</a></li>
-				<li><a href="../../../../../../configs/c1p/machines/8kb/large/debugger/machine.xml">\MACHINE.XML</a></li>
+				<li><a href="machine.xml">\MACHINE.XML</a></li>
 			</ul>
 
 		</div>

devices/c1p/machine/8kb/large/debugger/local.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="../../../../../../versions/c1pjs/1.15.7/machine.xsl"?>
+<?xml-stylesheet type="text/xsl" href="../../../../../../versions/c1pjs/1.15.8/machine.xsl"?>
 <machine id="c1p8kb" class="c1p" border="1" width="100%" style="background-color:#FAEBD7;padding-bottom:8px">
 	<name>OSI Challenger 1P (8Kb) with Debugger</name>
 	<computer id="c1p" name="Challenger 1P">
@@ -16,9 +16,9 @@
 	<debugger id="debugger"/>
 	<ram id="ram8K" size="0x2000"/>
 	<rom id="romNull" size="0x8000"/>
-	<rom id="romBasic" size="0x2000" image="../../../../../../devices/c1p/roms/basic-gcpatch.hex"/>
+	<rom id="romBasic" size="0x2000" image="../../../../rom/basic-gcpatch.hex"/>
-	<rom id="romSystem" size="0x0800" image="../../../../../../devices/c1p/roms/system.hex"/>
+	<rom id="romSystem" size="0x0800" image="../../../../rom/system.hex"/>
-	<video id="video" screenwidth="512" screenheight="384" cols="32" rows="32" charset="../../../../../../devices/c1p/video/chargen2x.png" width="512px" padding="8px">
+	<video id="video" screenwidth="512" screenheight="384" cols="32" rows="32" charset="../../../../video/chargen2x.png" width="512px" padding="8px">
 		<name>Video Display</name>
 	</video>
 	<keyboard id="keyboard" padleft="8px">
@@ -26,6 +26,6 @@
 		<control type="button" class="input" binding="ctrl-o">CTRL-O</control>
 		<control type="button" class="input" binding="break">BREAK</control>
 	</keyboard>
-	<serial ref="../../../../serial/samples.xml"/>
+	<serial ref="../../../../../../apps/c1p/samples.xml"/>
-	<panel ref="../../../../panels/default.xml"/>
+	<panel ref="../../../../panel/default.xml"/>
 </machine>

devices/c1p/machine/8kb/large/debugger/machine.xml

@@ -16,8 +16,8 @@
 	<debugger id="debugger"/>
 	<ram id="ram8K" size="0x2000"/>
 	<rom id="romNull" size="0x8000"/>
-	<rom id="romBasic" size="0x2000" image="/devices/c1p/roms/basic-gcpatch.hex"/>
+	<rom id="romBasic" size="0x2000" image="/devices/c1p/rom/basic-gcpatch.hex"/>
-	<rom id="romSystem" size="0x0800" image="/devices/c1p/roms/system.hex"/>
+	<rom id="romSystem" size="0x0800" image="/devices/c1p/rom/system.hex"/>
 	<video id="video" screenwidth="512" screenheight="384" cols="32" rows="32" charset="/devices/c1p/video/chargen2x.png" width="512px" padding="8px">
 		<name>Video Display</name>
 	</video>
@@ -26,6 +26,6 @@
 		<control type="button" class="input" binding="ctrl-o">CTRL-O</control>
 		<control type="button" class="input" binding="break">BREAK</control>
 	</keyboard>
-	<serial ref="/configs/c1p/serial/samples.xml"/>
+	<serial ref="/apps/c1p/samples.xml"/>
-	<panel ref="/configs/c1p/panels/default.xml"/>
+	<panel ref="/devices/c1p/panel/default.xml"/>
 </machine>

devices/c1p/machine/8kb/large/machine.xml

@@ -14,8 +14,8 @@
 	</computer>
 	<ram id="ram8K" size="0x2000"/>
 	<rom id="romNull" size="0x8000"/>
-	<rom id="romBasic" size="0x2000" image="/devices/c1p/roms/basic-gcpatch.hex"/>
+	<rom id="romBasic" size="0x2000" image="/devices/c1p/rom/basic-gcpatch.hex"/>
-	<rom id="romSystem" size="0x0800" image="/devices/c1p/roms/system.hex"/>
+	<rom id="romSystem" size="0x0800" image="/devices/c1p/rom/system.hex"/>
 	<video id="video" screenwidth="512" screenheight="384" cols="32" rows="32" charset="/devices/c1p/video/chargen2x.png" padding="8px"/>
 	<cpu id="cpu6502" autostart="false" pos="left" padleft="8px">
 		<control type="button" class="input" binding="run">Run</control>

devices/c1p/machine/8kb/small/machine.xml

@@ -14,8 +14,8 @@
 	<cpu id="cpu6502"/>
 	<ram id="ram8K" size="0x2000"/>
 	<rom id="romNull" size="0x8000"/>
-	<rom id="romBasic" size="0x2000" image="/devices/c1p/roms/basic-gcpatch.hex"/>
+	<rom id="romBasic" size="0x2000" image="/devices/c1p/rom/basic-gcpatch.hex"/>
-	<rom id="romSystem" size="0x0800" image="/devices/c1p/roms/system.hex"/>
+	<rom id="romSystem" size="0x0800" image="/devices/c1p/rom/system.hex"/>
 	<video id="video" screenwidth="256" screenheight="192" cols="32" rows="32" charset="/devices/c1p/video/chargen1x.png" width="256px" padding="8px"/>
 	<keyboard id="keyboard" padleft="8px">
 		<control type="button" class="input" binding="ctrl-c">CTRL-C</control>

devices/pc/README.md

@@ -0,0 +1,5 @@
+IBM PC Configurations
+---
+
+Here you'll find [Machine Configurations](/devices/pc/machine/), along with a variety of other component configurations
+that are used by the machines, such as [Control Panels](/devices/pc/panel/) and [Keyboard Layouts](/devices/pc/keyboard/).

devices/pc/machine/5150/cga/384kb/softkbd/machine.xml

@@ -11,9 +11,9 @@
 	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" width="960px" padding="8px">
 		<name>Color Display</name>
 	</video>
-	<keyboard ref="/configs/pc/keyboards/us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
-	<panel ref="/configs/pc/panels/wide.xml"/>
+	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/configs/pc/disks/samples.xml" width="280px"/>
+	<fdc ref="/disks/pc/samples.xml" width="280px"/>
 	<chipset id="chipset" model="5150" sw1="01001001" sw2="10100000" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
 		<control type="switches" class="input" label="SW2" binding="sw2" left="0px"/>

devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml

@@ -2,7 +2,7 @@
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.15.8/machine.xsl"?>
 <machine id="ibm5150" class="pc" border="1" width="980px" pos="center" style="background-color:#FAEBD7">
 	<name pos="center">IBM PC (Model 5150), CGA, 64K</name>
-	<computer id="pc-cga-64k" name="IBM PC" state="/configs/pc/machines/5150/cga/64kb/donkey/state.json"/>
+	<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"/>
@@ -10,10 +10,10 @@
 		<name>Color Display</name>
 	</video>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
-	<keyboard ref="/configs/pc/keyboards/minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
 	<debugger id="debugger"/>
-	<panel ref="/configs/pc/panels/wide.xml"/>
+	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/configs/pc/disks/samples.xml" width="280px"/>
+	<fdc ref="/disks/pc/samples.xml" width="280px"/>
 	<chipset id="chipset" model="5150" sw1="01001001" sw2="11110000" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
 		<control type="switches" class="input" label="SW2" binding="sw2" left="0px"/>

devices/pc/machine/5150/cga/64kb/donkey/machine.xml

@@ -2,7 +2,7 @@
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.15.8/machine.xsl"?>
 <machine id="ibm5150" class="pc" border="1" width="980px" pos="center" style="background-color:#FAEBD7">
 	<name pos="center">IBM PC (Model 5150), CGA, 64K</name>
-	<computer id="pc-cga-64k" name="IBM PC" state="/configs/pc/machines/5150/cga/64kb/donkey/state.json"/>
+	<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"/>
@@ -13,7 +13,7 @@
 		<control type="button" class="input" binding="run">Run</control>
 		<control type="button" class="input" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/configs/pc/keyboards/minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
-	<fdc ref="/configs/pc/disks/samples.xml" pos="right"/>
+	<fdc ref="/disks/pc/samples.xml" pos="right"/>
 	<chipset id="chipset" model="5150" sw1="01001001" sw2="11110000"/>
 </machine>

devices/pc/machine/5150/cga/64kb/softkbd/machine.xml

@@ -10,10 +10,10 @@
 	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" width="960px" padding="8px">
 		<name>Color Display</name>
 	</video>
-	<keyboard ref="/configs/pc/keyboards/us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
 	<debugger id="debugger"/>
-	<panel ref="/configs/pc/panels/wide.xml"/>
+	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/configs/pc/disks/samples.xml" width="280px"/>
+	<fdc ref="/disks/pc/samples.xml" width="280px"/>
 	<chipset id="chipset" model="5150" sw1="01001001" sw2="11110000" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
 		<control type="switches" class="input" label="SW2" binding="sw2" left="0px"/>

devices/pc/machine/5150/mda/64kb/debugger/machine.xml

@@ -10,10 +10,10 @@
 		<name>Monochrome Display</name>
 	</video>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
-	<keyboard ref="/configs/pc/keyboards/minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
 	<debugger id="debugger"/>
-	<panel ref="/configs/pc/panels/wide.xml"/>
+	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/configs/pc/disks/samples.xml" width="280px"/>
+	<fdc ref="/disks/pc/samples.xml" width="280px"/>
 	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
 		<control type="switches" class="input" label="SW2" binding="sw2" left="0px"/>

devices/pc/machine/5150/mda/64kb/machine.xml

@@ -13,7 +13,7 @@
 		<control type="button" class="input" binding="run">Run</control>
 		<control type="button" class="input" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/configs/pc/keyboards/minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
-	<fdc ref="/configs/pc/disks/samples.xml" pos="right"/>
+	<fdc ref="/disks/pc/samples.xml" pos="right"/>
 	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000"/>
 </machine>

devices/pc/machine/5150/mda/64kb/softkbd/machine.xml

@@ -10,10 +10,10 @@
 	<video id="videoMDA" screenwidth="720" screenheight="350" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" padding="8px">
 		<name>Monochrome Display</name>
 	</video>
-	<keyboard ref="/configs/pc/keyboards/us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
 	<debugger id="debugger"/>
-	<panel ref="/configs/pc/panels/wide.xml"/>
+	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/configs/pc/disks/samples.xml" width="280px"/>
+	<fdc ref="/disks/pc/samples.xml" width="280px"/>
 	<chipset id="chipset" model="5150" sw1="01000001" sw2="11110000" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
 		<control type="switches" class="input" label="SW2" binding="sw2" left="0px"/>

devices/pc/machine/5150/mda/README.md

@@ -5,6 +5,6 @@ All our Monochrome (MDA) configurations of the IBM PC Model 5150 are located her
 
 Below is a 64kb configuration, with a clock speed of 4.77Mhz,
 using the original IBM PC Model 5150 ROM BIOS and MDA font ROM. For more control,
-use this [alternate configuration](/configs/pc/machines/5150/mda/64kb/debugger/) with Control Panel and Debugger.
+use this [alternate configuration](/devices/pc/machine/5150/mda/64kb/debugger/) with Control Panel and Debugger.
 
-[IBM PC (Model 5150) with Monochrome Display and 64Kb](/configs/pc/machines/5150/mda/64kb/ "PCjs:ibm5150")
+[IBM PC (Model 5150) with Monochrome Display and 64Kb](/devices/pc/machine/5150/mda/64kb/ "PCjs:ibm5150")

devices/pc/machine/5160/cga/256kb/array/machine.xml

@@ -15,7 +15,7 @@
 		<control type="button" class="input" binding="reset">Reset</control>
 	</cpu>
 	<keyboard id="keyboard" model="us83"/>
-	<fdc ref="/configs/pc/disks/samples.xml"/>
+	<fdc ref="/disks/pc/samples.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001001"/>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 </machine>

devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml

@@ -11,10 +11,10 @@
 		<name>Color Display</name>
 	</video>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
-	<keyboard ref="/configs/pc/keyboards/minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
 	<debugger id="debugger"/>
-	<panel ref="/configs/pc/panels/wide.xml"/>
+	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/configs/pc/disks/samples.xml" width="280px"/>
+	<fdc ref="/disks/pc/samples.xml" width="280px"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
 		<control type="description" class="output" binding="swdesc" left="0px"/>

devices/pc/machine/5160/cga/256kb/demo/machine.xml

@@ -14,8 +14,8 @@
 		<control type="button" class="input" binding="run">Run</control>
 		<control type="button" class="input" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/configs/pc/keyboards/minimal-f1-f10.xml"/>
+	<keyboard ref="/devices/pc/keyboard/minimal-f1-f10.xml"/>
-	<fdc ref="/configs/pc/disks/samples.xml" pos="right"/>
+	<fdc ref="/disks/pc/samples.xml" pos="right"/>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 	<chipset id="chipset" model="5160" sw1="01001001"/>
 </machine>

devices/pc/machine/5160/cga/256kb/softkbd/machine.xml

@@ -11,10 +11,10 @@
 	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" width="960px" padding="8px">
 		<name>Color Display</name>
 	</video>
-	<keyboard ref="/configs/pc/keyboards/us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
 	<debugger id="debugger"/>
-	<panel ref="/configs/pc/panels/default.xml"/>
+	<panel ref="/devices/pc/panel/default.xml"/>
-	<fdc ref="/configs/pc/disks/samples.xml" width="280px"/>
+	<fdc ref="/disks/pc/samples.xml" width="280px"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
 		<control type="description" class="output" binding="swdesc" left="0px"/>

devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml

@@ -2,7 +2,7 @@
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.15.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" width="980px" pos="center" style="background-color:#FAEBD7">
 	<name pos="center">IBM PC XT (Model 5160) running Windows v1.01</name>
-	<computer id="xt-cga-win101" name="IBM PC XT" state="/configs/pc/machines/5160/cga/256kb/win101/state.json" resume="1"/>
+	<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"/>
@@ -11,15 +11,15 @@
 		<name>CGA Display</name>
 	</video>
 	<cpu id="cpu8088" model="8088" autostart="false"/>
-	<keyboard ref="/configs/pc/keyboards/minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
 	<debugger id="debugger"/>
-	<panel ref="/configs/pc/panels/wide.xml"/>
+	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/configs/pc/disks/library.xml" width="320px"/>
+	<fdc ref="/disks/pc/library.xml" width="320px"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
 		<control type="description" class="output" binding="swdesc" left="0px"/>
 	</chipset>
-	<hdc ref="/configs/pc/disks/fixed/win101.xml"/>
+	<hdc ref="/disks/pc/fixed/win101.xml"/>
 	<serial id="com1" adapter="1" binding="print"/>
 	<serial id="com2" adapter="2"/>
 	<mouse serial="com2"/>

devices/pc/machine/5160/cga/256kb/win101/machine.xml

@@ -2,7 +2,7 @@
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.15.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" pos="center" style="background-color:#FAEBD7">
 	<name pos="center">IBM PC XT (Model 5160) running Windows v1.01</name>
-	<computer id="xt-cga-win101" name="IBM PC XT" state="/configs/pc/machines/5160/cga/256kb/win101/state.json"/>
+	<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"/>
@@ -14,10 +14,10 @@
 		<control type="button" class="input" binding="run">Run</control>
 		<control type="button" class="input" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/configs/pc/keyboards/minimal-f1-f10.xml"/>
+	<keyboard ref="/devices/pc/keyboard/minimal-f1-f10.xml"/>
-	<fdc ref="/configs/pc/disks/samples.xml" width="400px"/>
+	<fdc ref="/disks/pc/samples.xml" width="400px"/>
 	<chipset id="chipset" model="5160" sw1="01001001"/>
-	<hdc ref="/configs/pc/disks/fixed/win101.xml"/>
+	<hdc ref="/disks/pc/fixed/win101.xml"/>
 	<serial id="com1" adapter="1" binding="print"/>
 	<serial id="com2" adapter="2"/>
 	<mouse serial="com2"/>

devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml

@@ -11,15 +11,15 @@
 	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" width="960px" padding="8px">
 		<name>Color Display</name>
 	</video>
-	<keyboard ref="/configs/pc/keyboards/us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
 	<debugger id="debugger"/>
-	<panel ref="/configs/pc/panels/wide.xml"/>
+	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/configs/pc/disks/library.xml" width="320px"/>
+	<fdc ref="/disks/pc/library.xml" width="320px"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
 		<control type="description" class="output" binding="swdesc" left="0px"/>
 	</chipset>
-	<hdc ref="/configs/pc/disks/fixed/win101.xml"/>
+	<hdc ref="/disks/pc/fixed/win101.xml"/>
 	<serial id="com1" adapter="1" binding="print"/>
 	<serial id="com2" adapter="2"/>
 	<mouse serial="com2"/>

devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml

@@ -11,15 +11,15 @@
 	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" charset="/devices/pc/video/ibm-mda-cga.json" pos="center" width="960px" padding="8px">
 		<name>Color Display</name>
 	</video>
-	<keyboard ref="/configs/pc/keyboards/us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
 	<debugger id="debugger"/>
-	<panel ref="/configs/pc/panels/default.xml"/>
+	<panel ref="/devices/pc/panel/default.xml"/>
-	<fdc ref="/configs/pc/disks/samples.xml" width="280px"/>
+	<fdc ref="/disks/pc/samples.xml" width="280px"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
 		<control type="description" class="output" binding="swdesc" left="0px"/>
 	</chipset>
-	<hdc ref="/configs/pc/disks/fixed/win101.xml"/>
+	<hdc ref="/disks/pc/fixed/win101.xml"/>
 	<serial id="com1" adapter="1" binding="print"/>
 	<serial id="com2" adapter="2"/>
 	<mouse serial="com2"/>

devices/pc/machine/5160/cga/640kb/debugger/machine.xml

@@ -11,10 +11,10 @@
 		<name>Color Display</name>
 	</video>
 	<cpu id="cpu8088" model="8088" autostart="true"/>
-	<keyboard ref="/configs/pc/keyboards/minimal-f1-f10.xml"/>
+	<keyboard ref="/devices/pc/keyboard/minimal-f1-f10.xml"/>
 	<debugger id="debugger"/>
-	<panel ref="/configs/pc/panels/wide.xml"/>
+	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/configs/pc/disks/library.xml" width="320px"/>
+	<fdc ref="/disks/pc/library.xml" width="320px"/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
 		<control type="description" class="output" binding="swdesc" left="0px"/>

devices/pc/machine/5160/cga/640kb/dos400m/machine.xml

@@ -11,10 +11,10 @@
 	<video id="videoCGA" screenwidth="960" screenheight="400" scale="true" fontrom="/devices/pc/video/ibm-mda-cga.json" pos="center" width="960px" padding="8px">
 		<name>Color Display</name>
 	</video>
-	<keyboard ref="/configs/pc/keyboards/us83.xml"/>
+	<keyboard ref="/devices/pc/keyboard/us83.xml"/>
 	<debugger id="debugger"/>
-	<panel ref="/configs/pc/panels/wide.xml"/>
+	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/configs/pc/disks/library.xml" automount='{A:{name:"MS-DOS 4.0M (Disk 1)",path:"/disks/pc/dos/microsoft/4.0M/MSDOS400M-DISK1.json"}, B:{name:"MS-DOS 4.0M (Disk 2)",path:"/disks/pc/dos/microsoft/4.0M/MSDOS400M-DISK2.json"}}'/>
+	<fdc ref="/disks/pc/library.xml" automount='{A:{name:"MS-DOS 4.0M (Disk 1)",path:"/disks/pc/dos/microsoft/4.0M/MSDOS400M-DISK1.json"}, B:{name:"MS-DOS 4.0M (Disk 2)",path:"/disks/pc/dos/microsoft/4.0M/MSDOS400M-DISK2.json"}}'/>
 	<chipset id="chipset" model="5160" sw1="01001001" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
 		<control type="description" class="output" binding="swdesc" left="0px"/>

devices/pc/machine/5160/cga/640kb/machine.xml

@@ -14,8 +14,8 @@
 		<control type="button" class="input" binding="run">Run</control>
 		<control type="button" class="input" binding="reset">Reset</control>
 	</cpu>
-	<keyboard ref="/configs/pc/keyboards/minimal-f1-f10.xml"/>
+	<keyboard ref="/devices/pc/keyboard/minimal-f1-f10.xml"/>
-	<fdc ref="/configs/pc/disks/library.xml" pos="right"/>
+	<fdc ref="/disks/pc/library.xml" pos="right"/>
 	<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
 	<chipset id="chipset" model="5160" sw1="01001001"/>
 </machine>

devices/pc/machine/5160/ega/256kb/debugger/machine.xml

@@ -12,10 +12,10 @@
 	<video id="videoEGA" model="ega" memory="0x10000" screenwidth="640" screenheight="350" pos="center" padding="8px">
 		<name>Enhanced Color Display</name>
 	</video>
-	<keyboard ref="/configs/pc/keyboards/minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
 	<debugger id="debugger"/>
-	<panel ref="/configs/pc/panels/wide.xml"/>
+	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/configs/pc/disks/library.xml"/>
+	<fdc ref="/disks/pc/library.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001101" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
 		<control type="description" class="output" binding="swdesc" left="0px"/>

devices/pc/machine/5160/ega/640kb/array/machine.xml

@@ -2,7 +2,7 @@
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.15.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" width="680px" float="left" style="background-color:#FAEBD7">
 	<name pos="center">IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive</name>
-	<computer id="xt-ega-640k" name="IBM PC XT" state="/configs/pc/machines/5160/ega/640kb/win101/state.json"/>
+	<computer id="xt-ega-640k" name="IBM PC XT" state="/devices/pc/machine/5160/ega/640kb/win101/state.json"/>
 	<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.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
@@ -11,13 +11,13 @@
 	<video id="videoEGA" model="ega" memory="0x20000" screenwidth="640" screenheight="350" width="640px" pos="center" padding="8px">
 		<name>Enhanced Color Display</name>
 	</video>
-	<keyboard ref="/configs/pc/keyboards/minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
 	<cpu id="cpu8088" model="8088">
 		<control type="button" class="input" binding="setSpeed">Fast</control>
 	</cpu>
-	<fdc ref="/configs/pc/disks/library.xml"/>
+	<fdc ref="/disks/pc/library.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001101"/>
-	<hdc ref="/configs/pc/disks/fixed/win101-ega.xml"/>
+	<hdc ref="/disks/pc/fixed/win101-ega.xml"/>
 	<serial id="com2" adapter="2"/>
 	<mouse serial="com2"/>
 </machine>

devices/pc/machine/5160/ega/640kb/debugger/machine.xml

@@ -12,15 +12,15 @@
 	<video id="videoEGA" model="ega" memory="0x20000" screenwidth="640" screenheight="350" pos="center" padding="8px">
 		<name>Enhanced Color Display</name>
 	</video>
-	<keyboard ref="/configs/pc/keyboards/minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
 	<debugger id="debugger"/>
-	<panel ref="/configs/pc/panels/wide.xml"/>
+	<panel ref="/devices/pc/panel/wide.xml"/>
-	<fdc ref="/configs/pc/disks/library.xml"/>
+	<fdc ref="/disks/pc/library.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001101" pos="left" padleft="8px" padbottom="8px">
 		<control type="switches" class="input" label="SW1" binding="sw1" left="0px"/>
 		<control type="description" class="output" binding="swdesc" left="0px"/>
 	</chipset>
-	<hdc ref="/configs/pc/disks/fixed/win101-ega.xml"/>
+	<hdc ref="/disks/pc/fixed/win101-ega.xml"/>
 	<serial id="com1" adapter="1" binding="print"/>
 	<serial id="com2" adapter="2"/>
 	<mouse serial="com2"/>

devices/pc/machine/5160/ega/640kb/machine.xml

@@ -12,10 +12,10 @@
 	<video id="videoEGA" model="ega" memory="0x20000" screenwidth="640" screenheight="350" pos="center" padding="8px">
 		<name>Enhanced Color Display</name>
 	</video>
-	<keyboard ref="/configs/pc/keyboards/minimal-functions.xml"/>
+	<keyboard ref="/devices/pc/keyboard/minimal-functions.xml"/>
-	<fdc ref="/configs/pc/disks/library.xml"/>
+	<fdc ref="/disks/pc/library.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001101"/>
-	<hdc ref="/configs/pc/disks/fixed/win101-ega.xml"/>
+	<hdc ref="/disks/pc/fixed/win101-ega.xml"/>
 	<serial id="com2" adapter="2"/>
 	<mouse serial="com2"/>
 </machine>

devices/pc/machine/5160/ega/640kb/win101/machine.xml

@@ -2,7 +2,7 @@
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.15.8/machine.xsl"?>
 <machine id="ibm5160" class="pc" border="1" style="background-color:#FAEBD7">
 	<name pos="center">IBM PC XT, 128K EGA, 640K RAM, 10Mb Hard Drive</name>
-	<computer id="xt-ega-640k" name="IBM PC XT" state="/configs/pc/machines/5160/ega/640kb/win101/state.json"/>
+	<computer id="xt-ega-640k" name="IBM PC XT" state="/devices/pc/machine/5160/ega/640kb/win101/state.json"/>
 	<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.json" notify="videoEGA"/>
 	<rom id="romHDC" addr="0xc8000" size="0x2000" file="/devices/pc/hdc/ibm-xebec-1982.json"/>
@@ -11,13 +11,13 @@
 	<video id="videoEGA" model="ega" memory="0x20000" screenwidth="640" screenheight="350" pos="center" padding="8px">
 		<name>Enhanced Color Display</name>
 	</video>
-	<keyboard ref="/configs/pc/keyboards/minimal.xml"/>
+	<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
 	<cpu id="cpu8088" model="8088">
 		<control type="button" class="input" binding="setSpeed">Fast</control>
 	</cpu>
-	<fdc ref="/configs/pc/disks/library.xml"/>
+	<fdc ref="/disks/pc/library.xml"/>
 	<chipset id="chipset" model="5160" sw1="01001101"/>
-	<hdc ref="/configs/pc/disks/fixed/win101-ega.xml"/>
+	<hdc ref="/disks/pc/fixed/win101-ega.xml"/>
 	<serial id="com2" adapter="2"/>
 	<mouse serial="com2"/>
 </machine>