Update to modules

Updated the modules and its controllers.
See Issue #6