Moved object matcher into its own class, moved pattern to inline pattern.h