Folder cleanup for version 8 release