added makefile, recognition context is trimmed, imported shorter grammar (less noise)
added contents of import to repo (the checked in client should be operatinal)