separated lexer and parser rules
update lexer rules, changed TEXT lex
Split into two lexer/parsers and updated them