Rearrange in preparation for repo rename