fix, rename and reorg