Reorganized all of the source files into a directory structure, and
modified the Makefile to account for this. About to try making clean and
rebuilding. Note that I also removed some possibly-spurious includes,
which may break things.

-Peter Mawhorter