Index: solr/common-build.xml
===================================================================
--- solr/common-build.xml	(revision 1326178)
+++ solr/common-build.xml	(working copy)
@@ -59,7 +59,7 @@
     </and>
   </condition>
 
-  <import file="${common-solr.dir}/../lucene/contrib/contrib-build.xml"/>
+  <import file="${common-solr.dir}/../lucene/module-build.xml"/>
 
   <path id="additional.dependencies">
   	<fileset dir="${common-solr.dir}/lib" excludes="${common.classpath.excludes}"/>
Index: modules/suggest/build.xml
===================================================================
--- modules/suggest/build.xml	(revision 1326178)
+++ modules/suggest/build.xml	(working copy)
@@ -29,5 +29,5 @@
 
   <!-- just a list of words for testing suggesters -->
   <property name="rat.excludes" value="**/Top50KWiki.utf8"/>
-  <import file="../../lucene/contrib/contrib-build.xml"/>
+  <import file="../../lucene/module-build.xml"/>
 </project>
Index: modules/facet/build.xml
===================================================================
--- modules/facet/build.xml	(revision 1326178)
+++ modules/facet/build.xml	(working copy)
@@ -30,7 +30,7 @@
   <!-- prettify.css/js -->
   <property name="rat.excludes" value="**/prettify.css,**/prettify.js"/>
   
-  <import file="../../lucene/contrib/contrib-build.xml"/>
+  <import file="../../lucene/module-build.xml"/>
 
   <property name="examples.dir" location="src/examples"/>
 
Index: modules/queryparser/build.xml
===================================================================
--- modules/queryparser/build.xml	(revision 1326178)
+++ modules/queryparser/build.xml	(working copy)
@@ -24,7 +24,7 @@
   <property name="dist.dir" location="dist/"/>
   <property name="maven.dist.dir" location="../dist/maven"/>
 
-  <import file="../../lucene/contrib/contrib-build.xml"/>
+  <import file="../../lucene/module-build.xml"/>
 
   <path id="classpath">
     <pathelement path="${queries.jar}"/>
Index: modules/queryparser/xmldtddocbuild.xml
===================================================================
--- modules/queryparser/xmldtddocbuild.xml	(revision 1326178)
+++ modules/queryparser/xmldtddocbuild.xml	(working copy)
@@ -19,7 +19,7 @@
 
 <project name="DTDDocAnt" default="main">
 
-  <import file="../contrib-build.xml"/>
+	<import file="../../lucene/module-build.xml"/>
 
     <description>
     This file generates DTDdocumentation
Index: modules/analysis/icu/build.xml
===================================================================
--- modules/analysis/icu/build.xml	(revision 1326178)
+++ modules/analysis/icu/build.xml	(working copy)
@@ -27,7 +27,7 @@
   <property name="build.dir" location="../build/icu" />
   <property name="dist.dir" location="../dist/icu" />
 
-  <import file="../../../lucene/contrib/contrib-build.xml"/>
+  <import file="../../../lucene/module-build.xml"/>
 
   <path id="icujar">
      <pathelement location="lib/icu4j-4.8.1.1.jar"/>
Index: modules/analysis/common/build.xml
===================================================================
--- modules/analysis/common/build.xml	(revision 1326178)
+++ modules/analysis/common/build.xml	(working copy)
@@ -29,7 +29,7 @@
   <!-- some files for testing that do not have license headers -->
   <property name="rat.excludes" value="**/*.aff,**/*.dic,**/*.txt,**/charfilter/*.htm*,**/*LuceneResourcesWikiPage.html"/>
 
-  <import file="../../../lucene/contrib/contrib-build.xml"/>
+  <import file="../../../lucene/module-build.xml"/>
 	
   <target name="compile-core" depends="jflex-notice, common.compile-core"/>
 
Index: modules/analysis/uima/build.xml
===================================================================
--- modules/analysis/uima/build.xml	(revision 1326178)
+++ modules/analysis/uima/build.xml	(working copy)
@@ -34,7 +34,7 @@
     <pathelement path="lib/WhitespaceTokenizer-2.3.1.jar"/>
   </path>
 
-  <import file="../../../lucene/contrib/contrib-build.xml"/>
+  <import file="../../../lucene/module-build.xml"/>
 
   <path id="classpath">
     <pathelement path="${analyzers-common.jar}"/>
