Change project design and structure