Restructing the project