diff --git a/build.xml b/build.xml
index d37777cc4dc..f4cbd319ce7 100644
--- a/build.xml
+++ b/build.xml
@@ -24,6 +24,10 @@
         <fileset dir="lucene" includes="build.xml" />
       </subant>
 
+      <subant target="test" inheritall="false" failonerror="true">
+        <fileset dir="modules" includes="build.xml" />
+      </subant>
+
       <subant target="test" inheritall="false" failonerror="true">
         <fileset dir="solr" includes="build.xml" />
       </subant>
@@ -34,6 +38,7 @@
     <sequential>
       <subant target="compile" inheritall="false" failonerror="true">
         <!--<fileset dir="lucene" includes="build.xml" /> -->
+        <fileset dir="modules" includes="build.xml" />
         <fileset dir="solr" includes="build.xml" />
       </subant>
     </sequential>
@@ -43,6 +48,7 @@
     <sequential>
       <subant target="clean" inheritall="false" failonerror="true">
         <fileset dir="lucene" includes="build.xml" />
+        <fileset dir="modules" includes="build.xml" />
         <fileset dir="solr" includes="build.xml" />
       </subant>
     </sequential>
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 70878968b52..219ed70259d 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -4,7 +4,7 @@ Lucene Change Log
 
 Changes in backwards compatibility policy
 
-* LUCENE-2413: Consolidated all Lucene analyzers into contrib/analyzers.
+* LUCENE-2413: Consolidated all Lucene analyzers into modules/analysis.
   - o.a.l.analysis.PorterStemFilter -> o.a.l.analysis.en.PorterStemFilter
   - o.a.l.analysis.ASCIIFoldingFilter -> o.a.l.analysis.miscellaneous.ASCIIFoldingFilter
   - o.a.l.analysis.ISOLatin1AccentFilter -> o.a.l.analysis.miscellaneous.ISOLatin1AccentFilter
diff --git a/lucene/contrib/benchmark/build.xml b/lucene/contrib/benchmark/build.xml
index e39771ee319..0324d4b3a9e 100644
--- a/lucene/contrib/benchmark/build.xml
+++ b/lucene/contrib/benchmark/build.xml
@@ -14,7 +14,7 @@
     <contrib-uptodate name="highlighter" property="highlighter.uptodate" classpath.property="highlighter.jar"/>
     <contrib-uptodate name="icu" property="icu.uptodate" classpath.property="icu.jar"/>
     <!-- analyzers common needs a hack for the jar file: -->
-    <contrib-uptodate name="analyzers/common" jarfile="${common.dir}/build/contrib/analyzers/common/lucene-analyzers-${version}.jar"
+    <module-uptodate name="analysis/common" jarfile="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
       property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
     <contrib-uptodate name="memory" property="memory.uptodate" classpath.property="memory.jar"/>
 
@@ -244,7 +244,7 @@
     </target>
     <target name="compile-analyzers-common" unless="analyzers-common.uptodate">
       <subant target="default">
-        <fileset dir="${common.dir}/contrib/analyzers/common" includes="build.xml"/>
+        <fileset dir="${common.dir}/../modules/analysis/common" includes="build.xml"/>
       </subant>
     </target>
     <target name="compile-memory" unless="memory.uptodate">
diff --git a/lucene/contrib/contrib-build.xml b/lucene/contrib/contrib-build.xml
index 4eff0267962..1b22b68e18f 100644
--- a/lucene/contrib/contrib-build.xml
+++ b/lucene/contrib/contrib-build.xml
@@ -122,4 +122,18 @@
       </uptodate>
     </sequential>
   </macrodef>
+
+  <macrodef name="module-uptodate">
+    <attribute name="name"/>
+    <attribute name="property" default="@{name}.uptodate"/>
+    <attribute name="classpath.property" default="@{name}.jar"/>
+    <!-- set jarfile only, if the target jar file has no generic name, applies to analyzers with its common and smartcn subdir -->
+    <attribute name="jarfile" default="${common.dir}/../modules/@{name}/build/lucene-@{name}-${version}.jar"/>
+    <sequential>
+      <property name="@{classpath.property}" location="@{jarfile}"/>
+      <uptodate property="@{property}" targetfile="@{jarfile}">
+      	<srcfiles dir="${common.dir}/../modules/@{name}/src/java" includes="**/*.java"/>
+      </uptodate>
+    </sequential>
+  </macrodef>
 </project>
diff --git a/lucene/contrib/analyzers/build.xml b/modules/analysis/build.xml
similarity index 100%
rename from lucene/contrib/analyzers/build.xml
rename to modules/analysis/build.xml
diff --git a/lucene/contrib/analyzers/common/README.txt b/modules/analysis/common/README.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/README.txt
rename to modules/analysis/common/README.txt
diff --git a/lucene/contrib/analyzers/common/SNOWBALL-LICENSE.txt b/modules/analysis/common/SNOWBALL-LICENSE.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/SNOWBALL-LICENSE.txt
rename to modules/analysis/common/SNOWBALL-LICENSE.txt
diff --git a/lucene/contrib/analyzers/common/build.xml b/modules/analysis/common/build.xml
similarity index 81%
rename from lucene/contrib/analyzers/common/build.xml
rename to modules/analysis/common/build.xml
index 2fecffdf0f3..5344c71aef0 100644
--- a/lucene/contrib/analyzers/common/build.xml
+++ b/modules/analysis/common/build.xml
@@ -17,21 +17,21 @@
     limitations under the License.
  -->
 
