Some reorganization and cleanup.  Adding an events object to keep track of eventy things.