undeprecate Folder2 use