-<project name="analyzers" default="default">
+<project name="analyzers-common" default="default">
 
   <description>
-    Additional Analyzers
+   Analyzers
   </description>
 	
-  <property name="build.dir" location="../../../build/contrib/analyzers/common" />
-  <property name="dist.dir" location="../../../dist/contrib/analyzers/common" />
-  <property name="maven.dist.dir" location="../../../dist/maven" />
+  <property name="build.dir" location="../build/common" />
+  <property name="dist.dir" location="../dist/common" />
+  <property name="maven.dist.dir" location="../dist/maven" />
 
-  <import file="../../contrib-build.xml"/>
+  <import file="../../../lucene/contrib/contrib-build.xml"/>
 	
   <path id="test.classpath">
     <path refid="classpath"/>
-    <pathelement location="../../../build/classes/test/"/>
+    <pathelement location="../../../lucene/build/classes/test/"/>
     <path refid="junit-path"/>
     <pathelement location="${build.dir}/classes/java"/>
   </path>	
diff --git a/lucene/contrib/analyzers/common/pom.xml.template b/modules/analysis/common/pom.xml.template
similarity index 100%
rename from lucene/contrib/analyzers/common/pom.xml.template
rename to modules/analysis/common/pom.xml.template
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicLetterTokenizer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicLetterTokenizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicLetterTokenizer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicLetterTokenizer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicStemmer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/ArabicStemmer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/ar/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ar/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ar/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemmer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemmer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/bg/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/bg/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianStemmer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianStemmer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/br/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/br/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKTokenizer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKTokenizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/CJKTokenizer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKTokenizer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/cjk/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cjk/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/cjk/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseTokenizer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseTokenizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/ChineseTokenizer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseTokenizer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/cn/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cn/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/cn/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/commongrams/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/commongrams/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/ByteVector.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/ByteVector.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/ByteVector.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/ByteVector.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/CharVector.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/CharVector.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/CharVector.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/CharVector.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphen.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphen.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphen.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphen.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphenation.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphenation.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphenation.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphenation.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationException.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationException.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationException.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationException.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternConsumer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternConsumer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternConsumer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternConsumer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/hyphenation.dtd b/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/hyphenation.dtd
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/hyphenation.dtd
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/hyphenation.dtd
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/compound/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechStemmer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechStemmer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/cz/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/cz/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/da/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/da/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/da/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/da/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanStemFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanStemFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/de/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/de/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/el/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/el/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/PorterStemFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/PorterStemFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/en/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/en/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/es/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/es/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/es/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/es/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/fa/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/fa/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fi/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/fi/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fi/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/fi/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/ElisionFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/ElisionFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/ElisionFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/fr/ElisionFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchStemFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchStemFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchStemFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchStemFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchStemmer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchStemmer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/fr/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiStemmer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/HindiStemmer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/hi/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hi/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/hi/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hu/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/hu/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/hu/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/hu/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/in/IndicNormalizer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/in/IndicNormalizer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/in/IndicTokenizer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/in/IndicTokenizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/in/IndicTokenizer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/in/IndicTokenizer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/in/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/in/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/in/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/in/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/it/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/it/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/it/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/it/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/EmptyTokenStream.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/EmptyTokenStream.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/EmptyTokenStream.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/EmptyTokenStream.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/ISOLatin1AccentFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ISOLatin1AccentFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/ISOLatin1AccentFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ISOLatin1AccentFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/PerFieldAnalyzerWrapper.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PerFieldAnalyzerWrapper.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/PerFieldAnalyzerWrapper.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PerFieldAnalyzerWrapper.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAndSuffixAwareTokenFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAndSuffixAwareTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAndSuffixAwareTokenFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAndSuffixAwareTokenFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAwareTokenFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAwareTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAwareTokenFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAwareTokenFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/SingleTokenTokenStream.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/SingleTokenTokenStream.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/SingleTokenTokenStream.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/SingleTokenTokenStream.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterIterator.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterIterator.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterIterator.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterIterator.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/miscellaneous/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/ngram/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ngram/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ngram/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchStemFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchStemFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchStemFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchStemFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchStemmer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchStemmer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/nl/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/nl/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/no/NorwegianAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/no/NorwegianAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/no/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/no/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/no/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/no/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/pattern/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/pattern/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/pattern/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/pattern/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/AbstractEncoder.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/AbstractEncoder.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/AbstractEncoder.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/AbstractEncoder.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/FloatEncoder.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/FloatEncoder.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/FloatEncoder.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/FloatEncoder.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/IdentityEncoder.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/IdentityEncoder.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/IdentityEncoder.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/IdentityEncoder.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/IntegerEncoder.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/IntegerEncoder.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/IntegerEncoder.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/IntegerEncoder.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/PayloadEncoder.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/PayloadEncoder.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/PayloadEncoder.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/PayloadEncoder.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/PayloadHelper.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/PayloadHelper.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/PayloadHelper.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/PayloadHelper.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/payloads/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/payloads/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/position/PositionFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/position/PositionFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/position/PositionFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/position/PositionFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/position/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/position/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/position/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/position/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/pt/PortugueseAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/pt/PortugueseAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/pt/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/pt/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/pt/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/pt/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/query/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/query/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/query/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/query/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/reverse/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/reverse/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/reverse/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/reverse/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ro/RomanianAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ro/RomanianAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ro/RomanianAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ro/RomanianAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ro/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/ro/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ro/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ro/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLetterTokenizer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLetterTokenizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLetterTokenizer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLetterTokenizer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLowerCaseFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLowerCaseFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianLowerCaseFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLowerCaseFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianStemmer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianStemmer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/ru/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleMatrixFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleMatrixFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleMatrixFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleMatrixFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/shingle/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/DateRecognizerSinkFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/sinks/DateRecognizerSinkFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/DateRecognizerSinkFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/sinks/DateRecognizerSinkFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/TeeSinkTokenFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/sinks/TeeSinkTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/TeeSinkTokenFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/sinks/TeeSinkTokenFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/TokenRangeSinkFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/sinks/TokenRangeSinkFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/TokenRangeSinkFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/sinks/TokenRangeSinkFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/TokenTypeSinkFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/sinks/TokenTypeSinkFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/TokenTypeSinkFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/sinks/TokenTypeSinkFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/sinks/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sinks/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/sinks/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/snowball/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/snowball/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sv/SwedishAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sv/SwedishAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sv/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/sv/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/sv/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/sv/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiWordFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiWordFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/ThaiWordFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiWordFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/th/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/th/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/th/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilter.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilter.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/tr/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/tr/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/tr/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/tr/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex b/modules/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex
diff --git a/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/package.html b/modules/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/package.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/package.html
rename to modules/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/package.html
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/Among.java b/modules/analysis/common/src/java/org/tartarus/snowball/Among.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/Among.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/Among.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/SnowballProgram.java b/modules/analysis/common/src/java/org/tartarus/snowball/SnowballProgram.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/SnowballProgram.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/SnowballProgram.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/TestApp.java b/modules/analysis/common/src/java/org/tartarus/snowball/TestApp.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/TestApp.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/TestApp.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/DanishStemmer.java b/modules/analysis/common/src/java/org/tartarus/snowball/ext/DanishStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/DanishStemmer.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/ext/DanishStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/DutchStemmer.java b/modules/analysis/common/src/java/org/tartarus/snowball/ext/DutchStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/DutchStemmer.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/ext/DutchStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/EnglishStemmer.java b/modules/analysis/common/src/java/org/tartarus/snowball/ext/EnglishStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/EnglishStemmer.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/ext/EnglishStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/FinnishStemmer.java b/modules/analysis/common/src/java/org/tartarus/snowball/ext/FinnishStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/FinnishStemmer.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/ext/FinnishStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/FrenchStemmer.java b/modules/analysis/common/src/java/org/tartarus/snowball/ext/FrenchStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/FrenchStemmer.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/ext/FrenchStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/German2Stemmer.java b/modules/analysis/common/src/java/org/tartarus/snowball/ext/German2Stemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/German2Stemmer.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/ext/German2Stemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/GermanStemmer.java b/modules/analysis/common/src/java/org/tartarus/snowball/ext/GermanStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/GermanStemmer.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/ext/GermanStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/HungarianStemmer.java b/modules/analysis/common/src/java/org/tartarus/snowball/ext/HungarianStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/HungarianStemmer.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/ext/HungarianStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/ItalianStemmer.java b/modules/analysis/common/src/java/org/tartarus/snowball/ext/ItalianStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/ItalianStemmer.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/ext/ItalianStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/KpStemmer.java b/modules/analysis/common/src/java/org/tartarus/snowball/ext/KpStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/KpStemmer.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/ext/KpStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/LovinsStemmer.java b/modules/analysis/common/src/java/org/tartarus/snowball/ext/LovinsStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/LovinsStemmer.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/ext/LovinsStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java b/modules/analysis/common/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/PorterStemmer.java b/modules/analysis/common/src/java/org/tartarus/snowball/ext/PorterStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/PorterStemmer.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/ext/PorterStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java b/modules/analysis/common/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/RomanianStemmer.java b/modules/analysis/common/src/java/org/tartarus/snowball/ext/RomanianStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/RomanianStemmer.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/ext/RomanianStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/RussianStemmer.java b/modules/analysis/common/src/java/org/tartarus/snowball/ext/RussianStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/RussianStemmer.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/ext/RussianStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java b/modules/analysis/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java b/modules/analysis/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java b/modules/analysis/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java
rename to modules/analysis/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/java/overview.html b/modules/analysis/common/src/java/overview.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/java/overview.html
rename to modules/analysis/common/src/java/overview.html
diff --git a/lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/ar/stopwords.txt b/modules/analysis/common/src/resources/org/apache/lucene/analysis/ar/stopwords.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/ar/stopwords.txt
rename to modules/analysis/common/src/resources/org/apache/lucene/analysis/ar/stopwords.txt
diff --git a/lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/bg/stopwords.txt b/modules/analysis/common/src/resources/org/apache/lucene/analysis/bg/stopwords.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/bg/stopwords.txt
rename to modules/analysis/common/src/resources/org/apache/lucene/analysis/bg/stopwords.txt
diff --git a/lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/fa/stopwords.txt b/modules/analysis/common/src/resources/org/apache/lucene/analysis/fa/stopwords.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/fa/stopwords.txt
rename to modules/analysis/common/src/resources/org/apache/lucene/analysis/fa/stopwords.txt
diff --git a/lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/hi/stopwords.txt b/modules/analysis/common/src/resources/org/apache/lucene/analysis/hi/stopwords.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/hi/stopwords.txt
rename to modules/analysis/common/src/resources/org/apache/lucene/analysis/hi/stopwords.txt
diff --git a/lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/ro/stopwords.txt b/modules/analysis/common/src/resources/org/apache/lucene/analysis/ro/stopwords.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/ro/stopwords.txt
rename to modules/analysis/common/src/resources/org/apache/lucene/analysis/ro/stopwords.txt
diff --git a/lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/danish_stop.txt b/modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/danish_stop.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/danish_stop.txt
rename to modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/danish_stop.txt
diff --git a/lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/dutch_stop.txt b/modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/dutch_stop.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/dutch_stop.txt
rename to modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/dutch_stop.txt
diff --git a/lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/english_stop.txt b/modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/english_stop.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/english_stop.txt
rename to modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/english_stop.txt
diff --git a/lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/finnish_stop.txt b/modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/finnish_stop.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/finnish_stop.txt
rename to modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/finnish_stop.txt
diff --git a/lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/french_stop.txt b/modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/french_stop.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/french_stop.txt
rename to modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/french_stop.txt
diff --git a/lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/german_stop.txt b/modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/german_stop.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/german_stop.txt
rename to modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/german_stop.txt
diff --git a/lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/hungarian_stop.txt b/modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/hungarian_stop.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/hungarian_stop.txt
rename to modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/hungarian_stop.txt
diff --git a/lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/italian_stop.txt b/modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/italian_stop.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/italian_stop.txt
rename to modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/italian_stop.txt
diff --git a/lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/norwegian_stop.txt b/modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/norwegian_stop.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/norwegian_stop.txt
rename to modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/norwegian_stop.txt
diff --git a/lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/portuguese_stop.txt b/modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/portuguese_stop.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/portuguese_stop.txt
rename to modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/portuguese_stop.txt
diff --git a/lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/russian_stop.txt b/modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/russian_stop.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/russian_stop.txt
rename to modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/russian_stop.txt
diff --git a/lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/spanish_stop.txt b/modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/spanish_stop.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/spanish_stop.txt
rename to modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/spanish_stop.txt
diff --git a/lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/swedish_stop.txt b/modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/swedish_stop.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/swedish_stop.txt
rename to modules/analysis/common/src/resources/org/apache/lucene/analysis/snowball/swedish_stop.txt
diff --git a/lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/tr/stopwords.txt b/modules/analysis/common/src/resources/org/apache/lucene/analysis/tr/stopwords.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/tr/stopwords.txt
rename to modules/analysis/common/src/resources/org/apache/lucene/analysis/tr/stopwords.txt
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ar/TestArabicLetterTokenizer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicLetterTokenizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ar/TestArabicLetterTokenizer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicLetterTokenizer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterTest.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/charfilter/htmlStripReaderTest.html b/modules/analysis/common/src/test/org/apache/lucene/analysis/charfilter/htmlStripReaderTest.html
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/charfilter/htmlStripReaderTest.html
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/charfilter/htmlStripReaderTest.html
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cjk/TestCJKTokenizer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKTokenizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cjk/TestCJKTokenizer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKTokenizer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cn/TestChineseTokenizer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/cn/TestChineseTokenizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cn/TestChineseTokenizer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/cn/TestChineseTokenizer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/compound/da_UTF8.xml b/modules/analysis/common/src/test/org/apache/lucene/analysis/compound/da_UTF8.xml
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/compound/da_UTF8.xml
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/compound/da_UTF8.xml
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/compound/hyphenation.dtd b/modules/analysis/common/src/test/org/apache/lucene/analysis/compound/hyphenation.dtd
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/compound/hyphenation.dtd
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/compound/hyphenation.dtd
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cz/customStopWordFile.txt b/modules/analysis/common/src/test/org/apache/lucene/analysis/cz/customStopWordFile.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/cz/customStopWordFile.txt
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/cz/customStopWordFile.txt
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/data.txt b/modules/analysis/common/src/test/org/apache/lucene/analysis/de/data.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/de/data.txt
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/de/data.txt
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/en/porterTestData.zip b/modules/analysis/common/src/test/org/apache/lucene/analysis/en/porterTestData.zip
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/en/porterTestData.zip
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/en/porterTestData.zip
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fr/TestElision.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestElision.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fr/TestElision.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestElision.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/in/TestIndicTokenizer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicTokenizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/in/TestIndicTokenizer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicTokenizer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/it/TestItalianAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/it/TestItalianAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/PatternAnalyzerTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/PatternAnalyzerTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/PatternAnalyzerTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/PatternAnalyzerTest.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestEmptyTokenStream.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestEmptyTokenStream.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestEmptyTokenStream.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestEmptyTokenStream.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestHyphenatedWordsFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestHyphenatedWordsFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestHyphenatedWordsFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestHyphenatedWordsFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestISOLatin1AccentFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestISOLatin1AccentFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestISOLatin1AccentFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestISOLatin1AccentFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalzyerWrapper.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalzyerWrapper.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalzyerWrapper.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalzyerWrapper.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAndSuffixAwareTokenFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAndSuffixAwareTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAndSuffixAwareTokenFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAndSuffixAwareTokenFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAwareTokenFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAwareTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAwareTokenFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAwareTokenFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestSingleTokenTokenFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestSingleTokenTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestSingleTokenTokenFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestSingleTokenTokenFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/nl/customStemDict.txt b/modules/analysis/common/src/test/org/apache/lucene/analysis/nl/customStemDict.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/nl/customStemDict.txt
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/nl/customStemDict.txt
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/no/TestNorwegianAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/no/TestNorwegianAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/position/PositionFilterTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/position/PositionFilterTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/position/PositionFilterTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/position/PositionFilterTest.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ro/TestRomanianAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/ro/TestRomanianAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ro/TestRomanianAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/ro/TestRomanianAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianLetterTokenizer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLetterTokenizer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianLetterTokenizer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLetterTokenizer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianStem.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianStem.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/TestRussianStem.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianStem.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/resUTF8.htm b/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/resUTF8.htm
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/resUTF8.htm
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/ru/resUTF8.htm
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/stemsUTF8.txt b/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/stemsUTF8.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/stemsUTF8.txt
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/ru/stemsUTF8.txt
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/testUTF8.txt b/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/testUTF8.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/testUTF8.txt
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/ru/testUTF8.txt
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/wordsUTF8.txt b/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/wordsUTF8.txt
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/ru/wordsUTF8.txt
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/ru/wordsUTF8.txt
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/TestShingleMatrixFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleMatrixFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/TestShingleMatrixFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleMatrixFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sinks/TokenRangeSinkTokenizerTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TokenRangeSinkTokenizerTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sinks/TokenRangeSinkTokenizerTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TokenRangeSinkTokenizerTest.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocabData.zip b/modules/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocabData.zip
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocabData.zip
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocabData.zip
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java
diff --git a/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java
similarity index 100%
rename from lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java
rename to modules/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java
diff --git a/lucene/contrib/analyzers/smartcn/build.xml b/modules/analysis/smartcn/build.xml
similarity index 76%
rename from lucene/contrib/analyzers/smartcn/build.xml
rename to modules/analysis/smartcn/build.xml
index 6e2c4f899e7..08da6cf9dec 100644
--- a/lucene/contrib/analyzers/smartcn/build.xml
+++ b/modules/analysis/smartcn/build.xml
@@ -17,19 +17,19 @@
     limitations under the License.
  -->
 
