Rearranging controllers