Module refactoring done.