reorganized the class diagram