Upgrad grammar to ANTLR 4, Implimented Folding,