Updates Tokenizer to use Token class
Updates Parser to use Token