update and change project structure