Update and rename geometry.hh to geometry.hpp