More refactoring and new modules.