Reorganized class diagram