Made changes to the modules, and changed the class diagram