Kevin's Commit

UML is under /src folder