diff --git a/dev-tools/idea/.idea/ant.xml b/dev-tools/idea/.idea/ant.xml
index a8e73f6d0b5..2cd14fd831b 100644
--- a/dev-tools/idea/.idea/ant.xml
+++ b/dev-tools/idea/.idea/ant.xml
@@ -45,9 +45,9 @@
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/dataimporthandler/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/extraction/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/langid/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/solr/contrib/solr-morphlines-cell/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/solr/contrib/solr-morphlines-core/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/solr/contrib/solr-mr/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/solr/contrib/morphlines-cell/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/solr/contrib/morphlines-core/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/solr/contrib/map-reduce/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/uima/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/velocity/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/solrj/build.xml" />
diff --git a/dev-tools/idea/.idea/libraries/Solr_morphlines_cell_library.xml b/dev-tools/idea/.idea/libraries/Solr_morphlines_cell_library.xml
index c1a0a6f0b0f..cbc99073448 100644
--- a/dev-tools/idea/.idea/libraries/Solr_morphlines_cell_library.xml
+++ b/dev-tools/idea/.idea/libraries/Solr_morphlines_cell_library.xml
@@ -1,10 +1,10 @@
 <component name="libraryTable">
   <library name="Solr morphlines cell library">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/solr/contrib/solr-morphlines-cell/lib" />
+      <root url="file://$PROJECT_DIR$/solr/contrib/morphlines-cell/lib" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
-    <jarDirectory url="file://$PROJECT_DIR$/solr/contrib/solr-morphlines-cell/lib" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/solr/contrib/morphlines-cell/lib" recursive="false" />
   </library>
 </component>
\ No newline at end of file
diff --git a/dev-tools/idea/.idea/libraries/Solr_morphlines_core_library.xml b/dev-tools/idea/.idea/libraries/Solr_morphlines_core_library.xml
index 25770ed8c4d..4260f5816d2 100644
--- a/dev-tools/idea/.idea/libraries/Solr_morphlines_core_library.xml
+++ b/dev-tools/idea/.idea/libraries/Solr_morphlines_core_library.xml
@@ -1,10 +1,10 @@
 <component name="libraryTable">
   <library name="Solr morphlines core library">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/solr/contrib/solr-morphlines-core/lib" />
+      <root url="file://$PROJECT_DIR$/solr/contrib/morphlines-core/lib" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
-    <jarDirectory url="file://$PROJECT_DIR$/solr/contrib/solr-morphlines-core/lib" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/solr/contrib/morphlines-core/lib" recursive="false" />
   </library>
 </component>
\ No newline at end of file
diff --git a/dev-tools/idea/.idea/libraries/Solr_morphlines_core_test_library.xml b/dev-tools/idea/.idea/libraries/Solr_morphlines_core_test_library.xml
index 0ae745a64b8..74699f467dd 100644
--- a/dev-tools/idea/.idea/libraries/Solr_morphlines_core_test_library.xml
+++ b/dev-tools/idea/.idea/libraries/Solr_morphlines_core_test_library.xml
@@ -1,10 +1,10 @@
 <component name="libraryTable">
   <library name="Solr morphlines core test library">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/solr/contrib/solr-morphlines-core/test-lib" />
+      <root url="file://$PROJECT_DIR$/solr/contrib/morphlines-core/test-lib" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
-    <jarDirectory url="file://$PROJECT_DIR$/solr/contrib/solr-morphlines-core/test-lib" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/solr/contrib/morphlines-core/test-lib" recursive="false" />
   </library>
 </component>
\ No newline at end of file
diff --git a/dev-tools/idea/.idea/modules.xml b/dev-tools/idea/.idea/modules.xml
index b8c9fb4e569..f966e7f16d8 100644
--- a/dev-tools/idea/.idea/modules.xml
+++ b/dev-tools/idea/.idea/modules.xml
@@ -49,9 +49,9 @@
       <module filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler/dataimporthandler.iml" />
       <module filepath="$PROJECT_DIR$/solr/contrib/extraction/extraction.iml" />
       <module filepath="$PROJECT_DIR$/solr/contrib/langid/langid.iml" />
-      <module filepath="$PROJECT_DIR$/solr/contrib/solr-morphlines-cell/solr-morphlines-cell.iml" />
-      <module filepath="$PROJECT_DIR$/solr/contrib/solr-morphlines-core/solr-morphlines-core.iml" />
-      <module filepath="$PROJECT_DIR$/solr/contrib/solr-mr/solr-mr.iml" />
+      <module filepath="$PROJECT_DIR$/solr/contrib/morphlines-cell/morphlines-cell.iml" />
+      <module filepath="$PROJECT_DIR$/solr/contrib/morphlines-core/morphlines-core.iml" />
+      <module filepath="$PROJECT_DIR$/solr/contrib/map-reduce/map-reduce.iml" />
       <module filepath="$PROJECT_DIR$/solr/contrib/uima/uima.iml" />
       <module filepath="$PROJECT_DIR$/solr/contrib/velocity/velocity.iml" />
       <module filepath="$PROJECT_DIR$/solr/solrj/src/java/solrj.iml" />
diff --git a/dev-tools/idea/.idea/workspace.xml b/dev-tools/idea/.idea/workspace.xml
index e5bdc922f07..00b4418ef4a 100644
--- a/dev-tools/idea/.idea/workspace.xml
+++ b/dev-tools/idea/.idea/workspace.xml
@@ -236,23 +236,23 @@
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Solr morphlines-cell contrib" type="JUnit" factoryName="JUnit">
-      <module name="solr-morphlines-cell" />
+      <module name="morphlines-cell" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-morphlines-cell" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/morphlines-cell" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Solr morphlines-core contrib" type="JUnit" factoryName="JUnit">
-      <module name="solr-morphlines-core" />
+      <module name="morphlines-core" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-morphlines-core" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/morphlines-core" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Solr mr (map-reduce) contrib" type="JUnit" factoryName="JUnit">
-      <module name="solr-mr" />
+      <module name="map-reduce" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-mr" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/map-reduce" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
diff --git a/dev-tools/idea/solr/contrib/solr-mr/solr-mr.iml b/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml
similarity index 93%
rename from dev-tools/idea/solr/contrib/solr-mr/solr-mr.iml
rename to dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml
index 3e7e3b466e0..676d4f64a9a 100644
--- a/dev-tools/idea/solr/contrib/solr-mr/solr-mr.iml
+++ b/dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-mr/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-mr/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/map-reduce/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/map-reduce/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
@@ -25,7 +25,7 @@
     <orderEntry type="module" module-name="misc" />
     <orderEntry type="module" module-name="extraction" />
     <orderEntry type="module" module-name="lucene-core" />
-    <orderEntry type="module" module-name="solr-morphlines-core" />
+    <orderEntry type="module" module-name="morphlines-core" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
diff --git a/dev-tools/idea/solr/contrib/solr-morphlines-cell/solr-morphlines-cell.iml b/dev-tools/idea/solr/contrib/morphlines-cell/morphlines-cell.iml
similarity index 91%
rename from dev-tools/idea/solr/contrib/solr-morphlines-cell/solr-morphlines-cell.iml
rename to dev-tools/idea/solr/contrib/morphlines-cell/morphlines-cell.iml
index e2a4cc3f864..4e2c9ba1409 100644
--- a/dev-tools/idea/solr/contrib/solr-morphlines-cell/solr-morphlines-cell.iml
+++ b/dev-tools/idea/solr/contrib/morphlines-cell/morphlines-cell.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-morphlines-cell/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-morphlines-cell/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/morphlines-cell/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/morphlines-cell/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
@@ -23,6 +23,6 @@
     <orderEntry type="module" module-name="solr-core" />
     <orderEntry type="module" module-name="solrj" />
     <orderEntry type="module" module-name="extraction" />
-    <orderEntry type="module" module-name="solr-morphlines-core" />
+    <orderEntry type="module" module-name="morphlines-core" />
   </component>
 </module>
\ No newline at end of file
diff --git a/dev-tools/idea/solr/contrib/solr-morphlines-core/solr-morphlines-core.iml b/dev-tools/idea/solr/contrib/morphlines-core/morphlines-core.iml
similarity index 94%
rename from dev-tools/idea/solr/contrib/solr-morphlines-core/solr-morphlines-core.iml
rename to dev-tools/idea/solr/contrib/morphlines-core/morphlines-core.iml
index 4942c8565a8..0de82170ca1 100644
--- a/dev-tools/idea/solr/contrib/solr-morphlines-core/solr-morphlines-core.iml
+++ b/dev-tools/idea/solr/contrib/morphlines-core/morphlines-core.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-morphlines-core/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-morphlines-core/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/morphlines-core/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/morphlines-core/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
diff --git a/dev-tools/maven/solr/contrib/solr-mr/pom.xml.template b/dev-tools/maven/solr/contrib/map-reduce/pom.xml.template
similarity index 92%
rename from dev-tools/maven/solr/contrib/solr-mr/pom.xml.template
rename to dev-tools/maven/solr/contrib/map-reduce/pom.xml.template
index 1683ef2c586..199604b7623 100644
--- a/dev-tools/maven/solr/contrib/solr-mr/pom.xml.template
+++ b/dev-tools/maven/solr/contrib/map-reduce/pom.xml.template
@@ -27,12 +27,12 @@
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.solr</groupId>
-  <artifactId>solr-mr</artifactId>
+  <artifactId>solr-map-reduce</artifactId>
   <packaging>jar</packaging>
   <name>Apache Solr map-reduce index construction</name>
   <description>Apache Solr - map-reduce index construction</description>
   <properties>
-    <module-directory>solr/contrib/solr-mr</module-directory>
+    <module-directory>solr/contrib/map-reduce</module-directory>
     <relative-top-level>../../../..</relative-top-level>
     <module-path>${relative-top-level}/${module-directory}</module-path>
   </properties>
@@ -55,10 +55,10 @@
       <artifactId>solr-test-framework</artifactId>
       <scope>test</scope>
     </dependency>
-@solr-mr.internal.dependencies@
-@solr-mr.external.dependencies@
-@solr-mr.internal.test.dependencies@
-@solr-mr.external.test.dependencies@
+@solr-map-reduce.internal.dependencies@
+@solr-map-reduce.external.dependencies@
+@solr-map-reduce.internal.test.dependencies@
+@solr-map-reduce.external.test.dependencies@
   </dependencies>
   <build>
     <sourceDirectory>${module-path}/src/java</sourceDirectory>
diff --git a/dev-tools/maven/solr/contrib/solr-morphlines-cell/pom.xml.template b/dev-tools/maven/solr/contrib/morphlines-cell/pom.xml.template
similarity index 98%
rename from dev-tools/maven/solr/contrib/solr-morphlines-cell/pom.xml.template
rename to dev-tools/maven/solr/contrib/morphlines-cell/pom.xml.template
index ebd13754c25..9bf9588e590 100644
--- a/dev-tools/maven/solr/contrib/solr-morphlines-cell/pom.xml.template
+++ b/dev-tools/maven/solr/contrib/morphlines-cell/pom.xml.template
@@ -32,7 +32,7 @@
   <name>Apache Solr Cell Morphlines</name>
   <description>Apache Solr - Cell Morphlines</description>
   <properties>
-    <module-directory>solr/contrib/solr-morphlines-cell</module-directory>
+    <module-directory>solr/contrib/morphlines-cell</module-directory>
     <relative-top-level>../../../..</relative-top-level>
     <module-path>${relative-top-level}/${module-directory}</module-path>
   </properties>
diff --git a/dev-tools/maven/solr/contrib/solr-morphlines-core/pom.xml.template b/dev-tools/maven/solr/contrib/morphlines-core/pom.xml.template
similarity index 98%
rename from dev-tools/maven/solr/contrib/solr-morphlines-core/pom.xml.template
rename to dev-tools/maven/solr/contrib/morphlines-core/pom.xml.template
index 92c785c23e5..a319566d584 100644
--- a/dev-tools/maven/solr/contrib/solr-morphlines-core/pom.xml.template
+++ b/dev-tools/maven/solr/contrib/morphlines-core/pom.xml.template
@@ -32,7 +32,7 @@
   <name>Apache Solr Morphlines Core</name>
   <description>Apache Solr - Morphlines Core</description>
   <properties>
-    <module-directory>solr/contrib/solr-morphlines-core</module-directory>
+    <module-directory>solr/contrib/morphlines-core</module-directory>
     <relative-top-level>../../../..</relative-top-level>
     <module-path>${relative-top-level}/${module-directory}</module-path>
   </properties>
diff --git a/dev-tools/maven/solr/contrib/pom.xml.template b/dev-tools/maven/solr/contrib/pom.xml.template
index 3873b1d59ab..db6ce3dc7e0 100644
--- a/dev-tools/maven/solr/contrib/pom.xml.template
+++ b/dev-tools/maven/solr/contrib/pom.xml.template
@@ -37,9 +37,9 @@
     <module>dataimporthandler-extras</module>
     <module>extraction</module>
     <module>langid</module>
-    <module>solr-morphlines-cell</module>
-    <module>solr-morphlines-core</module>
-    <module>solr-mr</module>
+    <module>morphlines-cell</module>
+    <module>morphlines-core</module>
+    <module>map-reduce</module>
     <module>uima</module>
     <module>velocity</module>
   </modules>
