Added a few more modules and made the structure more clear.
Added a fix for the new structure of modules.