Added fix for generated grammar to work with double quotes
Build rules split to support in development fixes in x and y files