Split concepts of Token and TokenType