Updated the complete reader package to use the new Reader struct
Updated the tests to use the new Reader struct