Renamed all instances of ECFG/ecfg to Grammar/grammar.