Refactor DCC modules.