Change structure to add Solr
Add solr connector