Separate files for reader classes
Clean up
Cleanup