Major restructuring of project layout