Updated Project structure & UML