Module refactoring.