Restructured whole project