Update folder structure and gitignore