updated class diagrams and grouped classes into modules