diff --git a/solr/contrib/solr-mr/build.xml b/solr/contrib/map-reduce/build.xml
similarity index 70%
rename from solr/contrib/solr-mr/build.xml
rename to solr/contrib/map-reduce/build.xml
index d9f1f72a26b..b1076bb4327 100644
--- a/solr/contrib/solr-mr/build.xml
+++ b/solr/contrib/map-reduce/build.xml
@@ -17,7 +17,7 @@
     limitations under the License.
  -->
 
-<project name="solr-mr" default="default">
+<project name="solr-map-reduce" default="default">
 
   <description>
     Solr map-reduce index construction.
@@ -29,7 +29,7 @@
   
   <property name="main.class" value="org.apache.solr.hadoop.MapReduceIndexerTool" />
   
-  <solr-contrib-uptodate name="solr-extraction" 
+  <solr-contrib-uptodate name="extraction" 
                          property="solr-extraction.uptodate" 
                          classpath.property="solr-cell.jar"/>
   
@@ -39,20 +39,20 @@
     </ant>
   </target>
   
-  <solr-contrib-uptodate name="solr-morphlines-core" 
+  <solr-contrib-uptodate name="morphlines-core" 
                          property="solr-morphlines-core.uptodate"/>
   
-  <target name="compile-solr-morphlines-core" unless="solr-morphlines-core.uptodate">
-   <ant dir="${common-solr.dir}/contrib/solr-morphlines-core" target="compile-core" inheritAll="false">
+  <target name="compile-morphlines-core" unless="solr-morphlines-core.uptodate">
+   <ant dir="${common-solr.dir}/contrib/morphlines-core" target="compile-core" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
   
-  <solr-contrib-uptodate name="solr-morphlines-cell" 
+  <solr-contrib-uptodate name="morphlines-cell" 
                          property="solr-morphlines-cell.uptodate"/>
   
-  <target name="compile-solr-morphlines-cell" unless="solr-morphlines-cell.uptodate">
-   <ant dir="${common-solr.dir}/contrib/solr-morphlines-cell" target="compile-core" inheritAll="false">
+  <target name="compile-morphlines-cell" unless="solr-morphlines-cell.uptodate">
+   <ant dir="${common-solr.dir}/contrib/morphlines-cell" target="compile-core" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
@@ -63,14 +63,14 @@
     </ant>
   </target>
 
-  <target name="resolve-solr-morphlines-core-libs">
-    <ant dir="${common-solr.dir}/contrib/solr-morphlines-core" target="resolve" inheritAll="false">
+  <target name="resolve-morphlines-core-libs">
+    <ant dir="${common-solr.dir}/contrib/morphlines-core" target="resolve" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
   
-  <target name="resolve-solr-morphlines-cell-libs">
-    <ant dir="${common-solr.dir}/contrib/solr-morphlines-cell" target="resolve" inheritAll="false">
+  <target name="resolve-morphlines-cell-libs">
+    <ant dir="${common-solr.dir}/contrib/morphlines-cell" target="resolve" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
@@ -79,9 +79,9 @@
     <pathelement location="${common-solr.dir}/build/contrib/solr-cell/classes/java"/>
     <fileset dir="${common-solr.dir}/contrib/extraction/lib" excludes="${common.classpath.excludes}"/>
     <pathelement location="${common-solr.dir}/build/contrib/solr-morphlines-core/classes/java"/>
-    <fileset dir="${common-solr.dir}/contrib/solr-morphlines-core/lib" excludes="${common.classpath.excludes}"/>
+    <fileset dir="${common-solr.dir}/contrib/morphlines-core/lib" excludes="${common.classpath.excludes}"/>
     <pathelement location="${common-solr.dir}/build/contrib/solr-morphlines-cell/classes/java"/>
-    <fileset dir="${common-solr.dir}/contrib/solr-morphlines-cell/lib" excludes="${common.classpath.excludes}"/>
+    <fileset dir="${common-solr.dir}/contrib/morphlines-cell/lib" excludes="${common.classpath.excludes}"/>
   </path>
 
   <path id="classpath">
@@ -92,7 +92,7 @@
   <path id="test.classpath">
     <path refid="solr.test.base.classpath"/>
     <path refid="classpath.additions"/>
-    <fileset dir="${common-solr.dir}/contrib/solr-morphlines-core/test-lib" excludes="${common.classpath.excludes}"/>
+    <fileset dir="${common-solr.dir}/contrib/morphlines-core/test-lib" excludes="${common.classpath.excludes}"/>
   </path>
 
   <path id="javadoc.classpath">
@@ -106,7 +106,7 @@
   </path>
   
   <!-- TODO: make this nicer like lucene? -->
-  <target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs,javadocs-solr-core,javadocs-extraction,javadocs-solr-morphlines-core,javadocs-solr-morphlines-cell">
+  <target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs,javadocs-solr-core,javadocs-extraction,javadocs-morphlines-core,javadocs-morphlines-cell">
         <sequential>
       <mkdir dir="${javadoc.dir}/${name}"/>
       <solr-invoke-javadoc>
@@ -129,19 +129,19 @@
     </ant>
   </target>
   
-  <target name="javadocs-solr-morphlines-core">
-    <ant dir="${common-solr.dir}/contrib/solr-morphlines-core" target="javadocs" inheritAll="false">
+  <target name="javadocs-morphlines-core">
+    <ant dir="${common-solr.dir}/contrib/morphlines-core" target="javadocs" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
   
-  <target name="javadocs-solr-morphlines-cell">
-    <ant dir="${common-solr.dir}/contrib/solr-morphlines-cell" target="javadocs" inheritAll="false">
+  <target name="javadocs-morphlines-cell">
+    <ant dir="${common-solr.dir}/contrib/morphlines-cell" target="javadocs" inheritAll="false">
      <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
   
-  <target name="compile-core" depends="resolve-extraction-libs, resolve-solr-morphlines-core-libs, resolve-solr-morphlines-cell-libs, compile-solr-extraction, compile-solr-morphlines-core, compile-solr-morphlines-cell, solr-contrib-build.compile-core"/>
+  <target name="compile-core" depends="resolve-extraction-libs, resolve-morphlines-core-libs, resolve-morphlines-cell-libs, compile-solr-extraction, compile-morphlines-core, compile-morphlines-cell, solr-contrib-build.compile-core"/>
   <target name="dist" depends="common-solr.dist"/>
 
 </project>
diff --git a/solr/contrib/solr-mr/ivy.xml b/solr/contrib/map-reduce/ivy.xml
similarity index 96%
rename from solr/contrib/solr-mr/ivy.xml
rename to solr/contrib/map-reduce/ivy.xml
index d51fd3b020e..179b39d666e 100644
--- a/solr/contrib/solr-mr/ivy.xml
+++ b/solr/contrib/map-reduce/ivy.xml
@@ -17,7 +17,7 @@
    under the License.    
 -->
 <ivy-module version="2.0" xmlns:maven="http://ant.apache.org/ivy/maven">
-  <info organisation="org.apache.solr" module="solr-mr" />
+  <info organisation="org.apache.solr" module="map-reduce" />
   <configurations>
     <conf name="compile" transitive="false" />
     <conf name="test" transitive="false" />
diff --git a/solr/contrib/solr-mr/src/java/assembly/hadoop-job.xml b/solr/contrib/map-reduce/src/java/assembly/hadoop-job.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/java/assembly/hadoop-job.xml
rename to solr/contrib/map-reduce/src/java/assembly/hadoop-job.xml
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/BatchWriter.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/BatchWriter.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/BatchWriter.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/BatchWriter.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/DataInputInputStream.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/DataInputInputStream.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/DataInputInputStream.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/DataInputInputStream.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/DataOutputOutputStream.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/DataOutputOutputStream.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/DataOutputOutputStream.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/DataOutputOutputStream.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/DryRunDocumentLoader.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/DryRunDocumentLoader.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/DryRunDocumentLoader.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/DryRunDocumentLoader.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/GoLive.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/GoLive.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/GoLive.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/GoLive.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/HdfsFileFieldNames.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/HdfsFileFieldNames.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/HdfsFileFieldNames.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/HdfsFileFieldNames.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/HeartBeater.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/HeartBeater.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/HeartBeater.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/HeartBeater.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/LineRandomizerMapper.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/LineRandomizerMapper.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/LineRandomizerMapper.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/LineRandomizerMapper.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/LineRandomizerReducer.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/LineRandomizerReducer.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/LineRandomizerReducer.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/LineRandomizerReducer.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/MapReduceIndexerTool.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/MapReduceIndexerTool.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/MapReduceIndexerTool.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/MapReduceIndexerTool.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/PathArgumentType.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/PathArgumentType.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/PathArgumentType.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/PathArgumentType.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/PathParts.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/PathParts.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/PathParts.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/PathParts.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/SolrCloudPartitioner.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrCloudPartitioner.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/SolrCloudPartitioner.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrCloudPartitioner.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/SolrCounters.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrCounters.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/SolrCounters.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrCounters.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/SolrInputDocumentWritable.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrInputDocumentWritable.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/SolrInputDocumentWritable.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrInputDocumentWritable.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/SolrMapper.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrMapper.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/SolrMapper.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrMapper.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/SolrOutputFormat.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/SolrOutputFormat.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/SolrRecordWriter.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrRecordWriter.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/SolrRecordWriter.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrRecordWriter.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/SolrReducer.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrReducer.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/SolrReducer.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrReducer.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/ToolRunnerHelpFormatter.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ToolRunnerHelpFormatter.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/ToolRunnerHelpFormatter.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ToolRunnerHelpFormatter.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/TreeMergeMapper.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/TreeMergeMapper.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/TreeMergeMapper.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/TreeMergeMapper.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/TreeMergeOutputFormat.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/TreeMergeOutputFormat.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/TreeMergeOutputFormat.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/TreeMergeOutputFormat.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/UnbufferedDataInputInputStream.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/UnbufferedDataInputInputStream.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/UnbufferedDataInputInputStream.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/UnbufferedDataInputInputStream.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/Utils.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/Utils.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/Utils.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/Utils.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/dedup/NoChangeUpdateConflictResolver.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/NoChangeUpdateConflictResolver.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/dedup/NoChangeUpdateConflictResolver.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/NoChangeUpdateConflictResolver.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/dedup/RejectingUpdateConflictResolver.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/RejectingUpdateConflictResolver.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/dedup/RejectingUpdateConflictResolver.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/RejectingUpdateConflictResolver.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/dedup/RetainMostRecentUpdateConflictResolver.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/RetainMostRecentUpdateConflictResolver.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/dedup/RetainMostRecentUpdateConflictResolver.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/RetainMostRecentUpdateConflictResolver.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/dedup/SolrInputDocumentComparator.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/SolrInputDocumentComparator.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/dedup/SolrInputDocumentComparator.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/SolrInputDocumentComparator.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/dedup/SortingUpdateConflictResolver.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/SortingUpdateConflictResolver.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/dedup/SortingUpdateConflictResolver.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/SortingUpdateConflictResolver.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/dedup/UpdateConflictResolver.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/UpdateConflictResolver.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/dedup/UpdateConflictResolver.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/UpdateConflictResolver.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/dedup/package.html b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/package.html
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/dedup/package.html
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/package.html
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/morphline/MorphlineCounters.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineCounters.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/morphline/MorphlineCounters.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineCounters.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/morphline/MorphlineMapRunner.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineMapRunner.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/morphline/MorphlineMapRunner.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineMapRunner.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/morphline/MorphlineMapper.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineMapper.java
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/morphline/MorphlineMapper.java
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/MorphlineMapper.java
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/morphline/package.html b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/package.html
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/morphline/package.html
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/package.html
diff --git a/solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/package.html b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/package.html
similarity index 100%
rename from solr/contrib/solr-mr/src/java/org/apache/solr/hadoop/package.html
rename to solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/package.html
diff --git a/solr/contrib/solr-mr/src/java/overview.html b/solr/contrib/map-reduce/src/java/overview.html
similarity index 92%
rename from solr/contrib/solr-mr/src/java/overview.html
rename to solr/contrib/map-reduce/src/java/overview.html
index c97f378ca2e..ad7c1c0c3fe 100644
--- a/solr/contrib/solr-mr/src/java/overview.html
+++ b/solr/contrib/map-reduce/src/java/overview.html
@@ -16,6 +16,6 @@
 -->
 <html>
 <body>
-Apache Solr Search Server: Solr MapReduce index building contrib
+Apache Solr Search Server: Solr MapReduce contrib
 </body>
 </html>
