Refactoring module def.