diff --git a/SOLR-README.txt b/SOLR-README.txt
deleted file mode 100644
index 6404f2c..0000000
--- a/SOLR-README.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-Default Solr Home Directory
-=============================
-
-This directory is the default Solr home directory which holds
-configuration files and Solr indexes (called cores).
-
-
-Basic Directory Structure
--------------------------
-
-The Solr Home directory typically contains the following...
-
-* solr.xml *
-
-This is the primary configuration file Solr looks for when starting;
-it specifies high-level configuration options that apply to all
-of your Solr cores, such as cluster-wide SolrCloud settings like
-the ZooKeeper client timeout.
-
-In addition, you can also declare Solr cores in this file, however
-it is recommended to just use automatic core discovery instead of
-listing cores in solr.xml.
-
-If no solr.xml file is found, then Solr assumes that there should be
-a single SolrCore named "collection1" and that the "Instance Directory"
-for collection1 should be the same as the Solr Home Directory.
-
-For more information about solr.xml, please see:
-https://lucene.apache.org/solr/guide/solr-cores-and-solr-xml.html
-
-* Individual SolrCore Instance Directories *
-
-Although solr.xml can be configured to look for SolrCore Instance Directories
-in any path, simple sub-directories of the Solr Home Dir using relative paths
-are common for many installations.
-
-* Core Discovery *
-
-During startup, Solr will scan sub-directories of Solr home looking for
-a specific file named core.properties. If core.properties is found in a
-sub-directory (at any depth), Solr will initialize a core using the properties
-defined in core.properties. For an example of core.properties, please see:
-
-example/solr/collection1/core.properties
-
-For more information about core discovery, please see:
-https://lucene.apache.org/solr/guide/defining-core-properties.html
-
-* A Shared 'lib' Directory *
-
-Although solr.xml can be configured with an optional "sharedLib" attribute
-that can point to any path, it is common to use a "./lib" sub-directory of the
-Solr Home Directory.
-
-* ZooKeeper Files *
-
-When using SolrCloud using the embedded ZooKeeper option for Solr, it is
-common to have a "zoo.cfg" file and "zoo_data" directories in the Solr Home
-Directory. Please see the SolrCloud documentation for more details.
-
-https://lucene.apache.org/solr/guide/solrcloud.html
diff --git a/materio_autocomplete/core.properties b/materio_autocomplete/core.properties
deleted file mode 100644
index dbb7504..0000000
--- a/materio_autocomplete/core.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Written by CorePropertiesLocator
-#Tue Feb 18 14:08:41 UTC 2020
-schema=schema.xml
-dataDir=data
-name=materio_autocomplete
-config=solrconfig.xml
diff --git a/materio/conf/accents_ar.txt b/materio_base/conf/accents_ar.txt
similarity index 100%
rename from materio/conf/accents_ar.txt
rename to materio_base/conf/accents_ar.txt
diff --git a/materio/conf/accents_bg.txt b/materio_base/conf/accents_bg.txt
similarity index 100%
rename from materio/conf/accents_bg.txt
rename to materio_base/conf/accents_bg.txt
diff --git a/materio/conf/accents_ca.txt b/materio_base/conf/accents_ca.txt
similarity index 100%
rename from materio/conf/accents_ca.txt
rename to materio_base/conf/accents_ca.txt
diff --git a/materio/conf/accents_cs.txt b/materio_base/conf/accents_cs.txt
similarity index 100%
rename from materio/conf/accents_cs.txt
rename to materio_base/conf/accents_cs.txt
diff --git a/materio/conf/accents_da.txt b/materio_base/conf/accents_da.txt
similarity index 100%
rename from materio/conf/accents_da.txt
rename to materio_base/conf/accents_da.txt
diff --git a/materio/conf/accents_de.txt b/materio_base/conf/accents_de.txt
similarity index 100%
rename from materio/conf/accents_de.txt
rename to materio_base/conf/accents_de.txt
diff --git a/materio/conf/accents_el.txt b/materio_base/conf/accents_el.txt
similarity index 100%
rename from materio/conf/accents_el.txt
rename to materio_base/conf/accents_el.txt
diff --git a/materio/conf/accents_en.txt b/materio_base/conf/accents_en.txt
similarity index 100%
rename from materio/conf/accents_en.txt
rename to materio_base/conf/accents_en.txt
diff --git a/materio/conf/accents_es.txt b/materio_base/conf/accents_es.txt
similarity index 100%
rename from materio/conf/accents_es.txt
rename to materio_base/conf/accents_es.txt
diff --git a/materio/conf/accents_fa.txt b/materio_base/conf/accents_fa.txt
similarity index 100%
rename from materio/conf/accents_fa.txt
rename to materio_base/conf/accents_fa.txt
diff --git a/materio/conf/accents_fi.txt b/materio_base/conf/accents_fi.txt
similarity index 100%
rename from materio/conf/accents_fi.txt
rename to materio_base/conf/accents_fi.txt
diff --git a/materio/conf/accents_fr.txt b/materio_base/conf/accents_fr.txt
similarity index 100%
rename from materio/conf/accents_fr.txt
rename to materio_base/conf/accents_fr.txt
diff --git a/materio/conf/accents_ga.txt b/materio_base/conf/accents_ga.txt
similarity index 100%
rename from materio/conf/accents_ga.txt
rename to materio_base/conf/accents_ga.txt
diff --git a/materio/conf/accents_hi.txt b/materio_base/conf/accents_hi.txt
similarity index 100%
rename from materio/conf/accents_hi.txt
rename to materio_base/conf/accents_hi.txt
diff --git a/materio/conf/accents_hr.txt b/materio_base/conf/accents_hr.txt
similarity index 100%
rename from materio/conf/accents_hr.txt
rename to materio_base/conf/accents_hr.txt
diff --git a/materio/conf/accents_hu.txt b/materio_base/conf/accents_hu.txt
similarity index 100%
rename from materio/conf/accents_hu.txt
rename to materio_base/conf/accents_hu.txt
diff --git a/materio/conf/accents_id.txt b/materio_base/conf/accents_id.txt
similarity index 100%
rename from materio/conf/accents_id.txt
rename to materio_base/conf/accents_id.txt
diff --git a/materio/conf/accents_it.txt b/materio_base/conf/accents_it.txt
similarity index 100%
rename from materio/conf/accents_it.txt
rename to materio_base/conf/accents_it.txt
diff --git a/materio/conf/accents_lv.txt b/materio_base/conf/accents_lv.txt
similarity index 100%
rename from materio/conf/accents_lv.txt
rename to materio_base/conf/accents_lv.txt
diff --git a/materio/conf/accents_nb.txt b/materio_base/conf/accents_nb.txt
similarity index 100%
rename from materio/conf/accents_nb.txt
rename to materio_base/conf/accents_nb.txt
diff --git a/materio/conf/accents_nl.txt b/materio_base/conf/accents_nl.txt
similarity index 100%
rename from materio/conf/accents_nl.txt
rename to materio_base/conf/accents_nl.txt
diff --git a/materio/conf/accents_nn.txt b/materio_base/conf/accents_nn.txt
similarity index 100%
rename from materio/conf/accents_nn.txt
rename to materio_base/conf/accents_nn.txt
diff --git a/materio/conf/accents_pl.txt b/materio_base/conf/accents_pl.txt
similarity index 100%
rename from materio/conf/accents_pl.txt
rename to materio_base/conf/accents_pl.txt
diff --git a/materio/conf/accents_pt_br.txt b/materio_base/conf/accents_pt_br.txt
similarity index 100%
rename from materio/conf/accents_pt_br.txt
rename to materio_base/conf/accents_pt_br.txt
diff --git a/materio/conf/accents_pt_pt.txt b/materio_base/conf/accents_pt_pt.txt
similarity index 100%
rename from materio/conf/accents_pt_pt.txt
rename to materio_base/conf/accents_pt_pt.txt
diff --git a/materio/conf/accents_ro.txt b/materio_base/conf/accents_ro.txt
similarity index 100%
rename from materio/conf/accents_ro.txt
rename to materio_base/conf/accents_ro.txt
diff --git a/materio/conf/accents_ru.txt b/materio_base/conf/accents_ru.txt
similarity index 100%
rename from materio/conf/accents_ru.txt
rename to materio_base/conf/accents_ru.txt
diff --git a/materio/conf/accents_sk.txt b/materio_base/conf/accents_sk.txt
similarity index 100%
rename from materio/conf/accents_sk.txt
rename to materio_base/conf/accents_sk.txt
diff --git a/materio/conf/accents_sr.txt b/materio_base/conf/accents_sr.txt
similarity index 100%
rename from materio/conf/accents_sr.txt
rename to materio_base/conf/accents_sr.txt
diff --git a/materio/conf/accents_sv.txt b/materio_base/conf/accents_sv.txt
similarity index 100%
rename from materio/conf/accents_sv.txt
rename to materio_base/conf/accents_sv.txt
diff --git a/materio/conf/accents_th.txt b/materio_base/conf/accents_th.txt
similarity index 100%
rename from materio/conf/accents_th.txt
rename to materio_base/conf/accents_th.txt
diff --git a/materio/conf/accents_tr.txt b/materio_base/conf/accents_tr.txt
similarity index 100%
rename from materio/conf/accents_tr.txt
rename to materio_base/conf/accents_tr.txt
diff --git a/materio/conf/accents_uk.txt b/materio_base/conf/accents_uk.txt
similarity index 100%
rename from materio/conf/accents_uk.txt
rename to materio_base/conf/accents_uk.txt
diff --git a/materio/conf/accents_und.txt b/materio_base/conf/accents_und.txt
similarity index 100%
rename from materio/conf/accents_und.txt
rename to materio_base/conf/accents_und.txt
diff --git a/materio/conf/elevate.xml b/materio_base/conf/elevate.xml
similarity index 100%
rename from materio/conf/elevate.xml
rename to materio_base/conf/elevate.xml
diff --git a/materio/conf/nouns_ar.txt b/materio_base/conf/nouns_ar.txt
similarity index 100%
rename from materio/conf/nouns_ar.txt
rename to materio_base/conf/nouns_ar.txt
diff --git a/materio/conf/nouns_bg.txt b/materio_base/conf/nouns_bg.txt
similarity index 100%
rename from materio/conf/nouns_bg.txt
rename to materio_base/conf/nouns_bg.txt
diff --git a/materio/conf/nouns_ca.txt b/materio_base/conf/nouns_ca.txt
similarity index 100%
rename from materio/conf/nouns_ca.txt
rename to materio_base/conf/nouns_ca.txt
diff --git a/materio/conf/nouns_da.txt b/materio_base/conf/nouns_da.txt
similarity index 100%
rename from materio/conf/nouns_da.txt
rename to materio_base/conf/nouns_da.txt
diff --git a/materio/conf/nouns_de.txt b/materio_base/conf/nouns_de.txt
similarity index 100%
rename from materio/conf/nouns_de.txt
rename to materio_base/conf/nouns_de.txt
diff --git a/materio/conf/nouns_el.txt b/materio_base/conf/nouns_el.txt
similarity index 100%
rename from materio/conf/nouns_el.txt
rename to materio_base/conf/nouns_el.txt
diff --git a/materio/conf/nouns_es.txt b/materio_base/conf/nouns_es.txt
similarity index 100%
rename from materio/conf/nouns_es.txt
rename to materio_base/conf/nouns_es.txt
diff --git a/materio/conf/nouns_fa.txt b/materio_base/conf/nouns_fa.txt
similarity index 100%
rename from materio/conf/nouns_fa.txt
rename to materio_base/conf/nouns_fa.txt
diff --git a/materio/conf/nouns_fi.txt b/materio_base/conf/nouns_fi.txt
similarity index 100%
rename from materio/conf/nouns_fi.txt
rename to materio_base/conf/nouns_fi.txt
diff --git a/materio/conf/nouns_fr.txt b/materio_base/conf/nouns_fr.txt
similarity index 100%
rename from materio/conf/nouns_fr.txt
rename to materio_base/conf/nouns_fr.txt
diff --git a/materio/conf/nouns_hi.txt b/materio_base/conf/nouns_hi.txt
similarity index 100%
rename from materio/conf/nouns_hi.txt
rename to materio_base/conf/nouns_hi.txt
diff --git a/materio/conf/nouns_it.txt b/materio_base/conf/nouns_it.txt
similarity index 100%
rename from materio/conf/nouns_it.txt
rename to materio_base/conf/nouns_it.txt
diff --git a/materio/conf/nouns_nb.txt b/materio_base/conf/nouns_nb.txt
similarity index 100%
rename from materio/conf/nouns_nb.txt
rename to materio_base/conf/nouns_nb.txt
diff --git a/materio/conf/nouns_nl.txt b/materio_base/conf/nouns_nl.txt
similarity index 100%
rename from materio/conf/nouns_nl.txt
rename to materio_base/conf/nouns_nl.txt
diff --git a/materio/conf/nouns_nn.txt b/materio_base/conf/nouns_nn.txt
similarity index 100%
rename from materio/conf/nouns_nn.txt
rename to materio_base/conf/nouns_nn.txt
diff --git a/materio/conf/nouns_pl.txt b/materio_base/conf/nouns_pl.txt
similarity index 100%
rename from materio/conf/nouns_pl.txt
rename to materio_base/conf/nouns_pl.txt
diff --git a/materio/conf/nouns_pt_br.txt b/materio_base/conf/nouns_pt_br.txt
similarity index 100%
rename from materio/conf/nouns_pt_br.txt
rename to materio_base/conf/nouns_pt_br.txt
diff --git a/materio/conf/nouns_pt_pt.txt b/materio_base/conf/nouns_pt_pt.txt
similarity index 100%
rename from materio/conf/nouns_pt_pt.txt
rename to materio_base/conf/nouns_pt_pt.txt
diff --git a/materio/conf/nouns_ro.txt b/materio_base/conf/nouns_ro.txt
similarity index 100%
rename from materio/conf/nouns_ro.txt
rename to materio_base/conf/nouns_ro.txt
diff --git a/materio/conf/nouns_ru.txt b/materio_base/conf/nouns_ru.txt
similarity index 100%
rename from materio/conf/nouns_ru.txt
rename to materio_base/conf/nouns_ru.txt
diff --git a/materio/conf/nouns_sv.txt b/materio_base/conf/nouns_sv.txt
similarity index 100%
rename from materio/conf/nouns_sv.txt
rename to materio_base/conf/nouns_sv.txt
diff --git a/materio/conf/nouns_th.txt b/materio_base/conf/nouns_th.txt
similarity index 100%
rename from materio/conf/nouns_th.txt
rename to materio_base/conf/nouns_th.txt
diff --git a/materio/conf/nouns_tr.txt b/materio_base/conf/nouns_tr.txt
similarity index 100%
rename from materio/conf/nouns_tr.txt
rename to materio_base/conf/nouns_tr.txt
diff --git a/materio/conf/nouns_uk.txt b/materio_base/conf/nouns_uk.txt
similarity index 100%
rename from materio/conf/nouns_uk.txt
rename to materio_base/conf/nouns_uk.txt
diff --git a/materio/conf/protwords_ar.txt b/materio_base/conf/protwords_ar.txt
similarity index 100%
rename from materio/conf/protwords_ar.txt
rename to materio_base/conf/protwords_ar.txt
diff --git a/materio/conf/protwords_bg.txt b/materio_base/conf/protwords_bg.txt
similarity index 100%
rename from materio/conf/protwords_bg.txt
rename to materio_base/conf/protwords_bg.txt
diff --git a/materio/conf/protwords_ca.txt b/materio_base/conf/protwords_ca.txt
similarity index 100%
rename from materio/conf/protwords_ca.txt
rename to materio_base/conf/protwords_ca.txt
diff --git a/materio/conf/protwords_cs.txt b/materio_base/conf/protwords_cs.txt
similarity index 100%
rename from materio/conf/protwords_cs.txt
rename to materio_base/conf/protwords_cs.txt
diff --git a/materio/conf/protwords_da.txt b/materio_base/conf/protwords_da.txt
similarity index 100%
rename from materio/conf/protwords_da.txt
rename to materio_base/conf/protwords_da.txt
diff --git a/materio/conf/protwords_de.txt b/materio_base/conf/protwords_de.txt
similarity index 100%
rename from materio/conf/protwords_de.txt
rename to materio_base/conf/protwords_de.txt
diff --git a/materio/conf/protwords_el.txt b/materio_base/conf/protwords_el.txt
similarity index 100%
rename from materio/conf/protwords_el.txt
rename to materio_base/conf/protwords_el.txt
diff --git a/materio/conf/protwords_en.txt b/materio_base/conf/protwords_en.txt
similarity index 100%
rename from materio/conf/protwords_en.txt
rename to materio_base/conf/protwords_en.txt
diff --git a/materio/conf/protwords_es.txt b/materio_base/conf/protwords_es.txt
similarity index 100%
rename from materio/conf/protwords_es.txt
rename to materio_base/conf/protwords_es.txt
diff --git a/materio/conf/protwords_fa.txt b/materio_base/conf/protwords_fa.txt
similarity index 100%
rename from materio/conf/protwords_fa.txt
rename to materio_base/conf/protwords_fa.txt
diff --git a/materio/conf/protwords_fi.txt b/materio_base/conf/protwords_fi.txt
similarity index 100%
rename from materio/conf/protwords_fi.txt
rename to materio_base/conf/protwords_fi.txt
diff --git a/materio/conf/protwords_fr.txt b/materio_base/conf/protwords_fr.txt
similarity index 100%
rename from materio/conf/protwords_fr.txt
rename to materio_base/conf/protwords_fr.txt
diff --git a/materio/conf/protwords_ga.txt b/materio_base/conf/protwords_ga.txt
similarity index 100%
rename from materio/conf/protwords_ga.txt
rename to materio_base/conf/protwords_ga.txt
diff --git a/materio/conf/protwords_hi.txt b/materio_base/conf/protwords_hi.txt
similarity index 100%
rename from materio/conf/protwords_hi.txt
rename to materio_base/conf/protwords_hi.txt
diff --git a/materio/conf/protwords_hr.txt b/materio_base/conf/protwords_hr.txt
similarity index 100%
rename from materio/conf/protwords_hr.txt
rename to materio_base/conf/protwords_hr.txt
diff --git a/materio/conf/protwords_hu.txt b/materio_base/conf/protwords_hu.txt
similarity index 100%
rename from materio/conf/protwords_hu.txt
rename to materio_base/conf/protwords_hu.txt
diff --git a/materio/conf/protwords_id.txt b/materio_base/conf/protwords_id.txt
similarity index 100%
rename from materio/conf/protwords_id.txt
rename to materio_base/conf/protwords_id.txt
diff --git a/materio/conf/protwords_it.txt b/materio_base/conf/protwords_it.txt
similarity index 100%
rename from materio/conf/protwords_it.txt
rename to materio_base/conf/protwords_it.txt
diff --git a/materio/conf/protwords_lv.txt b/materio_base/conf/protwords_lv.txt
similarity index 100%
rename from materio/conf/protwords_lv.txt
rename to materio_base/conf/protwords_lv.txt
diff --git a/materio/conf/protwords_nb.txt b/materio_base/conf/protwords_nb.txt
similarity index 100%
rename from materio/conf/protwords_nb.txt
rename to materio_base/conf/protwords_nb.txt
diff --git a/materio/conf/protwords_nl.txt b/materio_base/conf/protwords_nl.txt
similarity index 100%
rename from materio/conf/protwords_nl.txt
rename to materio_base/conf/protwords_nl.txt
diff --git a/materio/conf/protwords_nn.txt b/materio_base/conf/protwords_nn.txt
similarity index 100%
rename from materio/conf/protwords_nn.txt
rename to materio_base/conf/protwords_nn.txt
diff --git a/materio/conf/protwords_pl.txt b/materio_base/conf/protwords_pl.txt
similarity index 100%
rename from materio/conf/protwords_pl.txt
rename to materio_base/conf/protwords_pl.txt
diff --git a/materio/conf/protwords_pt_br.txt b/materio_base/conf/protwords_pt_br.txt
similarity index 100%
rename from materio/conf/protwords_pt_br.txt
rename to materio_base/conf/protwords_pt_br.txt
diff --git a/materio/conf/protwords_pt_pt.txt b/materio_base/conf/protwords_pt_pt.txt
similarity index 100%
rename from materio/conf/protwords_pt_pt.txt
rename to materio_base/conf/protwords_pt_pt.txt
diff --git a/materio/conf/protwords_ro.txt b/materio_base/conf/protwords_ro.txt
similarity index 100%
rename from materio/conf/protwords_ro.txt
rename to materio_base/conf/protwords_ro.txt
diff --git a/materio/conf/protwords_ru.txt b/materio_base/conf/protwords_ru.txt
similarity index 100%
rename from materio/conf/protwords_ru.txt
rename to materio_base/conf/protwords_ru.txt
diff --git a/materio/conf/protwords_sk.txt b/materio_base/conf/protwords_sk.txt
similarity index 100%
rename from materio/conf/protwords_sk.txt
rename to materio_base/conf/protwords_sk.txt
diff --git a/materio/conf/protwords_sr.txt b/materio_base/conf/protwords_sr.txt
similarity index 100%
rename from materio/conf/protwords_sr.txt
rename to materio_base/conf/protwords_sr.txt
diff --git a/materio/conf/protwords_sv.txt b/materio_base/conf/protwords_sv.txt
similarity index 100%
rename from materio/conf/protwords_sv.txt
rename to materio_base/conf/protwords_sv.txt
diff --git a/materio/conf/protwords_th.txt b/materio_base/conf/protwords_th.txt
similarity index 100%
rename from materio/conf/protwords_th.txt
rename to materio_base/conf/protwords_th.txt
diff --git a/materio/conf/protwords_tr.txt b/materio_base/conf/protwords_tr.txt
similarity index 100%
rename from materio/conf/protwords_tr.txt
rename to materio_base/conf/protwords_tr.txt
diff --git a/materio/conf/protwords_uk.txt b/materio_base/conf/protwords_uk.txt
similarity index 100%
rename from materio/conf/protwords_uk.txt
rename to materio_base/conf/protwords_uk.txt
diff --git a/materio/conf/protwords_und.txt b/materio_base/conf/protwords_und.txt
similarity index 100%
rename from materio/conf/protwords_und.txt
rename to materio_base/conf/protwords_und.txt
diff --git a/materio/conf/schema.xml b/materio_base/conf/schema.xml
similarity index 100%
rename from materio/conf/schema.xml
rename to materio_base/conf/schema.xml
diff --git a/materio/conf/schema_extra_fields.xml b/materio_base/conf/schema_extra_fields.xml
similarity index 100%
rename from materio/conf/schema_extra_fields.xml
rename to materio_base/conf/schema_extra_fields.xml
diff --git a/materio/conf/schema_extra_types.xml b/materio_base/conf/schema_extra_types.xml
similarity index 100%
rename from materio/conf/schema_extra_types.xml
rename to materio_base/conf/schema_extra_types.xml
diff --git a/materio/conf/solrconfig.xml b/materio_base/conf/solrconfig.xml
similarity index 100%
rename from materio/conf/solrconfig.xml
rename to materio_base/conf/solrconfig.xml
diff --git a/materio/conf/solrconfig_extra.xml b/materio_base/conf/solrconfig_extra.xml
similarity index 100%
rename from materio/conf/solrconfig_extra.xml
rename to materio_base/conf/solrconfig_extra.xml
diff --git a/materio/conf/solrconfig_index.xml b/materio_base/conf/solrconfig_index.xml
similarity index 100%
rename from materio/conf/solrconfig_index.xml
rename to materio_base/conf/solrconfig_index.xml
diff --git a/materio/conf/solrconfig_query.xml b/materio_base/conf/solrconfig_query.xml
similarity index 100%
rename from materio/conf/solrconfig_query.xml
rename to materio_base/conf/solrconfig_query.xml
diff --git a/materio/conf/solrconfig_requestdispatcher.xml b/materio_base/conf/solrconfig_requestdispatcher.xml
similarity index 100%
rename from materio/conf/solrconfig_requestdispatcher.xml
rename to materio_base/conf/solrconfig_requestdispatcher.xml
diff --git a/materio/conf/solrcore.properties b/materio_base/conf/solrcore.properties
similarity index 100%
rename from materio/conf/solrcore.properties
rename to materio_base/conf/solrcore.properties
diff --git a/materio/conf/stoptags_ja.txt b/materio_base/conf/stoptags_ja.txt
similarity index 100%
rename from materio/conf/stoptags_ja.txt
rename to materio_base/conf/stoptags_ja.txt
diff --git a/materio/conf/stopwords_ar.txt b/materio_base/conf/stopwords_ar.txt
similarity index 100%
rename from materio/conf/stopwords_ar.txt
rename to materio_base/conf/stopwords_ar.txt
diff --git a/materio/conf/stopwords_bg.txt b/materio_base/conf/stopwords_bg.txt
similarity index 100%
rename from materio/conf/stopwords_bg.txt
rename to materio_base/conf/stopwords_bg.txt
diff --git a/materio/conf/stopwords_ca.txt b/materio_base/conf/stopwords_ca.txt
similarity index 100%
rename from materio/conf/stopwords_ca.txt
rename to materio_base/conf/stopwords_ca.txt
diff --git a/materio/conf/stopwords_cs.txt b/materio_base/conf/stopwords_cs.txt
similarity index 100%
rename from materio/conf/stopwords_cs.txt
rename to materio_base/conf/stopwords_cs.txt
diff --git a/materio/conf/stopwords_da.txt b/materio_base/conf/stopwords_da.txt
similarity index 100%
rename from materio/conf/stopwords_da.txt
rename to materio_base/conf/stopwords_da.txt
diff --git a/materio/conf/stopwords_de.txt b/materio_base/conf/stopwords_de.txt
similarity index 100%
rename from materio/conf/stopwords_de.txt
rename to materio_base/conf/stopwords_de.txt
diff --git a/materio/conf/stopwords_el.txt b/materio_base/conf/stopwords_el.txt
similarity index 100%
rename from materio/conf/stopwords_el.txt
rename to materio_base/conf/stopwords_el.txt
diff --git a/materio/conf/stopwords_en.txt b/materio_base/conf/stopwords_en.txt
similarity index 100%
rename from materio/conf/stopwords_en.txt
rename to materio_base/conf/stopwords_en.txt
diff --git a/materio/conf/stopwords_es.txt b/materio_base/conf/stopwords_es.txt
similarity index 100%
rename from materio/conf/stopwords_es.txt
rename to materio_base/conf/stopwords_es.txt
diff --git a/materio/conf/stopwords_fa.txt b/materio_base/conf/stopwords_fa.txt
similarity index 100%
rename from materio/conf/stopwords_fa.txt
rename to materio_base/conf/stopwords_fa.txt
diff --git a/materio/conf/stopwords_fi.txt b/materio_base/conf/stopwords_fi.txt
similarity index 100%
rename from materio/conf/stopwords_fi.txt
rename to materio_base/conf/stopwords_fi.txt
diff --git a/materio/conf/stopwords_fr.txt b/materio_base/conf/stopwords_fr.txt
similarity index 100%
rename from materio/conf/stopwords_fr.txt
rename to materio_base/conf/stopwords_fr.txt
diff --git a/materio/conf/stopwords_ga.txt b/materio_base/conf/stopwords_ga.txt
similarity index 100%
rename from materio/conf/stopwords_ga.txt
rename to materio_base/conf/stopwords_ga.txt
diff --git a/materio/conf/stopwords_hi.txt b/materio_base/conf/stopwords_hi.txt
similarity index 100%
rename from materio/conf/stopwords_hi.txt
rename to materio_base/conf/stopwords_hi.txt
diff --git a/materio/conf/stopwords_hr.txt b/materio_base/conf/stopwords_hr.txt
similarity index 100%
rename from materio/conf/stopwords_hr.txt
rename to materio_base/conf/stopwords_hr.txt
diff --git a/materio/conf/stopwords_hu.txt b/materio_base/conf/stopwords_hu.txt
similarity index 100%
rename from materio/conf/stopwords_hu.txt
rename to materio_base/conf/stopwords_hu.txt
diff --git a/materio/conf/stopwords_id.txt b/materio_base/conf/stopwords_id.txt
similarity index 100%
rename from materio/conf/stopwords_id.txt
rename to materio_base/conf/stopwords_id.txt
diff --git a/materio/conf/stopwords_it.txt b/materio_base/conf/stopwords_it.txt
similarity index 100%
rename from materio/conf/stopwords_it.txt
rename to materio_base/conf/stopwords_it.txt
diff --git a/materio/conf/stopwords_ja.txt b/materio_base/conf/stopwords_ja.txt
similarity index 100%
rename from materio/conf/stopwords_ja.txt
rename to materio_base/conf/stopwords_ja.txt
diff --git a/materio/conf/stopwords_lv.txt b/materio_base/conf/stopwords_lv.txt
similarity index 100%
rename from materio/conf/stopwords_lv.txt
rename to materio_base/conf/stopwords_lv.txt
diff --git a/materio/conf/stopwords_nb.txt b/materio_base/conf/stopwords_nb.txt
similarity index 100%
rename from materio/conf/stopwords_nb.txt
rename to materio_base/conf/stopwords_nb.txt
diff --git a/materio/conf/stopwords_nl.txt b/materio_base/conf/stopwords_nl.txt
similarity index 100%
rename from materio/conf/stopwords_nl.txt
rename to materio_base/conf/stopwords_nl.txt
diff --git a/materio/conf/stopwords_nn.txt b/materio_base/conf/stopwords_nn.txt
similarity index 100%
rename from materio/conf/stopwords_nn.txt
rename to materio_base/conf/stopwords_nn.txt
diff --git a/materio/conf/stopwords_pl.txt b/materio_base/conf/stopwords_pl.txt
similarity index 100%
rename from materio/conf/stopwords_pl.txt
rename to materio_base/conf/stopwords_pl.txt
diff --git a/materio/conf/stopwords_pt_br.txt b/materio_base/conf/stopwords_pt_br.txt
similarity index 100%
rename from materio/conf/stopwords_pt_br.txt
rename to materio_base/conf/stopwords_pt_br.txt
diff --git a/materio/conf/stopwords_pt_pt.txt b/materio_base/conf/stopwords_pt_pt.txt
similarity index 100%
rename from materio/conf/stopwords_pt_pt.txt
rename to materio_base/conf/stopwords_pt_pt.txt
diff --git a/materio/conf/stopwords_ro.txt b/materio_base/conf/stopwords_ro.txt
similarity index 100%
rename from materio/conf/stopwords_ro.txt
rename to materio_base/conf/stopwords_ro.txt
diff --git a/materio/conf/stopwords_ru.txt b/materio_base/conf/stopwords_ru.txt
similarity index 100%
rename from materio/conf/stopwords_ru.txt
rename to materio_base/conf/stopwords_ru.txt
diff --git a/materio/conf/stopwords_sk.txt b/materio_base/conf/stopwords_sk.txt
similarity index 100%
rename from materio/conf/stopwords_sk.txt
rename to materio_base/conf/stopwords_sk.txt
diff --git a/materio/conf/stopwords_sr.txt b/materio_base/conf/stopwords_sr.txt
similarity index 100%
rename from materio/conf/stopwords_sr.txt
rename to materio_base/conf/stopwords_sr.txt
diff --git a/materio/conf/stopwords_sv.txt b/materio_base/conf/stopwords_sv.txt
similarity index 100%
rename from materio/conf/stopwords_sv.txt
rename to materio_base/conf/stopwords_sv.txt
diff --git a/materio/conf/stopwords_th.txt b/materio_base/conf/stopwords_th.txt
similarity index 100%
rename from materio/conf/stopwords_th.txt
rename to materio_base/conf/stopwords_th.txt
diff --git a/materio/conf/stopwords_tr.txt b/materio_base/conf/stopwords_tr.txt
similarity index 100%
rename from materio/conf/stopwords_tr.txt
rename to materio_base/conf/stopwords_tr.txt
diff --git a/materio/conf/stopwords_uk.txt b/materio_base/conf/stopwords_uk.txt
similarity index 100%
rename from materio/conf/stopwords_uk.txt
rename to materio_base/conf/stopwords_uk.txt
diff --git a/materio/conf/stopwords_und.txt b/materio_base/conf/stopwords_und.txt
similarity index 100%
rename from materio/conf/stopwords_und.txt
rename to materio_base/conf/stopwords_und.txt
diff --git a/materio/conf/synonyms_ar.txt b/materio_base/conf/synonyms_ar.txt
similarity index 100%
rename from materio/conf/synonyms_ar.txt
rename to materio_base/conf/synonyms_ar.txt
diff --git a/materio/conf/synonyms_bg.txt b/materio_base/conf/synonyms_bg.txt
similarity index 100%
rename from materio/conf/synonyms_bg.txt
rename to materio_base/conf/synonyms_bg.txt
diff --git a/materio/conf/synonyms_ca.txt b/materio_base/conf/synonyms_ca.txt
similarity index 100%
rename from materio/conf/synonyms_ca.txt
rename to materio_base/conf/synonyms_ca.txt
diff --git a/materio/conf/synonyms_cs.txt b/materio_base/conf/synonyms_cs.txt
similarity index 100%
rename from materio/conf/synonyms_cs.txt
rename to materio_base/conf/synonyms_cs.txt
diff --git a/materio/conf/synonyms_da.txt b/materio_base/conf/synonyms_da.txt
similarity index 100%
rename from materio/conf/synonyms_da.txt
rename to materio_base/conf/synonyms_da.txt
diff --git a/materio/conf/synonyms_de.txt b/materio_base/conf/synonyms_de.txt
similarity index 100%
rename from materio/conf/synonyms_de.txt
rename to materio_base/conf/synonyms_de.txt
diff --git a/materio/conf/synonyms_el.txt b/materio_base/conf/synonyms_el.txt
similarity index 100%
rename from materio/conf/synonyms_el.txt
rename to materio_base/conf/synonyms_el.txt
diff --git a/materio/conf/synonyms_en.txt b/materio_base/conf/synonyms_en.txt
similarity index 100%
rename from materio/conf/synonyms_en.txt
rename to materio_base/conf/synonyms_en.txt
diff --git a/materio/conf/synonyms_es.txt b/materio_base/conf/synonyms_es.txt
similarity index 100%
rename from materio/conf/synonyms_es.txt
rename to materio_base/conf/synonyms_es.txt
diff --git a/materio/conf/synonyms_fa.txt b/materio_base/conf/synonyms_fa.txt
similarity index 100%
rename from materio/conf/synonyms_fa.txt
rename to materio_base/conf/synonyms_fa.txt
diff --git a/materio/conf/synonyms_fi.txt b/materio_base/conf/synonyms_fi.txt
similarity index 100%
rename from materio/conf/synonyms_fi.txt
rename to materio_base/conf/synonyms_fi.txt
diff --git a/materio/conf/synonyms_fr.txt b/materio_base/conf/synonyms_fr.txt
similarity index 100%
rename from materio/conf/synonyms_fr.txt
rename to materio_base/conf/synonyms_fr.txt
diff --git a/materio/conf/synonyms_ga.txt b/materio_base/conf/synonyms_ga.txt
similarity index 100%
rename from materio/conf/synonyms_ga.txt
rename to materio_base/conf/synonyms_ga.txt
diff --git a/materio/conf/synonyms_hi.txt b/materio_base/conf/synonyms_hi.txt
similarity index 100%
rename from materio/conf/synonyms_hi.txt
rename to materio_base/conf/synonyms_hi.txt
diff --git a/materio/conf/synonyms_hr.txt b/materio_base/conf/synonyms_hr.txt
similarity index 100%
rename from materio/conf/synonyms_hr.txt
rename to materio_base/conf/synonyms_hr.txt
diff --git a/materio/conf/synonyms_hu.txt b/materio_base/conf/synonyms_hu.txt
similarity index 100%
rename from materio/conf/synonyms_hu.txt
rename to materio_base/conf/synonyms_hu.txt
diff --git a/materio/conf/synonyms_id.txt b/materio_base/conf/synonyms_id.txt
similarity index 100%
rename from materio/conf/synonyms_id.txt
rename to materio_base/conf/synonyms_id.txt
diff --git a/materio/conf/synonyms_it.txt b/materio_base/conf/synonyms_it.txt
similarity index 100%
rename from materio/conf/synonyms_it.txt
rename to materio_base/conf/synonyms_it.txt
diff --git a/materio/conf/synonyms_lv.txt b/materio_base/conf/synonyms_lv.txt
similarity index 100%
rename from materio/conf/synonyms_lv.txt
rename to materio_base/conf/synonyms_lv.txt
diff --git a/materio/conf/synonyms_nb.txt b/materio_base/conf/synonyms_nb.txt
similarity index 100%
rename from materio/conf/synonyms_nb.txt
rename to materio_base/conf/synonyms_nb.txt
diff --git a/materio/conf/synonyms_nl.txt b/materio_base/conf/synonyms_nl.txt
similarity index 100%
rename from materio/conf/synonyms_nl.txt
rename to materio_base/conf/synonyms_nl.txt
diff --git a/materio/conf/synonyms_nn.txt b/materio_base/conf/synonyms_nn.txt
similarity index 100%
rename from materio/conf/synonyms_nn.txt
rename to materio_base/conf/synonyms_nn.txt
diff --git a/materio/conf/synonyms_pl.txt b/materio_base/conf/synonyms_pl.txt
similarity index 100%
rename from materio/conf/synonyms_pl.txt
rename to materio_base/conf/synonyms_pl.txt
diff --git a/materio/conf/synonyms_pt_br.txt b/materio_base/conf/synonyms_pt_br.txt
similarity index 100%
rename from materio/conf/synonyms_pt_br.txt
rename to materio_base/conf/synonyms_pt_br.txt
diff --git a/materio/conf/synonyms_pt_pt.txt b/materio_base/conf/synonyms_pt_pt.txt
similarity index 100%
rename from materio/conf/synonyms_pt_pt.txt
rename to materio_base/conf/synonyms_pt_pt.txt
diff --git a/materio/conf/synonyms_ro.txt b/materio_base/conf/synonyms_ro.txt
similarity index 100%
rename from materio/conf/synonyms_ro.txt
rename to materio_base/conf/synonyms_ro.txt
diff --git a/materio/conf/synonyms_ru.txt b/materio_base/conf/synonyms_ru.txt
similarity index 100%
rename from materio/conf/synonyms_ru.txt
rename to materio_base/conf/synonyms_ru.txt
diff --git a/materio/conf/synonyms_sk.txt b/materio_base/conf/synonyms_sk.txt
similarity index 100%
rename from materio/conf/synonyms_sk.txt
rename to materio_base/conf/synonyms_sk.txt
diff --git a/materio/conf/synonyms_sr.txt b/materio_base/conf/synonyms_sr.txt
similarity index 100%
rename from materio/conf/synonyms_sr.txt
rename to materio_base/conf/synonyms_sr.txt
diff --git a/materio/conf/synonyms_sv.txt b/materio_base/conf/synonyms_sv.txt
similarity index 100%
rename from materio/conf/synonyms_sv.txt
rename to materio_base/conf/synonyms_sv.txt
diff --git a/materio/conf/synonyms_th.txt b/materio_base/conf/synonyms_th.txt
similarity index 100%
rename from materio/conf/synonyms_th.txt
rename to materio_base/conf/synonyms_th.txt
diff --git a/materio/conf/synonyms_tr.txt b/materio_base/conf/synonyms_tr.txt
similarity index 100%
rename from materio/conf/synonyms_tr.txt
rename to materio_base/conf/synonyms_tr.txt
diff --git a/materio/conf/synonyms_uk.txt b/materio_base/conf/synonyms_uk.txt
similarity index 100%
rename from materio/conf/synonyms_uk.txt
rename to materio_base/conf/synonyms_uk.txt
diff --git a/materio/conf/synonyms_und.txt b/materio_base/conf/synonyms_und.txt
similarity index 100%
rename from materio/conf/synonyms_und.txt
rename to materio_base/conf/synonyms_und.txt
diff --git a/materio/core.properties b/materio_base/core.properties
similarity index 100%
rename from materio/core.properties
rename to materio_base/core.properties
diff --git a/solr.xml b/solr.xml
deleted file mode 100644
index 795e352..0000000
--- a/solr.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-
-
-
- ${host:}
- ${jetty.port:8983}
- ${hostContext:solr}
-
- ${genericCoreNodeNames:true}
-
- ${zkClientTimeout:30000}
- ${distribUpdateSoTimeout:600000}
- ${distribUpdateConnTimeout:60000}
- ${zkCredentialsProvider:org.apache.solr.common.cloud.DefaultZkCredentialsProvider}
- ${zkACLProvider:org.apache.solr.common.cloud.DefaultZkACLProvider}
-
-
-
-
- ${socketTimeout:600000}
- ${connTimeout:60000}
- ${solr.shardsWhitelist:}
-
-
-
diff --git a/zoo.cfg b/zoo.cfg
deleted file mode 100644
index 7e42d8c..0000000
--- a/zoo.cfg
+++ /dev/null
@@ -1,31 +0,0 @@
-# The number of milliseconds of each tick
-tickTime=2000
-# The number of ticks that the initial
-# synchronization phase can take
-initLimit=10
-# The number of ticks that can pass between
-# sending a request and getting an acknowledgement
-syncLimit=5
-
-# the directory where the snapshot is stored.
-# dataDir=/opt/zookeeper/data
-# NOTE: Solr defaults the dataDir to /zoo_data
-
-# the port at which the clients will connect
-# clientPort=2181
-# NOTE: Solr sets this based on zkRun / zkHost params
-
-# the maximum number of client connections.
-# increase this if you need to handle more clients
-#maxClientCnxns=60
-#
-# Be sure to read the maintenance section of the
-# administrator guide before turning on autopurge.
-#
-# http://zookeeper.apache.org/doc/current/zookeeperAdmin.html#sc_maintenance
-#
-# The number of snapshots to retain in dataDir
-#autopurge.snapRetainCount=3
-# Purge task interval in hours
-# Set to "0" to disable auto purge feature
-#autopurge.purgeInterval=1