Commit Before GUI reorganization
Renamed a few classes to simplify things.  Still working on GUI
standardization