Reorganize the image selector files, in particular the image service.