.gitignore now reflects the current folder organization