Restructured the complete project