move package
starting to work on the matcher/output code and extended the grammar to be closer to the second suggestion