Moved around some more files.  Also created orphans directory for things that don't really have a new home.  Getting there!