rearrange packages a bit