Refactor modules
Refactoring