Index: modules/analysis/kuromoji/build.xml
===================================================================
--- modules/analysis/kuromoji/build.xml	(revision 1326178)
+++ modules/analysis/kuromoji/build.xml	(working copy)
@@ -46,7 +46,7 @@
   <!-- currently whether rat detects this as binary or not
        is platform dependent?! -->
   <property name="rat.excludes" value="**/*.txt,**/bocchan.utf-8"/>
-  <import file="../../../lucene/contrib/contrib-build.xml"/> 
+  <import file="../../../lucene/module-build.xml"/> 
 
   <available type="dir" file="${build.dir}/${ipadic.version}" property="dict.available"/>
 
Index: modules/analysis/smartcn/build.xml
===================================================================
--- modules/analysis/smartcn/build.xml	(revision 1326178)
+++ modules/analysis/smartcn/build.xml	(working copy)
@@ -26,7 +26,7 @@
   <property name="build.dir" location="../build/smartcn" />
   <property name="dist.dir" location="../dist/smartcn" />
 
-  <import file="../../../lucene/contrib/contrib-build.xml"/>
+  <import file="../../../lucene/module-build.xml"/>
 
   <path id="classpath">
     <pathelement path="${analyzers-common.jar}"/>
Index: modules/analysis/morfologik/build.xml
===================================================================
--- modules/analysis/morfologik/build.xml	(revision 1326178)
+++ modules/analysis/morfologik/build.xml	(working copy)
@@ -26,7 +26,7 @@
   <property name="build.dir" location="../build/morfologik" />
   <property name="dist.dir" location="../dist/morfologik" />
 
-  <import file="../../../lucene/contrib/contrib-build.xml"/>
+  <import file="../../../lucene/module-build.xml"/>
 
   <path id="classpath">
     <pathelement path="${analyzers-common.jar}"/>
Index: modules/analysis/phonetic/build.xml
===================================================================
--- modules/analysis/phonetic/build.xml	(revision 1326178)
+++ modules/analysis/phonetic/build.xml	(working copy)
@@ -26,7 +26,7 @@
   <property name="build.dir" location="../build/phonetic" />
   <property name="dist.dir" location="../dist/phonetic" />
 
-  <import file="../../../lucene/contrib/contrib-build.xml"/>
+  <import file="../../../lucene/module-build.xml"/>
 
   <path id="classpath">
     <pathelement path="${analyzers-common.jar}"/>
Index: modules/analysis/stempel/build.xml
===================================================================
--- modules/analysis/stempel/build.xml	(revision 1326178)
+++ modules/analysis/stempel/build.xml	(working copy)
@@ -26,7 +26,7 @@
   <property name="build.dir" location="../build/stempel" />
   <property name="dist.dir" location="../dist/stempel" />
 
-  <import file="../../../lucene/contrib/contrib-build.xml"/>
+  <import file="../../../lucene/module-build.xml"/>
 
   <path id="classpath">
     <pathelement path="${analyzers-common.jar}"/>
Index: modules/benchmark/build.xml
===================================================================
--- modules/benchmark/build.xml	(revision 1326178)
+++ modules/benchmark/build.xml	(working copy)
@@ -27,7 +27,7 @@
     <property name="dist.dir" location="dist/" />
     <property name="maven.dist.dir" location="../dist/maven" />
 
-    <import file="../../lucene/contrib/contrib-build.xml"/>
+    <import file="../../lucene/module-build.xml"/>
     <property name="working.dir" location="work"/>
 
     <!-- the tests have some parallel problems -->
Index: modules/grouping/build.xml
===================================================================
--- modules/grouping/build.xml	(revision 1326178)
+++ modules/grouping/build.xml	(working copy)
@@ -27,7 +27,7 @@
     <property name="dist.dir" location="dist/" />
     <property name="maven.dist.dir" location="../dist/maven" />
 
-    <import file="../../lucene/contrib/contrib-build.xml"/>
+    <import file="../../lucene/module-build.xml"/>
     <property name="working.dir" location="work"/>
 
     <path id="test.classpath">
Index: modules/spatial/build.xml
===================================================================
--- modules/spatial/build.xml	(revision 1326178)
+++ modules/spatial/build.xml	(working copy)
@@ -8,7 +8,7 @@
   <property name="dist.dir" location="dist/" />
   <property name="maven.dist.dir" location="../dist/maven" />
 
