Rearrange for easier packaging.