Don’t create directories in “dry run” mode
Fix command-line argument parsing
Make MetadataStore concept more generic