Initial commit with rudimentary image conversion classes.
Fixed merge conflicts.