Minor updates to .gitignore and structure