diff --git a/README.md b/README.md
index 34f8d655f..a22e0a96d 100644
--- a/README.md
+++ b/README.md
@@ -5,8 +5,12 @@ Welcome to [PCjs](/docs/about/pcjs/), the first IBM PC simulation to run in your
It was added to the [JavaScript Machines](/docs/about/) project in Fall 2012, and it is now part of the
[PCjs Project](https://github.com/jeffpar/pcjs) on [GitHub](http://github.com/). The project includes:
-* [PCjs](/docs/pcjs/), a simulation of the original IBM PC (circa 1981)
-* [C1Pjs](/docs/c1pjs/), a simulation of the OSI Challenger 1P (circa 1978)
+* [PCjs](/docs/pcjs/), a simulation of the IBM PC and PC compatibles
+* [C1Pjs](/docs/c1pjs/), a simulation of the 6502-based OSI Challenger 1P
+
+PCjs first simulated the 4.77Mhz 8088-based IBM PC, and has steadily evolved to support more classic machines,
+including the IBM PC XT, the 80286-based IBM PC AT, and the 80386-based COMPAQ DeskPro 386. PCjs fully supports
+the machines' original ROMs, video cards, etc, and all machines run at their original speeds.
All the simulations are written entirely in JavaScript. No Flash, Java or other plugins are required.
Supported browsers include modern versions of Chrome, Safari, Firefox, Internet Explorer (v9.0 and up), Edge,
diff --git a/docs/README.md b/docs/README.md
index f0043b8f8..f141b187a 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -28,9 +28,9 @@ Our [Publication Archive](/pubs/) includes these PC-related resources:
* [CPU Documents](/pubs/pc/reference/intel/)
* [Datasheets](/pubs/pc/datasheets/)
* [Magazines](/pubs/pc/magazines/)
-* [Programming Guides](/pubs/pc/programming/) (eg, [OS/2](/pubs/pc/programming/os2/))
+* [Programming Guides](/pubs/pc/programming/)
* [Reference Manuals](/pubs/pc/reference/)
-* [Software User Guides](/pubs/pc/software/)
+* [Software User and Development Guides](/pubs/pc/software/) (eg, DOS, [OS/2](/pubs/pc/software/os2/), Windows)
And publications related to Ohio Scientific's 6502-based Challenger 1P:
diff --git a/index.md b/index.md
index f730ecb2d..4ea49102c 100644
--- a/index.md
+++ b/index.md
@@ -15,8 +15,12 @@ Welcome to [PCjs](/docs/about/pcjs/), the first IBM PC simulation to run in your
It was added to the [JavaScript Machines](/docs/about/) project in Fall 2012, and it is now part of the
[PCjs Project](https://github.com/jeffpar/pcjs) on [GitHub](http://github.com/). The project includes:
-* [PCjs](/docs/pcjs/), a simulation of the original IBM PC (circa 1981)
-* [C1Pjs](/docs/c1pjs/), a simulation of the OSI Challenger 1P (circa 1978)
+* [PCjs](/docs/pcjs/), a simulation of the IBM PC and PC compatibles
+* [C1Pjs](/docs/c1pjs/), a simulation of the 6502-based OSI Challenger 1P
+
+PCjs first simulated the 4.77Mhz 8088-based IBM PC, and has steadily evolved to support more classic machines,
+including the IBM PC XT, the 80286-based IBM PC AT, and the 80386-based COMPAQ DeskPro 386. PCjs fully supports
+the machines' original ROMs, video cards, etc, and all machines run at their original speeds.
All the simulations are written entirely in JavaScript. No Flash, Java or other plugins are required.
Supported browsers include modern versions of Chrome, Safari, Firefox, Internet Explorer (v9.0 and up), Edge,
diff --git a/pubs/README.md b/pubs/README.md
index e81b3c7ab..971963572 100644
--- a/pubs/README.md
+++ b/pubs/README.md
@@ -9,11 +9,12 @@ Publication Archive
We have an assortment of PC-related resources:
+* [CPU Documents](/pubs/pc/reference/intel/)
* [Datasheets](/pubs/pc/datasheets/)
* [Magazines](/pubs/pc/magazines/)
-* [Programming Guides](/pubs/pc/programming/) (eg, [OS/2](/pubs/pc/programming/os2/))
+* [Programming Guides](/pubs/pc/programming/)
* [Reference Manuals](/pubs/pc/reference/)
-* [Software User Guides](/pubs/pc/software/)
+* [Software User and Development Guides](/pubs/pc/software/) (eg, DOS, [OS/2](/pubs/pc/software/os2/), Windows)
Publications related to Ohio Scientific's 6502-based Challenger 1P:
diff --git a/pubs/pc/programming/README.md b/pubs/pc/programming/README.md
index 29d234dd8..4be7d3a98 100644
--- a/pubs/pc/programming/README.md
+++ b/pubs/pc/programming/README.md
@@ -9,7 +9,6 @@ PC Programming Guides
* [The 8086 Book](http://archive.pcjs.org/pubs/pc/programming/The_8086_Book/The_8086_Book.pdf)
* [Graphics for the IBM PC](Graphics_for_the_IBM_PC/)
-* [OS/2 Programming Guides](/pubs/pc/programming/os2/)
[
](http://archive.pcjs.org/pubs/pc/programming/The_8086_Book/The_8086_Book.pdf)
[
](Graphics_for_the_IBM_PC/)
diff --git a/pubs/pc/software/README.md b/pubs/pc/software/README.md
index b2cb66c5e..e62839788 100644
--- a/pubs/pc/software/README.md
+++ b/pubs/pc/software/README.md
@@ -1,6 +1,6 @@
---
layout: page
-title: PC Software User Guides
+title: PC Software Guides
permalink: /pubs/pc/software/
---
@@ -10,5 +10,10 @@ PC Software User Guides
* [IBM PC Disk Operating System v1.00](dos/PCDOS100/)
* [IBM PC Disk Operating System v1.10](dos/PCDOS110/)
+PC Software Development Guides
+---
+
+* [OS/2 Software Development Guides](os2/)
+
[
](dos/PCDOS100/)
[
](dos/PCDOS110/)
diff --git a/pubs/pc/programming/os2/README.md b/pubs/pc/software/os2/README.md
similarity index 60%
rename from pubs/pc/programming/os2/README.md
rename to pubs/pc/software/os2/README.md
index 332d37927..e2f2a4560 100644
--- a/pubs/pc/programming/os2/README.md
+++ b/pubs/pc/software/os2/README.md
@@ -1,19 +1,21 @@
---
layout: page
title: "OS/2 Programming Guides"
-permalink: /pubs/pc/programming/os2/
+permalink: /pubs/pc/software/os2/
+redirect_from:
+ - /pubs/pc/programming/os2/
---
-OS/2 Programming Guides
+OS/2 Software Development Guides
---
For OS/2 1.0:
-* [Microsoft® Operating System/2 Programmer’s Toolkit](/pubs/pc/programming/os2/microsoft/ptk/1.0/), March 1988
+* [Microsoft® Operating System/2 Programmer’s Toolkit](/pubs/pc/software/os2/microsoft/ptk10/), March 1988
Note: the above guides are a work-in-progress (we're converting the PDFs to Markdown).
-OS/2 SDKs
+OS/2 Software Development Kit (SDK) Disks
---
* [Microsoft OS/2 SDK 1.02](/disks/pc/tools/microsoft/os2/sdk/1.02/)
diff --git a/pubs/pc/programming/os2/microsoft/ptk/1.0/README.md b/pubs/pc/software/os2/microsoft/ptk10/README.md
similarity index 90%
rename from pubs/pc/programming/os2/microsoft/ptk/1.0/README.md
rename to pubs/pc/software/os2/microsoft/ptk10/README.md
index abea434ea..d42a05946 100644
--- a/pubs/pc/programming/os2/microsoft/ptk/1.0/README.md
+++ b/pubs/pc/software/os2/microsoft/ptk10/README.md
@@ -1,7 +1,9 @@
---
layout: page
title: "Microsoft OS/2 Programmer's Toolkit: Welcome"
-permalink: /pubs/pc/programming/os2/microsoft/ptk/1.0/
+permalink: /pubs/pc/software/os2/microsoft/ptk10/
+redirect_from:
+ - /pubs/pc/programming/os2/microsoft/ptk/1.0/
---
Welcome
@@ -19,7 +21,7 @@ MS OS/2 Programmer's Toolkit:
+ *Microsoft Operating System/2 Programming Tools* describes the programming tools found in the MS OS/2 Programmer's
Toolkit. You can use these tools to develop OS/2 programs.
-+ *[Microsoft Operating System/2 Programmer's Learning Guide](/pubs/pc/programming/os2/microsoft/ptk/1.0/plguide/)* teaches you the
++ *[Microsoft Operating System/2 Programmer's Learning Guide](/pubs/pc/software/os2/microsoft/ptk10/plguide/)* teaches you the
fundamentals of programming for MS OS/2. You will be led through the steps necessary to create your first MS OS/2
program and dynamic-link library.
diff --git a/pubs/pc/programming/os2/microsoft/ptk/1.0/plguide/README.md b/pubs/pc/software/os2/microsoft/ptk10/plguide/README.md
similarity index 80%
rename from pubs/pc/programming/os2/microsoft/ptk/1.0/plguide/README.md
rename to pubs/pc/software/os2/microsoft/ptk10/plguide/README.md
index 43ad1f8ef..b6380323c 100644
--- a/pubs/pc/programming/os2/microsoft/ptk/1.0/plguide/README.md
+++ b/pubs/pc/software/os2/microsoft/ptk10/plguide/README.md
@@ -1,7 +1,9 @@
---
layout: page
title: "Microsoft OS/2 Programmer's Learning Guide"
-permalink: /pubs/pc/programming/os2/microsoft/ptk/1.0/plguide/
+permalink: /pubs/pc/software/os2/microsoft/ptk10/plguide/
+redirect_from:
+ - /pubs/pc/programming/os2/microsoft/ptk/1.0/plguide/
---
Programmer's Toolkit
@@ -15,13 +17,13 @@ Version 1.0
### Contents
-* 1.0 [Introduction](/pubs/pc/programming/os2/microsoft/ptk/1.0/plguide/chapter1/)
- * 1.1 [Overview](/pubs/pc/programming/os2/microsoft/ptk/1.0/plguide/chapter1/#overview)
- * 1.2 [What You Need to Start](/pubs/pc/programming/os2/microsoft/ptk/1.0/plguide/chapter1/#what-you-need-to-start)
- * 1.3 [What This Guide Covers](/pubs/pc/programming/os2/microsoft/ptk/1.0/plguide/chapter1/#what-this-guide-covers)
- * 1.4 [The Lqh Sample Program](/pubs/pc/programming/os2/microsoft/ptk/1.0/plguide/chapter1/#the-lqh-sample-program)
- * 1.5 [MS OS/2 Sample Programs](/pubs/pc/programming/os2/microsoft/ptk/1.0/plguide/chapter1/#ms-os2-sample-programs)
- * 1.6 [MS OS/2 and the C Run-time Library](/pubs/pc/programming/os2/microsoft/ptk/1.0/plguide/chapter1/#ms-os2-and-the-c-run-time-library)
+* 1.0 [Introduction](/pubs/pc/software/os2/microsoft/ptk10/plguide/chapter1/)
+ * 1.1 [Overview](/pubs/pc/software/os2/microsoft/ptk10/plguide/chapter1/#overview)
+ * 1.2 [What You Need to Start](/pubs/pc/software/os2/microsoft/ptk10/plguide/chapter1/#what-you-need-to-start)
+ * 1.3 [What This Guide Covers](/pubs/pc/software/os2/microsoft/ptk10/plguide/chapter1/#what-this-guide-covers)
+ * 1.4 [The Lqh Sample Program](/pubs/pc/software/os2/microsoft/ptk10/plguide/chapter1/#the-lqh-sample-program)
+ * 1.5 [MS OS/2 Sample Programs](/pubs/pc/software/os2/microsoft/ptk10/plguide/chapter1/#ms-os2-sample-programs)
+ * 1.6 [MS OS/2 and the C Run-time Library](/pubs/pc/software/os2/microsoft/ptk10/plguide/chapter1/#ms-os2-and-the-c-run-time-library)
* 2.0 Overview
* 2.1 Introduction
* 2.2 Creating an MS OS/2 Program
diff --git a/pubs/pc/programming/os2/microsoft/ptk/1.0/plguide/chapter1/README.md b/pubs/pc/software/os2/microsoft/ptk10/plguide/chapter1/README.md
similarity index 98%
rename from pubs/pc/programming/os2/microsoft/ptk/1.0/plguide/chapter1/README.md
rename to pubs/pc/software/os2/microsoft/ptk10/plguide/chapter1/README.md
index e0813b2c2..10058d692 100644
--- a/pubs/pc/programming/os2/microsoft/ptk/1.0/plguide/chapter1/README.md
+++ b/pubs/pc/software/os2/microsoft/ptk10/plguide/chapter1/README.md
@@ -1,7 +1,9 @@
---
layout: page
title: "Microsoft OS/2 Programmer's Learning Guide: Introduction"
-permalink: /pubs/pc/programming/os2/microsoft/ptk/1.0/plguide/chapter1/
+permalink: /pubs/pc/software/os2/microsoft/ptk10/plguide/chapter1/
+redirect_from:
+ - /pubs/pc/programming/os2/microsoft/ptk/1.0/plguide/chapter1/
---
Microsoft OS/2 Programmer's Learning Guide
diff --git a/pubs/pc/software/os2/sdk10/manifest.xml b/pubs/pc/software/os2/microsoft/sdk10/manifest.xml
similarity index 100%
rename from pubs/pc/software/os2/sdk10/manifest.xml
rename to pubs/pc/software/os2/microsoft/sdk10/manifest.xml