diff --git a/lucene/contrib/CHANGES.txt b/lucene/contrib/CHANGES.txt
index fb58977fb7c..4d9ae073c91 100644
--- a/lucene/contrib/CHANGES.txt
+++ b/lucene/contrib/CHANGES.txt
@@ -7,6 +7,8 @@ Build
  * LUCENE-2413: Moved the demo out of lucene core and into contrib/demo.
    (Robert Muir)
 
+ * LUCENE-2845: Moved contrib/benchmark to modules.
+
 New Features
 
   * LUCENE-2604: Added RegexpQuery support to contrib/queryparser.
diff --git a/lucene/contrib/benchmark/.rsync-filter b/modules/benchmark/.rsync-filter
similarity index 100%
rename from lucene/contrib/benchmark/.rsync-filter
rename to modules/benchmark/.rsync-filter
diff --git a/lucene/contrib/benchmark/CHANGES.txt b/modules/benchmark/CHANGES.txt
similarity index 100%
rename from lucene/contrib/benchmark/CHANGES.txt
rename to modules/benchmark/CHANGES.txt
diff --git a/lucene/contrib/benchmark/README.enwiki b/modules/benchmark/README.enwiki
similarity index 100%
rename from lucene/contrib/benchmark/README.enwiki
rename to modules/benchmark/README.enwiki
diff --git a/lucene/contrib/benchmark/build.xml b/modules/benchmark/build.xml
similarity index 98%
rename from lucene/contrib/benchmark/build.xml
rename to modules/benchmark/build.xml
index cbc6d1d6f03..3bccf5647e1 100644
--- a/lucene/contrib/benchmark/build.xml
+++ b/modules/benchmark/build.xml
@@ -5,7 +5,11 @@
         Lucene Benchmarking Contributions
     </description>
 
-    <import file="../contrib-build.xml"/>
+    <property name="build.dir" location="build/" />
+    <property name="dist.dir" location="dist/" />
+    <property name="maven.dist.dir" location="dist/maven" />
+
+    <import file="../../lucene/contrib/contrib-build.xml"/>
     <property name="working.dir" location="work"/>
 
     <!-- the tests have some parallel problems -->
