Moved grammar file to a better place with a better name