Re-organize modules.