some architecture corrections + PlantUML class diagrams