diff --git a/Classes/Query/Aggregation/TermsAggregationBuilder.php b/Classes/Query/Aggregation/TermsAggregationBuilder.php
index fcd8f22..c6ddaef 100644
--- a/Classes/Query/Aggregation/TermsAggregationBuilder.php
+++ b/Classes/Query/Aggregation/TermsAggregationBuilder.php
@@ -4,7 +4,7 @@
 namespace Sandstorm\LightweightElasticsearch\Query\Aggregation;
 
 use Neos\Flow\Annotations as Flow;
-use Sandstorm\LightweightElasticsearch\Query\SearchQueryBuilderInterface;
+use Sandstorm\LightweightElasticsearch\Query\Query\SearchQueryBuilderInterface;
 
 /**
  * A Terms aggregation can be used to build faceted search.
diff --git a/Classes/Query/AggregationRequestBuilder.php b/Classes/Query/AggregationRequestBuilder.php
index 4bc2489..e679c67 100644
--- a/Classes/Query/AggregationRequestBuilder.php
+++ b/Classes/Query/AggregationRequestBuilder.php
@@ -8,6 +8,7 @@
 use Sandstorm\LightweightElasticsearch\Query\Aggregation\AggregationBuilderInterface;
 use Sandstorm\LightweightElasticsearch\Query\Aggregation\AggregationResultInterface;
 use Sandstorm\LightweightElasticsearch\Query\Aggregation\QueryErrorAggregationResult;
+use Sandstorm\LightweightElasticsearch\Query\Query\SearchQueryBuilderInterface;
 
 /**
  * Specialized request builder which can run a SINGLE top-level aggregation.
diff --git a/Classes/Query/ElasticsearchHelper.php b/Classes/Query/ElasticsearchHelper.php
index ab768b4..63c57e7 100644
--- a/Classes/Query/ElasticsearchHelper.php
+++ b/Classes/Query/ElasticsearchHelper.php
@@ -18,6 +18,9 @@
 use Neos\ContentRepository\Domain\Model\NodeInterface;
 use Sandstorm\LightweightElasticsearch\Query\Aggregation\AggregationsBuilder;
 use Sandstorm\LightweightElasticsearch\Query\Aggregation\TermsAggregationBuilder;
+use Sandstorm\LightweightElasticsearch\Query\Query\BooleanQueryBuilder;
+use Sandstorm\LightweightElasticsearch\Query\Query\NeosFulltextQueryBuilder;
+use Sandstorm\LightweightElasticsearch\Query\Query\TermQueryBuilder;
 
 /**
  * Eel Helper to write search queries.
diff --git a/Classes/Query/BooleanQueryBuilder.php b/Classes/Query/Query/BooleanQueryBuilder.php
similarity index 97%
rename from Classes/Query/BooleanQueryBuilder.php
rename to Classes/Query/Query/BooleanQueryBuilder.php
index d73e961..8ef25e0 100644
--- a/Classes/Query/BooleanQueryBuilder.php
+++ b/Classes/Query/Query/BooleanQueryBuilder.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Sandstorm\LightweightElasticsearch\Query;
+namespace Sandstorm\LightweightElasticsearch\Query\Query;
 
 use Neos\Eel\ProtectedContextAwareInterface;
 use Neos\Flow\Annotations as Flow;
diff --git a/Classes/Query/NeosFulltextQueryBuilder.php b/Classes/Query/Query/NeosFulltextQueryBuilder.php
similarity index 98%
rename from Classes/Query/NeosFulltextQueryBuilder.php
rename to Classes/Query/Query/NeosFulltextQueryBuilder.php
index 55953e0..ef9dfc3 100644
--- a/Classes/Query/NeosFulltextQueryBuilder.php
+++ b/Classes/Query/Query/NeosFulltextQueryBuilder.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Sandstorm\LightweightElasticsearch\Query;
+namespace Sandstorm\LightweightElasticsearch\Query\Query;
 
 use Neos\Eel\ProtectedContextAwareInterface;
 use Neos\Flow\Annotations as Flow;
diff --git a/Classes/Query/SearchQueryBuilderInterface.php b/Classes/Query/Query/SearchQueryBuilderInterface.php
similarity index 61%
rename from Classes/Query/SearchQueryBuilderInterface.php
rename to Classes/Query/Query/SearchQueryBuilderInterface.php
index ec000de..bac089c 100644
--- a/Classes/Query/SearchQueryBuilderInterface.php
+++ b/Classes/Query/Query/SearchQueryBuilderInterface.php
@@ -1,8 +1,7 @@
 <?php
 
 
-namespace Sandstorm\LightweightElasticsearch\Query;
-
+namespace Sandstorm\LightweightElasticsearch\Query\Query;
 
 interface SearchQueryBuilderInterface
 {
diff --git a/Classes/Query/SimpleQueryStringBuilder.php b/Classes/Query/Query/SimpleQueryStringBuilder.php
similarity index 89%
rename from Classes/Query/SimpleQueryStringBuilder.php
rename to Classes/Query/Query/SimpleQueryStringBuilder.php
index 2570a2c..47d72df 100644
--- a/Classes/Query/SimpleQueryStringBuilder.php
+++ b/Classes/Query/Query/SimpleQueryStringBuilder.php
@@ -1,7 +1,7 @@
 <?php
+declare(strict_types=1);
 
-
-namespace Sandstorm\LightweightElasticsearch\Query;
+namespace Sandstorm\LightweightElasticsearch\Query\Query;
 
 use Neos\Flow\Annotations as Flow;
 
diff --git a/Classes/Query/TermQueryBuilder.php b/Classes/Query/Query/TermQueryBuilder.php
similarity index 87%
rename from Classes/Query/TermQueryBuilder.php
rename to Classes/Query/Query/TermQueryBuilder.php
index ae74386..22b83fb 100644
--- a/Classes/Query/TermQueryBuilder.php
+++ b/Classes/Query/Query/TermQueryBuilder.php
@@ -1,8 +1,7 @@
 <?php
+declare(strict_types=1);
 
-
-namespace Sandstorm\LightweightElasticsearch\Query;
-
+namespace Sandstorm\LightweightElasticsearch\Query\Query;
 use Neos\Flow\Annotations as Flow;
 
 /**
diff --git a/Classes/Query/TermsQueryBuilder.php b/Classes/Query/Query/TermsQueryBuilder.php
similarity index 87%
rename from Classes/Query/TermsQueryBuilder.php
rename to Classes/Query/Query/TermsQueryBuilder.php
index d4c456a..0cb1bec 100644
--- a/Classes/Query/TermsQueryBuilder.php
+++ b/Classes/Query/Query/TermsQueryBuilder.php
@@ -1,8 +1,7 @@
 <?php
+declare(strict_types=1);
 
-
-namespace Sandstorm\LightweightElasticsearch\Query;
-
+namespace Sandstorm\LightweightElasticsearch\Query\Query;
 use Neos\Flow\Annotations as Flow;
 
 /**
diff --git a/Classes/Query/SearchRequestBuilder.php b/Classes/Query/SearchRequestBuilder.php
index 1536c6b..53e9feb 100644
--- a/Classes/Query/SearchRequestBuilder.php
+++ b/Classes/Query/SearchRequestBuilder.php
@@ -5,6 +5,7 @@
 
 use Neos\Flow\Annotations as Flow;
 use Flowpack\ElasticSearch\Transfer\Exception\ApiException;
+use Sandstorm\LightweightElasticsearch\Query\Query\SearchQueryBuilderInterface;
 use Sandstorm\LightweightElasticsearch\Query\Result\SearchResult;