diff --git a/src/main/java/org/elasticsearch/index/query/BaseQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/query/BaseQueryParser.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/BaseQueryParser.java
rename to core/src/main/java/org/elasticsearch/index/query/query/BaseQueryParser.java
diff --git a/src/main/java/org/elasticsearch/index/query/BaseQueryParserTemp.java b/core/src/main/java/org/elasticsearch/index/query/query/BaseQueryParserTemp.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/BaseQueryParserTemp.java
rename to core/src/main/java/org/elasticsearch/index/query/query/BaseQueryParserTemp.java
diff --git a/src/main/java/org/elasticsearch/index/query/BaseTermQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/query/BaseTermQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/BaseTermQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/query/BaseTermQueryBuilder.java
diff --git a/src/main/java/org/elasticsearch/index/query/QueryValidationException.java b/core/src/main/java/org/elasticsearch/index/query/query/QueryValidationException.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/QueryValidationException.java
rename to core/src/main/java/org/elasticsearch/index/query/query/QueryValidationException.java
diff --git a/src/main/java/org/elasticsearch/index/query/QueryWrappingQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/query/QueryWrappingQueryBuilder.java
similarity index 100%
rename from src/main/java/org/elasticsearch/index/query/QueryWrappingQueryBuilder.java
rename to core/src/main/java/org/elasticsearch/index/query/query/QueryWrappingQueryBuilder.java
diff --git a/src/test/java/org/elasticsearch/index/query/BaseQueryTestCase.java b/core/src/test/java/org/elasticsearch/index/query/query/BaseQueryTestCase.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/BaseQueryTestCase.java
rename to core/src/test/java/org/elasticsearch/index/query/query/BaseQueryTestCase.java
diff --git a/src/test/java/org/elasticsearch/index/query/BaseTermQueryTestCase.java b/core/src/test/java/org/elasticsearch/index/query/query/BaseTermQueryTestCase.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/BaseTermQueryTestCase.java
rename to core/src/test/java/org/elasticsearch/index/query/query/BaseTermQueryTestCase.java
diff --git a/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTest.java b/core/src/test/java/org/elasticsearch/index/query/query/IdsQueryBuilderTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTest.java
rename to core/src/test/java/org/elasticsearch/index/query/query/IdsQueryBuilderTest.java
diff --git a/src/test/java/org/elasticsearch/index/query/MatchAllQueryBuilderTest.java b/core/src/test/java/org/elasticsearch/index/query/query/MatchAllQueryBuilderTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/MatchAllQueryBuilderTest.java
rename to core/src/test/java/org/elasticsearch/index/query/query/MatchAllQueryBuilderTest.java
diff --git a/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTest.java b/core/src/test/java/org/elasticsearch/index/query/query/RangeQueryBuilderTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTest.java
rename to core/src/test/java/org/elasticsearch/index/query/query/RangeQueryBuilderTest.java
diff --git a/src/test/java/org/elasticsearch/index/query/SpanTermQueryBuilderTest.java b/core/src/test/java/org/elasticsearch/index/query/query/SpanTermQueryBuilderTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/SpanTermQueryBuilderTest.java
rename to core/src/test/java/org/elasticsearch/index/query/query/SpanTermQueryBuilderTest.java
diff --git a/src/test/java/org/elasticsearch/index/query/TermQueryBuilderTest.java b/core/src/test/java/org/elasticsearch/index/query/query/TermQueryBuilderTest.java
similarity index 100%
rename from src/test/java/org/elasticsearch/index/query/TermQueryBuilderTest.java
rename to core/src/test/java/org/elasticsearch/index/query/query/TermQueryBuilderTest.java