Update and rename matcher.cc to matcher.cpp