Change double quotes to single
Move Match and utils to src/core