-<project name="smartcn" default="default">
+<project name="analyzers-smartcn" default="default">
 
   <description>
     Smart Chinese Analyzer
   </description>
 	
-  <property name="build.dir" location="../../../build/contrib/analyzers/smartcn" />
-  <property name="dist.dir" location="../../../dist/contrib/analyzers/smartcn" />
-  <property name="maven.dist.dir" location="../../../dist/maven" />
+  <property name="build.dir" location="../build/smartcn" />
+  <property name="dist.dir" location="../dist/smartcn" />
+  <property name="maven.dist.dir" location="../dist/maven" />
 
-  <import file="../../contrib-build.xml"/>
+  <import file="../../../lucene/contrib/contrib-build.xml"/>
 
-  <contrib-uptodate name="analyzers/common" jarfile="${common.dir}/build/contrib/analyzers/common/lucene-analyzers-${version}.jar"
+  <module-uptodate name="analysis/common" jarfile="../build/common/lucene-analyzers-common-${version}.jar"
     property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
 
   <path id="classpath">
@@ -40,7 +40,7 @@
   <path id="test.classpath">
   	<pathelement path="${analyzers-common.jar}"/>
     <path refid="classpath"/>
-    <pathelement location="../../../build/classes/test/"/>
+    <pathelement location="../../../lucene/build/classes/test/"/>
     <path refid="junit-path"/>
     <pathelement location="${build.dir}/classes/java"/>
   </path>
