refactoring (modules)