merge update and renamed grammar package to model package

cf4g09 and sa10g10