Fix image, merge folders