Remove commented out code
Add support for movies with a "sidecar"-photo that contains the metadata of the movie and, usually, a thumbnail.
Simplify MovieWithMedatada by using existing methods for renaming.