Added UML project and changed layout