refactor: consolidate diagnostics
funcs into single file
#416
+60
−45
diagnostics
funcs into single file
#416