Reorganized solr build to be self-contained