partial refactoring of modules