rearanged class diagram to better display class association