Cleaned Ugly UML

Added a bit more structure to the UML.