Added @@ - directory with tags in filenames for easier sorting and
tagging, fixed renaming of "full-form" filenames.