Update feature: Removed organize_by_mime_type. Added checks for
different types of ogranizations