Reorganize assignments