Changing around cup and lex files a bit to prepare for implementing grammar