Refactored the modules and classes from the first session