Rewrote grammar and lex files, added list of concrete classes