More module refactoring.