Rearrange for deployment