Refactor grammar check

This branch is for merging grammar checking phase with type-checking phase. The easiest way to review this PR is by commit that start with "Move grammar checking: ..." as each one will be the complete move of a node type 
only do this if the first grammar check returned false.