From 7ad9f7aad50f68c7763526117dec7f144afd014c Mon Sep 17 00:00:00 2001
From: Steven Rowe <sarowe@apache.org>
Date: Tue, 17 Apr 2012 15:50:40 +0000
Subject: [PATCH] LUCENE-3965: IntelliJ IDEA configuration: support
 modules/*->lucene/

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1327150 13f79535-47bb-0310-9956-ffa450edef68
---
 dev-tools/idea/.idea/ant.xml                  |  42 +-
 .../idea/.idea/libraries/ICU_library.xml      |   4 +-
 .../.idea/libraries/Morfologik_library.xml    |   4 +-
 dev-tools/idea/.idea/modules.xml              |  42 +-
 dev-tools/idea/.idea/workspace.xml            | 370 +++++++++---------
 .../analysis/common/analysis-common.iml       |   4 +-
 .../{modules => lucene}/analysis/icu/icu.iml  |   4 +-
 .../analysis/kuromoji/kuromoji.iml            |   4 +-
 .../analysis/morfologik/morfologik.iml        |   4 +-
 .../analysis/phonetic/phonetic.iml            |   4 +-
 .../analysis/smartcn/smartcn.iml              |   4 +-
 .../analysis/stempel/stempel.iml              |   4 +-
 .../analysis/uima/analysis-uima.iml           |   4 +-
 .../benchmark/benchmark.iml                   |   4 +-
 .../idea/lucene/{contrib => }/demo/demo.iml   |   4 +-
 .../idea/{modules => lucene}/facet/facet.iml  |   4 +-
 .../{modules => lucene}/grouping/grouping.iml |   4 +-
 .../{contrib => }/highlighter/highlighter.iml |   4 +-
 .../idea/{modules => lucene}/join/join.iml    |   4 +-
 .../lucene/{contrib => }/memory/memory.iml    |   4 +-
 .../idea/lucene/{contrib => }/misc/misc.iml   |   4 +-
 .../{modules => lucene}/queries/queries.iml   |   4 +-
 .../queryparser/queryparser.iml               |   4 +-
 .../lucene/{contrib => }/sandbox/sandbox.iml  |   4 +-
 .../{modules => lucene}/spatial/spatial.iml   |   4 +-
 .../{modules => lucene}/suggest/suggest.iml   |   4 +-
 26 files changed, 273 insertions(+), 273 deletions(-)
 rename dev-tools/idea/{modules => lucene}/analysis/common/analysis-common.iml (81%)
 rename dev-tools/idea/{modules => lucene}/analysis/icu/icu.iml (86%)
 rename dev-tools/idea/{modules => lucene}/analysis/kuromoji/kuromoji.iml (83%)
 rename dev-tools/idea/{modules => lucene}/analysis/morfologik/morfologik.iml (83%)
 rename dev-tools/idea/{modules => lucene}/analysis/phonetic/phonetic.iml (83%)
 rename dev-tools/idea/{modules => lucene}/analysis/smartcn/smartcn.iml (80%)
 rename dev-tools/idea/{modules => lucene}/analysis/stempel/stempel.iml (80%)
 rename dev-tools/idea/{modules => lucene}/analysis/uima/analysis-uima.iml (86%)
 rename dev-tools/idea/{modules => lucene}/benchmark/benchmark.iml (90%)
 rename dev-tools/idea/lucene/{contrib => }/demo/demo.iml (86%)
 rename dev-tools/idea/{modules => lucene}/facet/facet.iml (85%)
 rename dev-tools/idea/{modules => lucene}/grouping/grouping.iml (82%)
 rename dev-tools/idea/lucene/{contrib => }/highlighter/highlighter.iml (80%)
 rename dev-tools/idea/{modules => lucene}/join/join.iml (84%)
 rename dev-tools/idea/lucene/{contrib => }/memory/memory.iml (81%)
 rename dev-tools/idea/lucene/{contrib => }/misc/misc.iml (79%)
 rename dev-tools/idea/{modules => lucene}/queries/queries.iml (82%)
 rename dev-tools/idea/{modules => lucene}/queryparser/queryparser.iml (85%)
 rename dev-tools/idea/lucene/{contrib => }/sandbox/sandbox.iml (83%)
 rename dev-tools/idea/{modules => lucene}/spatial/spatial.iml (88%)
 rename dev-tools/idea/{modules => lucene}/suggest/suggest.iml (81%)

diff --git a/dev-tools/idea/.idea/ant.xml b/dev-tools/idea/.idea/ant.xml
index edfc5bb75ac..9cfa45ce5a6 100644
--- a/dev-tools/idea/.idea/ant.xml
+++ b/dev-tools/idea/.idea/ant.xml
@@ -3,30 +3,30 @@
   <component name="AntConfiguration">
     <buildFile url="file://$PROJECT_DIR$/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/lucene/contrib/demo/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/lucene/contrib/highlighter/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/lucene/contrib/memory/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/lucene/contrib/misc/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/lucene/contrib/sandbox/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/demo/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/highlighter/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/memory/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/misc/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/sandbox/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/core/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/tools/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/test-framework/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/modules/analysis/common/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/modules/analysis/icu/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/modules/analysis/kuromoji/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/modules/analysis/morfologik/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/modules/analysis/phonetic/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/modules/analysis/smartcn/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/modules/analysis/stempel/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/modules/analysis/uima/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/modules/benchmark/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/modules/facet/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/modules/grouping/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/modules/join/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/modules/queries/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/modules/queryparser/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/modules/spatial/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/modules/suggest/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/analysis/common/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/analysis/icu/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/analysis/kuromoji/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/analysis/morfologik/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/analysis/phonetic/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/analysis/smartcn/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/analysis/stempel/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/analysis/uima/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/benchmark/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/facet/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/grouping/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/join/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/queries/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/queryparser/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/spatial/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/suggest/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/core/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/analysis-extras/build.xml" />
diff --git a/dev-tools/idea/.idea/libraries/ICU_library.xml b/dev-tools/idea/.idea/libraries/ICU_library.xml
index 83735235ab1..477a039cf2d 100644
--- a/dev-tools/idea/.idea/libraries/ICU_library.xml
+++ b/dev-tools/idea/.idea/libraries/ICU_library.xml
@@ -1,10 +1,10 @@
 <component name="libraryTable">
   <library name="ICU library">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/modules/analysis/icu/lib" />
+      <root url="file://$PROJECT_DIR$/lucene/analysis/icu/lib" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
-    <jarDirectory url="file://$PROJECT_DIR$/modules/analysis/icu/lib" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lucene/analysis/icu/lib" recursive="false" />
   </library>
 </component>
\ No newline at end of file
diff --git a/dev-tools/idea/.idea/libraries/Morfologik_library.xml b/dev-tools/idea/.idea/libraries/Morfologik_library.xml
index 9a8e40fe2da..72c1c392d6b 100644
--- a/dev-tools/idea/.idea/libraries/Morfologik_library.xml
+++ b/dev-tools/idea/.idea/libraries/Morfologik_library.xml
@@ -1,10 +1,10 @@
 <component name="libraryTable">
   <library name="Morfologik library">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/modules/analysis/morfologik/lib" />
+      <root url="file://$PROJECT_DIR$/lucene/analysis/morfologik/lib" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
-    <jarDirectory url="file://$PROJECT_DIR$/modules/analysis/morfologik/lib" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lucene/analysis/morfologik/lib" recursive="false" />
   </library>
 </component>
\ No newline at end of file
diff --git a/dev-tools/idea/.idea/modules.xml b/dev-tools/idea/.idea/modules.xml
index 5bb07ee82af..89cb4771edc 100644
--- a/dev-tools/idea/.idea/modules.xml
+++ b/dev-tools/idea/.idea/modules.xml
@@ -4,27 +4,27 @@
     <modules>
       <module filepath="$PROJECT_DIR$/parent.iml" />
       <module filepath="$PROJECT_DIR$/lucene/lucene.iml" />
-      <module filepath="$PROJECT_DIR$/lucene/contrib/demo/demo.iml" />
-      <module filepath="$PROJECT_DIR$/lucene/contrib/highlighter/highlighter.iml" />
-      <module filepath="$PROJECT_DIR$/lucene/contrib/memory/memory.iml" />
-      <module filepath="$PROJECT_DIR$/lucene/contrib/misc/misc.iml" />
-      <module filepath="$PROJECT_DIR$/lucene/contrib/sandbox/sandbox.iml" />
-      <module filepath="$PROJECT_DIR$/modules/analysis/common/analysis-common.iml" />
-      <module filepath="$PROJECT_DIR$/modules/analysis/icu/icu.iml" />
-      <module filepath="$PROJECT_DIR$/modules/analysis/kuromoji/kuromoji.iml" />
-      <module filepath="$PROJECT_DIR$/modules/analysis/morfologik/morfologik.iml" />
-      <module filepath="$PROJECT_DIR$/modules/analysis/phonetic/phonetic.iml" />
-      <module filepath="$PROJECT_DIR$/modules/analysis/smartcn/smartcn.iml" />
-      <module filepath="$PROJECT_DIR$/modules/analysis/stempel/stempel.iml" />
-      <module filepath="$PROJECT_DIR$/modules/analysis/uima/analysis-uima.iml" />
-      <module filepath="$PROJECT_DIR$/modules/benchmark/benchmark.iml" />
-      <module filepath="$PROJECT_DIR$/modules/facet/facet.iml" />
-      <module filepath="$PROJECT_DIR$/modules/grouping/grouping.iml" />
-      <module filepath="$PROJECT_DIR$/modules/join/join.iml" />
-      <module filepath="$PROJECT_DIR$/modules/queries/queries.iml" />
-      <module filepath="$PROJECT_DIR$/modules/queryparser/queryparser.iml" />
-      <module filepath="$PROJECT_DIR$/modules/spatial/spatial.iml" />
-      <module filepath="$PROJECT_DIR$/modules/suggest/suggest.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/demo/demo.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/highlighter/highlighter.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/memory/memory.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/misc/misc.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/sandbox/sandbox.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/analysis/common/analysis-common.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/analysis/icu/icu.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/analysis/kuromoji/kuromoji.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/analysis/morfologik/morfologik.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/analysis/phonetic/phonetic.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/analysis/smartcn/smartcn.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/analysis/stempel/stempel.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/analysis/uima/analysis-uima.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/benchmark/benchmark.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/facet/facet.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/grouping/grouping.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/join/join.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/queries/queries.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/queryparser/queryparser.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/spatial/spatial.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/suggest/suggest.iml" />
       <module filepath="$PROJECT_DIR$/solr/solr.iml" />
       <module filepath="$PROJECT_DIR$/solr/contrib/analysis-extras/analysis-extras.iml" />
       <module filepath="$PROJECT_DIR$/solr/contrib/clustering/clustering.iml" />
diff --git a/dev-tools/idea/.idea/workspace.xml b/dev-tools/idea/.idea/workspace.xml
index 5145911dab8..cb40bf4903a 100644
--- a/dev-tools/idea/.idea/workspace.xml
+++ b/dev-tools/idea/.idea/workspace.xml
@@ -4,214 +4,214 @@
     <configuration default="true" type="JUnit" factoryName="JUnit">
       <option name="VM_PARAMETERS" value="-ea" />
     </configuration>
-    <configuration default="false" name="analysis-extras contrib" type="JUnit" factoryName="JUnit">
-      <module name="analysis-extras" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-analysis-extras" />
-      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-    </configuration>
-    <configuration default="false" name="benchmark module" type="JUnit" factoryName="JUnit">
-      <module name="benchmark" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/benchmark/build" />
-      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-      <method>
-        <option name="AntTarget" enabled="true" target="copy-alg-files-for-testing"
-                antfile="file://$PROJECT_DIR$/modules/benchmark/build.xml" />
-      </method>
-    </configuration>
-    <configuration default="false" name="clustering contrib" type="JUnit" factoryName="JUnit">
-      <module name="clustering" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-clustering" />
-      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-    </configuration>
-    <configuration default="false" name="common analysis module" type="JUnit" factoryName="JUnit">
-      <module name="analysis-common" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/build/common" />
-      <option name="VM_PARAMETERS" value="-ea  -DtempDir=temp" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-    </configuration>
-    <configuration default="false" name="dataimporthandler contrib" type="JUnit" factoryName="JUnit">
-      <module name="dataimporthandler" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-dataimporthandler" />
-      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-    </configuration>
-    <configuration default="false" name="dataimporthandler-extras contrib" type="JUnit" factoryName="JUnit">
-      <module name="dataimporthandler-extras" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-dataimporthandler-extras" />
-      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-    </configuration>
-    <configuration default="false" name="extraction contrib" type="JUnit" factoryName="JUnit">
-      <module name="extraction" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-cell" />
-      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-    </configuration>
-    <configuration default="false" name="facet module" type="JUnit" factoryName="JUnit">
-      <module name="facet" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/facet/build" />
-      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-    </configuration>
-    <configuration default="false" name="grouping module" type="JUnit" factoryName="JUnit">
-      <module name="grouping" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/grouping/build" />
-      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-    </configuration>
-    <configuration default="false" name="highlighter contrib" type="JUnit" factoryName="JUnit">
-      <module name="highlighter" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/highlighter" />
-      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-    </configuration>
-    <configuration default="false" name="icu analysis module" type="JUnit" factoryName="JUnit">
-      <module name="icu" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/build/icu" />
-      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-    </configuration>
-    <configuration default="false" name="join module" type="JUnit" factoryName="JUnit">
-      <module name="join" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/join/build" />
-      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-    </configuration>
-    <configuration default="false" name="kuromoji analysis module" type="JUnit" factoryName="JUnit">
-      <module name="kuromoji" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/build/kuromoji-idea" />
-      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-    </configuration>
-    <configuration default="false" name="langid contrib" type="JUnit" factoryName="JUnit">
-      <module name="langid" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-langid" />
-      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-    </configuration>
-    <configuration default="false" name="lucene" type="JUnit" factoryName="JUnit">
+    <configuration default="false" name="Lucene" type="JUnit" factoryName="JUnit">
       <module name="lucene" />
       <option name="TEST_OBJECT" value="package" />
       <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/lucene-idea" />
       <option name="VM_PARAMETERS" value="-ea -Dlucene.version=4.0-SNAPSHOT -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
-    <configuration default="false" name="memory contrib" type="JUnit" factoryName="JUnit">
-      <module name="memory" />
+    <configuration default="false" name="Module analyzers-common" type="JUnit" factoryName="JUnit">
+      <module name="analysis-common" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/memory" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/analysis/analyzers-common" />
+      <option name="VM_PARAMETERS" value="-ea  -DtempDir=temp" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
+    <configuration default="false" name="Module analyzers-icu" type="JUnit" factoryName="JUnit">
+      <module name="icu" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/analysis/analyzers-icu" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
-    <configuration default="false" name="misc contrib" type="JUnit" factoryName="JUnit">
-      <module name="misc" />
+    <configuration default="false" name="Module analyzers-kuromoji" type="JUnit" factoryName="JUnit">
+      <module name="kuromoji" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/misc" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/analysis/analyzers-kuromoji-idea" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
-    <configuration default="false" name="morfologik analysis module" type="JUnit" factoryName="JUnit">
+    <configuration default="false" name="Module analyzers-morfologik" type="JUnit" factoryName="JUnit">
       <module name="morfologik" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/build/morfologik" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/analysis/analyzers-morfologik" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
-    <configuration default="false" name="phonetic analysis module" type="JUnit" factoryName="JUnit">
+    <configuration default="false" name="Module analyzers-phonetic" type="JUnit" factoryName="JUnit">
       <module name="phonetic" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/build/phonetic" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/analysis/analyzers-phonetic" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
-    <configuration default="false" name="queries module" type="JUnit" factoryName="JUnit">
-      <module name="queries" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/queries/build" />
-      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-    </configuration>
-    <configuration default="false" name="queryparser module" type="JUnit" factoryName="JUnit">
-      <module name="queryparser" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/queries/build" />
-      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-    </configuration>
-    <configuration default="false" name="sandbox contrib" type="JUnit" factoryName="JUnit">
-      <module name="sandbox" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/sandbox" />
-      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
-      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
-    </configuration>
-    <configuration default="false" name="smartcn analysis module" type="JUnit" factoryName="JUnit">
+    <configuration default="false" name="Module analyzers-smartcn" type="JUnit" factoryName="JUnit">
       <module name="smartcn" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/build/smartcn" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/analysis/analyzers-smartcn" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
-    <configuration default="false" name="solr" type="JUnit" factoryName="JUnit">
+    <configuration default="false" name="Module analyzers-stempel" type="JUnit" factoryName="JUnit">
+      <module name="stempel" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/analysis/analyzers-stempel" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
+    <configuration default="false" name="Module analyzers-uima" type="JUnit" factoryName="JUnit">
+      <module name="analysis-uima" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/analysis/analyzers-uima" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
+    <configuration default="false" name="Module benchmark" type="JUnit" factoryName="JUnit">
+      <module name="benchmark" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/benchmark" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+      <method>
+        <option name="AntTarget" enabled="true" target="copy-alg-files-for-testing"
+                antfile="file://$PROJECT_DIR$/lucene/benchmark/build.xml" />
+      </method>
+    </configuration>
+    <configuration default="false" name="Module facet" type="JUnit" factoryName="JUnit">
+      <module name="facet" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/facet" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
+    <configuration default="false" name="Module grouping" type="JUnit" factoryName="JUnit">
+      <module name="grouping" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/grouping" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
+    <configuration default="false" name="Module highlighter" type="JUnit" factoryName="JUnit">
+      <module name="highlighter" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/highlighter" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
+    <configuration default="false" name="Module join" type="JUnit" factoryName="JUnit">
+      <module name="join" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/join" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
+    <configuration default="false" name="Module memory" type="JUnit" factoryName="JUnit">
+      <module name="memory" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/memory" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
+    <configuration default="false" name="Module misc" type="JUnit" factoryName="JUnit">
+      <module name="misc" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/misc" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
+    <configuration default="false" name="Module queries" type="JUnit" factoryName="JUnit">
+      <module name="queries" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/queries" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
+    <configuration default="false" name="Module queryparser" type="JUnit" factoryName="JUnit">
+      <module name="queryparser" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/queries" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
+    <configuration default="false" name="Module sandbox" type="JUnit" factoryName="JUnit">
+      <module name="sandbox" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/sandbox" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
+    <configuration default="false" name="Module spatial" type="JUnit" factoryName="JUnit">
+      <module name="spatial" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/spatial" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
+    <configuration default="false" name="Module suggest" type="JUnit" factoryName="JUnit">
+      <module name="suggest" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/suggest" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
+    <configuration default="false" name="Solr" type="JUnit" factoryName="JUnit">
       <module name="solr" />
       <option name="TEST_OBJECT" value="package" />
       <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/solr-idea" />
       <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
-    <configuration default="false" name="spatial module" type="JUnit" factoryName="JUnit">
-      <module name="spatial" />
+    <configuration default="false" name="Solr analysis-extras contrib" type="JUnit" factoryName="JUnit">
+      <module name="analysis-extras" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/spatial/build" />
-      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-analysis-extras" />
+      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
-    <configuration default="false" name="stempel analysis module" type="JUnit" factoryName="JUnit">
-      <module name="stempel" />
+    <configuration default="false" name="Solr clustering contrib" type="JUnit" factoryName="JUnit">
+      <module name="clustering" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/build/stempel" />
-      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-clustering" />
+      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
-    <configuration default="false" name="suggest module" type="JUnit" factoryName="JUnit">
-      <module name="suggest" />
+    <configuration default="false" name="Solr dataimporthandler contrib" type="JUnit" factoryName="JUnit">
+      <module name="dataimporthandler" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/suggest/build" />
-      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-dataimporthandler" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
-    <configuration default="false" name="uima analysis module" type="JUnit" factoryName="JUnit">
-      <module name="analysis-uima" />
+    <configuration default="false" name="Solr dataimporthandler-extras contrib" type="JUnit" factoryName="JUnit">
+      <module name="dataimporthandler-extras" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/analysis/build/uima" />
-      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-dataimporthandler-extras" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
-    <configuration default="false" name="uima contrib" type="JUnit" factoryName="JUnit">
+    <configuration default="false" name="Solr extraction contrib" type="JUnit" factoryName="JUnit">
+      <module name="extraction" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-cell" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
+    <configuration default="false" name="Solr langid contrib" type="JUnit" factoryName="JUnit">
+      <module name="langid" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-langid" />
+      <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+      <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+    </configuration>
+    <configuration default="false" name="Solr uima contrib" type="JUnit" factoryName="JUnit">
       <module name="uima" />
       <option name="TEST_OBJECT" value="package" />
       <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-uima" />
       <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
-    <configuration default="false" name="velocity contrib" type="JUnit" factoryName="JUnit">
+    <configuration default="false" name="Solr velocity contrib" type="JUnit" factoryName="JUnit">
       <module name="velocity" />
       <option name="TEST_OBJECT" value="package" />
       <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-velocity" />
@@ -219,36 +219,36 @@
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <list size="30">
-      <item index="0" class="java.lang.String" itemvalue="JUnit.analysis-extras contrib" />
-      <item index="1" class="java.lang.String" itemvalue="JUnit.benchmark module" />
-      <item index="2" class="java.lang.String" itemvalue="JUnit.clustering contrib" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.common analysis module" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.dataimporthandler contrib" />
-      <item index="5" class="java.lang.String" itemvalue="JUnit.dataimporthandler-extras contrib" />
-      <item index="6" class="java.lang.String" itemvalue="JUnit.extraction contrib" />
-      <item index="7" class="java.lang.String" itemvalue="JUnit.facet module" />
-      <item index="8" class="java.lang.String" itemvalue="JUnit.grouping module" />
-      <item index="9" class="java.lang.String" itemvalue="JUnit.highlighter contrib" />
-      <item index="10" class="java.lang.String" itemvalue="JUnit.icu analysis module" />
-      <item index="11" class="java.lang.String" itemvalue="JUnit.join module" />
-      <item index="12" class="java.lang.String" itemvalue="JUnit.kuromoji analysis module" />
-      <item index="13" class="java.lang.String" itemvalue="JUnit.langid contrib" />
-      <item index="14" class="java.lang.String" itemvalue="JUnit.lucene" />
-      <item index="15" class="java.lang.String" itemvalue="JUnit.memory contrib" />
-      <item index="16" class="java.lang.String" itemvalue="JUnit.misc contrib" />
-      <item index="17" class="java.lang.String" itemvalue="JUnit.morfologik analysis module" />
-      <item index="18" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
-      <item index="19" class="java.lang.String" itemvalue="JUnit.queries module" />
-      <item index="20" class="java.lang.String" itemvalue="JUnit.queryparser module" />
-      <item index="21" class="java.lang.String" itemvalue="JUnit.sandbox contrib" />
-      <item index="22" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
-      <item index="23" class="java.lang.String" itemvalue="JUnit.solr" />
-      <item index="24" class="java.lang.String" itemvalue="JUnit.spatial module" />
-      <item index="25" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
-      <item index="26" class="java.lang.String" itemvalue="JUnit.suggest module" />
-      <item index="27" class="java.lang.String" itemvalue="JUnit.uima analysis module" />
-      <item index="28" class="java.lang.String" itemvalue="JUnit.uima contrib" />
-      <item index="29" class="java.lang.String" itemvalue="JUnit.velocity contrib" />
+      <item index="0" class="java.lang.String" itemvalue="JUnit.Lucene" />
+      <item index="1" class="java.lang.String" itemvalue="JUnit.Module analyzers-common" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.Module analyzers-icu" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.Module analyzers-kuromoji" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.Module analyzers-morfologik" />
+      <item index="5" class="java.lang.String" itemvalue="JUnit.Module analyzers-phonetic" />
+      <item index="6" class="java.lang.String" itemvalue="JUnit.Module analyzers-smartcn" />
+      <item index="7" class="java.lang.String" itemvalue="JUnit.Module analyzers-stempel" />
+      <item index="8" class="java.lang.String" itemvalue="JUnit.Module analyzers-uima" />
+      <item index="9" class="java.lang.String" itemvalue="JUnit.Module benchmark" />
+      <item index="10" class="java.lang.String" itemvalue="JUnit.Module facet" />
+      <item index="11" class="java.lang.String" itemvalue="JUnit.Module grouping" />
+      <item index="12" class="java.lang.String" itemvalue="JUnit.Module highlighter" />
+      <item index="13" class="java.lang.String" itemvalue="JUnit.Module join" />
+      <item index="14" class="java.lang.String" itemvalue="JUnit.Module memory" />
+      <item index="15" class="java.lang.String" itemvalue="JUnit.Module misc" />
+      <item index="16" class="java.lang.String" itemvalue="JUnit.Module queries" />
+      <item index="17" class="java.lang.String" itemvalue="JUnit.Module queryparser" />
+      <item index="18" class="java.lang.String" itemvalue="JUnit.Module sandbox" />
+      <item index="19" class="java.lang.String" itemvalue="JUnit.Module spatial" />
+      <item index="20" class="java.lang.String" itemvalue="JUnit.Module suggest" />
+      <item index="21" class="java.lang.String" itemvalue="JUnit.Solr" />
+      <item index="22" class="java.lang.String" itemvalue="JUnit.Solr analysis-extras contrib" />
+      <item index="23" class="java.lang.String" itemvalue="JUnit.Solr clustering contrib" />
+      <item index="24" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler contrib" />
+      <item index="25" class="java.lang.String" itemvalue="JUnit.Solr dataimporthandler-extras contrib" />
+      <item index="26" class="java.lang.String" itemvalue="JUnit.Solr extraction contrib" />
+      <item index="27" class="java.lang.String" itemvalue="JUnit.Solr langid contrib" />
+      <item index="28" class="java.lang.String" itemvalue="JUnit.Solr uima contrib" />
+      <item index="29" class="java.lang.String" itemvalue="JUnit.Solr velocity contrib" />
     </list>
   </component>
 </project>
diff --git a/dev-tools/idea/modules/analysis/common/analysis-common.iml b/dev-tools/idea/lucene/analysis/common/analysis-common.iml
similarity index 81%
rename from dev-tools/idea/modules/analysis/common/analysis-common.iml
rename to dev-tools/idea/lucene/analysis/common/analysis-common.iml
index 961936a394b..54cb3006861 100644
--- a/dev-tools/idea/modules/analysis/common/analysis-common.iml
+++ b/dev-tools/idea/lucene/analysis/common/analysis-common.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../build/common/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/common/classes/test" />
+    <output url="file://$MODULE_DIR$/../../build/analysis/analyzers-common/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../build/analysis/analyzers-common/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
diff --git a/dev-tools/idea/modules/analysis/icu/icu.iml b/dev-tools/idea/lucene/analysis/icu/icu.iml
similarity index 86%
rename from dev-tools/idea/modules/analysis/icu/icu.iml
rename to dev-tools/idea/lucene/analysis/icu/icu.iml
index 6aeae01ecfb..7b6c54d11b9 100644
--- a/dev-tools/idea/modules/analysis/icu/icu.iml
+++ b/dev-tools/idea/lucene/analysis/icu/icu.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../build/icu/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/icu/classes/test" />
+    <output url="file://$MODULE_DIR$/../../build/analysis/analyzers-icu/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../build/analysis/analyzers-icu/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
diff --git a/dev-tools/idea/modules/analysis/kuromoji/kuromoji.iml b/dev-tools/idea/lucene/analysis/kuromoji/kuromoji.iml
similarity index 83%
rename from dev-tools/idea/modules/analysis/kuromoji/kuromoji.iml
rename to dev-tools/idea/lucene/analysis/kuromoji/kuromoji.iml
index 5274aa4c1af..bdff65d0628 100644
--- a/dev-tools/idea/modules/analysis/kuromoji/kuromoji.iml
+++ b/dev-tools/idea/lucene/analysis/kuromoji/kuromoji.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../build/kuromoji-idea/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/kuromoji-idea/classes/test" />
+    <output url="file://$MODULE_DIR$/../../build/analysis/analyzers-kuromoji-idea/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../build/analysis/analyzers-kuromoji-idea/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
diff --git a/dev-tools/idea/modules/analysis/morfologik/morfologik.iml b/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml
similarity index 83%
rename from dev-tools/idea/modules/analysis/morfologik/morfologik.iml
rename to dev-tools/idea/lucene/analysis/morfologik/morfologik.iml
index 4e69a024ee1..293c89b2a23 100644
--- a/dev-tools/idea/modules/analysis/morfologik/morfologik.iml
+++ b/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../build/morfologik/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/morfologik/classes/test" />
+    <output url="file://$MODULE_DIR$/../../build/analysis/analyzers-morfologik/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../build/analysis/analyzers-morfologik/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
diff --git a/dev-tools/idea/modules/analysis/phonetic/phonetic.iml b/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml
similarity index 83%
rename from dev-tools/idea/modules/analysis/phonetic/phonetic.iml
rename to dev-tools/idea/lucene/analysis/phonetic/phonetic.iml
index b385e80d4c7..e986169922a 100644
--- a/dev-tools/idea/modules/analysis/phonetic/phonetic.iml
+++ b/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../build/phonetic/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/phonetic/classes/test" />
+    <output url="file://$MODULE_DIR$/../../build/analysis/analyzers-phonetic/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../build/analysis/analyzers-phonetic/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
diff --git a/dev-tools/idea/modules/analysis/smartcn/smartcn.iml b/dev-tools/idea/lucene/analysis/smartcn/smartcn.iml
similarity index 80%
rename from dev-tools/idea/modules/analysis/smartcn/smartcn.iml
rename to dev-tools/idea/lucene/analysis/smartcn/smartcn.iml
index 290c1a0b85e..d9e440a8741 100644
--- a/dev-tools/idea/modules/analysis/smartcn/smartcn.iml
+++ b/dev-tools/idea/lucene/analysis/smartcn/smartcn.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../build/smartcn/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/smartcn/classes/test" />
+    <output url="file://$MODULE_DIR$/../../build/analysis/analyzers-smartcn/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../build/analysis/analyzers-smartcn/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
diff --git a/dev-tools/idea/modules/analysis/stempel/stempel.iml b/dev-tools/idea/lucene/analysis/stempel/stempel.iml
similarity index 80%
rename from dev-tools/idea/modules/analysis/stempel/stempel.iml
rename to dev-tools/idea/lucene/analysis/stempel/stempel.iml
index f2add5f6ba1..3c9f6a8e1c1 100644
--- a/dev-tools/idea/modules/analysis/stempel/stempel.iml
+++ b/dev-tools/idea/lucene/analysis/stempel/stempel.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../build/stempel/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/stempel/classes/test" />
+    <output url="file://$MODULE_DIR$/../../build/analysis/analyzers-stempel/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../build/analysis/analyzers-stempel/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
diff --git a/dev-tools/idea/modules/analysis/uima/analysis-uima.iml b/dev-tools/idea/lucene/analysis/uima/analysis-uima.iml
similarity index 86%
rename from dev-tools/idea/modules/analysis/uima/analysis-uima.iml
rename to dev-tools/idea/lucene/analysis/uima/analysis-uima.iml
index c54da0041ad..d62da6d2a92 100644
--- a/dev-tools/idea/modules/analysis/uima/analysis-uima.iml
+++ b/dev-tools/idea/lucene/analysis/uima/analysis-uima.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../build/uima/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../build/uima/classes/test" />
+    <output url="file://$MODULE_DIR$/../../build/analysis/analyzers-uima/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../build/analysis/analyzers-uima/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
diff --git a/dev-tools/idea/modules/benchmark/benchmark.iml b/dev-tools/idea/lucene/benchmark/benchmark.iml
similarity index 90%
rename from dev-tools/idea/modules/benchmark/benchmark.iml
rename to dev-tools/idea/lucene/benchmark/benchmark.iml
index 9a8790280ea..58f14bbdd79 100644
--- a/dev-tools/idea/modules/benchmark/benchmark.iml
+++ b/dev-tools/idea/lucene/benchmark/benchmark.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/java" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <output url="file://$MODULE_DIR$/../build/benchmark/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../build/benchmark/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
diff --git a/dev-tools/idea/lucene/contrib/demo/demo.iml b/dev-tools/idea/lucene/demo/demo.iml
similarity index 86%
rename from dev-tools/idea/lucene/contrib/demo/demo.iml
rename to dev-tools/idea/lucene/demo/demo.iml
index a1d44c55ddc..d76a6173834 100644
--- a/dev-tools/idea/lucene/contrib/demo/demo.iml
+++ b/dev-tools/idea/lucene/demo/demo.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../build/contrib/demo/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/contrib/demo/classes/test" />
+    <output url="file://$MODULE_DIR$/../build/demo/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../build/demo/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
diff --git a/dev-tools/idea/modules/facet/facet.iml b/dev-tools/idea/lucene/facet/facet.iml
similarity index 85%
rename from dev-tools/idea/modules/facet/facet.iml
rename to dev-tools/idea/lucene/facet/facet.iml
index 245ad58ce82..835ba65a1c6 100644
--- a/dev-tools/idea/modules/facet/facet.iml
+++ b/dev-tools/idea/lucene/facet/facet.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/java" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <output url="file://$MODULE_DIR$/../build/facet/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../build/facet/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
diff --git a/dev-tools/idea/modules/grouping/grouping.iml b/dev-tools/idea/lucene/grouping/grouping.iml
similarity index 82%
rename from dev-tools/idea/modules/grouping/grouping.iml
rename to dev-tools/idea/lucene/grouping/grouping.iml
index 2e0b6ff146b..891867d2720 100644
--- a/dev-tools/idea/modules/grouping/grouping.iml
+++ b/dev-tools/idea/lucene/grouping/grouping.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/java" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <output url="file://$MODULE_DIR$/../build/grouping/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../build/grouping/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
diff --git a/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml b/dev-tools/idea/lucene/highlighter/highlighter.iml
similarity index 80%
rename from dev-tools/idea/lucene/contrib/highlighter/highlighter.iml
rename to dev-tools/idea/lucene/highlighter/highlighter.iml
index a78e01d2931..a544e3b21d5 100644
--- a/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml
+++ b/dev-tools/idea/lucene/highlighter/highlighter.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../build/contrib/highlighter/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/contrib/highlighter/classes/test" />
+    <output url="file://$MODULE_DIR$/../build/highlighter/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../build/highlighter/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
diff --git a/dev-tools/idea/modules/join/join.iml b/dev-tools/idea/lucene/join/join.iml
similarity index 84%
rename from dev-tools/idea/modules/join/join.iml
rename to dev-tools/idea/lucene/join/join.iml
index f6138c55f87..ee35fc9ea39 100644
--- a/dev-tools/idea/modules/join/join.iml
+++ b/dev-tools/idea/lucene/join/join.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/java" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <output url="file://$MODULE_DIR$/../build/join/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../build/join/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
diff --git a/dev-tools/idea/lucene/contrib/memory/memory.iml b/dev-tools/idea/lucene/memory/memory.iml
similarity index 81%
rename from dev-tools/idea/lucene/contrib/memory/memory.iml
rename to dev-tools/idea/lucene/memory/memory.iml
index 5b2654f0d91..9bdc6605c5f 100644
--- a/dev-tools/idea/lucene/contrib/memory/memory.iml
+++ b/dev-tools/idea/lucene/memory/memory.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../build/contrib/memory/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/contrib/memory/classes/test" />
+    <output url="file://$MODULE_DIR$/../build/memory/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../build/memory/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
diff --git a/dev-tools/idea/lucene/contrib/misc/misc.iml b/dev-tools/idea/lucene/misc/misc.iml
similarity index 79%
rename from dev-tools/idea/lucene/contrib/misc/misc.iml
rename to dev-tools/idea/lucene/misc/misc.iml
index aba8711d322..93324481df1 100644
--- a/dev-tools/idea/lucene/contrib/misc/misc.iml
+++ b/dev-tools/idea/lucene/misc/misc.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../build/contrib/misc/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/contrib/misc/classes/test" />
+    <output url="file://$MODULE_DIR$/../build/misc/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../build/misc/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
diff --git a/dev-tools/idea/modules/queries/queries.iml b/dev-tools/idea/lucene/queries/queries.iml
similarity index 82%
rename from dev-tools/idea/modules/queries/queries.iml
rename to dev-tools/idea/lucene/queries/queries.iml
index 50cb2814087..2b4b876e13a 100644
--- a/dev-tools/idea/modules/queries/queries.iml
+++ b/dev-tools/idea/lucene/queries/queries.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/java" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <output url="file://$MODULE_DIR$/../build/queries/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../build/queries/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
diff --git a/dev-tools/idea/modules/queryparser/queryparser.iml b/dev-tools/idea/lucene/queryparser/queryparser.iml
similarity index 85%
rename from dev-tools/idea/modules/queryparser/queryparser.iml
rename to dev-tools/idea/lucene/queryparser/queryparser.iml
index d8bf0a2b99f..6799506e52c 100644
--- a/dev-tools/idea/modules/queryparser/queryparser.iml
+++ b/dev-tools/idea/lucene/queryparser/queryparser.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/java" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <output url="file://$MODULE_DIR$/../build/queryparser/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../build/queryparser/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
diff --git a/dev-tools/idea/lucene/contrib/sandbox/sandbox.iml b/dev-tools/idea/lucene/sandbox/sandbox.iml
similarity index 83%
rename from dev-tools/idea/lucene/contrib/sandbox/sandbox.iml
rename to dev-tools/idea/lucene/sandbox/sandbox.iml
index 3c61cb9b8a4..2f7ed1480a3 100644
--- a/dev-tools/idea/lucene/contrib/sandbox/sandbox.iml
+++ b/dev-tools/idea/lucene/sandbox/sandbox.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../build/contrib/sandbox/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/contrib/sandbox/classes/test" />
+    <output url="file://$MODULE_DIR$/../build/sandbox/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../build/sandbox/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
diff --git a/dev-tools/idea/modules/spatial/spatial.iml b/dev-tools/idea/lucene/spatial/spatial.iml
similarity index 88%
rename from dev-tools/idea/modules/spatial/spatial.iml
rename to dev-tools/idea/lucene/spatial/spatial.iml
index 37707c801fa..9d203f8fb0a 100644
--- a/dev-tools/idea/modules/spatial/spatial.iml
+++ b/dev-tools/idea/lucene/spatial/spatial.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/java" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <output url="file://$MODULE_DIR$/../build/spatial/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../build/spatial/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
diff --git a/dev-tools/idea/modules/suggest/suggest.iml b/dev-tools/idea/lucene/suggest/suggest.iml
similarity index 81%
rename from dev-tools/idea/modules/suggest/suggest.iml
rename to dev-tools/idea/lucene/suggest/suggest.iml
index bbd6eabbd4e..9f3338dc6ac 100644
--- a/dev-tools/idea/modules/suggest/suggest.iml
+++ b/dev-tools/idea/lucene/suggest/suggest.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/java" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <output url="file://$MODULE_DIR$/../build/suggest/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../build/suggest/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />