Restructered entire project