Reorganized grammars to be more heady and academic
Merge pull request #7 from jbauschatz/master

Reorganized grammars to be more heady and academic