Normalise header comments
Move regex matchers to their own file