Renaming ReaderState to TokenBuilder and moving it outside of the reader package.