refactored directory tree for solr