Extract Tokenizer from Parser
Move helper classes out of parser