Moving TokenStream to it's own class