Restructured and added new needs of project