improvements to project layout