Initial work on cleaning up image code in preparation for further refactoring
Refactor image parsing to data and parsing classes.
Add forgotten file.