Renamed some things, a bit of work on the core classes diagram [incomplete]