Moving SaveImageQuery and Image to their own files.