diff --git a/solr/contrib/solr-mr/src/test-files/custom-mimetypes.xml b/solr/contrib/map-reduce/src/test-files/custom-mimetypes.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/custom-mimetypes.xml
rename to solr/contrib/map-reduce/src/test-files/custom-mimetypes.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/currency.xml b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/currency.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/currency.xml
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/currency.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/elevate.xml b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/elevate.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/elevate.xml
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/elevate.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/contractions_ca.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/contractions_ca.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/contractions_ca.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/contractions_ca.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/contractions_fr.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/contractions_fr.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/contractions_fr.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/contractions_fr.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/contractions_ga.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/contractions_ga.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/contractions_ga.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/contractions_ga.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/contractions_it.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/contractions_it.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/contractions_it.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/contractions_it.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/hyphenations_ga.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/hyphenations_ga.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/hyphenations_ga.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/hyphenations_ga.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stemdict_nl.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stemdict_nl.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stemdict_nl.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stemdict_nl.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stoptags_ja.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stoptags_ja.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stoptags_ja.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stoptags_ja.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ar.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_ar.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ar.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_ar.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_bg.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_bg.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_bg.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_bg.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ca.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_ca.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ca.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_ca.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_cz.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_cz.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_cz.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_cz.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_da.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_da.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_da.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_da.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_de.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_de.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_de.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_de.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_el.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_el.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_el.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_el.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_en.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_en.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_en.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_en.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_es.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_es.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_es.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_es.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_eu.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_eu.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_eu.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_eu.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_fa.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_fa.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_fa.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_fa.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_fi.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_fi.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_fi.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_fi.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_fr.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_fr.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_fr.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_fr.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ga.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_ga.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ga.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_ga.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_gl.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_gl.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_gl.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_gl.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_hi.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_hi.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_hi.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_hi.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_hu.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_hu.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_hu.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_hu.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_hy.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_hy.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_hy.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_hy.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_id.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_id.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_id.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_id.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_it.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_it.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_it.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_it.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ja.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_ja.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ja.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_ja.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_lv.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_lv.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_lv.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_lv.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_nl.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_nl.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_nl.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_nl.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_no.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_no.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_no.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_no.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_pt.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_pt.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_pt.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_pt.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ro.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_ro.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ro.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_ro.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ru.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_ru.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ru.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_ru.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_sv.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_sv.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_sv.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_sv.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_th.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_th.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_th.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_th.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_tr.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_tr.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_tr.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/stopwords_tr.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/userdict_ja.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/userdict_ja.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/lang/userdict_ja.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/lang/userdict_ja.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/protwords.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/protwords.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/protwords.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/protwords.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/schema.xml b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/schema.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/schema.xml
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/schema.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/solrconfig.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/solrconfig.xml
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/solrconfig.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/stopwords.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/stopwords.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/stopwords.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/stopwords.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/synonyms.txt b/solr/contrib/map-reduce/src/test-files/solr/collection1/conf/synonyms.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/collection1/conf/synonyms.txt
rename to solr/contrib/map-reduce/src/test-files/solr/collection1/conf/synonyms.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/currency.xml b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/currency.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/currency.xml
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/currency.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/elevate.xml b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/elevate.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/elevate.xml
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/elevate.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/contractions_ca.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/contractions_ca.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/contractions_ca.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/contractions_ca.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/contractions_fr.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/contractions_fr.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/contractions_fr.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/contractions_fr.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/contractions_ga.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/contractions_ga.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/contractions_ga.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/contractions_ga.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/contractions_it.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/contractions_it.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/contractions_it.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/contractions_it.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/hyphenations_ga.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/hyphenations_ga.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/hyphenations_ga.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/hyphenations_ga.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stemdict_nl.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stemdict_nl.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stemdict_nl.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stemdict_nl.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stoptags_ja.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stoptags_ja.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stoptags_ja.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stoptags_ja.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ar.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_ar.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ar.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_ar.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_bg.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_bg.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_bg.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_bg.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ca.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_ca.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ca.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_ca.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_cz.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_cz.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_cz.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_cz.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_da.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_da.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_da.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_da.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_de.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_de.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_de.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_de.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_el.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_el.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_el.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_el.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_en.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_en.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_en.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_en.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_es.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_es.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_es.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_es.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_eu.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_eu.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_eu.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_eu.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_fa.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_fa.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_fa.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_fa.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_fi.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_fi.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_fi.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_fi.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_fr.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_fr.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_fr.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_fr.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ga.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_ga.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ga.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_ga.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_gl.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_gl.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_gl.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_gl.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_hi.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_hi.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_hi.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_hi.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_hu.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_hu.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_hu.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_hu.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_hy.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_hy.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_hy.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_hy.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_id.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_id.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_id.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_id.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_it.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_it.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_it.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_it.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ja.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_ja.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ja.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_ja.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_lv.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_lv.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_lv.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_lv.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_nl.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_nl.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_nl.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_nl.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_no.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_no.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_no.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_no.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_pt.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_pt.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_pt.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_pt.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ro.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_ro.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ro.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_ro.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ru.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_ru.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ru.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_ru.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_sv.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_sv.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_sv.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_sv.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_th.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_th.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_th.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_th.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_tr.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_tr.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_tr.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/stopwords_tr.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/userdict_ja.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/userdict_ja.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/lang/userdict_ja.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/lang/userdict_ja.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/protwords.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/protwords.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/protwords.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/protwords.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/schema.xml b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/schema.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/schema.xml
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/schema.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/solrconfig.xml b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/solrconfig.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/solrconfig.xml
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/solrconfig.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/stopwords.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/stopwords.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/stopwords.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/stopwords.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/synonyms.txt b/solr/contrib/map-reduce/src/test-files/solr/minimr/conf/synonyms.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/conf/synonyms.txt
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/conf/synonyms.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/solr.xml b/solr/contrib/map-reduce/src/test-files/solr/minimr/solr.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/minimr/solr.xml
rename to solr/contrib/map-reduce/src/test-files/solr/minimr/solr.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/currency.xml b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/currency.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/currency.xml
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/currency.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/elevate.xml b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/elevate.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/elevate.xml
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/elevate.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/contractions_ca.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/contractions_ca.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/contractions_ca.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/contractions_ca.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/contractions_fr.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/contractions_fr.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/contractions_fr.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/contractions_fr.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/contractions_ga.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/contractions_ga.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/contractions_ga.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/contractions_ga.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/contractions_it.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/contractions_it.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/contractions_it.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/contractions_it.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/hyphenations_ga.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/hyphenations_ga.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/hyphenations_ga.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/hyphenations_ga.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stemdict_nl.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stemdict_nl.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stemdict_nl.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stemdict_nl.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stoptags_ja.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stoptags_ja.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stoptags_ja.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stoptags_ja.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ar.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_ar.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ar.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_ar.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_bg.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_bg.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_bg.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_bg.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ca.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_ca.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ca.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_ca.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_cz.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_cz.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_cz.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_cz.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_da.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_da.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_da.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_da.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_de.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_de.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_de.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_de.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_el.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_el.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_el.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_el.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_en.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_en.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_en.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_en.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_es.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_es.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_es.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_es.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_eu.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_eu.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_eu.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_eu.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_fa.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_fa.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_fa.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_fa.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_fi.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_fi.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_fi.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_fi.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_fr.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_fr.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_fr.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_fr.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ga.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_ga.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ga.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_ga.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_gl.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_gl.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_gl.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_gl.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_hi.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_hi.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_hi.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_hi.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_hu.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_hu.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_hu.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_hu.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_hy.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_hy.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_hy.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_hy.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_id.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_id.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_id.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_id.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_it.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_it.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_it.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_it.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ja.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_ja.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ja.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_ja.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_lv.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_lv.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_lv.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_lv.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_nl.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_nl.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_nl.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_nl.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_no.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_no.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_no.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_no.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_pt.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_pt.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_pt.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_pt.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ro.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_ro.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ro.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_ro.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ru.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_ru.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ru.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_ru.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_sv.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_sv.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_sv.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_sv.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_th.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_th.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_th.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_th.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_tr.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_tr.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_tr.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/stopwords_tr.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/userdict_ja.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/userdict_ja.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/lang/userdict_ja.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/lang/userdict_ja.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/protwords.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/protwords.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/protwords.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/protwords.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/schema.xml b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/schema.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/schema.xml
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/schema.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/solrconfig.xml b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/solrconfig.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/solrconfig.xml
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/solrconfig.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/stopwords.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/stopwords.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/stopwords.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/stopwords.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/synonyms.txt b/solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/synonyms.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/conf/synonyms.txt
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/conf/synonyms.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/solr.xml b/solr/contrib/map-reduce/src/test-files/solr/mrunit/solr.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/mrunit/solr.xml
rename to solr/contrib/map-reduce/src/test-files/solr/mrunit/solr.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solr.xml b/solr/contrib/map-reduce/src/test-files/solr/solr.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solr.xml
rename to solr/contrib/map-reduce/src/test-files/solr/solr.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/currency.xml b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/currency.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/currency.xml
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/currency.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/elevate.xml b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/elevate.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/elevate.xml
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/elevate.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_ca.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_ca.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_ca.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_ca.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_fr.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_fr.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_fr.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_fr.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_ga.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_ga.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_ga.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_ga.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_it.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_it.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_it.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_it.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/hyphenations_ga.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/hyphenations_ga.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/hyphenations_ga.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/hyphenations_ga.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stemdict_nl.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stemdict_nl.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stemdict_nl.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stemdict_nl.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stoptags_ja.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stoptags_ja.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stoptags_ja.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stoptags_ja.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ar.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ar.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ar.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ar.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_bg.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_bg.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_bg.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_bg.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ca.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ca.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ca.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ca.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_cz.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_cz.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_cz.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_cz.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_da.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_da.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_da.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_da.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_de.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_de.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_de.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_de.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_el.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_el.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_el.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_el.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_en.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_en.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_en.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_en.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_es.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_es.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_es.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_es.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_eu.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_eu.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_eu.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_eu.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fa.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fa.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fa.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fa.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fi.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fi.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fi.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fi.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fr.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fr.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fr.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fr.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ga.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ga.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ga.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ga.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_gl.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_gl.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_gl.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_gl.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hi.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hi.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hi.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hi.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hu.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hu.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hu.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hu.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hy.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hy.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hy.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hy.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_id.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_id.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_id.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_id.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_it.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_it.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_it.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_it.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ja.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ja.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ja.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ja.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_lv.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_lv.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_lv.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_lv.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_nl.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_nl.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_nl.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_nl.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_no.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_no.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_no.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_no.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_pt.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_pt.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_pt.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_pt.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ro.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ro.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ro.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ro.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ru.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ru.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ru.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ru.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_sv.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_sv.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_sv.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_sv.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_th.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_th.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_th.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_th.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_tr.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_tr.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_tr.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_tr.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/userdict_ja.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/userdict_ja.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/userdict_ja.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/lang/userdict_ja.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/protwords.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/protwords.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/protwords.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/protwords.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/schema.xml b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/schema.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/schema.xml
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/schema.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/stopwords.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/stopwords.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/stopwords.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/stopwords.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/synonyms.txt b/solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/synonyms.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/synonyms.txt
rename to solr/contrib/map-reduce/src/test-files/solr/solrcelltest/collection1/conf/synonyms.txt
diff --git a/solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcloud/conf/solrconfig.xml b/solr/contrib/map-reduce/src/test-files/solr/solrcloud/conf/solrconfig.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test-files/solr/solrcloud/conf/solrconfig.xml
rename to solr/contrib/map-reduce/src/test-files/solr/solrcloud/conf/solrconfig.xml
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/NullHeader.docx b/solr/contrib/map-reduce/src/test-files/test-documents/NullHeader.docx
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/NullHeader.docx
rename to solr/contrib/map-reduce/src/test-files/test-documents/NullHeader.docx
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/boilerplate.html b/solr/contrib/map-reduce/src/test-files/test-documents/boilerplate.html
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/boilerplate.html
rename to solr/contrib/map-reduce/src/test-files/test-documents/boilerplate.html
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/complex.mbox b/solr/contrib/map-reduce/src/test-files/test-documents/complex.mbox
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/complex.mbox
rename to solr/contrib/map-reduce/src/test-files/test-documents/complex.mbox
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/rsstest.rss b/solr/contrib/map-reduce/src/test-files/test-documents/rsstest.rss
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/rsstest.rss
rename to solr/contrib/map-reduce/src/test-files/test-documents/rsstest.rss
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/sample-statuses-20120521-100919.avro b/solr/contrib/map-reduce/src/test-files/test-documents/sample-statuses-20120521-100919.avro
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/sample-statuses-20120521-100919.avro
rename to solr/contrib/map-reduce/src/test-files/test-documents/sample-statuses-20120521-100919.avro
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/sample-statuses-20120906-141433 b/solr/contrib/map-reduce/src/test-files/test-documents/sample-statuses-20120906-141433
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/sample-statuses-20120906-141433
rename to solr/contrib/map-reduce/src/test-files/test-documents/sample-statuses-20120906-141433
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/sample-statuses-20120906-141433-medium.avro b/solr/contrib/map-reduce/src/test-files/test-documents/sample-statuses-20120906-141433-medium.avro
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/sample-statuses-20120906-141433-medium.avro
rename to solr/contrib/map-reduce/src/test-files/test-documents/sample-statuses-20120906-141433-medium.avro
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/sample-statuses-20120906-141433.avro b/solr/contrib/map-reduce/src/test-files/test-documents/sample-statuses-20120906-141433.avro
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/sample-statuses-20120906-141433.avro
rename to solr/contrib/map-reduce/src/test-files/test-documents/sample-statuses-20120906-141433.avro
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/sample-statuses-20120906-141433.bz2 b/solr/contrib/map-reduce/src/test-files/test-documents/sample-statuses-20120906-141433.bz2
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/sample-statuses-20120906-141433.bz2
rename to solr/contrib/map-reduce/src/test-files/test-documents/sample-statuses-20120906-141433.bz2
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/sample-statuses-20120906-141433.gz b/solr/contrib/map-reduce/src/test-files/test-documents/sample-statuses-20120906-141433.gz
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/sample-statuses-20120906-141433.gz
rename to solr/contrib/map-reduce/src/test-files/test-documents/sample-statuses-20120906-141433.gz
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/test-outlook.msg b/solr/contrib/map-reduce/src/test-files/test-documents/test-outlook.msg
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/test-outlook.msg
rename to solr/contrib/map-reduce/src/test-files/test-documents/test-outlook.msg
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testAIFF.aif b/solr/contrib/map-reduce/src/test-files/test-documents/testAIFF.aif
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testAIFF.aif
rename to solr/contrib/map-reduce/src/test-files/test-documents/testAIFF.aif
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testBMP.bmp b/solr/contrib/map-reduce/src/test-files/test-documents/testBMP.bmp
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testBMP.bmp
rename to solr/contrib/map-reduce/src/test-files/test-documents/testBMP.bmp
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testBMPfp.txt b/solr/contrib/map-reduce/src/test-files/test-documents/testBMPfp.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testBMPfp.txt
rename to solr/contrib/map-reduce/src/test-files/test-documents/testBMPfp.txt
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testEMLX.emlx b/solr/contrib/map-reduce/src/test-files/test-documents/testEMLX.emlx
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testEMLX.emlx
rename to solr/contrib/map-reduce/src/test-files/test-documents/testEMLX.emlx
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testEXCEL.xls b/solr/contrib/map-reduce/src/test-files/test-documents/testEXCEL.xls
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testEXCEL.xls
rename to solr/contrib/map-reduce/src/test-files/test-documents/testEXCEL.xls
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testEXCEL.xlsx b/solr/contrib/map-reduce/src/test-files/test-documents/testEXCEL.xlsx
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testEXCEL.xlsx
rename to solr/contrib/map-reduce/src/test-files/test-documents/testEXCEL.xlsx
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testFLAC.flac b/solr/contrib/map-reduce/src/test-files/test-documents/testFLAC.flac
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testFLAC.flac
rename to solr/contrib/map-reduce/src/test-files/test-documents/testFLAC.flac
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testFLV.flv b/solr/contrib/map-reduce/src/test-files/test-documents/testFLV.flv
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testFLV.flv
rename to solr/contrib/map-reduce/src/test-files/test-documents/testFLV.flv
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testJPEG_EXIF.jpg b/solr/contrib/map-reduce/src/test-files/test-documents/testJPEG_EXIF.jpg
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testJPEG_EXIF.jpg
rename to solr/contrib/map-reduce/src/test-files/test-documents/testJPEG_EXIF.jpg
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testJPEG_EXIF.jpg.gz b/solr/contrib/map-reduce/src/test-files/test-documents/testJPEG_EXIF.jpg.gz
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testJPEG_EXIF.jpg.gz
rename to solr/contrib/map-reduce/src/test-files/test-documents/testJPEG_EXIF.jpg.gz
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testJPEG_EXIF.jpg.tar.gz b/solr/contrib/map-reduce/src/test-files/test-documents/testJPEG_EXIF.jpg.tar.gz
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testJPEG_EXIF.jpg.tar.gz
rename to solr/contrib/map-reduce/src/test-files/test-documents/testJPEG_EXIF.jpg.tar.gz
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testMP3i18n.mp3 b/solr/contrib/map-reduce/src/test-files/test-documents/testMP3i18n.mp3
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testMP3i18n.mp3
rename to solr/contrib/map-reduce/src/test-files/test-documents/testMP3i18n.mp3
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testMP4.m4a b/solr/contrib/map-reduce/src/test-files/test-documents/testMP4.m4a
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testMP4.m4a
rename to solr/contrib/map-reduce/src/test-files/test-documents/testMP4.m4a
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testPDF.pdf b/solr/contrib/map-reduce/src/test-files/test-documents/testPDF.pdf
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testPDF.pdf
rename to solr/contrib/map-reduce/src/test-files/test-documents/testPDF.pdf
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testPNG.png b/solr/contrib/map-reduce/src/test-files/test-documents/testPNG.png
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testPNG.png
rename to solr/contrib/map-reduce/src/test-files/test-documents/testPNG.png
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testPPT_various.ppt b/solr/contrib/map-reduce/src/test-files/test-documents/testPPT_various.ppt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testPPT_various.ppt
rename to solr/contrib/map-reduce/src/test-files/test-documents/testPPT_various.ppt
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testPPT_various.pptx b/solr/contrib/map-reduce/src/test-files/test-documents/testPPT_various.pptx
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testPPT_various.pptx
rename to solr/contrib/map-reduce/src/test-files/test-documents/testPPT_various.pptx
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testPSD.psd b/solr/contrib/map-reduce/src/test-files/test-documents/testPSD.psd
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testPSD.psd
rename to solr/contrib/map-reduce/src/test-files/test-documents/testPSD.psd
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testPages.pages b/solr/contrib/map-reduce/src/test-files/test-documents/testPages.pages
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testPages.pages
rename to solr/contrib/map-reduce/src/test-files/test-documents/testPages.pages
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testRTFVarious.rtf b/solr/contrib/map-reduce/src/test-files/test-documents/testRTFVarious.rtf
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testRTFVarious.rtf
rename to solr/contrib/map-reduce/src/test-files/test-documents/testRTFVarious.rtf
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testSVG.svg b/solr/contrib/map-reduce/src/test-files/test-documents/testSVG.svg
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testSVG.svg
rename to solr/contrib/map-reduce/src/test-files/test-documents/testSVG.svg
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testTIFF.tif b/solr/contrib/map-reduce/src/test-files/test-documents/testTIFF.tif
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testTIFF.tif
rename to solr/contrib/map-reduce/src/test-files/test-documents/testTIFF.tif
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testVISIO.vsd b/solr/contrib/map-reduce/src/test-files/test-documents/testVISIO.vsd
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testVISIO.vsd
rename to solr/contrib/map-reduce/src/test-files/test-documents/testVISIO.vsd
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testWAV.wav b/solr/contrib/map-reduce/src/test-files/test-documents/testWAV.wav
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testWAV.wav
rename to solr/contrib/map-reduce/src/test-files/test-documents/testWAV.wav
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testWORD_various.doc b/solr/contrib/map-reduce/src/test-files/test-documents/testWORD_various.doc
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testWORD_various.doc
rename to solr/contrib/map-reduce/src/test-files/test-documents/testWORD_various.doc
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testXML.xml b/solr/contrib/map-reduce/src/test-files/test-documents/testXML.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testXML.xml
rename to solr/contrib/map-reduce/src/test-files/test-documents/testXML.xml
diff --git a/solr/contrib/solr-mr/src/test-files/test-documents/testXML2.xml b/solr/contrib/map-reduce/src/test-files/test-documents/testXML2.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-documents/testXML2.xml
rename to solr/contrib/map-reduce/src/test-files/test-documents/testXML2.xml
diff --git a/solr/contrib/solr-mr/src/test-files/test-morphlines/loadSolrBasic.conf b/solr/contrib/map-reduce/src/test-files/test-morphlines/loadSolrBasic.conf
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-morphlines/loadSolrBasic.conf
rename to solr/contrib/map-reduce/src/test-files/test-morphlines/loadSolrBasic.conf
diff --git a/solr/contrib/solr-mr/src/test-files/test-morphlines/solrCellDocumentTypes.conf b/solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellDocumentTypes.conf
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-morphlines/solrCellDocumentTypes.conf
rename to solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellDocumentTypes.conf
diff --git a/solr/contrib/solr-mr/src/test-files/test-morphlines/solrCellJPGCompressed.conf b/solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellJPGCompressed.conf
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-morphlines/solrCellJPGCompressed.conf
rename to solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellJPGCompressed.conf
diff --git a/solr/contrib/solr-mr/src/test-files/test-morphlines/solrCellXML.conf b/solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellXML.conf
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-morphlines/solrCellXML.conf
rename to solr/contrib/map-reduce/src/test-files/test-morphlines/solrCellXML.conf
diff --git a/solr/contrib/solr-mr/src/test-files/test-morphlines/tokenizeText.conf b/solr/contrib/map-reduce/src/test-files/test-morphlines/tokenizeText.conf
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-morphlines/tokenizeText.conf
rename to solr/contrib/map-reduce/src/test-files/test-morphlines/tokenizeText.conf
diff --git a/solr/contrib/solr-mr/src/test-files/test-morphlines/tutorialReadAvroContainer.conf b/solr/contrib/map-reduce/src/test-files/test-morphlines/tutorialReadAvroContainer.conf
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/test-morphlines/tutorialReadAvroContainer.conf
rename to solr/contrib/map-reduce/src/test-files/test-morphlines/tutorialReadAvroContainer.conf
diff --git a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/IdentityMapper.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/IdentityMapper.java
similarity index 100%
rename from solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/IdentityMapper.java
rename to solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/IdentityMapper.java
diff --git a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/IdentityReducer.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/IdentityReducer.java
similarity index 100%
rename from solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/IdentityReducer.java
rename to solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/IdentityReducer.java
diff --git a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/LineRandomizerMapperReducerTest.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/LineRandomizerMapperReducerTest.java
similarity index 100%
rename from solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/LineRandomizerMapperReducerTest.java
rename to solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/LineRandomizerMapperReducerTest.java
diff --git a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MRUnitBase.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MRUnitBase.java
similarity index 98%
rename from solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MRUnitBase.java
rename to solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MRUnitBase.java
index 6238c225748..c47858232c4 100644
--- a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MRUnitBase.java
+++ b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MRUnitBase.java
@@ -29,7 +29,7 @@ import org.junit.BeforeClass;
 
 public abstract class MRUnitBase extends SolrTestCaseJ4 {
   
-  protected static final String RESOURCES_DIR = ExternalPaths.SOURCE_HOME + "/contrib/solr-mr/src/test-files";  
+  protected static final String RESOURCES_DIR = ExternalPaths.SOURCE_HOME + "/contrib/map-reduce/src/test-files";  
   protected static final String DOCUMENTS_DIR = RESOURCES_DIR + "/test-documents";
   protected static File solrHomeZip;
 
diff --git a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java
similarity index 99%
rename from solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java
rename to solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java
index e95ebb851d7..c559e0c9cfb 100644
--- a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java
+++ b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java
@@ -49,7 +49,7 @@ public class MapReduceIndexerToolArgumentParserTest extends LuceneTestCase {
   private ByteArrayOutputStream bout;
   private ByteArrayOutputStream berr;
   
-  private static final String RESOURCES_DIR = ExternalPaths.SOURCE_HOME + "/contrib/solr-mr/src/test-files";  
+  private static final String RESOURCES_DIR = ExternalPaths.SOURCE_HOME + "/contrib/map-reduce/src/test-files";  
   private static final File MINIMR_INSTANCE_DIR = new File(RESOURCES_DIR + "/solr/minimr");
 
   private static final String MORPHLINE_FILE = RESOURCES_DIR + "/test-morphlines/solrCellDocumentTypes.conf";
diff --git a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
similarity index 99%
rename from solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
rename to solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
index 1a0101e171f..b4aad76a452 100644
--- a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
+++ b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
@@ -66,7 +66,7 @@ import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies.Conseque
 public class MorphlineBasicMiniMRTest extends SolrTestCaseJ4 {
   
   private static final boolean ENABLE_LOCAL_JOB_RUNNER = false; // for debugging only
-  private static final String RESOURCES_DIR = ExternalPaths.SOURCE_HOME + "/contrib/solr-mr/src/test-files";  
+  private static final String RESOURCES_DIR = ExternalPaths.SOURCE_HOME + "/contrib/map-reduce/src/test-files";  
   private static final String DOCUMENTS_DIR = RESOURCES_DIR + "/test-documents";
   private static final File MINIMR_CONF_DIR = new File(RESOURCES_DIR + "/solr/minimr");
   
diff --git a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
similarity index 99%
rename from solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
rename to solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
index 5b654bcc6d7..b2477acaf4f 100644
--- a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
+++ b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
@@ -86,7 +86,7 @@ import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies.Conseque
 @Slow
 public class MorphlineGoLiveMiniMRTest extends AbstractFullDistribZkTestBase {
   
-  private static final String RESOURCES_DIR = ExternalPaths.SOURCE_HOME + "/contrib/solr-mr/src/test-files";  
+  private static final String RESOURCES_DIR = ExternalPaths.SOURCE_HOME + "/contrib/map-reduce/src/test-files";  
   private static final String DOCUMENTS_DIR = RESOURCES_DIR + "/test-documents";
   private static final File MINIMR_INSTANCE_DIR = new File(RESOURCES_DIR + "/solr/minimr");
   private static final File MINIMR_CONF_DIR = new File(RESOURCES_DIR + "/solr/minimr");
diff --git a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java
similarity index 100%
rename from solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java
rename to solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java
diff --git a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineReducerTest.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineReducerTest.java
similarity index 100%
rename from solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/MorphlineReducerTest.java
rename to solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineReducerTest.java
diff --git a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/UtilsForTests.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/UtilsForTests.java
similarity index 97%
rename from solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/UtilsForTests.java
rename to solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/UtilsForTests.java
index b21d8d204e7..f31237e3cc4 100644
--- a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/UtilsForTests.java
+++ b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/UtilsForTests.java
@@ -33,7 +33,7 @@ import org.apache.solr.util.ExternalPaths;
 
 
 public class UtilsForTests {
-  protected static final String RESOURCES_DIR = ExternalPaths.SOURCE_HOME + "/contrib/solr-mr/src/test-files";  
+  protected static final String RESOURCES_DIR = ExternalPaths.SOURCE_HOME + "/contrib/map-reduce/src/test-files";  
   
   public static void validateSolrServerDocumentCount(File solrHomeDir, FileSystem fs, Path outDir, int expectedDocs, int expectedShards)
       throws IOException, SolrServerException {
diff --git a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/hack/MiniMRClientCluster.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/hack/MiniMRClientCluster.java
similarity index 100%
rename from solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/hack/MiniMRClientCluster.java
rename to solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/hack/MiniMRClientCluster.java
diff --git a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/hack/MiniMRClientClusterFactory.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/hack/MiniMRClientClusterFactory.java
similarity index 100%
rename from solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/hack/MiniMRClientClusterFactory.java
rename to solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/hack/MiniMRClientClusterFactory.java
diff --git a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/hack/MiniMRCluster.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/hack/MiniMRCluster.java
similarity index 100%
rename from solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/hack/MiniMRCluster.java
rename to solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/hack/MiniMRCluster.java
diff --git a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/hack/MiniMRYarnCluster.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/hack/MiniMRYarnCluster.java
similarity index 100%
rename from solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/hack/MiniMRYarnCluster.java
rename to solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/hack/MiniMRYarnCluster.java
diff --git a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/hack/MiniMRYarnClusterAdapter.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/hack/MiniMRYarnClusterAdapter.java
similarity index 100%
rename from solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/hack/MiniMRYarnClusterAdapter.java
rename to solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/hack/MiniMRYarnClusterAdapter.java
diff --git a/solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/hack/MiniYARNCluster.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/hack/MiniYARNCluster.java
similarity index 100%
rename from solr/contrib/solr-mr/src/test/org/apache/solr/hadoop/hack/MiniYARNCluster.java
rename to solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/hack/MiniYARNCluster.java
diff --git a/solr/contrib/solr-morphlines-cell/build.xml b/solr/contrib/morphlines-cell/build.xml
similarity index 71%
rename from solr/contrib/solr-morphlines-cell/build.xml
rename to solr/contrib/morphlines-cell/build.xml
index e0da709634a..352e7cf106a 100644
--- a/solr/contrib/solr-morphlines-cell/build.xml
+++ b/solr/contrib/morphlines-cell/build.xml
@@ -25,34 +25,34 @@
 
   <import file="../contrib-build.xml"/>
   
-  <solr-contrib-uptodate name="solr-extraction" 
+  <solr-contrib-uptodate name="extraction" 
                          property="solr-extraction.uptodate" 
                          classpath.property="solr-cell.jar"/>
   
-  <target name="compile-solr-extraction" unless="extraction.uptodate">
+  <target name="compile-solr-extraction" unless="solr-extraction.uptodate">
    <ant dir="${common-solr.dir}/contrib/extraction" target="compile-core" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
   
-  <solr-contrib-uptodate name="solr-morphlines-core" 
+  <solr-contrib-uptodate name="morphlines-core" 
                          property="solr-morphlines-core.uptodate"/>
   
-  <target name="compile-solr-morphlines-core" unless="solr-morphlines-core.uptodate">
-   <ant dir="${common-solr.dir}/contrib/solr-morphlines-core" target="compile-core" inheritAll="false">
+  <target name="compile-morphlines-core" unless="solr-morphlines-core.uptodate">
+   <ant dir="${common-solr.dir}/contrib/morphlines-core" target="compile-core" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
-    <ant dir="${common-solr.dir}/contrib/solr-morphlines-core" target="compile-test" inheritAll="false">
+    <ant dir="${common-solr.dir}/contrib/morphlines-core" target="compile-test" inheritAll="false">
        <propertyset refid="uptodate.and.compiled.properties"/>
      </ant>
   </target>
   
-  <solr-contrib-uptodate name="solr-mr" 
-                         property="solr-mr.uptodate" 
+  <solr-contrib-uptodate name="map-reduce" 
+                         property="solr-map-reduce.uptodate" 
                          classpath.property="MapReduceIndexerTool.jar"/>
-  <target name="compile-solr-mr" unless="solr-mr.uptodate">
+  <target name="compile-map-reduce" unless="solr-map-reduce.uptodate">
     
-   <ant dir="${common-solr.dir}/contrib/solr-mr" target="compile-core" inheritAll="false">
+   <ant dir="${common-solr.dir}/contrib/map-reduce" target="compile-core" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
@@ -63,14 +63,14 @@
     </ant>
   </target>
   
-  <target name="resolve-solr-morphlines-core-libs">
-    <ant dir="${common-solr.dir}/contrib/solr-morphlines-core" target="resolve" inheritAll="false">
+  <target name="resolve-morphlines-core-libs">
+    <ant dir="${common-solr.dir}/contrib/morphlines-core" target="resolve" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
   
-  <target name="resolve-solr-mr-libs">
-    <ant dir="${common-solr.dir}/contrib/solr-mr" target="resolve" inheritAll="false">
+  <target name="resolve-map-reduce-libs">
+    <ant dir="${common-solr.dir}/contrib/map-reduce" target="resolve" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
@@ -79,9 +79,9 @@
     <pathelement location="${common-solr.dir}/build/contrib/solr-cell/classes/java"/>
     <fileset dir="${common-solr.dir}/contrib/extraction/lib" excludes="${common.classpath.excludes}"/>
     <pathelement location="${common-solr.dir}/build/contrib/solr-morphlines-core/classes/java"/>
-    <fileset dir="${common-solr.dir}/contrib/solr-morphlines-core/lib" excludes="${common.classpath.excludes}"/>
-    <!-- <pathelement location="${common-solr.dir}/build/contrib/solr-mr/classes/java"/> -->
-    <!-- <fileset dir="${common-solr.dir}/contrib/solr-mr/lib" excludes="${common.classpath.excludes}"/> -->
+    <fileset dir="${common-solr.dir}/contrib/morphlines-core/lib" excludes="${common.classpath.excludes}"/>
+    <!-- <pathelement location="${common-solr.dir}/build/contrib/solr-map-reduce/classes/java"/> -->
+    <!-- <fileset dir="${common-solr.dir}/contrib/map-reduce/lib" excludes="${common.classpath.excludes}"/> -->
   </path>
 
   <path id="classpath">
@@ -93,7 +93,7 @@
     <path refid="solr.test.base.classpath"/>
     <path refid="classpath.additions"/>
     <pathelement location="${common-solr.dir}/build/contrib/solr-morphlines-core/classes/test"/>
-    <fileset dir="${common-solr.dir}/contrib/solr-morphlines-core/test-lib" excludes="${common.classpath.excludes}"/>
+    <fileset dir="${common-solr.dir}/contrib/morphlines-core/test-lib" excludes="${common.classpath.excludes}"/>
   </path>
 
   <path id="javadoc.classpath">
@@ -107,7 +107,7 @@
   </path>
   
   <!-- TODO: make this nicer like lucene? -->
-  <target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs,javadocs-solr-core,javadocs-extraction,javadocs-solr-morphlines-core">
+  <target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs,javadocs-solr-core,javadocs-extraction,javadocs-morphlines-core">
         <sequential>
       <mkdir dir="${javadoc.dir}/${name}"/>
       <solr-invoke-javadoc>
@@ -131,13 +131,13 @@
     </ant>
   </target>
   
-  <target name="javadocs-solr-morphlines-core">
-    <ant dir="${common-solr.dir}/contrib/solr-morphlines-core" target="javadocs" inheritAll="false">
+  <target name="javadocs-morphlines-core">
+    <ant dir="${common-solr.dir}/contrib/morphlines-core" target="javadocs" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
   
-  <target name="compile-core" depends="resolve-extraction-libs, resolve-solr-morphlines-core-libs, resolve-solr-mr-libs, compile-solr-extraction, compile-solr-morphlines-core, solr-contrib-build.compile-core"/>
+  <target name="compile-core" depends="resolve-extraction-libs, resolve-morphlines-core-libs, resolve-map-reduce-libs, compile-solr-extraction, compile-morphlines-core, solr-contrib-build.compile-core"/>
   <target name="dist" depends="common-solr.dist"/>
 
 </project>
diff --git a/solr/contrib/solr-morphlines-cell/ivy.xml b/solr/contrib/morphlines-cell/ivy.xml
similarity index 96%
rename from solr/contrib/solr-morphlines-cell/ivy.xml
rename to solr/contrib/morphlines-cell/ivy.xml
index ee652bd8363..1394c71b7b6 100644
--- a/solr/contrib/solr-morphlines-cell/ivy.xml
+++ b/solr/contrib/morphlines-cell/ivy.xml
@@ -17,7 +17,7 @@
    under the License.    
 -->
 <ivy-module version="2.0" xmlns:maven="http://ant.apache.org/ivy/maven">
-  <info organisation="org.apache.solr" module="solr-morphlines-cell" />
+  <info organisation="org.apache.solr" module="morphlines-cell" />
   <configurations>
     <conf name="compile" transitive="false" />
     <conf name="test" transitive="false" />
diff --git a/solr/contrib/solr-morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java b/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java
rename to solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java
diff --git a/solr/contrib/solr-morphlines-cell/src/java/org/apache/solr/morphlines/cell/StripNonCharSolrContentHandlerFactory.java b/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/StripNonCharSolrContentHandlerFactory.java
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/java/org/apache/solr/morphlines/cell/StripNonCharSolrContentHandlerFactory.java
rename to solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/StripNonCharSolrContentHandlerFactory.java
diff --git a/solr/contrib/solr-morphlines-cell/src/java/org/apache/solr/morphlines/cell/TrimSolrContentHandlerFactory.java b/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/TrimSolrContentHandlerFactory.java
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/java/org/apache/solr/morphlines/cell/TrimSolrContentHandlerFactory.java
rename to solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/TrimSolrContentHandlerFactory.java
diff --git a/solr/contrib/solr-morphlines-cell/src/java/org/apache/solr/morphlines/cell/package.html b/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/package.html
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/java/org/apache/solr/morphlines/cell/package.html
rename to solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/package.html
diff --git a/solr/contrib/solr-morphlines-cell/src/java/overview.html b/solr/contrib/morphlines-cell/src/java/overview.html
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/java/overview.html
rename to solr/contrib/morphlines-cell/src/java/overview.html
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/currency.xml b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/currency.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/currency.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/currency.xml
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/elevate.xml b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/elevate.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/elevate.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/elevate.xml
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/contractions_ca.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/contractions_ca.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/contractions_ca.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/contractions_ca.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/contractions_fr.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/contractions_fr.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/contractions_fr.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/contractions_fr.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/contractions_ga.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/contractions_ga.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/contractions_ga.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/contractions_ga.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/contractions_it.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/contractions_it.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/contractions_it.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/contractions_it.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/hyphenations_ga.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/hyphenations_ga.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/hyphenations_ga.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/hyphenations_ga.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stemdict_nl.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stemdict_nl.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stemdict_nl.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stemdict_nl.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stoptags_ja.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stoptags_ja.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stoptags_ja.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stoptags_ja.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_ar.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ar.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_ar.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ar.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_bg.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_bg.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_bg.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_bg.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_ca.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ca.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_ca.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ca.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_cz.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_cz.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_cz.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_cz.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_da.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_da.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_da.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_da.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_de.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_de.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_de.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_de.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_el.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_el.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_el.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_el.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_en.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_en.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_en.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_en.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_es.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_es.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_es.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_es.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_eu.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_eu.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_eu.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_eu.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_fa.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_fa.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_fa.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_fa.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_fi.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_fi.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_fi.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_fi.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_fr.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_fr.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_fr.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_fr.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_ga.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ga.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_ga.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ga.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_gl.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_gl.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_gl.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_gl.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_hi.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_hi.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_hi.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_hi.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_hu.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_hu.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_hu.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_hu.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_hy.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_hy.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_hy.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_hy.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_id.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_id.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_id.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_id.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_it.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_it.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_it.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_it.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_ja.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ja.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_ja.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ja.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_lv.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_lv.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_lv.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_lv.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_nl.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_nl.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_nl.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_nl.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_no.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_no.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_no.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_no.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_pt.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_pt.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_pt.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_pt.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_ro.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ro.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_ro.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ro.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_ru.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ru.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_ru.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_ru.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_sv.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_sv.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_sv.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_sv.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_th.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_th.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_th.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_th.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_tr.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_tr.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/stopwords_tr.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/stopwords_tr.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/userdict_ja.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/userdict_ja.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/lang/userdict_ja.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/lang/userdict_ja.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/protwords.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/protwords.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/protwords.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/protwords.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/schema.xml b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/schema.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/schema.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/schema.xml
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/solrconfig.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/solrconfig.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/solrconfig.xml
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/stopwords.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/stopwords.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/stopwords.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/stopwords.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/collection1/conf/synonyms.txt b/solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/synonyms.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/collection1/conf/synonyms.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/collection1/conf/synonyms.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/currency.xml b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/currency.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/currency.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/currency.xml
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/elevate.xml b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/elevate.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/elevate.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/elevate.xml
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/contractions_ca.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/contractions_ca.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/contractions_ca.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/contractions_ca.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/contractions_fr.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/contractions_fr.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/contractions_fr.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/contractions_fr.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/contractions_ga.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/contractions_ga.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/contractions_ga.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/contractions_ga.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/contractions_it.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/contractions_it.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/contractions_it.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/contractions_it.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/hyphenations_ga.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/hyphenations_ga.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/hyphenations_ga.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/hyphenations_ga.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stemdict_nl.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stemdict_nl.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stemdict_nl.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stemdict_nl.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stoptags_ja.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stoptags_ja.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stoptags_ja.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stoptags_ja.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_ar.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ar.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_ar.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ar.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_bg.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_bg.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_bg.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_bg.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_ca.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ca.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_ca.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ca.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_cz.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_cz.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_cz.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_cz.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_da.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_da.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_da.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_da.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_de.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_de.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_de.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_de.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_el.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_el.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_el.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_el.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_en.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_en.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_en.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_en.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_es.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_es.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_es.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_es.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_eu.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_eu.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_eu.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_eu.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_fa.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_fa.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_fa.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_fa.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_fi.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_fi.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_fi.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_fi.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_fr.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_fr.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_fr.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_fr.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_ga.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ga.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_ga.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ga.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_gl.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_gl.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_gl.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_gl.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_hi.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_hi.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_hi.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_hi.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_hu.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_hu.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_hu.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_hu.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_hy.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_hy.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_hy.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_hy.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_id.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_id.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_id.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_id.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_it.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_it.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_it.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_it.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_ja.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ja.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_ja.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ja.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_lv.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_lv.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_lv.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_lv.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_nl.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_nl.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_nl.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_nl.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_no.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_no.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_no.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_no.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_pt.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_pt.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_pt.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_pt.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_ro.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ro.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_ro.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ro.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_ru.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ru.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_ru.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_ru.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_sv.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_sv.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_sv.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_sv.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_th.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_th.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_th.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_th.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_tr.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_tr.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/stopwords_tr.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/stopwords_tr.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/userdict_ja.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/userdict_ja.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/lang/userdict_ja.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/lang/userdict_ja.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/protwords.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/protwords.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/protwords.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/protwords.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/schema.xml b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/schema.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/schema.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/schema.xml
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/solrconfig.xml b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/solrconfig.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/solrconfig.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/solrconfig.xml
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/stopwords.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/stopwords.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/stopwords.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/stopwords.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/conf/synonyms.txt b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/synonyms.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/conf/synonyms.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/conf/synonyms.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/minimr/solr.xml b/solr/contrib/morphlines-cell/src/test-files/solr/minimr/solr.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/minimr/solr.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/minimr/solr.xml
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/currency.xml b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/currency.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/currency.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/currency.xml
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/elevate.xml b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/elevate.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/elevate.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/elevate.xml
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/contractions_ca.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/contractions_ca.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/contractions_ca.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/contractions_ca.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/contractions_fr.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/contractions_fr.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/contractions_fr.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/contractions_fr.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/contractions_ga.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/contractions_ga.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/contractions_ga.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/contractions_ga.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/contractions_it.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/contractions_it.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/contractions_it.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/contractions_it.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/hyphenations_ga.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/hyphenations_ga.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/hyphenations_ga.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/hyphenations_ga.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stemdict_nl.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stemdict_nl.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stemdict_nl.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stemdict_nl.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stoptags_ja.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stoptags_ja.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stoptags_ja.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stoptags_ja.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_ar.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ar.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_ar.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ar.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_bg.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_bg.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_bg.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_bg.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_ca.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ca.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_ca.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ca.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_cz.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_cz.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_cz.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_cz.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_da.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_da.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_da.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_da.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_de.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_de.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_de.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_de.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_el.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_el.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_el.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_el.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_en.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_en.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_en.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_en.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_es.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_es.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_es.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_es.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_eu.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_eu.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_eu.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_eu.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_fa.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_fa.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_fa.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_fa.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_fi.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_fi.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_fi.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_fi.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_fr.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_fr.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_fr.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_fr.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_ga.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ga.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_ga.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ga.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_gl.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_gl.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_gl.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_gl.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_hi.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_hi.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_hi.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_hi.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_hu.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_hu.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_hu.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_hu.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_hy.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_hy.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_hy.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_hy.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_id.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_id.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_id.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_id.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_it.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_it.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_it.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_it.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_ja.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ja.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_ja.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ja.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_lv.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_lv.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_lv.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_lv.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_nl.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_nl.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_nl.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_nl.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_no.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_no.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_no.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_no.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_pt.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_pt.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_pt.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_pt.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_ro.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ro.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_ro.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ro.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_ru.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ru.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_ru.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_ru.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_sv.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_sv.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_sv.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_sv.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_th.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_th.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_th.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_th.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_tr.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_tr.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/stopwords_tr.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/stopwords_tr.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/userdict_ja.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/userdict_ja.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/lang/userdict_ja.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/lang/userdict_ja.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/protwords.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/protwords.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/protwords.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/protwords.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/schema.xml b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/schema.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/schema.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/schema.xml
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/solrconfig.xml b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/solrconfig.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/solrconfig.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/solrconfig.xml
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/stopwords.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/stopwords.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/stopwords.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/stopwords.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/synonyms.txt b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/synonyms.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/conf/synonyms.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/conf/synonyms.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/mrunit/solr.xml b/solr/contrib/morphlines-cell/src/test-files/solr/mrunit/solr.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/mrunit/solr.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/mrunit/solr.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/solr.xml b/solr/contrib/morphlines-cell/src/test-files/solr/solr.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/solr.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/solr.xml
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/currency.xml b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/currency.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/currency.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/currency.xml
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/elevate.xml b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/elevate.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/elevate.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/elevate.xml
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_ca.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_ca.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_ca.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_ca.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_fr.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_fr.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_fr.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_fr.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_ga.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_ga.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_ga.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_ga.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_it.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_it.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_it.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/contractions_it.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/hyphenations_ga.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/hyphenations_ga.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/hyphenations_ga.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/hyphenations_ga.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stemdict_nl.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stemdict_nl.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stemdict_nl.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stemdict_nl.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stoptags_ja.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stoptags_ja.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stoptags_ja.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stoptags_ja.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ar.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ar.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ar.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ar.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_bg.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_bg.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_bg.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_bg.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ca.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ca.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ca.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ca.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_cz.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_cz.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_cz.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_cz.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_da.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_da.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_da.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_da.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_de.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_de.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_de.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_de.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_el.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_el.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_el.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_el.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_en.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_en.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_en.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_en.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_es.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_es.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_es.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_es.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_eu.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_eu.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_eu.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_eu.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fa.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fa.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fa.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fa.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fi.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fi.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fi.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fi.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fr.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fr.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fr.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_fr.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ga.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ga.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ga.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ga.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_gl.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_gl.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_gl.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_gl.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hi.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hi.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hi.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hi.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hu.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hu.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hu.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hu.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hy.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hy.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hy.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_hy.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_id.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_id.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_id.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_id.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_it.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_it.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_it.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_it.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ja.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ja.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ja.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ja.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_lv.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_lv.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_lv.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_lv.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_nl.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_nl.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_nl.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_nl.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_no.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_no.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_no.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_no.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_pt.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_pt.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_pt.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_pt.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ro.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ro.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ro.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ro.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ru.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ru.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ru.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_ru.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_sv.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_sv.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_sv.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_sv.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_th.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_th.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_th.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_th.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_tr.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_tr.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_tr.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/stopwords_tr.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/userdict_ja.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/userdict_ja.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/lang/userdict_ja.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/lang/userdict_ja.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/protwords.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/protwords.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/protwords.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/protwords.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/schema.xml b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/schema.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/schema.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/schema.xml
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/stopwords.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/stopwords.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/stopwords.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/stopwords.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/synonyms.txt b/solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/synonyms.txt
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcelltest/collection1/conf/synonyms.txt
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcelltest/collection1/conf/synonyms.txt
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solrcloud/conf/solrconfig.xml b/solr/contrib/morphlines-cell/src/test-files/solr/solrcloud/conf/solrconfig.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solrcloud/conf/solrconfig.xml
rename to solr/contrib/morphlines-cell/src/test-files/solr/solrcloud/conf/solrconfig.xml
diff --git a/solr/contrib/solr-morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java b/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
similarity index 100%
rename from solr/contrib/solr-morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
rename to solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
diff --git a/solr/contrib/solr-morphlines-core/build.xml b/solr/contrib/morphlines-core/build.xml
similarity index 98%
rename from solr/contrib/solr-morphlines-core/build.xml
rename to solr/contrib/morphlines-core/build.xml
index ad11be1226c..859b0322e2b 100644
--- a/solr/contrib/solr-morphlines-core/build.xml
+++ b/solr/contrib/morphlines-core/build.xml
@@ -27,7 +27,7 @@
 
   <import file="../contrib-build.xml"/>
   
-  <solr-contrib-uptodate name="solr-extraction" 
+  <solr-contrib-uptodate name="extraction" 
                          property="solr-extraction.uptodate" 
                          classpath.property="solr-cell.jar"/>
   
diff --git a/solr/contrib/solr-morphlines-core/ivy.xml b/solr/contrib/morphlines-core/ivy.xml
similarity index 98%
rename from solr/contrib/solr-morphlines-core/ivy.xml
rename to solr/contrib/morphlines-core/ivy.xml
index abefff79135..c3712b7270c 100644
--- a/solr/contrib/solr-morphlines-core/ivy.xml
+++ b/solr/contrib/morphlines-core/ivy.xml
@@ -17,9 +17,9 @@
    under the License.    
 -->
 <ivy-module version="2.0" xmlns:maven="http://ant.apache.org/ivy/maven">
-  <info organisation="org.apache.solr" module="solr-morphlines-core" />
+  <info organisation="org.apache.solr" module="morphlines-core" />
   <configurations>
-    <!-- artifacts in the "compile" configuration will go into solr-morphlines-core/lib/ -->
+    <!-- artifacts in the "compile" configuration will go into morphlines-core/lib/ -->
     <conf name="compile" transitive="false" />
     <!-- artifacts in the "test" and "test.DfsMiniCluster" configuration will go into solr/core/test-lib/ -->
     <conf name="test" transitive="false" />
diff --git a/solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/DocumentLoader.java b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/DocumentLoader.java
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/DocumentLoader.java
rename to solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/DocumentLoader.java
diff --git a/solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/GenerateSolrSequenceKeyBuilder.java b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/GenerateSolrSequenceKeyBuilder.java
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/GenerateSolrSequenceKeyBuilder.java
rename to solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/GenerateSolrSequenceKeyBuilder.java
diff --git a/solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/LoadSolrBuilder.java b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/LoadSolrBuilder.java
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/LoadSolrBuilder.java
rename to solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/LoadSolrBuilder.java
diff --git a/solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/SafeConcurrentUpdateSolrServer.java b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SafeConcurrentUpdateSolrServer.java
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/SafeConcurrentUpdateSolrServer.java
rename to solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SafeConcurrentUpdateSolrServer.java
diff --git a/solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/SanitizeUnknownSolrFieldsBuilder.java b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SanitizeUnknownSolrFieldsBuilder.java
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/SanitizeUnknownSolrFieldsBuilder.java
rename to solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SanitizeUnknownSolrFieldsBuilder.java
diff --git a/solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrLocator.java b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrLocator.java
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrLocator.java
rename to solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrLocator.java
diff --git a/solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrMorphlineContext.java b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrMorphlineContext.java
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrMorphlineContext.java
rename to solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrMorphlineContext.java
diff --git a/solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrServerDocumentLoader.java b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrServerDocumentLoader.java
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrServerDocumentLoader.java
rename to solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/SolrServerDocumentLoader.java
diff --git a/solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java
rename to solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java
diff --git a/solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/ZooKeeperDownloader.java b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/ZooKeeperDownloader.java
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/ZooKeeperDownloader.java
rename to solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/ZooKeeperDownloader.java
diff --git a/solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/package.html b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/package.html
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/java/org/apache/solr/morphlines/solr/package.html
rename to solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/package.html
diff --git a/solr/contrib/solr-morphlines-core/src/java/overview.html b/solr/contrib/morphlines-core/src/java/overview.html
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/java/overview.html
rename to solr/contrib/morphlines-core/src/java/overview.html
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/README b/solr/contrib/morphlines-core/src/test-files/README
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/README
rename to solr/contrib/morphlines-core/src/test-files/README
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/books_numeric_ids.csv b/solr/contrib/morphlines-core/src/test-files/books_numeric_ids.csv
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/books_numeric_ids.csv
rename to solr/contrib/morphlines-core/src/test-files/books_numeric_ids.csv
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/exampledocs/example.html b/solr/contrib/morphlines-core/src/test-files/exampledocs/example.html
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/exampledocs/example.html
rename to solr/contrib/morphlines-core/src/test-files/exampledocs/example.html
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/exampledocs/example.txt b/solr/contrib/morphlines-core/src/test-files/exampledocs/example.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/exampledocs/example.txt
rename to solr/contrib/morphlines-core/src/test-files/exampledocs/example.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/lib-dirs/README b/solr/contrib/morphlines-core/src/test-files/lib-dirs/README
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/lib-dirs/README
rename to solr/contrib/morphlines-core/src/test-files/lib-dirs/README
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/lib-dirs/a/a1/empty-file-a1.txt b/solr/contrib/morphlines-core/src/test-files/lib-dirs/a/a1/empty-file-a1.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/lib-dirs/a/a1/empty-file-a1.txt
rename to solr/contrib/morphlines-core/src/test-files/lib-dirs/a/a1/empty-file-a1.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/lib-dirs/a/a2/empty-file-a2.txt b/solr/contrib/morphlines-core/src/test-files/lib-dirs/a/a2/empty-file-a2.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/lib-dirs/a/a2/empty-file-a2.txt
rename to solr/contrib/morphlines-core/src/test-files/lib-dirs/a/a2/empty-file-a2.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/lib-dirs/b/b1/empty-file-b1.txt b/solr/contrib/morphlines-core/src/test-files/lib-dirs/b/b1/empty-file-b1.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/lib-dirs/b/b1/empty-file-b1.txt
rename to solr/contrib/morphlines-core/src/test-files/lib-dirs/b/b1/empty-file-b1.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/lib-dirs/b/b2/empty-file-b2.txt b/solr/contrib/morphlines-core/src/test-files/lib-dirs/b/b2/empty-file-b2.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/lib-dirs/b/b2/empty-file-b2.txt
rename to solr/contrib/morphlines-core/src/test-files/lib-dirs/b/b2/empty-file-b2.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/lib-dirs/c/c1/empty-file-c1.txt b/solr/contrib/morphlines-core/src/test-files/lib-dirs/c/c1/empty-file-c1.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/lib-dirs/c/c1/empty-file-c1.txt
rename to solr/contrib/morphlines-core/src/test-files/lib-dirs/c/c1/empty-file-c1.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/lib-dirs/c/c2/empty-file-c2.txt b/solr/contrib/morphlines-core/src/test-files/lib-dirs/c/c2/empty-file-c2.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/lib-dirs/c/c2/empty-file-c2.txt
rename to solr/contrib/morphlines-core/src/test-files/lib-dirs/c/c2/empty-file-c2.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/lib-dirs/d/d1/empty-file-d1.txt b/solr/contrib/morphlines-core/src/test-files/lib-dirs/d/d1/empty-file-d1.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/lib-dirs/d/d1/empty-file-d1.txt
rename to solr/contrib/morphlines-core/src/test-files/lib-dirs/d/d1/empty-file-d1.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/lib-dirs/d/d2/empty-file-d2.txt b/solr/contrib/morphlines-core/src/test-files/lib-dirs/d/d2/empty-file-d2.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/lib-dirs/d/d2/empty-file-d2.txt
rename to solr/contrib/morphlines-core/src/test-files/lib-dirs/d/d2/empty-file-d2.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/log4j.properties b/solr/contrib/morphlines-core/src/test-files/log4j.properties
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/log4j.properties
rename to solr/contrib/morphlines-core/src/test-files/log4j.properties
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/mailing_lists.pdf b/solr/contrib/morphlines-core/src/test-files/mailing_lists.pdf
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/mailing_lists.pdf
rename to solr/contrib/morphlines-core/src/test-files/mailing_lists.pdf
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/old-solr-example/README.txt b/solr/contrib/morphlines-core/src/test-files/old-solr-example/README.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/old-solr-example/README.txt
rename to solr/contrib/morphlines-core/src/test-files/old-solr-example/README.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/old-solr-example/solr.xml b/solr/contrib/morphlines-core/src/test-files/old-solr-example/solr.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/old-solr-example/solr.xml
rename to solr/contrib/morphlines-core/src/test-files/old-solr-example/solr.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/addfields.updateprocessor.js b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/addfields.updateprocessor.js
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/addfields.updateprocessor.js
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/addfields.updateprocessor.js
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/analyzingInfixSuggest.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/analyzingInfixSuggest.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/analyzingInfixSuggest.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/analyzingInfixSuggest.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-currency.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-currency.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-currency.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-currency.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-mp-solrconfig.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-mp-solrconfig.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-mp-solrconfig.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-mp-solrconfig.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-nested.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-nested.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-nested.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-nested.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-bogus-analysis-parameters.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-bogus-analysis-parameters.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-bogus-analysis-parameters.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-bogus-analysis-parameters.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-bogus-field-parameters.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-bogus-field-parameters.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-bogus-field-parameters.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-bogus-field-parameters.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-codec-global-vs-ft-mismatch.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-codec-global-vs-ft-mismatch.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-codec-global-vs-ft-mismatch.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-codec-global-vs-ft-mismatch.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-dynamic-multivalued.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-dynamic-multivalued.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-dynamic-multivalued.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-dynamic-multivalued.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-code-in-xml.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-code-in-xml.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-code-in-xml.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-code-in-xml.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-default-code.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-default-code.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-default-code.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-bogus-default-code.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-multivalued.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-multivalued.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-multivalued.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-multivalued.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-oer-norates.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-oer-norates.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-oer-norates.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-ft-oer-norates.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-multivalued.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-multivalued.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-multivalued.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-currency-multivalued.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dup-dynamicField.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dup-dynamicField.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dup-dynamicField.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dup-dynamicField.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dup-field.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dup-field.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dup-field.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dup-field.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-default-val.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-default-val.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-default-val.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-default-val.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-required.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-required.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-required.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-dynamicfield-required.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-external-filefield.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-external-filefield.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-external-filefield.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-external-filefield.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-dest-should-fail-test.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-dest-should-fail-test.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-dest-should-fail-test.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-dest-should-fail-test.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-source-should-fail-test.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-source-should-fail-test.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-source-should-fail-test.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-misplaced-asterisk-copyfield-source-should-fail-test.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-dest-should-fail-test.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-dest-should-fail-test.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-dest-should-fail-test.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-dest-should-fail-test.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-source-should-fail-test.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-source-should-fail-test.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-source-should-fail-test.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-multiple-asterisk-copyfield-source-should-fail-test.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-non-glob-copyfield-source-matching-nothing-should-fail-test.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-non-glob-copyfield-source-matching-nothing-should-fail-test.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-non-glob-copyfield-source-matching-nothing-should-fail-test.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-non-glob-copyfield-source-matching-nothing-should-fail-test.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-nontext-analyzer.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-nontext-analyzer.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-nontext-analyzer.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-nontext-analyzer.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-norms.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-norms.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-norms.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-norms.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-pos.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-pos.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-pos.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-pos.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-tf.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-tf.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-tf.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-not-indexed-but-tf.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-omit-tf-but-not-pos.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-omit-tf-but-not-pos.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-omit-tf-but-not-pos.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-omit-tf-but-not-pos.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sim-global-vs-ft-mismatch.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sim-global-vs-ft-mismatch.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sim-global-vs-ft-mismatch.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sim-global-vs-ft-mismatch.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-both-tf.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-both-tf.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-both-tf.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-both-tf.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-baseline.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-baseline.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-baseline.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-baseline.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-hyperbolic.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-hyperbolic.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-hyperbolic.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-hyperbolic.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-norms.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-norms.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-norms.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-sweetspot-partial-norms.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-is-copyfield-dest.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-is-copyfield-dest.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-is-copyfield-dest.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-is-copyfield-dest.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-multivalued.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-multivalued.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-multivalued.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-multivalued.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-uses-default.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-uses-default.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-uses-default.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-uses-default.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-unsupported-docValues.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-unsupported-docValues.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-schema-unsupported-docValues.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-schema-unsupported-docValues.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-bogus-scriptengine-name.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-invalid-scriptfile.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-invalid-scriptfile.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-invalid-scriptfile.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-invalid-scriptfile.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-managed-schema-named-schema.xml.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-managed-schema-named-schema.xml.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-managed-schema-named-schema.xml.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-managed-schema-named-schema.xml.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-missing-scriptfile.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-missing-scriptfile.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-missing-scriptfile.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-missing-scriptfile.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-cfs.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-cfs.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-cfs.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-cfs.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-dirfactory.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-dirfactory.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-dirfactory.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-dirfactory.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-schema-mutable-but-not-managed.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-schema-mutable-but-not-managed.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-schema-mutable-but-not-managed.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-schema-mutable-but-not-managed.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-unexpected-schema-attribute.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-unexpected-schema-attribute.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-unexpected-schema-attribute.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-unexpected-schema-attribute.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-warmer-no-reopen.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-warmer-no-reopen.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-warmer-no-reopen.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad-solrconfig-warmer-no-reopen.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad_solrconfig.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad_solrconfig.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/bad_solrconfig.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/bad_solrconfig.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/compoundDictionary.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/compoundDictionary.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/compoundDictionary.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/compoundDictionary.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/conditional.updateprocessor.js b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/conditional.updateprocessor.js
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/conditional.updateprocessor.js
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/conditional.updateprocessor.js
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/currency.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/currency.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/currency.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/currency.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/da_UTF8.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/da_UTF8.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/da_UTF8.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/da_UTF8.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/da_compoundDictionary.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/da_compoundDictionary.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/da_compoundDictionary.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/da_compoundDictionary.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/elevate.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/elevate.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/elevate.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/elevate.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/frenchArticles.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/frenchArticles.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/frenchArticles.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/frenchArticles.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/fuzzysuggest.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/fuzzysuggest.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/fuzzysuggest.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/fuzzysuggest.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/hunspell-test.aff b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/hunspell-test.aff
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/hunspell-test.aff
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/hunspell-test.aff
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/hunspell-test.dic b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/hunspell-test.dic
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/hunspell-test.dic
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/hunspell-test.dic
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/hyphenation.dtd b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/hyphenation.dtd
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/hyphenation.dtd
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/hyphenation.dtd
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/jasuggest.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/jasuggest.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/jasuggest.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/jasuggest.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/keep-1.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/keep-1.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/keep-1.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/keep-1.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/keep-2.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/keep-2.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/keep-2.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/keep-2.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/mapping-ISOLatin1Accent.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/mapping-ISOLatin1Accent.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/mapping-ISOLatin1Accent.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/mapping-ISOLatin1Accent.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/missing.functions.updateprocessor.js b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/missing.functions.updateprocessor.js
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/missing.functions.updateprocessor.js
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/missing.functions.updateprocessor.js
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/missleading.extension.updateprocessor.js.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/missleading.extension.updateprocessor.js.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/missleading.extension.updateprocessor.js.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/missleading.extension.updateprocessor.js.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/old_synonyms.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/old_synonyms.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/old_synonyms.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/old_synonyms.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/open-exchange-rates.json b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/open-exchange-rates.json
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/open-exchange-rates.json
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/open-exchange-rates.json
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/phrasesuggest.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/phrasesuggest.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/phrasesuggest.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/phrasesuggest.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/protwords.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/protwords.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/protwords.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/protwords.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/regex-boost-processor-test.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/regex-boost-processor-test.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/regex-boost-processor-test.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/regex-boost-processor-test.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-behavior.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-behavior.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-behavior.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-behavior.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-binaryfield.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-binaryfield.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-binaryfield.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-binaryfield.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-bm25.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-bm25.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-bm25.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-bm25.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-charfilters.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-charfilters.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-charfilters.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-charfilters.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-class-name-shortening-on-serialization.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-class-name-shortening-on-serialization.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-class-name-shortening-on-serialization.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-class-name-shortening-on-serialization.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-collate.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-collate.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-collate.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-collate.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-dfr.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-dfr.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-dfr.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-dfr.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-docValues.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-docValues.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-docValues.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-docValues.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-docValuesMulti.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-docValuesMulti.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-docValuesMulti.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-docValuesMulti.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-eff.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-eff.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-eff.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-eff.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-folding.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-folding.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-folding.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-folding.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-ib.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-ib.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-ib.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-ib.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-id-and-version-fields-only.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-id-and-version-fields-only.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-id-and-version-fields-only.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-id-and-version-fields-only.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-minimal.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-minimal.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-minimal.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-minimal.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-numeric.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-numeric.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-numeric.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-numeric.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-one-field-no-dynamic-field-unique-key.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-one-field-no-dynamic-field-unique-key.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-one-field-no-dynamic-field-unique-key.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-one-field-no-dynamic-field-unique-key.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-one-field-no-dynamic-field.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-one-field-no-dynamic-field.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-one-field-no-dynamic-field.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-one-field-no-dynamic-field.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-replication1.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-replication1.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-replication1.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-replication1.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-replication2.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-replication2.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-replication2.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-replication2.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-required-fields.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-required-fields.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-required-fields.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-required-fields.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-rest-lucene-match-version.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-rest-lucene-match-version.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-rest-lucene-match-version.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-rest-lucene-match-version.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-rest.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-rest.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-rest.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-rest.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-reversed.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-reversed.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-reversed.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-reversed.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-sim.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-sim.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-sim.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-sim.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-snippet-field.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-snippet-field.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-snippet-field.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-snippet-field.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-snippet-type.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-snippet-type.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-snippet-type.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-snippet-type.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-snippet-types.incl b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-snippet-types.incl
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-snippet-types.incl
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-snippet-types.incl
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-spatial.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-spatial.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-spatial.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-spatial.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-spellchecker.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-stop-keep.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-stop-keep.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-stop-keep.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-stop-keep.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-sweetspot.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-sweetspot.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-sweetspot.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-sweetspot.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-tfidf.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-tfidf.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-tfidf.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-tfidf.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-tiny.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-tiny.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-tiny.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-tiny.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-trie.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-trie.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-trie.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-trie.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-xinclude.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-xinclude.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema-xinclude.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema-xinclude.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema11.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema11.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema11.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema11.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema12.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema12.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema12.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema12.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema15.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema15.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema15.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema15.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema_codec.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema_codec.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schema_codec.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schema_codec.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schemasurround.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schemasurround.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/schemasurround.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/schemasurround.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-basic.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-basic.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-basic.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-basic.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-caching.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-caching.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-caching.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-caching.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-defaults.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-defaults.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-defaults.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-defaults.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-infostream-logging.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-infostream-logging.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-infostream-logging.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-infostream-logging.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-lazywriter.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-lazywriter.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-lazywriter.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-lazywriter.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicy.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicy.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicy.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicy.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master1.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master2.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master3.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-reqHandler.incl b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-reqHandler.incl
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-reqHandler.incl
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-reqHandler.incl
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-slave.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-snippet-processor.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-snippet-processor.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-snippet-processor.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-snippet-processor.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicy.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicy.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicy.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicy.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-warmer.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-warmer.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-warmer.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-warmer.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig_codec.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig_codec.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig_codec.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig_codec.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig_perf.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/stemdict.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/stemdict.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/stemdict.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/stemdict.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/stop-1.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/stop-1.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/stop-1.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/stop-1.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/stop-2.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/stop-2.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/stop-2.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/stop-2.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/stop-snowball.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/stop-snowball.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/stop-snowball.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/stop-snowball.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/stoptypes-1.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/stoptypes-1.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/stoptypes-1.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/stoptypes-1.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/stoptypes-2.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/stoptypes-2.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/stoptypes-2.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/stoptypes-2.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/stopwithbom.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/stopwithbom.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/stopwithbom.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/stopwithbom.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/stopwords.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/stopwords.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/stopwords.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/stopwords.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/stopwordsWrongEncoding.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/stopwordsWrongEncoding.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/stopwordsWrongEncoding.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/stopwordsWrongEncoding.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/synonyms.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/synonyms.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/synonyms.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/synonyms.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/throw.error.on.add.updateprocessor.js b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/throw.error.on.add.updateprocessor.js
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/throw.error.on.add.updateprocessor.js
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/throw.error.on.add.updateprocessor.js
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/trivial.updateprocessor0.js b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/trivial.updateprocessor0.js
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/trivial.updateprocessor0.js
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/trivial.updateprocessor0.js
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/trivial.updateprocessor1.js b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/trivial.updateprocessor1.js
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/trivial.updateprocessor1.js
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/trivial.updateprocessor1.js
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/wdftypes.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/wdftypes.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/wdftypes.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/wdftypes.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/xslt/dummy-using-include.xsl b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/xslt/dummy-using-include.xsl
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/xslt/dummy-using-include.xsl
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/xslt/dummy-using-include.xsl
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/xslt/dummy.xsl b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/xslt/dummy.xsl
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/xslt/dummy.xsl
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/xslt/dummy.xsl
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/xslt/xsl-update-handler-test.xsl b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/xslt/xsl-update-handler-test.xsl
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/conf/xslt/xsl-update-handler-test.xsl
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/xslt/xsl-update-handler-test.xsl
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/lib/README b/solr/contrib/morphlines-core/src/test-files/solr/collection1/lib/README
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/lib/README
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/lib/README
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/lib/classes/empty-file-main-lib.txt b/solr/contrib/morphlines-core/src/test-files/solr/collection1/lib/classes/empty-file-main-lib.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/collection1/lib/classes/empty-file-main-lib.txt
rename to solr/contrib/morphlines-core/src/test-files/solr/collection1/lib/classes/empty-file-main-lib.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/conf/core.properties b/solr/contrib/morphlines-core/src/test-files/solr/conf/core.properties
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/conf/core.properties
rename to solr/contrib/morphlines-core/src/test-files/solr/conf/core.properties
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/crazy-path-to-config.xml b/solr/contrib/morphlines-core/src/test-files/solr/crazy-path-to-config.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/crazy-path-to-config.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/crazy-path-to-config.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/crazy-path-to-schema.xml b/solr/contrib/morphlines-core/src/test-files/solr/crazy-path-to-schema.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/crazy-path-to-schema.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/crazy-path-to-schema.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/external_eff b/solr/contrib/morphlines-core/src/test-files/solr/external_eff
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/external_eff
rename to solr/contrib/morphlines-core/src/test-files/solr/external_eff
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/solr-50-all.xml b/solr/contrib/morphlines-core/src/test-files/solr/solr-50-all.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/solr-50-all.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/solr-50-all.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/solr-multicore.xml b/solr/contrib/morphlines-core/src/test-files/solr/solr-multicore.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/solr-multicore.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/solr-multicore.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/solr-no-core.xml b/solr/contrib/morphlines-core/src/test-files/solr/solr-no-core.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/solr-no-core.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/solr-no-core.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/solr-shardhandler-old.xml b/solr/contrib/morphlines-core/src/test-files/solr/solr-shardhandler-old.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/solr-shardhandler-old.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/solr-shardhandler-old.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/solr-shardhandler.xml b/solr/contrib/morphlines-core/src/test-files/solr/solr-shardhandler.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/solr-shardhandler.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/solr-shardhandler.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/solr-stress-new.xml b/solr/contrib/morphlines-core/src/test-files/solr/solr-stress-new.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/solr-stress-new.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/solr-stress-new.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/solr/solr-stress-old.xml b/solr/contrib/morphlines-core/src/test-files/solr/solr-stress-old.xml
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/solr/solr-stress-old.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/solr-stress-old.xml
diff --git a/solr/contrib/solr-mr/src/test-files/solr/solr.xml b/solr/contrib/morphlines-core/src/test-files/solr/solr.xml
similarity index 100%
rename from solr/contrib/solr-mr/src/test-files/solr/solr.xml
rename to solr/contrib/morphlines-core/src/test-files/solr/solr.xml
diff --git a/solr/contrib/solr-morphlines-core/src/test-files/spellings.txt b/solr/contrib/morphlines-core/src/test-files/spellings.txt
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test-files/spellings.txt
rename to solr/contrib/morphlines-core/src/test-files/spellings.txt
diff --git a/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
similarity index 99%
rename from solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
rename to solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
index ac562e66ac7..9ffe6f63220 100644
--- a/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
+++ b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
@@ -68,7 +68,7 @@ public class AbstractSolrMorphlineTestBase extends SolrTestCaseJ4 {
   protected static final String EXTERNAL_SOLR_SERVER_URL = System.getProperty("externalSolrServer");
 //  protected static final String EXTERNAL_SOLR_SERVER_URL = "http://127.0.0.1:8983/solr";
 
-  protected static final String RESOURCES_DIR = ExternalPaths.SOURCE_HOME + "/contrib/solr-mr/src/test-files"; 
+  protected static final String RESOURCES_DIR = ExternalPaths.SOURCE_HOME + "/contrib/map-reduce/src/test-files"; 
   protected static final String DEFAULT_BASE_DIR = "solr";
   protected static final AtomicInteger SEQ_NUM = new AtomicInteger();
   protected static final AtomicInteger SEQ_NUM2 = new AtomicInteger();
diff --git a/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java
similarity index 99%
rename from solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java
rename to solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java
index 62cf325d5a7..615c2ccc733 100644
--- a/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java
+++ b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java
@@ -49,7 +49,7 @@ import com.typesafe.config.Config;
 public abstract class AbstractSolrMorphlineZkTestBase extends AbstractFullDistribZkTestBase {
   private static final File solrHomeDirectory = new File(TEMP_DIR, AbstractSolrMorphlineZkTestBase.class.getName());
   
-  protected static final String RESOURCES_DIR = ExternalPaths.SOURCE_HOME + "/contrib/solr-mr/src/test-files";  
+  protected static final String RESOURCES_DIR = ExternalPaths.SOURCE_HOME + "/contrib/map-reduce/src/test-files";  
   private static final File SOLR_INSTANCE_DIR = new File(RESOURCES_DIR + "/solr");
   private static final File SOLR_CONF_DIR = new File(RESOURCES_DIR + "/solr/collection1");
 
diff --git a/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/CollectingDocumentLoader.java b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/CollectingDocumentLoader.java
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/CollectingDocumentLoader.java
rename to solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/CollectingDocumentLoader.java
diff --git a/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/EmbeddedTestSolrServer.java b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/EmbeddedTestSolrServer.java
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/EmbeddedTestSolrServer.java
rename to solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/EmbeddedTestSolrServer.java
diff --git a/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java
rename to solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java
diff --git a/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java
rename to solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java
diff --git a/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java
rename to solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java
diff --git a/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java
similarity index 100%
rename from solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java
rename to solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java
diff --git a/solr/example/scripts/map-reduce/map-reduce-indexer.bat b/solr/example/scripts/map-reduce/map-reduce-indexer.bat
new file mode 100644
index 00000000000..0817dee7880
--- /dev/null
+++ b/solr/example/scripts/map-reduce/map-reduce-indexer.bat
@@ -0,0 +1,9 @@
+
+set JVM=java
+
+REM  Find location of this script
+
+set SDIR=%~dp0
+if "%SDIR:~-1%"=="\" set SDIR=%SDIR:~0,-1%
+
+"%JVM%" -classpath "%SDIR%\..\..\..\dist\*:%SDIR%\..\..\..\contrib\map-reduce\lib\*:%SDIR%\..\..\..\contrib\morphlines-core\lib\*:%SDIR%\..\..\..\contrib\morphlines-cell\lib\*:%SDIR%\..\..\..\contrib\extraction\lib\*:%SDIR%\..\..\solr-webapp\webapp\WEB-INF\lib\*:%SDIR%\..\..\lib\ext\*" org.apache.solr.hadoop.MapReduceIndexerTool %*
diff --git a/solr/example/scripts/map-reduce/map-reduce-indexer.sh b/solr/example/scripts/map-reduce/map-reduce-indexer.sh
new file mode 100644
index 00000000000..db361ed2614
--- /dev/null
+++ b/solr/example/scripts/map-reduce/map-reduce-indexer.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+JVM="java"
+
+# Find location of this script
+
+sdir="`dirname \"$0\"`"
+
+PATH=$JAVA_HOME/bin:$PATH $JVM -cp "$sdir/../../../dist/*:$sdir/../../../contrib/map-reduce/lib/*:$sdir/../../../contrib/morphlines-core/lib/*:$sdir/../../../contrib/morphlines-cell/lib/*:$sdir/../../../contrib/extraction/lib/*:$sdir/../../solr-webapp/webapp/WEB-INF/lib/*:$sdir/../../lib/ext/*" org.apache.solr.hadoop.MapReduceIndexerTool ${1+"$@"}
+
diff --git a/solr/example/scripts/solr-mr/solr-mr.bat b/solr/example/scripts/solr-mr/solr-mr.bat
deleted file mode 100644
index 89f934628bd..00000000000
--- a/solr/example/scripts/solr-mr/solr-mr.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-
-set JVM=java
-
-REM  Find location of this script
-
-set SDIR=%~dp0
-if "%SDIR:~-1%"=="\" set SDIR=%SDIR:~0,-1%
-
-"%JVM%" -classpath "%SDIR%\..\..\..\dist\*:%SDIR%\..\..\..\contrib\solr-mr\lib\*:%SDIR%\..\..\..\contrib\solr-morphlines-core\lib\*:%SDIR%\..\..\..\contrib\solr-morphlines-cell\lib\*:%SDIR%\..\..\..\contrib\extraction\lib\*:%SDIR%\..\..\solr-webapp\solr\WEB-INF\lib\*:%SDIR%\..\..\lib\ext\*" org.apache.solr.hadoop.MapReduceIndexerTool %*
diff --git a/solr/example/scripts/solr-mr/solr-mr.sh b/solr/example/scripts/solr-mr/solr-mr.sh
deleted file mode 100644
index f48eaae336b..00000000000
--- a/solr/example/scripts/solr-mr/solr-mr.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-JVM="java"
-
-# Find location of this script
-
-sdir="`dirname \"$0\"`"
-
-PATH=$JAVA_HOME/bin:$PATH $JVM -cp "$sdir/../../../dist/*:$sdir/../../../contrib/solr-mr/lib/*:$sdir/../../../contrib/solr-morphlines-core/lib/*:$sdir/../../../contrib/solr-morphlines-cell/lib/*:$sdir/../../../contrib/extraction/lib/*:$sdir/../../solr-webapp/solr/WEB-INF/lib/*:$sdir/../../lib/ext/*" org.apache.solr.hadoop.MapReduceIndexerTool ${1+"$@"}
-