diff --git a/lucene/contrib/analyzers/smartcn/pom.xml.template b/modules/analysis/smartcn/pom.xml.template
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/pom.xml.template
rename to modules/analysis/smartcn/pom.xml.template
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/AnalyzerProfile.java b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/AnalyzerProfile.java
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/AnalyzerProfile.java
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/AnalyzerProfile.java
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/CharType.java b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/CharType.java
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/CharType.java
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/CharType.java
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/Utility.java b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/Utility.java
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/Utility.java
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/Utility.java
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordSegmenter.java b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordSegmenter.java
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordSegmenter.java
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordSegmenter.java
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordTokenFilter.java b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordTokenFilter.java
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordTokenFilter.java
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordType.java b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordType.java
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordType.java
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordType.java
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/AbstractDictionary.java b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/AbstractDictionary.java
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/AbstractDictionary.java
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/AbstractDictionary.java
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BigramDictionary.java b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BigramDictionary.java
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BigramDictionary.java
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BigramDictionary.java
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/HHMMSegmenter.java b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/HHMMSegmenter.java
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/HHMMSegmenter.java
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/HHMMSegmenter.java
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/PathNode.java b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/PathNode.java
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/PathNode.java
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/PathNode.java
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegToken.java b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegToken.java
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegToken.java
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegToken.java
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenFilter.java b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenFilter.java
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenFilter.java
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenPair.java b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenPair.java
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenPair.java
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenPair.java
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/WordDictionary.java b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/WordDictionary.java
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/WordDictionary.java
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/WordDictionary.java
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/package.html b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/package.html
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/package.html
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/package.html
diff --git a/lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/package.html b/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/package.html
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/package.html
rename to modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/package.html
diff --git a/lucene/contrib/analyzers/smartcn/src/java/overview.html b/modules/analysis/smartcn/src/java/overview.html
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/java/overview.html
rename to modules/analysis/smartcn/src/java/overview.html
diff --git a/lucene/contrib/analyzers/smartcn/src/resources/org/apache/lucene/analysis/cn/smart/hhmm/bigramdict.mem b/modules/analysis/smartcn/src/resources/org/apache/lucene/analysis/cn/smart/hhmm/bigramdict.mem
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/resources/org/apache/lucene/analysis/cn/smart/hhmm/bigramdict.mem
rename to modules/analysis/smartcn/src/resources/org/apache/lucene/analysis/cn/smart/hhmm/bigramdict.mem
diff --git a/lucene/contrib/analyzers/smartcn/src/resources/org/apache/lucene/analysis/cn/smart/hhmm/coredict.mem b/modules/analysis/smartcn/src/resources/org/apache/lucene/analysis/cn/smart/hhmm/coredict.mem
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/resources/org/apache/lucene/analysis/cn/smart/hhmm/coredict.mem
rename to modules/analysis/smartcn/src/resources/org/apache/lucene/analysis/cn/smart/hhmm/coredict.mem
diff --git a/lucene/contrib/analyzers/smartcn/src/resources/org/apache/lucene/analysis/cn/smart/stopwords.txt b/modules/analysis/smartcn/src/resources/org/apache/lucene/analysis/cn/smart/stopwords.txt
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/resources/org/apache/lucene/analysis/cn/smart/stopwords.txt
rename to modules/analysis/smartcn/src/resources/org/apache/lucene/analysis/cn/smart/stopwords.txt
diff --git a/lucene/contrib/analyzers/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java b/modules/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java
rename to modules/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java
diff --git a/lucene/contrib/analyzers/stempel/build.xml b/modules/analysis/stempel/build.xml
similarity index 73%
rename from lucene/contrib/analyzers/stempel/build.xml
rename to modules/analysis/stempel/build.xml
index 6233dbadcaa..07f708f8816 100644
--- a/lucene/contrib/analyzers/stempel/build.xml
+++ b/modules/analysis/stempel/build.xml
@@ -17,21 +17,21 @@
     limitations under the License.
  -->
 
