Changed order of Makefile and renamed statement to expression in grammar