update of UML diagrams
various structural improvements