Merge "Move SaveImage-, DeleteImage- to separate files"