diff --git a/dev-tools/idea/.idea/ant.xml b/dev-tools/idea/.idea/ant.xml
index a4d3dc14155..edfc5bb75ac 100644
--- a/dev-tools/idea/.idea/ant.xml
+++ b/dev-tools/idea/.idea/ant.xml
@@ -25,8 +25,7 @@
     <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/base/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/modules/spatial/strategy/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$/solr/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/core/build.xml" />
diff --git a/dev-tools/idea/.idea/modules.xml b/dev-tools/idea/.idea/modules.xml
index a15c422c4b9..5bb07ee82af 100644
--- a/dev-tools/idea/.idea/modules.xml
+++ b/dev-tools/idea/.idea/modules.xml
@@ -23,8 +23,7 @@
       <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/base/spatial-base.iml" />
-      <module filepath="$PROJECT_DIR$/modules/spatial/strategy/spatial-strategy.iml" />
+      <module filepath="$PROJECT_DIR$/modules/spatial/spatial.iml" />
       <module filepath="$PROJECT_DIR$/modules/suggest/suggest.iml" />
       <module filepath="$PROJECT_DIR$/solr/solr.iml" />
       <module filepath="$PROJECT_DIR$/solr/contrib/analysis-extras/analysis-extras.iml" />
diff --git a/dev-tools/idea/.idea/workspace.xml b/dev-tools/idea/.idea/workspace.xml
index 7879450bdcc..f1d8775fc40 100644
--- a/dev-tools/idea/.idea/workspace.xml
+++ b/dev-tools/idea/.idea/workspace.xml
@@ -173,7 +173,7 @@
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="spatial module" type="JUnit" factoryName="JUnit">
-      <module name="spatial-strategy" />
+      <module name="spatial" />
       <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" />
diff --git a/dev-tools/idea/modules/spatial/spatial.iml b/dev-tools/idea/modules/spatial/spatial.iml
index 8f4557419fd..8ba51639bde 100644
--- a/dev-tools/idea/modules/spatial/spatial.iml
+++ b/dev-tools/idea/modules/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/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" />
@@ -11,6 +11,16 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
+      </library>
+    </orderEntry>
     <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
     <orderEntry type="module" module-name="lucene" exported="" />
     <orderEntry type="module" module-name="queries" />
diff --git a/dev-tools/idea/solr/solr.iml b/dev-tools/idea/solr/solr.iml
index ac406a45cc8..1056e62f7aa 100644
--- a/dev-tools/idea/solr/solr.iml
+++ b/dev-tools/idea/solr/solr.iml
@@ -21,8 +21,7 @@
     <orderEntry type="library" name="Solr library" level="project" />
     <orderEntry type="library" name="Solr example library" level="project" />
     <orderEntry type="module" module-name="kuromoji" />
-    <orderEntry type="module" module-name="spatial-base" />
-    <orderEntry type="module" module-name="spatial-strategy" />
+    <orderEntry type="module" module-name="spatial" />
     <orderEntry type="module" module-name="grouping" />
     <orderEntry type="module" module-name="highlighter" />
     <orderEntry type="module" module-name="icu" />