Group token text and type in new class token
Refactor tokenizer in fashion of an iterator of tokens