diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..aff4fdb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+\#*
+*~
+*.bak
+*.o
diff --git a/README.md b/README.md
index d427c88..20baf48 100644
--- a/README.md
+++ b/README.md
@@ -1,66 +1,79 @@
-simh support/migration tools.
+#simh support/migration tools.
+
+The tools are organized into categories, each of which has a subdirectory.
+
+For consistency, each tool has its own subdirectory, even if it only contains a single file.
+(READMEs for tools without them are welcome)
+
+
+## Configuration support
+
+Tools to assist with configuring a simulator.
+
+Directory | Contents
+---- | ----
+config11 | Calculate the floating address space layout of a PDP-11 or VAX.
+
+## Converters
+
+Tools that convert/support simulator data file formats
+
+Directory | Contents
+---- | ----
+asc | Convert ASCII file line endings
+decsys | Convert decimal listing file to a DECtape file
+dtos8cvt | Convert a PDP-8 DECtape image from OS/8 format to simulator format.
+gt7cvt | Convert a gt7 magtape dump to a SIMH magtape
+hpconvert | Convert an HP disc image between SIMH and HPDrive formats
+indent | Convert simulator sources to 4-column tabs
+littcvt | Remove density maker from litt format tapes
+m8376 | Assembles 8 PROM files into a 32bit binary file
+mt2tpc | Convert a simh simulated magtape to TPC format
+mtcvtfix | Fix a SIMH magtape containing a misread EOF
+mtcvtodd | Convert an E11 magtape (with odd record sizes) to SIMH
+mtcvtv23 | Convert a tape image in .TPC format to SIMH (.tap)
+noff | Remove <ff> (formfeed, \f) from a source listing
+sfmtcvt | Convert a Motorola S format PROM dump to a binary file
+strrem | Remove a string from each line of a file
+strsub | Substitute a string in each line of a file
+tar2mt | Convert a tar file to a simulated 8192B blocked magtape
+tp512cvt | Convert a tp data file to a simulated 512B blocked magtape
+tpc2mt | Convert a TPC simulated magtape to simh format
+
+## Cross-assemblers
+
+Cross-assemblers for various machine architectures
+
+Directory | Contents
+---- | ----
+hpasm | Assembler for the HP2100
+macro1 | Assembler for the PDP-1
+macro7 | Assembler for the PDP-7
+macro8x | Assembler for the PDP-8
+macro11 | Assembler for the PDP-11
+
+## Extracters
+
+Data extraction tools
+
+Except as noted, all read SIMH tape container format.
+
+Directory | Contents
+---- | ----
+backup | Extract files from a TOPS-10 backup tape 
+ckabstape | Disassemble 18-bit binary paper tape
+mmdir | List directory of Interdata MDM tape
+mtdump | Dump the record structure of a SIMH, E11, TPC, or P7B
+ods2 | Directory, Copy & Search commands for VMS ODS2 disk images
+rawcopy | Create SIMH disk image from physical media on RAW device.
+sdsdump | Disassemble SDS SDS paper tape
+tpdump | Dump files on IBM 1401 tape
+
+## File systems
+
+Provide access to a foreign files system from a host machine.
+
+Directory | Contents
+---- | ----
+putr | Read (and write some) DEC filesystems from PCs
 
