Rearrange internals