Update .gitignore
Update folder structure