diff --git a/dev-tools/idea/.idea/ant.xml b/dev-tools/idea/.idea/ant.xml
index 03d9259d64f..fbb58a6adf2 100644
--- a/dev-tools/idea/.idea/ant.xml
+++ b/dev-tools/idea/.idea/ant.xml
@@ -4,7 +4,6 @@
     <buildFile url="file://$PROJECT_DIR$/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/contrib/ant/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/lucene/contrib/benchmark/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/contrib/db/bdb/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/contrib/db/bdb-je/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/contrib/db/build.xml" />
@@ -27,6 +26,7 @@
     <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/benchmark/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/analysis-extras/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/clustering/build.xml" />
diff --git a/dev-tools/idea/.idea/modules.xml b/dev-tools/idea/.idea/modules.xml
index 66a3fcd51c7..ec1b41689c2 100644
--- a/dev-tools/idea/.idea/modules.xml
+++ b/dev-tools/idea/.idea/modules.xml
@@ -2,37 +2,37 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module filepath="$PROJECT_DIR$/solr/contrib/analysis-extras/analysis-extras.iml" />
+      <module filepath="$PROJECT_DIR$/parent.iml" />
+      <module filepath="$PROJECT_DIR$/lucene/lucene.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/ant/ant.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/db/bdb/bdb.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/db/bdb-je/bdb-je.iml" />
-      <module filepath="$PROJECT_DIR$/lucene/contrib/benchmark/benchmark.iml" />
-      <module filepath="$PROJECT_DIR$/solr/contrib/clustering/clustering.iml" />
-      <module filepath="$PROJECT_DIR$/modules/analysis/common/common.iml" />
-      <module filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler/dataimporthandler.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/demo/demo.iml" />
-      <module filepath="$PROJECT_DIR$/solr/contrib/extraction/extraction.iml" />
-      <module filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler/src/extras/extras.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/highlighter/highlighter.iml" />
-      <module filepath="$PROJECT_DIR$/modules/analysis/icu/icu.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/instantiated/instantiated.iml" />
-      <module filepath="$PROJECT_DIR$/lucene/lucene.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/lucli/lucli.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/memory/memory.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/misc/misc.iml" />
-      <module filepath="$PROJECT_DIR$/parent.iml" />
-      <module filepath="$PROJECT_DIR$/modules/analysis/phonetic/phonetic.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/queries/queries.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/queryparser/queryparser.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/remote/remote.iml" />
-      <module filepath="$PROJECT_DIR$/modules/analysis/smartcn/smartcn.iml" />
-      <module filepath="$PROJECT_DIR$/solr/solr.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/spatial/spatial.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/spellchecker/spellchecker.iml" />
-      <module filepath="$PROJECT_DIR$/modules/analysis/stempel/stempel.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/swing/swing.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/wordnet/wordnet.iml" />
       <module filepath="$PROJECT_DIR$/lucene/contrib/xml-query-parser/xml-query-parser.iml" />
+      <module filepath="$PROJECT_DIR$/modules/analysis/common/common.iml" />
+      <module filepath="$PROJECT_DIR$/modules/analysis/icu/icu.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/benchmark/benchmark.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" />
+      <module filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler/dataimporthandler.iml" />
+      <module filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler/src/extras/extras.iml" />
+      <module filepath="$PROJECT_DIR$/solr/contrib/extraction/extraction.iml" />
     </modules>
   </component>
 </project>
diff --git a/dev-tools/idea/.idea/workspace.xml b/dev-tools/idea/.idea/workspace.xml
index 3467156a99f..dc3cf62a377 100644
--- a/dev-tools/idea/.idea/workspace.xml
+++ b/dev-tools/idea/.idea/workspace.xml
@@ -29,10 +29,10 @@
       <option name="VM_PARAMETERS" value="-ea -DtempDir=bdb-je-temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
-    <configuration default="false" name="benchmark contrib" type="JUnit" factoryName="JUnit">
+    <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$/lucene/build/contrib/benchmark" />
+      <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>
     </configuration>
@@ -209,7 +209,7 @@
       <item index="1" class="java.lang.String" itemvalue="JUnit.ant contrib" />
       <item index="2" class="java.lang.String" itemvalue="JUnit.bdb contrib" />
       <item index="3" class="java.lang.String" itemvalue="JUnit.bdb-je contrib" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.benchmark contrib" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.benchmark module" />
       <item index="5" class="java.lang.String" itemvalue="JUnit.clustering contrib" />
       <item index="6" class="java.lang.String" itemvalue="JUnit.common analysis module" />
       <item index="7" class="java.lang.String" itemvalue="JUnit.dataimporthandler contrib" />
diff --git a/dev-tools/idea/lucene/contrib/benchmark/benchmark.iml b/dev-tools/idea/modules/benchmark/benchmark.iml
similarity index 89%
rename from dev-tools/idea/lucene/contrib/benchmark/benchmark.iml
rename to dev-tools/idea/modules/benchmark/benchmark.iml
index 17863fa1006..95ca885a13c 100644
--- a/dev-tools/idea/lucene/contrib/benchmark/benchmark.iml
+++ b/dev-tools/idea/modules/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/contrib/benchmark/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../build/contrib/benchmark/classes/test" />
+    <output url="file://$MODULE_DIR$/build/classes/java" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />