Renaming reader class to parser class