Updated UML

Redundant package diagrams moved.
Class diagram updated.