Move some more image classes to image package