Directory renaming.

Figured it was a better idea to un-indent some folders.