Fix .gitignore and update folder names
normalize settings