Reorganized UML and removed classes not present in code.