Management reshuffled: Viv Richards to mentor Pakistan till WT20