Removed Keyword.java and added matching rules in TokenClass.java.