FolderEntry refactors