new project structure
update .gitignore
merge conflict