Lots of cleanup: Refactoring + added commandline options

* Same commandline arg processing for both scripts.
* Output diffs and screenshots to sane default dirs.