Architecture reorganization
UML Update