-  <import file="../../lucene/contrib/contrib-build.xml"/>
+  <import file="../../lucene/module-build.xml"/>
 
   <path id="spatialjar">
      <pathelement path="lib/spatial4j-0.2.jar"/>
Index: modules/join/build.xml
===================================================================
--- modules/join/build.xml	(revision 1326178)
+++ modules/join/build.xml	(working copy)
@@ -8,7 +8,7 @@
   <property name="dist.dir" location="dist/" />
   <property name="maven.dist.dir" location="../dist/maven" />
 
-  <import file="../../lucene/contrib/contrib-build.xml"/>
+  <import file="../../lucene/module-build.xml"/>
 
   <path id="classpath">
     <pathelement path="${grouping.jar}"/>
Index: modules/queries/build.xml
===================================================================
--- modules/queries/build.xml	(revision 1326178)
+++ modules/queries/build.xml	(working copy)
@@ -24,5 +24,5 @@
   <property name="dist.dir" location="dist/"/>
   <property name="maven.dist.dir" location="../dist/maven"/>
 
-  <import file="../../lucene/contrib/contrib-build.xml"/>
+  <import file="../../lucene/module-build.xml"/>
 </project>
\ No newline at end of file
Index: lucene/module-build.xml
===================================================================
--- lucene/module-build.xml	(working copy)
+++ lucene/module-build.xml	(working copy)
@@ -25,7 +25,7 @@
   <property name="dist.dir" location="../../dist/contrib/${ant.project.name}"/>
   <property name="maven.dist.dir" location="../../dist/maven"/>
 
-  <import file="../common-build.xml"/>
+  <import file="common-build.xml"/>
 
   <available property="contrib.has.tests" type="dir" file="src/test" />
   
Index: lucene/contrib/demo/build.xml
===================================================================
--- lucene/contrib/demo/build.xml	(revision 1326178)
+++ lucene/contrib/demo/build.xml	(working copy)
@@ -25,7 +25,7 @@
 
   <property name="demo.name" value="lucene-demos-${version}"/>
 
-  <import file="../contrib-build.xml"/>
+  <import file="../../module-build.xml"/>
 
   <target name="init" depends="contrib-build.init,jar-lucene-core"/>
   
Index: lucene/contrib/memory/build.xml
===================================================================
--- lucene/contrib/memory/build.xml	(revision 1326178)
+++ lucene/contrib/memory/build.xml	(working copy)
@@ -23,7 +23,7 @@
     High-performance single-document index to compare against Query
   </description>
 
-  <import file="../contrib-build.xml"/>
+  <import file="../../module-build.xml"/>
 
   <path id="test.classpath">
     <pathelement path="${queryparser.jar}"/>
Index: lucene/contrib/misc/build.xml
===================================================================
--- lucene/contrib/misc/build.xml	(revision 1326178)
+++ lucene/contrib/misc/build.xml	(working copy)
@@ -25,7 +25,7 @@
     Miscellaneous Lucene extensions
   </description>
 
-  <import file="../contrib-build.xml"/>
+  <import file="../../module-build.xml"/>
 
   <target name="install-cpptasks" unless="cpptasks.uptodate" depends="ivy-availability-check,ivy-fail">
     <property name="cpptasks.uptodate" value="true"/>
Index: lucene/contrib/contrib-build.xml (deleted)
===================================================================
Index: lucene/contrib/sandbox/build.xml
===================================================================
--- lucene/contrib/sandbox/build.xml	(revision 1326178)
+++ lucene/contrib/sandbox/build.xml	(working copy)
@@ -21,7 +21,7 @@
     Sandbox for odd contrib code
   </description>
 
-  <import file="../contrib-build.xml"/>
+  <import file="../../module-build.xml"/>
 
   <path id="classpath">
     <pathelement path="lib/jakarta-regexp-1.4.jar"/>
Index: lucene/contrib/highlighter/build.xml
===================================================================
--- lucene/contrib/highlighter/build.xml	(revision 1326178)
+++ lucene/contrib/highlighter/build.xml	(working copy)
@@ -23,7 +23,7 @@
     Hits highlighter
   </description>
 
-  <import file="../contrib-build.xml"/>
+  <import file="../../module-build.xml"/>
 
   <path id="classpath">
     <pathelement path="${memory.jar}"/>