diff --git a/modules/spatial-TEMP/LICENSE.txt b/modules/spatial/strategy/LICENSE.txt
similarity index 100%
rename from modules/spatial-TEMP/LICENSE.txt
rename to modules/spatial/strategy/LICENSE.txt
diff --git a/modules/spatial-TEMP/build.xml b/modules/spatial/strategy/build.xml
similarity index 100%
rename from modules/spatial-TEMP/build.xml
rename to modules/spatial/strategy/build.xml
diff --git a/modules/spatial-TEMP/lib/commons-lang-2.6.jar b/modules/spatial/strategy/lib/commons-lang-2.6.jar
similarity index 100%
rename from modules/spatial-TEMP/lib/commons-lang-2.6.jar
rename to modules/spatial/strategy/lib/commons-lang-2.6.jar
diff --git a/modules/spatial-TEMP/lib/commons-lang-LICENSE-ASL.txt b/modules/spatial/strategy/lib/commons-lang-LICENSE-ASL.txt
similarity index 100%
rename from modules/spatial-TEMP/lib/commons-lang-LICENSE-ASL.txt
rename to modules/spatial/strategy/lib/commons-lang-LICENSE-ASL.txt
diff --git a/modules/spatial-TEMP/lib/commons-lang-NOTICE.txt b/modules/spatial/strategy/lib/commons-lang-NOTICE.txt
similarity index 100%
rename from modules/spatial-TEMP/lib/commons-lang-NOTICE.txt
rename to modules/spatial/strategy/lib/commons-lang-NOTICE.txt
diff --git a/modules/spatial-TEMP/lib/slf4j-LICENSE-BSD_LIKE.txt b/modules/spatial/strategy/lib/slf4j-LICENSE-BSD_LIKE.txt
similarity index 100%
rename from modules/spatial-TEMP/lib/slf4j-LICENSE-BSD_LIKE.txt
rename to modules/spatial/strategy/lib/slf4j-LICENSE-BSD_LIKE.txt
diff --git a/modules/spatial-TEMP/lib/slf4j-NOTICE.txt b/modules/spatial/strategy/lib/slf4j-NOTICE.txt
similarity index 100%
rename from modules/spatial-TEMP/lib/slf4j-NOTICE.txt
rename to modules/spatial/strategy/lib/slf4j-NOTICE.txt
diff --git a/modules/spatial-TEMP/lib/slf4j-api-1.6.1.jar b/modules/spatial/strategy/lib/slf4j-api-1.6.1.jar
similarity index 100%
rename from modules/spatial-TEMP/lib/slf4j-api-1.6.1.jar
rename to modules/spatial/strategy/lib/slf4j-api-1.6.1.jar
diff --git a/modules/spatial-TEMP/pom.xml b/modules/spatial/strategy/pom.xml
similarity index 100%
rename from modules/spatial-TEMP/pom.xml
rename to modules/spatial/strategy/pom.xml
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/context/ParseUtils.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/context/ParseUtils.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/context/ParseUtils.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/context/ParseUtils.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/context/SpatialContext.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/context/SpatialContext.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/context/SpatialContext.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/context/SpatialContext.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/context/SpatialContextFactory.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/context/SpatialContextFactory.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/context/SpatialContextFactory.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/context/SpatialContextFactory.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContext.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContext.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContext.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContext.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContextFactory.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContextFactory.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContextFactory.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContextFactory.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/distance/AbstractDistanceCalculator.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/distance/AbstractDistanceCalculator.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/distance/AbstractDistanceCalculator.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/distance/AbstractDistanceCalculator.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/distance/CartesianDistCalc.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/distance/CartesianDistCalc.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/distance/CartesianDistCalc.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/distance/CartesianDistCalc.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/distance/DistanceCalculator.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/distance/DistanceCalculator.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/distance/DistanceCalculator.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/distance/DistanceCalculator.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/distance/DistanceUnits.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/distance/DistanceUnits.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/distance/DistanceUnits.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/distance/DistanceUnits.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/distance/DistanceUtils.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/distance/DistanceUtils.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/distance/DistanceUtils.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/distance/DistanceUtils.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/distance/GeodesicSphereDistCalc.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/distance/GeodesicSphereDistCalc.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/distance/GeodesicSphereDistCalc.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/distance/GeodesicSphereDistCalc.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/distance/package-info.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/distance/package-info.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/distance/package-info.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/distance/package-info.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/exception/InvalidShapeException.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/exception/InvalidShapeException.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/exception/InvalidShapeException.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/exception/InvalidShapeException.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/exception/InvalidSpatialArgument.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/exception/InvalidSpatialArgument.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/exception/InvalidSpatialArgument.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/exception/InvalidSpatialArgument.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/exception/UnsupportedSpatialOperation.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/exception/UnsupportedSpatialOperation.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/exception/UnsupportedSpatialOperation.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/exception/UnsupportedSpatialOperation.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/io/LineReader.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/io/LineReader.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/io/LineReader.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/io/LineReader.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/io/geonames/Geoname.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/io/geonames/Geoname.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/io/geonames/Geoname.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/io/geonames/Geoname.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/io/geonames/GeonamesReader.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/io/geonames/GeonamesReader.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/io/geonames/GeonamesReader.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/io/geonames/GeonamesReader.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/io/sample/SampleData.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/io/sample/SampleData.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/io/sample/SampleData.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/io/sample/SampleData.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/io/sample/SampleDataReader.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/io/sample/SampleDataReader.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/io/sample/SampleDataReader.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/io/sample/SampleDataReader.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/package-info.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/package-info.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/package-info.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/package-info.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/prefix/Node.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/prefix/Node.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/prefix/Node.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/prefix/Node.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTree.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTree.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTree.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTree.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeFactory.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeFactory.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeFactory.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeFactory.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/prefix/geohash/GeohashPrefixTree.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/prefix/geohash/GeohashPrefixTree.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/prefix/geohash/GeohashPrefixTree.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/prefix/geohash/GeohashPrefixTree.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/prefix/geohash/GeohashUtils.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/prefix/geohash/GeohashUtils.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/prefix/geohash/GeohashUtils.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/prefix/geohash/GeohashUtils.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/prefix/package-info.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/prefix/package-info.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/prefix/package-info.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/prefix/package-info.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/prefix/quad/QuadPrefixTree.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/prefix/quad/QuadPrefixTree.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/prefix/quad/QuadPrefixTree.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/prefix/quad/QuadPrefixTree.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/query/SpatialArgs.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/query/SpatialArgs.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/query/SpatialArgs.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/query/SpatialArgs.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/query/SpatialArgsParser.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/query/SpatialArgsParser.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/query/SpatialArgsParser.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/query/SpatialArgsParser.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/query/SpatialOperation.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/query/SpatialOperation.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/query/SpatialOperation.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/query/SpatialOperation.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/query/package-info.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/query/package-info.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/query/package-info.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/query/package-info.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/Circle.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/Circle.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/Circle.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/Circle.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/MultiShape.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/MultiShape.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/MultiShape.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/MultiShape.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/Point.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/Point.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/Point.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/Point.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/Rectangle.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/Rectangle.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/Rectangle.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/Rectangle.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/Shape.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/Shape.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/Shape.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/Shape.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/SpatialRelation.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/SpatialRelation.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/SpatialRelation.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/SpatialRelation.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/simple/CircleImpl.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/simple/CircleImpl.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/simple/CircleImpl.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/simple/CircleImpl.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/simple/GeoCircleImpl.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/simple/GeoCircleImpl.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/simple/GeoCircleImpl.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/simple/GeoCircleImpl.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/simple/PointImpl.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/simple/PointImpl.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/simple/PointImpl.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/simple/PointImpl.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/simple/RectangleImpl.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/simple/RectangleImpl.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/base/shape/simple/RectangleImpl.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/base/shape/simple/RectangleImpl.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/SimpleSpatialFieldInfo.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/SimpleSpatialFieldInfo.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/SimpleSpatialFieldInfo.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/SimpleSpatialFieldInfo.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/SpatialFieldInfo.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/SpatialFieldInfo.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/SpatialFieldInfo.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/SpatialFieldInfo.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/SpatialStrategy.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/package-info.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/package-info.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/package-info.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/package-info.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/prefix/PointPrefixTreeFieldCacheProvider.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/PointPrefixTreeFieldCacheProvider.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/prefix/PointPrefixTreeFieldCacheProvider.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/PointPrefixTreeFieldCacheProvider.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixCellsTokenizer.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixCellsTokenizer.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixCellsTokenizer.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixCellsTokenizer.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/PrefixTreeStrategy.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeFilter.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategy.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategy.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategy.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategy.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/TermQueryPrefixTreeStrategy.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/prefix/package-info.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/package-info.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/prefix/package-info.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/prefix/package-info.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/util/CachedDistanceValueSource.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/CachedDistanceValueSource.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/util/CachedDistanceValueSource.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/CachedDistanceValueSource.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/util/CachingDoubleValueSource.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/CachingDoubleValueSource.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/util/CachingDoubleValueSource.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/CachingDoubleValueSource.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/util/NumericFieldInfo.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/NumericFieldInfo.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/util/NumericFieldInfo.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/NumericFieldInfo.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCache.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCacheProvider.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCacheProvider.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCacheProvider.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/ShapeFieldCacheProvider.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/util/StringListTokenizer.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/StringListTokenizer.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/util/StringListTokenizer.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/StringListTokenizer.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/util/TruncateFilter.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/TruncateFilter.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/util/TruncateFilter.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/TruncateFilter.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/util/ValueSourceFilter.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/ValueSourceFilter.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/util/ValueSourceFilter.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/util/ValueSourceFilter.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/vector/DistanceValueSource.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/vector/DistanceValueSource.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/vector/DistanceValueSource.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/vector/DistanceValueSource.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesFieldInfo.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesFieldInfo.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesFieldInfo.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesFieldInfo.java
diff --git a/modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java b/modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java
similarity index 100%
rename from modules/spatial-TEMP/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java
rename to modules/spatial/strategy/src/java/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategy.java
diff --git a/modules/spatial-TEMP/src/test-files/cities-IsWithin-BBox.txt b/modules/spatial/strategy/src/test-files/cities-IsWithin-BBox.txt
similarity index 100%
rename from modules/spatial-TEMP/src/test-files/cities-IsWithin-BBox.txt
rename to modules/spatial/strategy/src/test-files/cities-IsWithin-BBox.txt
diff --git a/modules/spatial-TEMP/src/test-files/data/countries-bbox.txt b/modules/spatial/strategy/src/test-files/data/countries-bbox.txt
similarity index 100%
rename from modules/spatial-TEMP/src/test-files/data/countries-bbox.txt
rename to modules/spatial/strategy/src/test-files/data/countries-bbox.txt
diff --git a/modules/spatial-TEMP/src/test-files/data/countries-poly.txt b/modules/spatial/strategy/src/test-files/data/countries-poly.txt
similarity index 100%
rename from modules/spatial-TEMP/src/test-files/data/countries-poly.txt
rename to modules/spatial/strategy/src/test-files/data/countries-poly.txt
diff --git a/modules/spatial-TEMP/src/test-files/data/geonames-IE.txt b/modules/spatial/strategy/src/test-files/data/geonames-IE.txt
similarity index 100%
rename from modules/spatial-TEMP/src/test-files/data/geonames-IE.txt
rename to modules/spatial/strategy/src/test-files/data/geonames-IE.txt
diff --git a/modules/spatial-TEMP/src/test-files/data/states-bbox.txt b/modules/spatial/strategy/src/test-files/data/states-bbox.txt
similarity index 100%
rename from modules/spatial-TEMP/src/test-files/data/states-bbox.txt
rename to modules/spatial/strategy/src/test-files/data/states-bbox.txt
diff --git a/modules/spatial-TEMP/src/test-files/data/states-poly.txt b/modules/spatial/strategy/src/test-files/data/states-poly.txt
similarity index 100%
rename from modules/spatial-TEMP/src/test-files/data/states-poly.txt
rename to modules/spatial/strategy/src/test-files/data/states-poly.txt
diff --git a/modules/spatial-TEMP/src/test-files/data/world-cities-points.txt b/modules/spatial/strategy/src/test-files/data/world-cities-points.txt
similarity index 100%
rename from modules/spatial-TEMP/src/test-files/data/world-cities-points.txt
rename to modules/spatial/strategy/src/test-files/data/world-cities-points.txt
diff --git a/modules/spatial-TEMP/src/test-files/states-Intersects-BBox.txt b/modules/spatial/strategy/src/test-files/states-Intersects-BBox.txt
similarity index 100%
rename from modules/spatial-TEMP/src/test-files/states-Intersects-BBox.txt
rename to modules/spatial/strategy/src/test-files/states-Intersects-BBox.txt
diff --git a/modules/spatial-TEMP/src/test-files/states-IsWithin-BBox.txt b/modules/spatial/strategy/src/test-files/states-IsWithin-BBox.txt
similarity index 100%
rename from modules/spatial-TEMP/src/test-files/states-IsWithin-BBox.txt
rename to modules/spatial/strategy/src/test-files/states-IsWithin-BBox.txt
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/SpatialMatchConcern.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/SpatialMatchConcern.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/SpatialMatchConcern.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/SpatialMatchConcern.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/SpatialTestCase.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/SpatialTestCase.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/SpatialTestCase.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/SpatialTestCase.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/SpatialTestQuery.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/SpatialTestQuery.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/SpatialTestQuery.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/SpatialTestQuery.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/StrategyTestCase.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/StrategyTestCase.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/StrategyTestCase.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/StrategyTestCase.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/TestTestFramework.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/TestTestFramework.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/TestTestFramework.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/TestTestFramework.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/context/BaseSpatialContextTestCase.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/context/BaseSpatialContextTestCase.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/context/BaseSpatialContextTestCase.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/context/BaseSpatialContextTestCase.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/context/SpatialContextFactoryTest.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/context/SpatialContextFactoryTest.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/context/SpatialContextFactoryTest.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/context/SpatialContextFactoryTest.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/context/SpatialContextTestCase.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/context/SpatialContextTestCase.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/context/SpatialContextTestCase.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/context/SpatialContextTestCase.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/distance/TestDistances.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/distance/TestDistances.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/distance/TestDistances.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/distance/TestDistances.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeTest.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeTest.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeTest.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeTest.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/prefix/TestGridMatchInfo.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/prefix/TestGridMatchInfo.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/prefix/TestGridMatchInfo.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/prefix/TestGridMatchInfo.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/prefix/geohash/TestGeohashUtils.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/prefix/geohash/TestGeohashUtils.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/prefix/geohash/TestGeohashUtils.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/prefix/geohash/TestGeohashUtils.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/shape/AbstractTestShapes.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/shape/AbstractTestShapes.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/shape/AbstractTestShapes.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/shape/AbstractTestShapes.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/shape/TestShapes2D.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/shape/TestShapes2D.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/shape/TestShapes2D.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/shape/TestShapes2D.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/shape/TestShapesGeo.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/shape/TestShapesGeo.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/base/shape/TestShapesGeo.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/shape/TestShapesGeo.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/prefix/BaseRecursivePrefixTreeStrategyTestCase.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategyTestCase.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategyTestCase.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategyTestCase.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/prefix/RecursivePrefixTreeStrategyTestCase.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/strategy/prefix/TestSpatialPrefixField.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/prefix/TestSpatialPrefixField.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/strategy/prefix/TestSpatialPrefixField.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/prefix/TestSpatialPrefixField.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/prefix/TestTermQueryPrefixGridStrategy.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/vector/BaseTwoDoublesStrategyTestCase.java
diff --git a/modules/spatial-TEMP/src/test/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java
similarity index 100%
rename from modules/spatial-TEMP/src/test/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java
rename to modules/spatial/strategy/src/test/org/apache/lucene/spatial/strategy/vector/TwoDoublesStrategyTestCase.java