Remove Paramter
Removed Buffered reader parameter from the reader classes. Made it a
global variable
Rename Class
Renamed a couple classes to match the naming conventions