Moved stuff in the class diagram.