diff --git a/modules/spatial/base/lib/commons-lang-2.6.jar b/modules/spatial/lib/commons-lang-2.6.jar
similarity index 100%
rename from modules/spatial/base/lib/commons-lang-2.6.jar
rename to modules/spatial/lib/commons-lang-2.6.jar
diff --git a/modules/spatial/base/lib/commons-lang-LICENSE-ASL.txt b/modules/spatial/lib/commons-lang-LICENSE-ASL.txt
similarity index 100%
rename from modules/spatial/base/lib/commons-lang-LICENSE-ASL.txt
rename to modules/spatial/lib/commons-lang-LICENSE-ASL.txt
diff --git a/modules/spatial/base/lib/commons-lang-NOTICE.txt b/modules/spatial/lib/commons-lang-NOTICE.txt
similarity index 100%
rename from modules/spatial/base/lib/commons-lang-NOTICE.txt
rename to modules/spatial/lib/commons-lang-NOTICE.txt
diff --git a/modules/spatial/base/lib/slf4j-LICENSE-BSD_LIKE.txt b/modules/spatial/lib/slf4j-LICENSE-BSD_LIKE.txt
similarity index 100%
rename from modules/spatial/base/lib/slf4j-LICENSE-BSD_LIKE.txt
rename to modules/spatial/lib/slf4j-LICENSE-BSD_LIKE.txt
diff --git a/modules/spatial/base/lib/slf4j-NOTICE.txt b/modules/spatial/lib/slf4j-NOTICE.txt
similarity index 100%
rename from modules/spatial/base/lib/slf4j-NOTICE.txt
rename to modules/spatial/lib/slf4j-NOTICE.txt
diff --git a/modules/spatial/base/lib/slf4j-api-1.6.1.jar b/modules/spatial/lib/slf4j-api-1.6.1.jar
similarity index 100%
rename from modules/spatial/base/lib/slf4j-api-1.6.1.jar
rename to modules/spatial/lib/slf4j-api-1.6.1.jar
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/SimpleSpatialFieldInfo.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SimpleSpatialFieldInfo.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/SimpleSpatialFieldInfo.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/SimpleSpatialFieldInfo.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/SpatialFieldInfo.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SpatialFieldInfo.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/SpatialFieldInfo.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/SpatialFieldInfo.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/package-info.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/package-info.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/package-info.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/package-info.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/PointPrefixTreeFieldCacheProvider.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/PointPrefixTreeFieldCacheProvider.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/PointPrefixTreeFieldCacheProvider.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/PointPrefixTreeFieldCacheProvider.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixCellsTokenizer.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixCellsTokenizer.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixCellsTokenizer.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixCellsTokenizer.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategy.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategy.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategy.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategy.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/package-info.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/package-info.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/package-info.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/prefix/package-info.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/CachedDistanceValueSource.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/CachedDistanceValueSource.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/CachedDistanceValueSource.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/CachedDistanceValueSource.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/CachingDoubleValueSource.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/CachingDoubleValueSource.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/CachingDoubleValueSource.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/CachingDoubleValueSource.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/NumericFieldInfo.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/NumericFieldInfo.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/NumericFieldInfo.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/NumericFieldInfo.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCacheProvider.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCacheProvider.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCacheProvider.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCacheProvider.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/StringListTokenizer.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/StringListTokenizer.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/StringListTokenizer.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/StringListTokenizer.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/TruncateFilter.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/TruncateFilter.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/TruncateFilter.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/TruncateFilter.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/ValueSourceFilter.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/ValueSourceFilter.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/ValueSourceFilter.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/util/ValueSourceFilter.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/vector/DistanceValueSource.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/DistanceValueSource.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/vector/DistanceValueSource.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/DistanceValueSource.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesFieldInfo.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesFieldInfo.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesFieldInfo.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesFieldInfo.java
diff --git a/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java b/modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java
similarity index 100%
rename from modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java
rename to modules/spatial/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java
diff --git a/modules/spatial/strategy/src/java/overview.html b/modules/spatial/src/java/overview.html
similarity index 100%
rename from modules/spatial/strategy/src/java/overview.html
rename to modules/spatial/src/java/overview.html
diff --git a/modules/spatial/strategy/src/test-files/cities-IsWithin-BBox.txt b/modules/spatial/src/test-files/cities-IsWithin-BBox.txt
similarity index 100%
rename from modules/spatial/strategy/src/test-files/cities-IsWithin-BBox.txt
rename to modules/spatial/src/test-files/cities-IsWithin-BBox.txt
diff --git a/modules/spatial/strategy/src/test-files/data/countries-bbox.txt b/modules/spatial/src/test-files/data/countries-bbox.txt
similarity index 100%
rename from modules/spatial/strategy/src/test-files/data/countries-bbox.txt
rename to modules/spatial/src/test-files/data/countries-bbox.txt
diff --git a/modules/spatial/strategy/src/test-files/data/countries-poly.txt b/modules/spatial/src/test-files/data/countries-poly.txt
similarity index 100%
rename from modules/spatial/strategy/src/test-files/data/countries-poly.txt
rename to modules/spatial/src/test-files/data/countries-poly.txt
diff --git a/modules/spatial/strategy/src/test-files/data/geonames-IE.txt b/modules/spatial/src/test-files/data/geonames-IE.txt
similarity index 100%
rename from modules/spatial/strategy/src/test-files/data/geonames-IE.txt
rename to modules/spatial/src/test-files/data/geonames-IE.txt
diff --git a/modules/spatial/strategy/src/test-files/data/states-bbox.txt b/modules/spatial/src/test-files/data/states-bbox.txt
similarity index 100%
rename from modules/spatial/strategy/src/test-files/data/states-bbox.txt
rename to modules/spatial/src/test-files/data/states-bbox.txt
diff --git a/modules/spatial/strategy/src/test-files/data/states-poly.txt b/modules/spatial/src/test-files/data/states-poly.txt
similarity index 100%
rename from modules/spatial/strategy/src/test-files/data/states-poly.txt
rename to modules/spatial/src/test-files/data/states-poly.txt
diff --git a/modules/spatial/strategy/src/test-files/data/world-cities-points.txt b/modules/spatial/src/test-files/data/world-cities-points.txt
similarity index 100%
rename from modules/spatial/strategy/src/test-files/data/world-cities-points.txt
rename to modules/spatial/src/test-files/data/world-cities-points.txt
diff --git a/modules/spatial/strategy/src/test-files/states-Intersects-BBox.txt b/modules/spatial/src/test-files/states-Intersects-BBox.txt
similarity index 100%
rename from modules/spatial/strategy/src/test-files/states-Intersects-BBox.txt
rename to modules/spatial/src/test-files/states-Intersects-BBox.txt
diff --git a/modules/spatial/strategy/src/test-files/states-IsWithin-BBox.txt b/modules/spatial/src/test-files/states-IsWithin-BBox.txt
similarity index 100%
rename from modules/spatial/strategy/src/test-files/states-IsWithin-BBox.txt
rename to modules/spatial/src/test-files/states-IsWithin-BBox.txt
diff --git a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/SpatialMatchConcern.java b/modules/spatial/src/test/org/apache/lucene/spatial/SpatialMatchConcern.java
similarity index 100%
rename from modules/spatial/strategy/src/test/org/apache/lucene/spatial/SpatialMatchConcern.java
rename to modules/spatial/src/test/org/apache/lucene/spatial/SpatialMatchConcern.java
diff --git a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/SpatialTestCase.java b/modules/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java
similarity index 100%
rename from modules/spatial/strategy/src/test/org/apache/lucene/spatial/SpatialTestCase.java
rename to modules/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java
diff --git a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/SpatialTestQuery.java b/modules/spatial/src/test/org/apache/lucene/spatial/SpatialTestQuery.java
similarity index 100%
rename from modules/spatial/strategy/src/test/org/apache/lucene/spatial/SpatialTestQuery.java
rename to modules/spatial/src/test/org/apache/lucene/spatial/SpatialTestQuery.java
diff --git a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/StrategyTestCase.java b/modules/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java
similarity index 100%
rename from modules/spatial/strategy/src/test/org/apache/lucene/spatial/StrategyTestCase.java
rename to modules/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java
diff --git a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/TestTestFramework.java b/modules/spatial/src/test/org/apache/lucene/spatial/TestTestFramework.java
similarity index 100%
rename from modules/spatial/strategy/src/test/org/apache/lucene/spatial/TestTestFramework.java
rename to modules/spatial/src/test/org/apache/lucene/spatial/TestTestFramework.java
diff --git a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java b/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java
similarity index 100%
rename from modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java
rename to modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java
diff --git a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategyTestCase.java b/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategyTestCase.java
similarity index 100%
rename from modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategyTestCase.java
rename to modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategyTestCase.java
diff --git a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/prefix/TestSpatialPrefixField.java b/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/TestSpatialPrefixField.java
similarity index 100%
rename from modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/prefix/TestSpatialPrefixField.java
rename to modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/TestSpatialPrefixField.java
diff --git a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java b/modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java
similarity index 100%
rename from modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java
rename to modules/spatial/src/test/org/apache/lucene/spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java
diff --git a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java b/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java
similarity index 100%
rename from modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java
rename to modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java
diff --git a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java b/modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java
similarity index 100%
rename from modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java
rename to modules/spatial/src/test/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java