Reorg and fixed the project files