Rearrange types