Fixed a few more checkstyle issues.
Allow moving photo pairs back to the input folder
Get rid of duplicate complaint from checkstyle