more shuffling of files

almost done with reorganizing this directory.  There are two files left
over that I don't know where they go.