rename and reorg a bit