Reorganize images

#81