Move the Diagnostic Handler up a level out of the parser
Rename 'Diagnostic' to 'Diagnostics' in Parser