Updated Grammar and Relation Files

Updated Grammar and Relation files to reflect recent changes. Left
formatting of said files as they were, but changed class names to
reflect style requirements.