Make grammar(s) more concise

• rethink grammar in light of upcoming changes
  • merge of different types for endpoints, "composition over inheritance"
• rethink necessicity of intermediate grammar (MRagConnect)