Moved Stuff / Added UML diagram