Folder changes

Removed a few redundant folders