Update to project layout