Project Rename and folder reorg.