Grunt for PEG
Make generated structure closer to original

Account for CALC expressions

Add watch task