Folder name fixes and .gitignore additions.