Update and rename matcher.hh to matcher.hpp