Rearrange things in preparation of more changes