Sorted parser productions
Merge pull request #18 from Markush2010/restructure-productions

Sorted parser productions