The two parser are now merged. Also modified the ast's roots (added a parsetree to improve the uniformity). Improved the toplevel capabilities, now can parse rules and terms alike (we still should add a keyword such as "reduce" for terms). I'm aware of the inconsistencies in the new ast(s), I'll try redesign it later (open for suggestions).