Reorganize image helper classes.
Add previous and  new image classes.