Update for project layout changes