Restructure and merge .gitignore files