Fixing imports on benchmark scripts.  Also added new upload script that works for ES.