Fix folder capitalization issues

Ran git-unite (thank you Todd A. Wood!) to fix problems with folder
capitalization