Start work on breaking up monolithic Reader and Writer classes into dedicated subclasses to make maintenance work easier