Project restructuring (again)