Change some folder names

Fiddling around with stuff