Fix folder name with (Git-unite tool https://github.com/tawman/git-unite)