-<project name="stempel" default="default">
+<project name="analyzers-stempel" default="default">
 
   <description>
     Stempel Analyzer
   </description>
 	
-  <property name="build.dir" location="../../../build/contrib/analyzers/stempel" />
-  <property name="dist.dir" location="../../../dist/contrib/analyzers/stempel" />
-  <property name="maven.dist.dir" location="../../../dist/maven" />
+  <property name="build.dir" location="../build/stempel" />
+  <property name="dist.dir" location="../dist/stempel" />
+  <property name="maven.dist.dir" location="../dist/maven" />
 
-  <import file="../../contrib-build.xml"/>
+  <import file="../../../lucene/contrib/contrib-build.xml"/>
 	
   <path id="test.classpath">
     <path refid="classpath"/>
-    <pathelement location="../../../build/classes/test/"/>
+    <pathelement location="../../../lucene/build/classes/test/"/>
     <path refid="junit-path"/>
     <pathelement location="${build.dir}/classes/java"/>
   </path>	
diff --git a/lucene/contrib/analyzers/stempel/pom.xml.template b/modules/analysis/stempel/pom.xml.template
similarity index 100%
rename from lucene/contrib/analyzers/stempel/pom.xml.template
rename to modules/analysis/stempel/pom.xml.template
diff --git a/lucene/contrib/analyzers/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java b/modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java
rename to modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java
diff --git a/lucene/contrib/analyzers/stempel/src/java/org/apache/lucene/analysis/pl/package.html b/modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/package.html
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/java/org/apache/lucene/analysis/pl/package.html
rename to modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/package.html
diff --git a/lucene/contrib/analyzers/stempel/src/java/org/apache/lucene/analysis/stempel/StempelFilter.java b/modules/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelFilter.java
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/java/org/apache/lucene/analysis/stempel/StempelFilter.java
rename to modules/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelFilter.java
diff --git a/lucene/contrib/analyzers/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java b/modules/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java
rename to modules/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java
diff --git a/lucene/contrib/analyzers/stempel/src/java/org/apache/lucene/analysis/stempel/package.html b/modules/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/package.html
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/java/org/apache/lucene/analysis/stempel/package.html
rename to modules/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/package.html
diff --git a/lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Cell.java b/modules/analysis/stempel/src/java/org/egothor/stemmer/Cell.java
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Cell.java
rename to modules/analysis/stempel/src/java/org/egothor/stemmer/Cell.java
diff --git a/lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Compile.java b/modules/analysis/stempel/src/java/org/egothor/stemmer/Compile.java
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Compile.java
rename to modules/analysis/stempel/src/java/org/egothor/stemmer/Compile.java
diff --git a/lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Diff.java b/modules/analysis/stempel/src/java/org/egothor/stemmer/Diff.java
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Diff.java
rename to modules/analysis/stempel/src/java/org/egothor/stemmer/Diff.java
diff --git a/lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/DiffIt.java b/modules/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/DiffIt.java
rename to modules/analysis/stempel/src/java/org/egothor/stemmer/DiffIt.java
diff --git a/lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Gener.java b/modules/analysis/stempel/src/java/org/egothor/stemmer/Gener.java
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Gener.java
rename to modules/analysis/stempel/src/java/org/egothor/stemmer/Gener.java
diff --git a/lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Lift.java b/modules/analysis/stempel/src/java/org/egothor/stemmer/Lift.java
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Lift.java
rename to modules/analysis/stempel/src/java/org/egothor/stemmer/Lift.java
diff --git a/lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/MultiTrie.java b/modules/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie.java
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/MultiTrie.java
rename to modules/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie.java
diff --git a/lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/MultiTrie2.java b/modules/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie2.java
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/MultiTrie2.java
rename to modules/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie2.java
diff --git a/lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Optimizer.java b/modules/analysis/stempel/src/java/org/egothor/stemmer/Optimizer.java
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Optimizer.java
rename to modules/analysis/stempel/src/java/org/egothor/stemmer/Optimizer.java
diff --git a/lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Optimizer2.java b/modules/analysis/stempel/src/java/org/egothor/stemmer/Optimizer2.java
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Optimizer2.java
rename to modules/analysis/stempel/src/java/org/egothor/stemmer/Optimizer2.java
diff --git a/lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Reduce.java b/modules/analysis/stempel/src/java/org/egothor/stemmer/Reduce.java
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Reduce.java
rename to modules/analysis/stempel/src/java/org/egothor/stemmer/Reduce.java
diff --git a/lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Row.java b/modules/analysis/stempel/src/java/org/egothor/stemmer/Row.java
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Row.java
rename to modules/analysis/stempel/src/java/org/egothor/stemmer/Row.java
diff --git a/lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Trie.java b/modules/analysis/stempel/src/java/org/egothor/stemmer/Trie.java
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/java/org/egothor/stemmer/Trie.java
rename to modules/analysis/stempel/src/java/org/egothor/stemmer/Trie.java
diff --git a/lucene/contrib/analyzers/stempel/src/java/overview.html b/modules/analysis/stempel/src/java/overview.html
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/java/overview.html
rename to modules/analysis/stempel/src/java/overview.html
diff --git a/lucene/contrib/analyzers/stempel/src/resources/org/apache/lucene/analysis/pl/stemmer_20000.tbl b/modules/analysis/stempel/src/resources/org/apache/lucene/analysis/pl/stemmer_20000.tbl
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/resources/org/apache/lucene/analysis/pl/stemmer_20000.tbl
rename to modules/analysis/stempel/src/resources/org/apache/lucene/analysis/pl/stemmer_20000.tbl
diff --git a/lucene/contrib/analyzers/stempel/src/resources/org/apache/lucene/analysis/pl/stopwords.txt b/modules/analysis/stempel/src/resources/org/apache/lucene/analysis/pl/stopwords.txt
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/resources/org/apache/lucene/analysis/pl/stopwords.txt
rename to modules/analysis/stempel/src/resources/org/apache/lucene/analysis/pl/stopwords.txt
diff --git a/lucene/contrib/analyzers/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java b/modules/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java
rename to modules/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java
diff --git a/lucene/contrib/analyzers/stempel/src/test/org/egothor/stemmer/TestCompile.java b/modules/analysis/stempel/src/test/org/egothor/stemmer/TestCompile.java
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/test/org/egothor/stemmer/TestCompile.java
rename to modules/analysis/stempel/src/test/org/egothor/stemmer/TestCompile.java
diff --git a/lucene/contrib/analyzers/stempel/src/test/org/egothor/stemmer/TestStemmer.java b/modules/analysis/stempel/src/test/org/egothor/stemmer/TestStemmer.java
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/test/org/egothor/stemmer/TestStemmer.java
rename to modules/analysis/stempel/src/test/org/egothor/stemmer/TestStemmer.java
diff --git a/lucene/contrib/analyzers/stempel/src/test/org/egothor/stemmer/testRules.txt b/modules/analysis/stempel/src/test/org/egothor/stemmer/testRules.txt
similarity index 100%
rename from lucene/contrib/analyzers/stempel/src/test/org/egothor/stemmer/testRules.txt
rename to modules/analysis/stempel/src/test/org/egothor/stemmer/testRules.txt
diff --git a/modules/build.xml b/modules/build.xml
new file mode 100644
index 00000000000..4aaf06f40bb
--- /dev/null
+++ b/modules/build.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+ 
+        http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+ -->
+
+<project name="modules" default="test" basedir=".">
+  <target name="test" description="Test all modules">
+    <sequential>
+      <subant target="test" inheritall="false" failonerror="true">
+        <fileset dir="analysis" includes="build.xml" />
+      </subant>
+    </sequential>
+  </target>
+
+  <target name="compile" description="Compile all modules">
+    <sequential>
+      <subant target="compile" inheritall="false" failonerror="true">
+        <fileset dir="analysis" includes="build.xml" />
+      </subant>
+    </sequential>
+  </target>
+
+  <target name="clean" description="Clean all modules">
+    <sequential>
+      <subant target="clean" inheritall="false" failonerror="true">
+        <fileset dir="analysis" includes="build.xml" />
+      </subant>
+    </sequential>
+  </target>
+
+</project>
diff --git a/solr/common-build.xml b/solr/common-build.xml
index 48eddfff7ae..db70fe85c18 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -154,7 +154,7 @@
   
   <path id="lucene.classpath">
     <pathelement location="${common-solr.dir}/../lucene/build/classes/java" />
