Changed folder names

Renamed folders to be in sync with the master branch