Screenshots: store in directories

This allows you to store the baseline and per-run screenshots in
different directories, particularly handy if you're doing something like
storing the baselines in some sort of management system.

Long-term it will make sense to start timestamping runs for historical
archives