Rearrange for pip packaging