Move image files location and fix path to image fiels