Moved grammar to files