rearrangement of class diagram