Refactor project
Update new project