rearrange dependencies