PR: Reorganize images

See #81 for details