Moved around some classes in the class diagram to make it less
cluttered, and easier to read.