Reorg some things.  Set up some classes.
Moved files