Rename xml_handler2.hpp to xml_handler.hpp