Rearrange some stuff.