renaming folders, simplifying gitignore file