Project folder structure reorg