move images to subdir
fix merge conflict