Handle the case where both the old and new Pictures or Videos directory exist.
This fixes #193 (closed).