Reorganize, update class diagram