-    <pathelement location="${common-solr.dir}/../lucene/build/contrib/analyzers/common/classes/java" />
+    <pathelement location="${common-solr.dir}/../modules/analysis/build/common/classes/java" />
     <pathelement location="${common-solr.dir}/../lucene/build/contrib/highlighter/classes/java" />
     <pathelement location="${common-solr.dir}/../lucene/build/contrib/memory/classes/java" />
     <pathelement location="${common-solr.dir}/../lucene/build/contrib/misc/classes/java" />
@@ -169,7 +169,7 @@
         <fileset dir="../lucene/" includes="build.xml" />
       </subant>
       <subant target="jar" inheritall="false" failonerror="true">
-        <fileset dir="../lucene/contrib/analyzers/common" includes="build.xml" />
+        <fileset dir="../modules/analysis/common" includes="build.xml" />
         <fileset dir="../lucene/contrib/highlighter" includes="build.xml" />
         <fileset dir="../lucene/contrib/memory" includes="build.xml" />
         <fileset dir="../lucene/contrib/misc" includes="build.xml" />
@@ -186,8 +186,8 @@
       <fileset dir="../lucene/build/">
         <include name="lucene-core-${lucene_version}.jar" />
       </fileset>
-      <fileset dir="../lucene/build/contrib/analyzers/common">
-        <include name="lucene-analyzers-${lucene_version}.jar" />
+      <fileset dir="../modules/analysis/build/common">
+        <include name="lucene-analyzers-common-${lucene_version}.jar" />
       </fileset>
       <fileset dir="../lucene/build/contrib/highlighter">
         <include name="lucene-highlighter-${lucene_version}.jar" />
@@ -212,7 +212,7 @@
   
   <target name="compile-lucene" unless="lucene-compiled">
     <property name="lucene-compiled" value="true"/>
-    <ant antfile="build.xml" target="compile" dir="../lucene/contrib/analyzers/common"/>
+    <ant antfile="build.xml" target="compile" dir="../modules/analysis/common"/>
     <ant antfile="build.xml" target="compile" dir="../lucene/contrib/highlighter"/>
     <ant antfile="build.xml" target="compile" dir="../lucene/contrib/memory"/>
     <ant antfile="build.xml" target="compile" dir="../lucene/contrib/misc"/>