Update project structure
Update .gitignore