Move the EBNF
Remove everything for now
Add factor-regex and mathop-regex