Rename all the folders appropriately

Rename all the things