Rearrange deps