Update and rename image.hh to image.hpp