Total restructure of project, need to make functional