Refactors all modules to avoid duplicity between modules