Added refactored solr files