Project file reorg