Moving more classes, renaming things cleaning up how we deal with Events.