Refactor - simple reorg of projects to fit standard layout