Mamata rejigs Cabinet; Amit Mitra retained as advisor