tokens are now a class with an enum in nested package