Folder cleanup

Folder cleanup