Changed the structure of the modules