Update UML diagrams & site
Fix some Sonar issues