Better visibility
Moved tokenizer to a different file