restructured whole project