Rename Match to Line, NoMatch to RawLine and DidMatch to MatchedLine

More refactoring so that it's clear what each component is doing