Major cleanup and reorg.  Hopefully for the better