Updated folder names

For the sake of uniformity.