refactoring Solr client classes, work in progress