folder structure reorg to pull in other projects into the same repo