FolderType support. Updates in naming of files.