move things around a bit...

modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java

@@ -45,7 +45,7 @@ import org.elasticsearch.index.Index;
 import org.elasticsearch.index.analysis.AnalysisService;
 import org.elasticsearch.index.mapper.internal.TypeFieldMapper;
 import org.elasticsearch.index.mapper.object.ObjectMapper;
-import org.elasticsearch.index.query.type.nested.NonNestedDocsFilter;
+import org.elasticsearch.index.search.nested.NonNestedDocsFilter;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.indices.InvalidTypeNameException;
 import org.elasticsearch.indices.TypeMissingException;

modules/elasticsearch/src/main/java/org/elasticsearch/index/query/HasChildFilterParser.java

@@ -26,7 +26,7 @@ import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.mapper.DocumentMapper;
-import org.elasticsearch.index.query.type.child.HasChildFilter;
+import org.elasticsearch.index.search.child.HasChildFilter;
 import org.elasticsearch.search.internal.SearchContext;
 
 import java.io.IOException;

modules/elasticsearch/src/main/java/org/elasticsearch/index/query/HasChildQueryParser.java

@@ -26,7 +26,7 @@ import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.mapper.DocumentMapper;
-import org.elasticsearch.index.query.type.child.HasChildFilter;
+import org.elasticsearch.index.search.child.HasChildFilter;
 import org.elasticsearch.search.internal.SearchContext;
 
 import java.io.IOException;

modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java

@@ -17,11 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.index.query.type.nested;
+package org.elasticsearch.index.query;
 
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.index.query.BaseQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
 
 import java.io.IOException;
 

modules/elasticsearch/src/main/java/org/elasticsearch/index/query/NestedQueryParser.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.query.type.nested;
+package org.elasticsearch.index.query;
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.DeletionAwareConstantScoreQuery;
@@ -30,9 +30,8 @@ import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.object.ObjectMapper;
-import org.elasticsearch.index.query.QueryParseContext;
+import org.elasticsearch.index.search.nested.BlockJoinQuery;
-import org.elasticsearch.index.query.QueryParser;
+import org.elasticsearch.index.search.nested.NonNestedDocsFilter;
-import org.elasticsearch.index.query.QueryParsingException;
 
 import java.io.IOException;
 

modules/elasticsearch/src/main/java/org/elasticsearch/index/query/QueryBuilders.java

@@ -20,7 +20,6 @@
 package org.elasticsearch.index.query;
 
 import org.elasticsearch.common.Nullable;
-import org.elasticsearch.index.query.type.nested.NestedQueryBuilder;
 
 /**
  * A static factory for simple "import static" usage.

modules/elasticsearch/src/main/java/org/elasticsearch/index/query/TopChildrenQueryParser.java

@@ -25,7 +25,7 @@ import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.mapper.DocumentMapper;
-import org.elasticsearch.index.query.type.child.TopChildrenQuery;
+import org.elasticsearch.index.search.child.TopChildrenQuery;
 import org.elasticsearch.search.internal.SearchContext;
 
 import java.io.IOException;

modules/elasticsearch/src/main/java/org/elasticsearch/index/search/child/ChildCollector.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.query.type.child;
+package org.elasticsearch.index.search.child;
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.Collector;

modules/elasticsearch/src/main/java/org/elasticsearch/index/search/child/HasChildFilter.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.query.type.child;
+package org.elasticsearch.index.search.child;
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.Collector;

modules/elasticsearch/src/main/java/org/elasticsearch/index/search/child/TopChildrenQuery.java

@@ -17,11 +17,18 @@
  * under the License.
  */
 
-package org.elasticsearch.index.query.type.child;
+package org.elasticsearch.index.search.child;
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Term;
-import org.apache.lucene.search.*;
+import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.Searcher;
+import org.apache.lucene.search.Similarity;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.Weight;
 import org.apache.lucene.util.ToStringUtils;
 import org.elasticsearch.ElasticSearchIllegalArgumentException;
 import org.elasticsearch.ElasticSearchIllegalStateException;
@@ -32,7 +39,11 @@ import org.elasticsearch.search.internal.ScopePhase;
 import org.elasticsearch.search.internal.SearchContext;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * @author kimchy (shay.banon)

modules/elasticsearch/src/main/java/org/elasticsearch/index/search/nested/BlockJoinQuery.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.query.type.nested;
+package org.elasticsearch.index.search.nested;
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Term;

modules/elasticsearch/src/main/java/org/elasticsearch/index/search/nested/NestedDocsFilter.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.query.type.nested;
+package org.elasticsearch.index.search.nested;
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Term;

modules/elasticsearch/src/main/java/org/elasticsearch/index/search/nested/NonNestedDocsFilter.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.query.type.nested;
+package org.elasticsearch.index.search.nested;
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Term;

modules/elasticsearch/src/main/java/org/elasticsearch/indices/query/IndicesQueriesRegistry.java

@@ -24,7 +24,6 @@ import org.elasticsearch.common.collect.Maps;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.query.*;
-import org.elasticsearch.index.query.type.nested.NestedQueryParser;
 
 import java.util.Map;