removed solr test instance and rearranged files