CMS-4753 Move image code into own module.