Rearchitect project layout