Total reorganization so that I can finally find stuff where it makes sen...

...se.  I'm up for a revert if you don't agree.  I'm just trying to be consistent.