Adds proper sections to grammar and default config
Also removes mt_output, will be rewritten