Remove "solr/"; move "solr_maven/" to "solr/"