Refactor project layout so it will deploy more easily.