Restructuring the project