Update class diagram

Add associations, and remove unnecessary classes from the diagram