added archive_basename
typo
fixed huge slowdown in organize_dir