Moved `Image` to its own file.
Merge pull request #380 from bvssvni/master

Moved `Image` to its own file.