Changed the structure of the modules. Added new naming convension