Move matcher module into the utils package