Re-design structure of project