Expanded parser.jison into two different files