solr refactor initial commit