Everything in the right place

Functions are in the right place to be object oriented properly, but
they are not changed to work correctly yet. There is a lot of work to
do with the image class.