diff --git a/lucene/contrib/benchmark/conf/analyzer.alg b/modules/benchmark/conf/analyzer.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/analyzer.alg
rename to modules/benchmark/conf/analyzer.alg
diff --git a/lucene/contrib/benchmark/conf/basicNRT.alg b/modules/benchmark/conf/basicNRT.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/basicNRT.alg
rename to modules/benchmark/conf/basicNRT.alg
diff --git a/lucene/contrib/benchmark/conf/collation.alg b/modules/benchmark/conf/collation.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/collation.alg
rename to modules/benchmark/conf/collation.alg
diff --git a/lucene/contrib/benchmark/conf/collector-small.alg b/modules/benchmark/conf/collector-small.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/collector-small.alg
rename to modules/benchmark/conf/collector-small.alg
diff --git a/lucene/contrib/benchmark/conf/collector.alg b/modules/benchmark/conf/collector.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/collector.alg
rename to modules/benchmark/conf/collector.alg
diff --git a/lucene/contrib/benchmark/conf/compound-penalty.alg b/modules/benchmark/conf/compound-penalty.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/compound-penalty.alg
rename to modules/benchmark/conf/compound-penalty.alg
diff --git a/lucene/contrib/benchmark/conf/createLineFile.alg b/modules/benchmark/conf/createLineFile.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/createLineFile.alg
rename to modules/benchmark/conf/createLineFile.alg
diff --git a/lucene/contrib/benchmark/conf/deletepercent.alg b/modules/benchmark/conf/deletepercent.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/deletepercent.alg
rename to modules/benchmark/conf/deletepercent.alg
diff --git a/lucene/contrib/benchmark/conf/deletes.alg b/modules/benchmark/conf/deletes.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/deletes.alg
rename to modules/benchmark/conf/deletes.alg
diff --git a/lucene/contrib/benchmark/conf/extractWikipedia.alg b/modules/benchmark/conf/extractWikipedia.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/extractWikipedia.alg
rename to modules/benchmark/conf/extractWikipedia.alg
diff --git a/lucene/contrib/benchmark/conf/highlight-profile.alg b/modules/benchmark/conf/highlight-profile.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/highlight-profile.alg
rename to modules/benchmark/conf/highlight-profile.alg
diff --git a/lucene/contrib/benchmark/conf/highlight-vs-vector-highlight.alg b/modules/benchmark/conf/highlight-vs-vector-highlight.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/highlight-vs-vector-highlight.alg
rename to modules/benchmark/conf/highlight-vs-vector-highlight.alg
diff --git a/lucene/contrib/benchmark/conf/indexLineFile.alg b/modules/benchmark/conf/indexLineFile.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/indexLineFile.alg
rename to modules/benchmark/conf/indexLineFile.alg
diff --git a/lucene/contrib/benchmark/conf/indexing-flush-by-RAM-multithreaded.alg b/modules/benchmark/conf/indexing-flush-by-RAM-multithreaded.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/indexing-flush-by-RAM-multithreaded.alg
rename to modules/benchmark/conf/indexing-flush-by-RAM-multithreaded.alg
diff --git a/lucene/contrib/benchmark/conf/indexing-flush-by-RAM.alg b/modules/benchmark/conf/indexing-flush-by-RAM.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/indexing-flush-by-RAM.alg
rename to modules/benchmark/conf/indexing-flush-by-RAM.alg
diff --git a/lucene/contrib/benchmark/conf/indexing-multithreaded.alg b/modules/benchmark/conf/indexing-multithreaded.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/indexing-multithreaded.alg
rename to modules/benchmark/conf/indexing-multithreaded.alg
diff --git a/lucene/contrib/benchmark/conf/indexing.alg b/modules/benchmark/conf/indexing.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/indexing.alg
rename to modules/benchmark/conf/indexing.alg
diff --git a/lucene/contrib/benchmark/conf/micro-standard-flush-by-ram.alg b/modules/benchmark/conf/micro-standard-flush-by-ram.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/micro-standard-flush-by-ram.alg
rename to modules/benchmark/conf/micro-standard-flush-by-ram.alg
diff --git a/lucene/contrib/benchmark/conf/micro-standard.alg b/modules/benchmark/conf/micro-standard.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/micro-standard.alg
rename to modules/benchmark/conf/micro-standard.alg
diff --git a/lucene/contrib/benchmark/conf/readContentSource.alg b/modules/benchmark/conf/readContentSource.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/readContentSource.alg
rename to modules/benchmark/conf/readContentSource.alg
diff --git a/lucene/contrib/benchmark/conf/sample.alg b/modules/benchmark/conf/sample.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/sample.alg
rename to modules/benchmark/conf/sample.alg
diff --git a/lucene/contrib/benchmark/conf/shingle.alg b/modules/benchmark/conf/shingle.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/shingle.alg
rename to modules/benchmark/conf/shingle.alg
diff --git a/lucene/contrib/benchmark/conf/sloppy-phrase.alg b/modules/benchmark/conf/sloppy-phrase.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/sloppy-phrase.alg
rename to modules/benchmark/conf/sloppy-phrase.alg
diff --git a/lucene/contrib/benchmark/conf/sort-standard.alg b/modules/benchmark/conf/sort-standard.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/sort-standard.alg
rename to modules/benchmark/conf/sort-standard.alg
diff --git a/lucene/contrib/benchmark/conf/standard-flush-by-RAM.alg b/modules/benchmark/conf/standard-flush-by-RAM.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/standard-flush-by-RAM.alg
rename to modules/benchmark/conf/standard-flush-by-RAM.alg
diff --git a/lucene/contrib/benchmark/conf/standard-highlights-notv.alg b/modules/benchmark/conf/standard-highlights-notv.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/standard-highlights-notv.alg
rename to modules/benchmark/conf/standard-highlights-notv.alg
diff --git a/lucene/contrib/benchmark/conf/standard-highlights-tv.alg b/modules/benchmark/conf/standard-highlights-tv.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/standard-highlights-tv.alg
rename to modules/benchmark/conf/standard-highlights-tv.alg
diff --git a/lucene/contrib/benchmark/conf/standard.alg b/modules/benchmark/conf/standard.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/standard.alg
rename to modules/benchmark/conf/standard.alg
diff --git a/lucene/contrib/benchmark/conf/tokenize.alg b/modules/benchmark/conf/tokenize.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/tokenize.alg
rename to modules/benchmark/conf/tokenize.alg
diff --git a/lucene/contrib/benchmark/conf/vector-highlight-profile.alg b/modules/benchmark/conf/vector-highlight-profile.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/vector-highlight-profile.alg
rename to modules/benchmark/conf/vector-highlight-profile.alg
diff --git a/lucene/contrib/benchmark/conf/wikipedia-flush-by-RAM.alg b/modules/benchmark/conf/wikipedia-flush-by-RAM.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/wikipedia-flush-by-RAM.alg
rename to modules/benchmark/conf/wikipedia-flush-by-RAM.alg
diff --git a/lucene/contrib/benchmark/conf/wikipedia.alg b/modules/benchmark/conf/wikipedia.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/wikipedia.alg
rename to modules/benchmark/conf/wikipedia.alg
diff --git a/lucene/contrib/benchmark/conf/wikipediaOneRound.alg b/modules/benchmark/conf/wikipediaOneRound.alg
similarity index 100%
rename from lucene/contrib/benchmark/conf/wikipediaOneRound.alg
rename to modules/benchmark/conf/wikipediaOneRound.alg
diff --git a/lucene/contrib/benchmark/lib/commons-beanutils-1.7.0.jar b/modules/benchmark/lib/commons-beanutils-1.7.0.jar
similarity index 100%
rename from lucene/contrib/benchmark/lib/commons-beanutils-1.7.0.jar
rename to modules/benchmark/lib/commons-beanutils-1.7.0.jar
diff --git a/lucene/contrib/benchmark/lib/commons-collections-3.1.jar b/modules/benchmark/lib/commons-collections-3.1.jar
similarity index 100%
rename from lucene/contrib/benchmark/lib/commons-collections-3.1.jar
rename to modules/benchmark/lib/commons-collections-3.1.jar
diff --git a/lucene/contrib/benchmark/lib/commons-compress-1.0.jar b/modules/benchmark/lib/commons-compress-1.0.jar
similarity index 100%
rename from lucene/contrib/benchmark/lib/commons-compress-1.0.jar
rename to modules/benchmark/lib/commons-compress-1.0.jar
diff --git a/lucene/contrib/benchmark/lib/commons-digester-1.7.jar b/modules/benchmark/lib/commons-digester-1.7.jar
similarity index 100%
rename from lucene/contrib/benchmark/lib/commons-digester-1.7.jar
rename to modules/benchmark/lib/commons-digester-1.7.jar
diff --git a/lucene/contrib/benchmark/lib/commons-logging-1.0.4.jar b/modules/benchmark/lib/commons-logging-1.0.4.jar
similarity index 100%
rename from lucene/contrib/benchmark/lib/commons-logging-1.0.4.jar
rename to modules/benchmark/lib/commons-logging-1.0.4.jar
diff --git a/lucene/contrib/benchmark/lib/xercesImpl-2.10.0.jar b/modules/benchmark/lib/xercesImpl-2.10.0.jar
similarity index 100%
rename from lucene/contrib/benchmark/lib/xercesImpl-2.10.0.jar
rename to modules/benchmark/lib/xercesImpl-2.10.0.jar
diff --git a/lucene/contrib/benchmark/lib/xml-apis-2.10.0.jar b/modules/benchmark/lib/xml-apis-2.10.0.jar
similarity index 100%
rename from lucene/contrib/benchmark/lib/xml-apis-2.10.0.jar
rename to modules/benchmark/lib/xml-apis-2.10.0.jar
diff --git a/lucene/contrib/benchmark/pom.xml.template b/modules/benchmark/pom.xml.template
similarity index 100%
rename from lucene/contrib/benchmark/pom.xml.template
rename to modules/benchmark/pom.xml.template
diff --git a/lucene/contrib/benchmark/scripts/collation.bm2jira.pl b/modules/benchmark/scripts/collation.bm2jira.pl
similarity index 100%
rename from lucene/contrib/benchmark/scripts/collation.bm2jira.pl
rename to modules/benchmark/scripts/collation.bm2jira.pl
diff --git a/lucene/contrib/benchmark/scripts/compare.collation.benchmark.tables.pl b/modules/benchmark/scripts/compare.collation.benchmark.tables.pl
similarity index 100%
rename from lucene/contrib/benchmark/scripts/compare.collation.benchmark.tables.pl
rename to modules/benchmark/scripts/compare.collation.benchmark.tables.pl
diff --git a/lucene/contrib/benchmark/scripts/compare.shingle.benchmark.tables.pl b/modules/benchmark/scripts/compare.shingle.benchmark.tables.pl
similarity index 100%
rename from lucene/contrib/benchmark/scripts/compare.shingle.benchmark.tables.pl
rename to modules/benchmark/scripts/compare.shingle.benchmark.tables.pl
diff --git a/lucene/contrib/benchmark/scripts/shingle.bm2jira.pl b/modules/benchmark/scripts/shingle.bm2jira.pl
similarity index 100%
rename from lucene/contrib/benchmark/scripts/shingle.bm2jira.pl
rename to modules/benchmark/scripts/shingle.bm2jira.pl
diff --git a/lucene/contrib/benchmark/sortBench.py b/modules/benchmark/sortBench.py
similarity index 100%
rename from lucene/contrib/benchmark/sortBench.py
rename to modules/benchmark/sortBench.py
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/Constants.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/Constants.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/Constants.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/Constants.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/Benchmark.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/Benchmark.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/Benchmark.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/Benchmark.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentSource.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentSource.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentSource.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentSource.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocData.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocData.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocData.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocData.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/HTMLParser.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/HTMLParser.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/HTMLParser.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/HTMLParser.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishContentSource.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishContentSource.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishContentSource.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishContentSource.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/NoMoreDataException.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/NoMoreDataException.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/NoMoreDataException.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/NoMoreDataException.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/QueryMaker.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/QueryMaker.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/QueryMaker.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/QueryMaker.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SingleDocSource.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SingleDocSource.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SingleDocSource.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SingleDocSource.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SortableSingleDocSource.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SortableSingleDocSource.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SortableSingleDocSource.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SortableSingleDocSource.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/package.html b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/package.html
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/package.html
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/package.html
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/package.html b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/package.html
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/package.html
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/package.html
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/Sample.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/Sample.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/Sample.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/Sample.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/package.html b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/package.html
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/package.html
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/package.html
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Points.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Points.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Points.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Points.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Report.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Report.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Report.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Report.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/package.html b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/package.html
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/package.html
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/package.html
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/BenchmarkHighlighter.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/BenchmarkHighlighter.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/BenchmarkHighlighter.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/BenchmarkHighlighter.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ClearStatsTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ClearStatsTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ClearStatsTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ClearStatsTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseIndexTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseIndexTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseIndexTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseIndexTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseReaderTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseReaderTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseReaderTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseReaderTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/DeleteByPercentTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/DeleteByPercentTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/DeleteByPercentTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/DeleteByPercentTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/DeleteDocTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/DeleteDocTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/DeleteDocTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/DeleteDocTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/FlushReaderTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/FlushReaderTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/FlushReaderTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/FlushReaderTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NearRealtimeReaderTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NearRealtimeReaderTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NearRealtimeReaderTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NearRealtimeReaderTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewRoundTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewRoundTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewRoundTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewRoundTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewShingleAnalyzerTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewShingleAnalyzerTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewShingleAnalyzerTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewShingleAnalyzerTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenIndexTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenIndexTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenIndexTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenIndexTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OptimizeTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OptimizeTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OptimizeTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OptimizeTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReopenReaderTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReopenReaderTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReopenReaderTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReopenReaderTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepAllTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepAllTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepAllTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepAllTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSelectByPrefTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSelectByPrefTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSelectByPrefTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSelectByPrefTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameRoundTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameRoundTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameRoundTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameRoundTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefRoundTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefRoundTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefRoundTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefRoundTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReportTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReportTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReportTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReportTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetInputsTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetInputsTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetInputsTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetInputsTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetSystemEraseTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetSystemEraseTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetSystemEraseTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetSystemEraseTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetSystemSoftTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetSystemSoftTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetSystemSoftTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetSystemSoftTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RollbackIndexTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RollbackIndexTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RollbackIndexTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RollbackIndexTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SetPropTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SetPropTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SetPropTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SetPropTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/UpdateDocTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/UpdateDocTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/UpdateDocTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/UpdateDocTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WaitTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WaitTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WaitTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WaitTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WarmTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WarmTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WarmTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WarmTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/package.html b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/package.html
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/package.html
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/package.html
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/FileUtils.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/FileUtils.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/FileUtils.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/FileUtils.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Format.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Format.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Format.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Format.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StringBuilderReader.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StringBuilderReader.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StringBuilderReader.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StringBuilderReader.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/package.html b/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/package.html
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/package.html
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/package.html
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/package.html b/modules/benchmark/src/java/org/apache/lucene/benchmark/package.html
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/package.html
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/package.html
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/Judge.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/Judge.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/Judge.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/quality/Judge.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityBenchmark.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityBenchmark.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityBenchmark.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityBenchmark.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityQuery.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityQuery.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityQuery.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityQuery.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityQueryParser.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityQueryParser.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityQueryParser.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityQueryParser.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityStats.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityStats.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityStats.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityStats.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/package.html b/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/package.html
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/package.html
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/quality/package.html
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/Trec1MQReader.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/Trec1MQReader.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/Trec1MQReader.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/Trec1MQReader.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecJudge.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecJudge.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecJudge.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecJudge.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecTopicsReader.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecTopicsReader.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecTopicsReader.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecTopicsReader.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/package.html b/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/package.html
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/package.html
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/package.html
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/DocNameExtractor.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/DocNameExtractor.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/DocNameExtractor.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/DocNameExtractor.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/QualityQueriesFinder.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/QualityQueriesFinder.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/QualityQueriesFinder.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/QualityQueriesFinder.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SimpleQQParser.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SubmissionReport.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SubmissionReport.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SubmissionReport.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SubmissionReport.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/package.html b/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/package.html
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/package.html
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/package.html
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/MemUsage.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/stats/MemUsage.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/MemUsage.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/stats/MemUsage.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/QueryData.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/stats/QueryData.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/QueryData.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/stats/QueryData.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/TestData.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/stats/TestData.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/TestData.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/stats/TestData.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/TestRunData.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/stats/TestRunData.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/TestRunData.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/stats/TestRunData.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/TimeData.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/stats/TimeData.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/TimeData.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/stats/TimeData.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java
diff --git a/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java b/modules/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java
similarity index 100%
rename from lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java
rename to modules/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java
diff --git a/lucene/contrib/benchmark/src/java/overview.html b/modules/benchmark/src/java/overview.html
similarity index 100%
rename from lucene/contrib/benchmark/src/java/overview.html
rename to modules/benchmark/src/java/overview.html
diff --git a/lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/BenchmarkTestCase.java b/modules/benchmark/src/test/org/apache/lucene/benchmark/BenchmarkTestCase.java
similarity index 100%
rename from lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/BenchmarkTestCase.java
rename to modules/benchmark/src/test/org/apache/lucene/benchmark/BenchmarkTestCase.java
diff --git a/lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java b/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
similarity index 100%
rename from lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
rename to modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
diff --git a/lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java b/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java
similarity index 100%
rename from lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java
rename to modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java
diff --git a/lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java b/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java
similarity index 100%
rename from lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java
rename to modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java
diff --git a/lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java b/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java
similarity index 100%
rename from lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java
rename to modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java
diff --git a/lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java b/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java
similarity index 100%
rename from lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java
rename to modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java
diff --git a/lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/reuters.first20.lines.txt b/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/reuters.first20.lines.txt
similarity index 100%
rename from lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/reuters.first20.lines.txt
rename to modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/reuters.first20.lines.txt
diff --git a/lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingHighlighterTestTask.java b/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingHighlighterTestTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingHighlighterTestTask.java
rename to modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingHighlighterTestTask.java
diff --git a/lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingSearchTestTask.java b/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingSearchTestTask.java
similarity index 100%
rename from lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingSearchTestTask.java
rename to modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingSearchTestTask.java
diff --git a/lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java b/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java
similarity index 100%
rename from lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java
rename to modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java
diff --git a/lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/PerfTaskTest.java b/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/PerfTaskTest.java
similarity index 100%
rename from lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/PerfTaskTest.java
rename to modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/PerfTaskTest.java
diff --git a/lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java b/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java
similarity index 100%
rename from lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java
rename to modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java
diff --git a/lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/TestConfig.java b/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/TestConfig.java
similarity index 100%
rename from lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/TestConfig.java
rename to modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/TestConfig.java
diff --git a/lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java b/modules/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java
similarity index 100%
rename from lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java
rename to modules/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java
diff --git a/lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/quality/reuters.578.lines.txt.bz2 b/modules/benchmark/src/test/org/apache/lucene/benchmark/quality/reuters.578.lines.txt.bz2
similarity index 100%
rename from lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/quality/reuters.578.lines.txt.bz2
rename to modules/benchmark/src/test/org/apache/lucene/benchmark/quality/reuters.578.lines.txt.bz2
diff --git a/lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/quality/trecQRels.txt b/modules/benchmark/src/test/org/apache/lucene/benchmark/quality/trecQRels.txt
similarity index 100%
rename from lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/quality/trecQRels.txt
rename to modules/benchmark/src/test/org/apache/lucene/benchmark/quality/trecQRels.txt
diff --git a/lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/quality/trecTopics.txt b/modules/benchmark/src/test/org/apache/lucene/benchmark/quality/trecTopics.txt
similarity index 100%
rename from lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/quality/trecTopics.txt
rename to modules/benchmark/src/test/org/apache/lucene/benchmark/quality/trecTopics.txt
diff --git a/modules/build.xml b/modules/build.xml
index 179ef68e89c..5a07003c66b 100644
--- a/modules/build.xml
+++ b/modules/build.xml
@@ -22,6 +22,7 @@
     <sequential>
       <subant target="test" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
+        <fileset dir="benchmark" includes="build.xml" />
       </subant>
     </sequential>
   </target>
@@ -30,6 +31,7 @@
     <sequential>
       <subant target="compile" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
+        <fileset dir="benchmark" includes="build.xml" />
       </subant>
     </sequential>
   </target>
@@ -38,6 +40,7 @@
     <sequential>
       <subant target="compile-test" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
+        <fileset dir="benchmark" includes="build.xml" />
       </subant>
     </sequential>
   </target>
@@ -46,6 +49,7 @@
     <sequential>
       <subant target="javadocs" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
+        <fileset dir="benchmark" includes="build.xml" />
       </subant>
     </sequential>
   </target>
@@ -54,6 +58,7 @@
     <sequential>
       <subant target="dist-maven" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
+        <fileset dir="benchmark" includes="build.xml" />
       </subant>
     </sequential>
   </target>
@@ -62,6 +67,7 @@
     <sequential>
       <subant target="clean" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
+        <fileset dir="benchmark" includes="build.xml" />
       </subant>
     </sequential>
   </target>