Reorgnize contrib modules.