Folder and Import Support Merged