Rearrange controllers