Allows screenshots/diffs directory to be properly targeted
Refactors screenshots to be more flexible