Refactoring of the modules