.gitignore now reflects the folder organization after refactoring