-ods2_readme.txt
-config11				- a program for calculating the floating address space layout of a PDP-11 or VAX.
-config11\config11.c
-config11\config11.txt
-converters				- tools to convert/support simulator data files formats
-converters\asc.c
-converters\asc.txt
-converters\dtos8cvt.c
-converters\dtos8cvt.txt
-converters\gt7cvt.c
-converters\littcvt.c
-converters\mtcvtfix.c
-converters\mtcvtodd.c
-converters\mtcvtv23.c
-converters\mtcvtv23.txt
-converters\mt2tpc.c
-converters\sfmtcvt.c
-converters\tar2mt.c
-converters\tar2mt.txt
-converters\tp512cvt.c
-converters\tpc2mt.c
-crossassemblers				- cross assemblers for various machine architectures
-crossassemblers\macro1.c
-crossassemblers\macro11
-crossassemblers\macro7.c
-crossassemblers\macro8x.c
-crossassemblers\macro11\changes
-crossassemblers\macro11\depends
-crossassemblers\macro11\dumpobj.c
-crossassemblers\macro11\dumpobj.dsp
-crossassemblers\macro11\license
-crossassemblers\macro11\macro11.c
-crossassemblers\macro11\macro11.dsp
-crossassemblers\macro11\macro11.dsw
-crossassemblers\macro11\macro11.h
-crossassemblers\macro11\makefile
-crossassemblers\macro11\mlb.c
-crossassemblers\macro11\mlb.h
-crossassemblers\macro11\object.c
-crossassemblers\macro11\object.h
-crossassemblers\macro11\rad50.c
-crossassemblers\macro11\rad50.h
-crossassemblers\macro11\stream2.c
-crossassemblers\macro11\stream2.h
-crossassemblers\macro11\todo
-crossassemblers\macro11\util.c
-crossassemblers\macro11\util.h
-extracters					- data extraction tools
-extracters\backup
-extracters\ckabstape.c
-extracters\mmdir.c
-extracters\mtdump.c
-extracters\mtdump.txt
-extracters\rawcopy
-extracters\sdsdump.c
-extracters\backup\backup.c
-extracters\backup\backup.h
-extracters\backup\backup.txt
-extracters\rawcopy\RawCopy.c
-extracters\rawcopy\RawCopy.txt
-putr
-putr\putr.com
-putr\putr.txt
-putr\readme.txt
diff --git a/converters/asc.c b/converters/asc/asc.c
similarity index 100%
rename from converters/asc.c
rename to converters/asc/asc.c
diff --git a/converters/asc.txt b/converters/asc/asc.txt
similarity index 100%
rename from converters/asc.txt
rename to converters/asc/asc.txt
diff --git a/converters/decsys.c b/converters/decsys/decsys.c
similarity index 100%
rename from converters/decsys.c
rename to converters/decsys/decsys.c
diff --git a/converters/dtos8cvt.c b/converters/dtos8cvt/dtos8cvt.c
similarity index 100%
rename from converters/dtos8cvt.c
rename to converters/dtos8cvt/dtos8cvt.c
diff --git a/converters/dtos8cvt.txt b/converters/dtos8cvt/dtos8cvt.txt
similarity index 100%
rename from converters/dtos8cvt.txt
rename to converters/dtos8cvt/dtos8cvt.txt
diff --git a/converters/gt7cvt.c b/converters/gt7cvt/gt7cvt.c
similarity index 100%
rename from converters/gt7cvt.c
rename to converters/gt7cvt/gt7cvt.c
diff --git a/converters/hpconvert.c b/converters/hpconvert/hpconvert.c
similarity index 100%
rename from converters/hpconvert.c
rename to converters/hpconvert/hpconvert.c
diff --git a/converters/indent.c b/converters/indent/indent.c
similarity index 100%
rename from converters/indent.c
rename to converters/indent/indent.c
diff --git a/converters/littcvt.c b/converters/littcvt/littcvt.c
similarity index 100%
rename from converters/littcvt.c
rename to converters/littcvt/littcvt.c
diff --git a/converters/m8376.c b/converters/m8376/m8376.c
similarity index 100%
rename from converters/m8376.c
rename to converters/m8376/m8376.c
diff --git a/converters/mt2tpc.c b/converters/mt2tpc/mt2tpc.c
similarity index 100%
rename from converters/mt2tpc.c
rename to converters/mt2tpc/mt2tpc.c
diff --git a/converters/mtcvtv23.c b/converters/mtcvt23/mtcvtv23.c
similarity index 100%
rename from converters/mtcvtv23.c
rename to converters/mtcvt23/mtcvtv23.c
diff --git a/converters/mtcvtv23.txt b/converters/mtcvt23/mtcvtv23.txt
similarity index 100%
rename from converters/mtcvtv23.txt
rename to converters/mtcvt23/mtcvtv23.txt
diff --git a/converters/mtcvtfix.c b/converters/mtcvtfix/mtcvtfix.c
similarity index 100%
rename from converters/mtcvtfix.c
rename to converters/mtcvtfix/mtcvtfix.c
diff --git a/converters/mtcvtodd.c b/converters/mtcvtodd/mtcvtodd.c
similarity index 100%
rename from converters/mtcvtodd.c
rename to converters/mtcvtodd/mtcvtodd.c
diff --git a/converters/noff.c b/converters/noff/noff.c
similarity index 100%
rename from converters/noff.c
rename to converters/noff/noff.c
diff --git a/converters/sfmtcvt.c b/converters/sfmtcvt/sfmtcvt.c
similarity index 100%
rename from converters/sfmtcvt.c
rename to converters/sfmtcvt/sfmtcvt.c
diff --git a/converters/strrem.c b/converters/strrem/strrem.c
similarity index 100%
rename from converters/strrem.c
rename to converters/strrem/strrem.c
diff --git a/converters/strsub.c b/converters/strsub/strsub.c
similarity index 100%
rename from converters/strsub.c
rename to converters/strsub/strsub.c
diff --git a/converters/tar2mt.c b/converters/tar2mt/tar2mt.c
similarity index 100%
rename from converters/tar2mt.c
rename to converters/tar2mt/tar2mt.c
diff --git a/converters/tar2mt.txt b/converters/tar2mt/tar2mt.txt
similarity index 100%
rename from converters/tar2mt.txt
rename to converters/tar2mt/tar2mt.txt
diff --git a/converters/tp512cvt.c b/converters/tp512cvt/tp512cvt.c
similarity index 100%
rename from converters/tp512cvt.c
rename to converters/tp512cvt/tp512cvt.c
diff --git a/converters/tpc2mt.c b/converters/tpc2mt/tpc2mt.c
similarity index 100%
rename from converters/tpc2mt.c
rename to converters/tpc2mt/tpc2mt.c
diff --git a/crossassemblers/hpasm.c b/crossassemblers/hpasm/hpasm.c
similarity index 100%
rename from crossassemblers/hpasm.c
rename to crossassemblers/hpasm/hpasm.c
diff --git a/crossassemblers/macro1.c b/crossassemblers/macro1/macro1.c
similarity index 100%
rename from crossassemblers/macro1.c
rename to crossassemblers/macro1/macro1.c
diff --git a/crossassemblers/macro7.c b/crossassemblers/macro7/macro7.c
similarity index 100%
rename from crossassemblers/macro7.c
rename to crossassemblers/macro7/macro7.c
diff --git a/crossassemblers/macro8x.c b/crossassemblers/macro8x/macro8x.c
similarity index 100%
rename from crossassemblers/macro8x.c
rename to crossassemblers/macro8x/macro8x.c
diff --git a/extracters/ckabstape.c b/extracters/ckabstape/ckabstape.c
similarity index 100%
rename from extracters/ckabstape.c
rename to extracters/ckabstape/ckabstape.c
diff --git a/extracters/mmdir.c b/extracters/mmdir/mmdir.c
similarity index 100%
rename from extracters/mmdir.c
rename to extracters/mmdir/mmdir.c
diff --git a/extracters/mtdump.c b/extracters/mtdump/mtdump.c
similarity index 100%
rename from extracters/mtdump.c
rename to extracters/mtdump/mtdump.c
diff --git a/extracters/mtdump.txt b/extracters/mtdump/mtdump.txt
similarity index 100%
rename from extracters/mtdump.txt
rename to extracters/mtdump/mtdump.txt
diff --git a/ods2_readme.txt b/extracters/ods2/ods2_readme.txt
similarity index 100%
rename from ods2_readme.txt
rename to extracters/ods2/ods2_readme.txt
diff --git a/extracters/sdsdump.c b/extracters/sdsdump/sdsdump.c
similarity index 100%
rename from extracters/sdsdump.c
rename to extracters/sdsdump/sdsdump.c
diff --git a/extracters/tpdump.c b/extracters/tpdump/tpdump.c
similarity index 100%
rename from extracters/tpdump.c
rename to extracters/tpdump/tpdump.c