Rename and reorg.