Makes Tokenizer instantiable
Updates Parser to use new Tokenizer class