Restructure library folder structures

ruflin · Feb 11, 2020 · 1928d0b · 1928d0b
1 parent 5e8cea1
commit 1928d0b
Show file tree

Hide file tree

Showing 443 changed files with 12 additions and 51 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -12,4 +12,4 @@
 /docker-entrypoint.sh export-ignore
 /env export-ignore
 /phpdoc.dist.xml export-ignore
-/test export-ignore
+/tests export-ignore
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -1,8 +1,7 @@
 <?php
 
 $finder = PhpCsFixer\Finder::create()
-    ->exclude(['vendor', 'var'])
-    ->in([__DIR__])
+    ->in(['src/', 'tests/'])
 ;
 
 return PhpCsFixer\Config::create()

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Backward Compatibility Breaks
 ### Added
 ### Changed
+- Refactored code structure: use `src/` and `tests/` folders [#1755](https://github.com/ruflin/Elastica/pull/1755)
 - Require elastica-php library >= v7.1.1, fixes an issue on Ingestion/Put() type-hinting
 - Require guzzle >= v6.3 as development library: fixes issues on PHP >= 7.2
 - Require phpunit >= v7.5, fixes deprecations in with PHP 7.3

diff --git a/composer.json b/composer.json
@@ -29,12 +29,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Elastica\\": "lib/Elastica/"
+            "Elastica\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Elastica\\Test\\": "test/Elastica/"
+            "Elastica\\Test\\": "tests/"
         }
     },
     "extra": {

diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml
@@ -8,6 +8,6 @@
         <target>./build/api</target>
     </transformer>
     <files>
-        <directory>./lib</directory>
+        <directory>./src</directory>
     </files>
 </docblox>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -11,12 +11,12 @@
 >
   <filter>
     <whitelist>
-      <directory>lib/</directory>
+      <directory>src/</directory>
     </whitelist>
   </filter>
   <testsuites>
     <testsuite name="default">
-      <directory>test/Elastica/</directory>
+      <directory>tests/</directory>
     </testsuite>
   </testsuites>
 </phpunit>
diff --git a/lib/Elastica/AbstractUpdateAction.php → src/AbstractUpdateAction.php b/lib/Elastica/AbstractUpdateAction.php → src/AbstractUpdateAction.php
diff --git a/...stica/Aggregation/AbstractAggregation.php → src/Aggregation/AbstractAggregation.php b/...stica/Aggregation/AbstractAggregation.php → src/Aggregation/AbstractAggregation.php
diff --git a/...Aggregation/AbstractSimpleAggregation.php → ...Aggregation/AbstractSimpleAggregation.php b/...Aggregation/AbstractSimpleAggregation.php → ...Aggregation/AbstractSimpleAggregation.php
diff --git a/.../Aggregation/AbstractTermsAggregation.php → src/Aggregation/AbstractTermsAggregation.php b/.../Aggregation/AbstractTermsAggregation.php → src/Aggregation/AbstractTermsAggregation.php
diff --git a/lib/Elastica/Aggregation/AdjacencyMatrix.php → src/Aggregation/AdjacencyMatrix.php b/lib/Elastica/Aggregation/AdjacencyMatrix.php → src/Aggregation/AdjacencyMatrix.php
diff --git a/lib/Elastica/Aggregation/Avg.php → src/Aggregation/Avg.php b/lib/Elastica/Aggregation/Avg.php → src/Aggregation/Avg.php
diff --git a/lib/Elastica/Aggregation/AvgBucket.php → src/Aggregation/AvgBucket.php b/lib/Elastica/Aggregation/AvgBucket.php → src/Aggregation/AvgBucket.php
diff --git a/lib/Elastica/Aggregation/BucketScript.php → src/Aggregation/BucketScript.php b/lib/Elastica/Aggregation/BucketScript.php → src/Aggregation/BucketScript.php
diff --git a/lib/Elastica/Aggregation/BucketSelector.php → src/Aggregation/BucketSelector.php b/lib/Elastica/Aggregation/BucketSelector.php → src/Aggregation/BucketSelector.php
diff --git a/lib/Elastica/Aggregation/Cardinality.php → src/Aggregation/Cardinality.php b/lib/Elastica/Aggregation/Cardinality.php → src/Aggregation/Cardinality.php
diff --git a/lib/Elastica/Aggregation/Children.php → src/Aggregation/Children.php b/lib/Elastica/Aggregation/Children.php → src/Aggregation/Children.php
diff --git a/lib/Elastica/Aggregation/DateHistogram.php → src/Aggregation/DateHistogram.php b/lib/Elastica/Aggregation/DateHistogram.php → src/Aggregation/DateHistogram.php
diff --git a/lib/Elastica/Aggregation/DateRange.php → src/Aggregation/DateRange.php b/lib/Elastica/Aggregation/DateRange.php → src/Aggregation/DateRange.php
diff --git a/lib/Elastica/Aggregation/Derivative.php → src/Aggregation/Derivative.php b/lib/Elastica/Aggregation/Derivative.php → src/Aggregation/Derivative.php
diff --git a/...astica/Aggregation/DiversifiedSampler.php → src/Aggregation/DiversifiedSampler.php b/...astica/Aggregation/DiversifiedSampler.php → src/Aggregation/DiversifiedSampler.php
diff --git a/lib/Elastica/Aggregation/ExtendedStats.php → src/Aggregation/ExtendedStats.php b/lib/Elastica/Aggregation/ExtendedStats.php → src/Aggregation/ExtendedStats.php
diff --git a/lib/Elastica/Aggregation/Filter.php → src/Aggregation/Filter.php b/lib/Elastica/Aggregation/Filter.php → src/Aggregation/Filter.php
diff --git a/lib/Elastica/Aggregation/Filters.php → src/Aggregation/Filters.php b/lib/Elastica/Aggregation/Filters.php → src/Aggregation/Filters.php
diff --git a/lib/Elastica/Aggregation/GeoBounds.php → src/Aggregation/GeoBounds.php b/lib/Elastica/Aggregation/GeoBounds.php → src/Aggregation/GeoBounds.php
diff --git a/lib/Elastica/Aggregation/GeoCentroid.php → src/Aggregation/GeoCentroid.php b/lib/Elastica/Aggregation/GeoCentroid.php → src/Aggregation/GeoCentroid.php
diff --git a/lib/Elastica/Aggregation/GeoDistance.php → src/Aggregation/GeoDistance.php b/lib/Elastica/Aggregation/GeoDistance.php → src/Aggregation/GeoDistance.php
diff --git a/lib/Elastica/Aggregation/GeohashGrid.php → src/Aggregation/GeohashGrid.php b/lib/Elastica/Aggregation/GeohashGrid.php → src/Aggregation/GeohashGrid.php
diff --git a/...lastica/Aggregation/GlobalAggregation.php → src/Aggregation/GlobalAggregation.php b/...lastica/Aggregation/GlobalAggregation.php → src/Aggregation/GlobalAggregation.php
diff --git a/lib/Elastica/Aggregation/Histogram.php → src/Aggregation/Histogram.php b/lib/Elastica/Aggregation/Histogram.php → src/Aggregation/Histogram.php
diff --git a/lib/Elastica/Aggregation/IpRange.php → src/Aggregation/IpRange.php b/lib/Elastica/Aggregation/IpRange.php → src/Aggregation/IpRange.php
diff --git a/lib/Elastica/Aggregation/Max.php → src/Aggregation/Max.php b/lib/Elastica/Aggregation/Max.php → src/Aggregation/Max.php
diff --git a/lib/Elastica/Aggregation/Min.php → src/Aggregation/Min.php b/lib/Elastica/Aggregation/Min.php → src/Aggregation/Min.php
diff --git a/lib/Elastica/Aggregation/Missing.php → src/Aggregation/Missing.php b/lib/Elastica/Aggregation/Missing.php → src/Aggregation/Missing.php
diff --git a/lib/Elastica/Aggregation/Nested.php → src/Aggregation/Nested.php b/lib/Elastica/Aggregation/Nested.php → src/Aggregation/Nested.php
diff --git a/...lastica/Aggregation/ParentAggregation.php → src/Aggregation/ParentAggregation.php b/...lastica/Aggregation/ParentAggregation.php → src/Aggregation/ParentAggregation.php
diff --git a/lib/Elastica/Aggregation/Percentiles.php → src/Aggregation/Percentiles.php b/lib/Elastica/Aggregation/Percentiles.php → src/Aggregation/Percentiles.php
diff --git a/lib/Elastica/Aggregation/Range.php → src/Aggregation/Range.php b/lib/Elastica/Aggregation/Range.php → src/Aggregation/Range.php
diff --git a/lib/Elastica/Aggregation/ReverseNested.php → src/Aggregation/ReverseNested.php b/lib/Elastica/Aggregation/ReverseNested.php → src/Aggregation/ReverseNested.php
diff --git a/lib/Elastica/Aggregation/Sampler.php → src/Aggregation/Sampler.php b/lib/Elastica/Aggregation/Sampler.php → src/Aggregation/Sampler.php
diff --git a/lib/Elastica/Aggregation/ScriptedMetric.php → src/Aggregation/ScriptedMetric.php b/lib/Elastica/Aggregation/ScriptedMetric.php → src/Aggregation/ScriptedMetric.php
diff --git a/lib/Elastica/Aggregation/SerialDiff.php → src/Aggregation/SerialDiff.php b/lib/Elastica/Aggregation/SerialDiff.php → src/Aggregation/SerialDiff.php
diff --git a/...Elastica/Aggregation/SignificantTerms.php → src/Aggregation/SignificantTerms.php b/...Elastica/Aggregation/SignificantTerms.php → src/Aggregation/SignificantTerms.php
diff --git a/lib/Elastica/Aggregation/Stats.php → src/Aggregation/Stats.php b/lib/Elastica/Aggregation/Stats.php → src/Aggregation/Stats.php
diff --git a/lib/Elastica/Aggregation/StatsBucket.php → src/Aggregation/StatsBucket.php b/lib/Elastica/Aggregation/StatsBucket.php → src/Aggregation/StatsBucket.php
diff --git a/lib/Elastica/Aggregation/Sum.php → src/Aggregation/Sum.php b/lib/Elastica/Aggregation/Sum.php → src/Aggregation/Sum.php
diff --git a/lib/Elastica/Aggregation/SumBucket.php → src/Aggregation/SumBucket.php b/lib/Elastica/Aggregation/SumBucket.php → src/Aggregation/SumBucket.php
diff --git a/lib/Elastica/Aggregation/Terms.php → src/Aggregation/Terms.php b/lib/Elastica/Aggregation/Terms.php → src/Aggregation/Terms.php
diff --git a/lib/Elastica/Aggregation/TopHits.php → src/Aggregation/TopHits.php b/lib/Elastica/Aggregation/TopHits.php → src/Aggregation/TopHits.php
diff --git a/lib/Elastica/Aggregation/ValueCount.php → src/Aggregation/ValueCount.php b/lib/Elastica/Aggregation/ValueCount.php → src/Aggregation/ValueCount.php
diff --git a/lib/Elastica/ArrayableInterface.php → src/ArrayableInterface.php b/lib/Elastica/ArrayableInterface.php → src/ArrayableInterface.php
diff --git a/lib/Elastica/Bulk.php → src/Bulk.php b/lib/Elastica/Bulk.php → src/Bulk.php
diff --git a/lib/Elastica/Bulk/Action.php → src/Bulk/Action.php b/lib/Elastica/Bulk/Action.php → src/Bulk/Action.php
diff --git a/...Elastica/Bulk/Action/AbstractDocument.php → src/Bulk/Action/AbstractDocument.php b/...Elastica/Bulk/Action/AbstractDocument.php → src/Bulk/Action/AbstractDocument.php
diff --git a/lib/Elastica/Bulk/Action/CreateDocument.php → src/Bulk/Action/CreateDocument.php b/lib/Elastica/Bulk/Action/CreateDocument.php → src/Bulk/Action/CreateDocument.php
diff --git a/lib/Elastica/Bulk/Action/DeleteDocument.php → src/Bulk/Action/DeleteDocument.php b/lib/Elastica/Bulk/Action/DeleteDocument.php → src/Bulk/Action/DeleteDocument.php
diff --git a/lib/Elastica/Bulk/Action/IndexDocument.php → src/Bulk/Action/IndexDocument.php b/lib/Elastica/Bulk/Action/IndexDocument.php → src/Bulk/Action/IndexDocument.php
diff --git a/lib/Elastica/Bulk/Action/UpdateDocument.php → src/Bulk/Action/UpdateDocument.php b/lib/Elastica/Bulk/Action/UpdateDocument.php → src/Bulk/Action/UpdateDocument.php
diff --git a/lib/Elastica/Bulk/Response.php → src/Bulk/Response.php b/lib/Elastica/Bulk/Response.php → src/Bulk/Response.php
diff --git a/lib/Elastica/Bulk/ResponseSet.php → src/Bulk/ResponseSet.php b/lib/Elastica/Bulk/ResponseSet.php → src/Bulk/ResponseSet.php
diff --git a/lib/Elastica/Client.php → src/Client.php b/lib/Elastica/Client.php → src/Client.php
diff --git a/lib/Elastica/ClientConfiguration.php → src/ClientConfiguration.php b/lib/Elastica/ClientConfiguration.php → src/ClientConfiguration.php
diff --git a/lib/Elastica/Cluster.php → src/Cluster.php b/lib/Elastica/Cluster.php → src/Cluster.php
diff --git a/lib/Elastica/Cluster/Health.php → src/Cluster/Health.php b/lib/Elastica/Cluster/Health.php → src/Cluster/Health.php
diff --git a/lib/Elastica/Cluster/Health/Index.php → src/Cluster/Health/Index.php b/lib/Elastica/Cluster/Health/Index.php → src/Cluster/Health/Index.php
diff --git a/lib/Elastica/Cluster/Health/Shard.php → src/Cluster/Health/Shard.php b/lib/Elastica/Cluster/Health/Shard.php → src/Cluster/Health/Shard.php
diff --git a/lib/Elastica/Cluster/Settings.php → src/Cluster/Settings.php b/lib/Elastica/Cluster/Settings.php → src/Cluster/Settings.php
diff --git a/lib/Elastica/Collapse.php → src/Collapse.php b/lib/Elastica/Collapse.php → src/Collapse.php
diff --git a/lib/Elastica/Collapse/InnerHits.php → src/Collapse/InnerHits.php b/lib/Elastica/Collapse/InnerHits.php → src/Collapse/InnerHits.php
diff --git a/lib/Elastica/Connection.php → src/Connection.php b/lib/Elastica/Connection.php → src/Connection.php
diff --git a/lib/Elastica/Connection/ConnectionPool.php → src/Connection/ConnectionPool.php b/lib/Elastica/Connection/ConnectionPool.php → src/Connection/ConnectionPool.php
diff --git a/.../Connection/Strategy/CallbackStrategy.php → src/Connection/Strategy/CallbackStrategy.php b/.../Connection/Strategy/CallbackStrategy.php → src/Connection/Strategy/CallbackStrategy.php
diff --git a/...astica/Connection/Strategy/RoundRobin.php → src/Connection/Strategy/RoundRobin.php b/...astica/Connection/Strategy/RoundRobin.php → src/Connection/Strategy/RoundRobin.php
diff --git a/lib/Elastica/Connection/Strategy/Simple.php → src/Connection/Strategy/Simple.php b/lib/Elastica/Connection/Strategy/Simple.php → src/Connection/Strategy/Simple.php
diff --git a/...a/Connection/Strategy/StrategyFactory.php → src/Connection/Strategy/StrategyFactory.php b/...a/Connection/Strategy/StrategyFactory.php → src/Connection/Strategy/StrategyFactory.php
diff --git a/...Connection/Strategy/StrategyInterface.php → ...Connection/Strategy/StrategyInterface.php b/...Connection/Strategy/StrategyInterface.php → ...Connection/Strategy/StrategyInterface.php
diff --git a/lib/Elastica/Document.php → src/Document.php b/lib/Elastica/Document.php → src/Document.php
diff --git a/...ception/Bulk/Response/ActionException.php → ...ception/Bulk/Response/ActionException.php b/...ception/Bulk/Response/ActionException.php → ...ception/Bulk/Response/ActionException.php
diff --git a/...tica/Exception/Bulk/ResponseException.php → src/Exception/Bulk/ResponseException.php b/...tica/Exception/Bulk/ResponseException.php → src/Exception/Bulk/ResponseException.php
diff --git a/lib/Elastica/Exception/BulkException.php → src/Exception/BulkException.php b/lib/Elastica/Exception/BulkException.php → src/Exception/BulkException.php
diff --git a/lib/Elastica/Exception/ClientException.php → src/Exception/ClientException.php b/lib/Elastica/Exception/ClientException.php → src/Exception/ClientException.php
diff --git a/.../Exception/Connection/GuzzleException.php → src/Exception/Connection/GuzzleException.php b/.../Exception/Connection/GuzzleException.php → src/Exception/Connection/GuzzleException.php
diff --git a/...ca/Exception/Connection/HttpException.php → src/Exception/Connection/HttpException.php b/...ca/Exception/Connection/HttpException.php → src/Exception/Connection/HttpException.php
diff --git a/...lastica/Exception/ConnectionException.php → src/Exception/ConnectionException.php b/...lastica/Exception/ConnectionException.php → src/Exception/ConnectionException.php
diff --git a/...lastica/Exception/DeprecatedException.php → src/Exception/DeprecatedException.php b/...lastica/Exception/DeprecatedException.php → src/Exception/DeprecatedException.php
diff --git a/...tica/Exception/ElasticsearchException.php → src/Exception/ElasticsearchException.php b/...tica/Exception/ElasticsearchException.php → src/Exception/ElasticsearchException.php
diff --git a/...Elastica/Exception/ExceptionInterface.php → src/Exception/ExceptionInterface.php b/...Elastica/Exception/ExceptionInterface.php → src/Exception/ExceptionInterface.php
diff --git a/lib/Elastica/Exception/InvalidException.php → src/Exception/InvalidException.php b/lib/Elastica/Exception/InvalidException.php → src/Exception/InvalidException.php
diff --git a/...Elastica/Exception/JSONParseException.php → src/Exception/JSONParseException.php b/...Elastica/Exception/JSONParseException.php → src/Exception/JSONParseException.php
diff --git a/lib/Elastica/Exception/NotFoundException.php → src/Exception/NotFoundException.php b/lib/Elastica/Exception/NotFoundException.php → src/Exception/NotFoundException.php
diff --git a/...ica/Exception/NotImplementedException.php → src/Exception/NotImplementedException.php b/...ica/Exception/NotImplementedException.php → src/Exception/NotImplementedException.php
diff --git a/...xception/PartialShardFailureException.php → ...xception/PartialShardFailureException.php b/...xception/PartialShardFailureException.php → ...xception/PartialShardFailureException.php
diff --git a/...stica/Exception/QueryBuilderException.php → src/Exception/QueryBuilderException.php b/...stica/Exception/QueryBuilderException.php → src/Exception/QueryBuilderException.php
diff --git a/lib/Elastica/Exception/ResponseException.php → src/Exception/ResponseException.php b/lib/Elastica/Exception/ResponseException.php → src/Exception/ResponseException.php
diff --git a/lib/Elastica/Exception/RuntimeException.php → src/Exception/RuntimeException.php b/lib/Elastica/Exception/RuntimeException.php → src/Exception/RuntimeException.php
diff --git a/lib/Elastica/Index.php → src/Index.php b/lib/Elastica/Index.php → src/Index.php
diff --git a/lib/Elastica/Index/Recovery.php → src/Index/Recovery.php b/lib/Elastica/Index/Recovery.php → src/Index/Recovery.php
diff --git a/lib/Elastica/Index/Settings.php → src/Index/Settings.php b/lib/Elastica/Index/Settings.php → src/Index/Settings.php
diff --git a/lib/Elastica/Index/Stats.php → src/Index/Stats.php b/lib/Elastica/Index/Stats.php → src/Index/Stats.php
diff --git a/lib/Elastica/IndexTemplate.php → src/IndexTemplate.php b/lib/Elastica/IndexTemplate.php → src/IndexTemplate.php
diff --git a/lib/Elastica/JSON.php → src/JSON.php b/lib/Elastica/JSON.php → src/JSON.php
diff --git a/lib/Elastica/Mapping.php → src/Mapping.php b/lib/Elastica/Mapping.php → src/Mapping.php
diff --git a/lib/Elastica/Multi/MultiBuilder.php → src/Multi/MultiBuilder.php b/lib/Elastica/Multi/MultiBuilder.php → src/Multi/MultiBuilder.php
diff --git a/lib/Elastica/Multi/MultiBuilderInterface.php → src/Multi/MultiBuilderInterface.php b/lib/Elastica/Multi/MultiBuilderInterface.php → src/Multi/MultiBuilderInterface.php
diff --git a/lib/Elastica/Multi/ResultSet.php → src/Multi/ResultSet.php b/lib/Elastica/Multi/ResultSet.php → src/Multi/ResultSet.php
diff --git a/lib/Elastica/Multi/Search.php → src/Multi/Search.php b/lib/Elastica/Multi/Search.php → src/Multi/Search.php
diff --git a/lib/Elastica/NameableInterface.php → src/NameableInterface.php b/lib/Elastica/NameableInterface.php → src/NameableInterface.php
diff --git a/lib/Elastica/Node.php → src/Node.php b/lib/Elastica/Node.php → src/Node.php
diff --git a/lib/Elastica/Node/Info.php → src/Node/Info.php b/lib/Elastica/Node/Info.php → src/Node/Info.php
diff --git a/lib/Elastica/Node/Stats.php → src/Node/Stats.php b/lib/Elastica/Node/Stats.php → src/Node/Stats.php
diff --git a/lib/Elastica/Param.php → src/Param.php b/lib/Elastica/Param.php → src/Param.php
diff --git a/lib/Elastica/Pipeline.php → src/Pipeline.php b/lib/Elastica/Pipeline.php → src/Pipeline.php
diff --git a/lib/Elastica/Processor/AbstractProcessor.php → src/Processor/AbstractProcessor.php b/lib/Elastica/Processor/AbstractProcessor.php → src/Processor/AbstractProcessor.php
diff --git a/lib/Elastica/Processor/Append.php → src/Processor/Append.php b/lib/Elastica/Processor/Append.php → src/Processor/Append.php
diff --git a/lib/Elastica/Processor/Attachment.php → src/Processor/Attachment.php b/lib/Elastica/Processor/Attachment.php → src/Processor/Attachment.php
diff --git a/lib/Elastica/Processor/Convert.php → src/Processor/Convert.php b/lib/Elastica/Processor/Convert.php → src/Processor/Convert.php
diff --git a/lib/Elastica/Processor/Date.php → src/Processor/Date.php b/lib/Elastica/Processor/Date.php → src/Processor/Date.php
diff --git a/lib/Elastica/Processor/DateIndexName.php → src/Processor/DateIndexName.php b/lib/Elastica/Processor/DateIndexName.php → src/Processor/DateIndexName.php
diff --git a/lib/Elastica/Processor/DotExpander.php → src/Processor/DotExpander.php b/lib/Elastica/Processor/DotExpander.php → src/Processor/DotExpander.php
diff --git a/lib/Elastica/Processor/Fail.php → src/Processor/Fail.php b/lib/Elastica/Processor/Fail.php → src/Processor/Fail.php
diff --git a/lib/Elastica/Processor/Join.php → src/Processor/Join.php b/lib/Elastica/Processor/Join.php → src/Processor/Join.php
diff --git a/lib/Elastica/Processor/Json.php → src/Processor/Json.php b/lib/Elastica/Processor/Json.php → src/Processor/Json.php
diff --git a/lib/Elastica/Processor/Kv.php → src/Processor/Kv.php b/lib/Elastica/Processor/Kv.php → src/Processor/Kv.php
diff --git a/lib/Elastica/Processor/Lowercase.php → src/Processor/Lowercase.php b/lib/Elastica/Processor/Lowercase.php → src/Processor/Lowercase.php
diff --git a/lib/Elastica/Processor/Remove.php → src/Processor/Remove.php b/lib/Elastica/Processor/Remove.php → src/Processor/Remove.php
diff --git a/lib/Elastica/Processor/Rename.php → src/Processor/Rename.php b/lib/Elastica/Processor/Rename.php → src/Processor/Rename.php
diff --git a/lib/Elastica/Processor/Set.php → src/Processor/Set.php b/lib/Elastica/Processor/Set.php → src/Processor/Set.php
diff --git a/lib/Elastica/Processor/Sort.php → src/Processor/Sort.php b/lib/Elastica/Processor/Sort.php → src/Processor/Sort.php
diff --git a/lib/Elastica/Processor/Split.php → src/Processor/Split.php b/lib/Elastica/Processor/Split.php → src/Processor/Split.php
diff --git a/lib/Elastica/Processor/Trim.php → src/Processor/Trim.php b/lib/Elastica/Processor/Trim.php → src/Processor/Trim.php
diff --git a/lib/Elastica/Processor/Uppercase.php → src/Processor/Uppercase.php b/lib/Elastica/Processor/Uppercase.php → src/Processor/Uppercase.php
diff --git a/lib/Elastica/Query.php → src/Query.php b/lib/Elastica/Query.php → src/Query.php
diff --git a/lib/Elastica/Query/AbstractGeoDistance.php → src/Query/AbstractGeoDistance.php b/lib/Elastica/Query/AbstractGeoDistance.php → src/Query/AbstractGeoDistance.php
diff --git a/lib/Elastica/Query/AbstractGeoShape.php → src/Query/AbstractGeoShape.php b/lib/Elastica/Query/AbstractGeoShape.php → src/Query/AbstractGeoShape.php
diff --git a/lib/Elastica/Query/AbstractQuery.php → src/Query/AbstractQuery.php b/lib/Elastica/Query/AbstractQuery.php → src/Query/AbstractQuery.php
diff --git a/lib/Elastica/Query/AbstractSpanQuery.php → src/Query/AbstractSpanQuery.php b/lib/Elastica/Query/AbstractSpanQuery.php → src/Query/AbstractSpanQuery.php
diff --git a/lib/Elastica/Query/BoolQuery.php → src/Query/BoolQuery.php b/lib/Elastica/Query/BoolQuery.php → src/Query/BoolQuery.php
diff --git a/lib/Elastica/Query/Boosting.php → src/Query/Boosting.php b/lib/Elastica/Query/Boosting.php → src/Query/Boosting.php
diff --git a/lib/Elastica/Query/Common.php → src/Query/Common.php b/lib/Elastica/Query/Common.php → src/Query/Common.php
diff --git a/lib/Elastica/Query/ConstantScore.php → src/Query/ConstantScore.php b/lib/Elastica/Query/ConstantScore.php → src/Query/ConstantScore.php
diff --git a/lib/Elastica/Query/DisMax.php → src/Query/DisMax.php b/lib/Elastica/Query/DisMax.php → src/Query/DisMax.php
diff --git a/lib/Elastica/Query/DistanceFeature.php → src/Query/DistanceFeature.php b/lib/Elastica/Query/DistanceFeature.php → src/Query/DistanceFeature.php
diff --git a/lib/Elastica/Query/Exists.php → src/Query/Exists.php b/lib/Elastica/Query/Exists.php → src/Query/Exists.php
diff --git a/lib/Elastica/Query/FunctionScore.php → src/Query/FunctionScore.php b/lib/Elastica/Query/FunctionScore.php → src/Query/FunctionScore.php
diff --git a/lib/Elastica/Query/Fuzzy.php → src/Query/Fuzzy.php b/lib/Elastica/Query/Fuzzy.php → src/Query/Fuzzy.php
diff --git a/lib/Elastica/Query/GeoBoundingBox.php → src/Query/GeoBoundingBox.php b/lib/Elastica/Query/GeoBoundingBox.php → src/Query/GeoBoundingBox.php
diff --git a/lib/Elastica/Query/GeoDistance.php → src/Query/GeoDistance.php b/lib/Elastica/Query/GeoDistance.php → src/Query/GeoDistance.php
diff --git a/lib/Elastica/Query/GeoPolygon.php → src/Query/GeoPolygon.php b/lib/Elastica/Query/GeoPolygon.php → src/Query/GeoPolygon.php
diff --git a/lib/Elastica/Query/GeoShapePreIndexed.php → src/Query/GeoShapePreIndexed.php b/lib/Elastica/Query/GeoShapePreIndexed.php → src/Query/GeoShapePreIndexed.php
diff --git a/lib/Elastica/Query/GeoShapeProvided.php → src/Query/GeoShapeProvided.php b/lib/Elastica/Query/GeoShapeProvided.php → src/Query/GeoShapeProvided.php
diff --git a/lib/Elastica/Query/HasChild.php → src/Query/HasChild.php b/lib/Elastica/Query/HasChild.php → src/Query/HasChild.php
diff --git a/lib/Elastica/Query/HasParent.php → src/Query/HasParent.php b/lib/Elastica/Query/HasParent.php → src/Query/HasParent.php
diff --git a/lib/Elastica/Query/Ids.php → src/Query/Ids.php b/lib/Elastica/Query/Ids.php → src/Query/Ids.php
diff --git a/lib/Elastica/Query/InnerHits.php → src/Query/InnerHits.php b/lib/Elastica/Query/InnerHits.php → src/Query/InnerHits.php
diff --git a/lib/Elastica/Query/Limit.php → src/Query/Limit.php b/lib/Elastica/Query/Limit.php → src/Query/Limit.php
diff --git a/lib/Elastica/Query/Match.php → src/Query/Match.php b/lib/Elastica/Query/Match.php → src/Query/Match.php
diff --git a/lib/Elastica/Query/MatchAll.php → src/Query/MatchAll.php b/lib/Elastica/Query/MatchAll.php → src/Query/MatchAll.php
diff --git a/lib/Elastica/Query/MatchNone.php → src/Query/MatchNone.php b/lib/Elastica/Query/MatchNone.php → src/Query/MatchNone.php
diff --git a/lib/Elastica/Query/MatchPhrase.php → src/Query/MatchPhrase.php b/lib/Elastica/Query/MatchPhrase.php → src/Query/MatchPhrase.php
diff --git a/lib/Elastica/Query/MatchPhrasePrefix.php → src/Query/MatchPhrasePrefix.php b/lib/Elastica/Query/MatchPhrasePrefix.php → src/Query/MatchPhrasePrefix.php
diff --git a/lib/Elastica/Query/MoreLikeThis.php → src/Query/MoreLikeThis.php b/lib/Elastica/Query/MoreLikeThis.php → src/Query/MoreLikeThis.php
diff --git a/lib/Elastica/Query/MultiMatch.php → src/Query/MultiMatch.php b/lib/Elastica/Query/MultiMatch.php → src/Query/MultiMatch.php
diff --git a/lib/Elastica/Query/Nested.php → src/Query/Nested.php b/lib/Elastica/Query/Nested.php → src/Query/Nested.php
diff --git a/lib/Elastica/Query/ParentId.php → src/Query/ParentId.php b/lib/Elastica/Query/ParentId.php → src/Query/ParentId.php
diff --git a/lib/Elastica/Query/Percolate.php → src/Query/Percolate.php b/lib/Elastica/Query/Percolate.php → src/Query/Percolate.php
diff --git a/lib/Elastica/Query/Prefix.php → src/Query/Prefix.php b/lib/Elastica/Query/Prefix.php → src/Query/Prefix.php
diff --git a/lib/Elastica/Query/QueryString.php → src/Query/QueryString.php b/lib/Elastica/Query/QueryString.php → src/Query/QueryString.php
diff --git a/lib/Elastica/Query/Range.php → src/Query/Range.php b/lib/Elastica/Query/Range.php → src/Query/Range.php
diff --git a/lib/Elastica/Query/Regexp.php → src/Query/Regexp.php b/lib/Elastica/Query/Regexp.php → src/Query/Regexp.php
diff --git a/lib/Elastica/Query/Script.php → src/Query/Script.php b/lib/Elastica/Query/Script.php → src/Query/Script.php
diff --git a/lib/Elastica/Query/Simple.php → src/Query/Simple.php b/lib/Elastica/Query/Simple.php → src/Query/Simple.php
diff --git a/lib/Elastica/Query/SimpleQueryString.php → src/Query/SimpleQueryString.php b/lib/Elastica/Query/SimpleQueryString.php → src/Query/SimpleQueryString.php
diff --git a/lib/Elastica/Query/SpanContaining.php → src/Query/SpanContaining.php b/lib/Elastica/Query/SpanContaining.php → src/Query/SpanContaining.php
diff --git a/lib/Elastica/Query/SpanFirst.php → src/Query/SpanFirst.php b/lib/Elastica/Query/SpanFirst.php → src/Query/SpanFirst.php
diff --git a/lib/Elastica/Query/SpanMulti.php → src/Query/SpanMulti.php b/lib/Elastica/Query/SpanMulti.php → src/Query/SpanMulti.php
diff --git a/lib/Elastica/Query/SpanNear.php → src/Query/SpanNear.php b/lib/Elastica/Query/SpanNear.php → src/Query/SpanNear.php
diff --git a/lib/Elastica/Query/SpanNot.php → src/Query/SpanNot.php b/lib/Elastica/Query/SpanNot.php → src/Query/SpanNot.php
diff --git a/lib/Elastica/Query/SpanOr.php → src/Query/SpanOr.php b/lib/Elastica/Query/SpanOr.php → src/Query/SpanOr.php
diff --git a/lib/Elastica/Query/SpanTerm.php → src/Query/SpanTerm.php b/lib/Elastica/Query/SpanTerm.php → src/Query/SpanTerm.php
diff --git a/lib/Elastica/Query/SpanWithin.php → src/Query/SpanWithin.php b/lib/Elastica/Query/SpanWithin.php → src/Query/SpanWithin.php
diff --git a/lib/Elastica/Query/Term.php → src/Query/Term.php b/lib/Elastica/Query/Term.php → src/Query/Term.php
diff --git a/lib/Elastica/Query/Terms.php → src/Query/Terms.php b/lib/Elastica/Query/Terms.php → src/Query/Terms.php
diff --git a/lib/Elastica/Query/Wildcard.php → src/Query/Wildcard.php b/lib/Elastica/Query/Wildcard.php → src/Query/Wildcard.php
diff --git a/lib/Elastica/QueryBuilder.php → src/QueryBuilder.php b/lib/Elastica/QueryBuilder.php → src/QueryBuilder.php
diff --git a/lib/Elastica/QueryBuilder/DSL.php → src/QueryBuilder/DSL.php b/lib/Elastica/QueryBuilder/DSL.php → src/QueryBuilder/DSL.php
diff --git a/...Elastica/QueryBuilder/DSL/Aggregation.php → src/QueryBuilder/DSL/Aggregation.php b/...Elastica/QueryBuilder/DSL/Aggregation.php → src/QueryBuilder/DSL/Aggregation.php
diff --git a/lib/Elastica/QueryBuilder/DSL/Collapse.php → src/QueryBuilder/DSL/Collapse.php b/lib/Elastica/QueryBuilder/DSL/Collapse.php → src/QueryBuilder/DSL/Collapse.php
diff --git a/lib/Elastica/QueryBuilder/DSL/Query.php → src/QueryBuilder/DSL/Query.php b/lib/Elastica/QueryBuilder/DSL/Query.php → src/QueryBuilder/DSL/Query.php
diff --git a/lib/Elastica/QueryBuilder/DSL/Suggest.php → src/QueryBuilder/DSL/Suggest.php b/lib/Elastica/QueryBuilder/DSL/Suggest.php → src/QueryBuilder/DSL/Suggest.php
diff --git a/lib/Elastica/QueryBuilder/Facade.php → src/QueryBuilder/Facade.php b/lib/Elastica/QueryBuilder/Facade.php → src/QueryBuilder/Facade.php
diff --git a/lib/Elastica/QueryBuilder/Version.php → src/QueryBuilder/Version.php b/lib/Elastica/QueryBuilder/Version.php → src/QueryBuilder/Version.php
diff --git a/lib/Elastica/QueryBuilder/Version/Latest.php → src/QueryBuilder/Version/Latest.php b/lib/Elastica/QueryBuilder/Version/Latest.php → src/QueryBuilder/Version/Latest.php
diff --git a/...stica/QueryBuilder/Version/Version700.php → src/QueryBuilder/Version/Version700.php b/...stica/QueryBuilder/Version/Version700.php → src/QueryBuilder/Version/Version700.php
diff --git a/lib/Elastica/Reindex.php → src/Reindex.php b/lib/Elastica/Reindex.php → src/Reindex.php
diff --git a/lib/Elastica/Request.php → src/Request.php b/lib/Elastica/Request.php → src/Request.php
diff --git a/lib/Elastica/Rescore/AbstractRescore.php → src/Rescore/AbstractRescore.php b/lib/Elastica/Rescore/AbstractRescore.php → src/Rescore/AbstractRescore.php
diff --git a/lib/Elastica/Rescore/Query.php → src/Rescore/Query.php b/lib/Elastica/Rescore/Query.php → src/Rescore/Query.php
diff --git a/lib/Elastica/Response.php → src/Response.php b/lib/Elastica/Response.php → src/Response.php
diff --git a/lib/Elastica/Result.php → src/Result.php b/lib/Elastica/Result.php → src/Result.php
diff --git a/lib/Elastica/ResultSet.php → src/ResultSet.php b/lib/Elastica/ResultSet.php → src/ResultSet.php
diff --git a/lib/Elastica/ResultSet/BuilderInterface.php → src/ResultSet/BuilderInterface.php b/lib/Elastica/ResultSet/BuilderInterface.php → src/ResultSet/BuilderInterface.php
diff --git a/lib/Elastica/ResultSet/ChainProcessor.php → src/ResultSet/ChainProcessor.php b/lib/Elastica/ResultSet/ChainProcessor.php → src/ResultSet/ChainProcessor.php
diff --git a/lib/Elastica/ResultSet/DefaultBuilder.php → src/ResultSet/DefaultBuilder.php b/lib/Elastica/ResultSet/DefaultBuilder.php → src/ResultSet/DefaultBuilder.php
diff --git a/lib/Elastica/ResultSet/ProcessingBuilder.php → src/ResultSet/ProcessingBuilder.php b/lib/Elastica/ResultSet/ProcessingBuilder.php → src/ResultSet/ProcessingBuilder.php
diff --git a/...Elastica/ResultSet/ProcessorInterface.php → src/ResultSet/ProcessorInterface.php b/...Elastica/ResultSet/ProcessorInterface.php → src/ResultSet/ProcessorInterface.php
diff --git a/lib/Elastica/Script/AbstractScript.php → src/Script/AbstractScript.php b/lib/Elastica/Script/AbstractScript.php → src/Script/AbstractScript.php
diff --git a/lib/Elastica/Script/Script.php → src/Script/Script.php b/lib/Elastica/Script/Script.php → src/Script/Script.php
diff --git a/lib/Elastica/Script/ScriptFields.php → src/Script/ScriptFields.php b/lib/Elastica/Script/ScriptFields.php → src/Script/ScriptFields.php
diff --git a/lib/Elastica/Script/ScriptId.php → src/Script/ScriptId.php b/lib/Elastica/Script/ScriptId.php → src/Script/ScriptId.php
diff --git a/lib/Elastica/Scroll.php → src/Scroll.php b/lib/Elastica/Scroll.php → src/Scroll.php
diff --git a/lib/Elastica/Search.php → src/Search.php b/lib/Elastica/Search.php → src/Search.php
diff --git a/lib/Elastica/SearchableInterface.php → src/SearchableInterface.php b/lib/Elastica/SearchableInterface.php → src/SearchableInterface.php
diff --git a/lib/Elastica/Snapshot.php → src/Snapshot.php b/lib/Elastica/Snapshot.php → src/Snapshot.php
diff --git a/lib/Elastica/Status.php → src/Status.php b/lib/Elastica/Status.php → src/Status.php
diff --git a/lib/Elastica/Suggest.php → src/Suggest.php b/lib/Elastica/Suggest.php → src/Suggest.php
diff --git a/lib/Elastica/Suggest/AbstractSuggest.php → src/Suggest/AbstractSuggest.php b/lib/Elastica/Suggest/AbstractSuggest.php → src/Suggest/AbstractSuggest.php
diff --git a/...eGenerator/AbstractCandidateGenerator.php → ...eGenerator/AbstractCandidateGenerator.php b/...eGenerator/AbstractCandidateGenerator.php → ...eGenerator/AbstractCandidateGenerator.php
diff --git a/...st/CandidateGenerator/DirectGenerator.php → ...st/CandidateGenerator/DirectGenerator.php b/...st/CandidateGenerator/DirectGenerator.php → ...st/CandidateGenerator/DirectGenerator.php
diff --git a/lib/Elastica/Suggest/Completion.php → src/Suggest/Completion.php b/lib/Elastica/Suggest/Completion.php → src/Suggest/Completion.php
diff --git a/lib/Elastica/Suggest/Phrase.php → src/Suggest/Phrase.php b/lib/Elastica/Suggest/Phrase.php → src/Suggest/Phrase.php
diff --git a/lib/Elastica/Suggest/Term.php → src/Suggest/Term.php b/lib/Elastica/Suggest/Term.php → src/Suggest/Term.php
diff --git a/lib/Elastica/Task.php → src/Task.php b/lib/Elastica/Task.php → src/Task.php
diff --git a/lib/Elastica/Transport/AbstractTransport.php → src/Transport/AbstractTransport.php b/lib/Elastica/Transport/AbstractTransport.php → src/Transport/AbstractTransport.php
diff --git a/lib/Elastica/Transport/AwsAuthV4.php → src/Transport/AwsAuthV4.php b/lib/Elastica/Transport/AwsAuthV4.php → src/Transport/AwsAuthV4.php
diff --git a/lib/Elastica/Transport/Guzzle.php → src/Transport/Guzzle.php b/lib/Elastica/Transport/Guzzle.php → src/Transport/Guzzle.php
diff --git a/lib/Elastica/Transport/Http.php → src/Transport/Http.php b/lib/Elastica/Transport/Http.php → src/Transport/Http.php
diff --git a/lib/Elastica/Transport/HttpAdapter.php → src/Transport/HttpAdapter.php b/lib/Elastica/Transport/HttpAdapter.php → src/Transport/HttpAdapter.php
diff --git a/lib/Elastica/Transport/Https.php → src/Transport/Https.php b/lib/Elastica/Transport/Https.php → src/Transport/Https.php
diff --git a/lib/Elastica/Transport/NullTransport.php → src/Transport/NullTransport.php b/lib/Elastica/Transport/NullTransport.php → src/Transport/NullTransport.php
diff --git a/lib/Elastica/Util.php → src/Util.php b/lib/Elastica/Util.php → src/Util.php
diff --git a/test/phpunit.xhprof.xml b/test/phpunit.xhprof.xml
diff --git a/...egation/AbstractSimpleAggregationTest.php → ...egation/AbstractSimpleAggregationTest.php b/...egation/AbstractSimpleAggregationTest.php → ...egation/AbstractSimpleAggregationTest.php
diff --git a/...stica/Aggregation/AdjacencyMatrixTest.php → tests/Aggregation/AdjacencyMatrixTest.php b/...stica/Aggregation/AdjacencyMatrixTest.php → tests/Aggregation/AdjacencyMatrixTest.php
diff --git a/...a/Aggregation/AggregationMetadataTest.php → ...s/Aggregation/AggregationMetadataTest.php b/...a/Aggregation/AggregationMetadataTest.php → ...s/Aggregation/AggregationMetadataTest.php
diff --git a/test/Elastica/Aggregation/AvgBucketTest.php → tests/Aggregation/AvgBucketTest.php b/test/Elastica/Aggregation/AvgBucketTest.php → tests/Aggregation/AvgBucketTest.php
diff --git a/test/Elastica/Aggregation/AvgTest.php → tests/Aggregation/AvgTest.php b/test/Elastica/Aggregation/AvgTest.php → tests/Aggregation/AvgTest.php
diff --git a/...stica/Aggregation/BaseAggregationTest.php → tests/Aggregation/BaseAggregationTest.php b/...stica/Aggregation/BaseAggregationTest.php → tests/Aggregation/BaseAggregationTest.php
diff --git a/...Elastica/Aggregation/BucketScriptTest.php → tests/Aggregation/BucketScriptTest.php b/...Elastica/Aggregation/BucketScriptTest.php → tests/Aggregation/BucketScriptTest.php
diff --git a/...astica/Aggregation/BucketSelectorTest.php → tests/Aggregation/BucketSelectorTest.php b/...astica/Aggregation/BucketSelectorTest.php → tests/Aggregation/BucketSelectorTest.php
diff --git a/.../Elastica/Aggregation/CardinalityTest.php → tests/Aggregation/CardinalityTest.php b/.../Elastica/Aggregation/CardinalityTest.php → tests/Aggregation/CardinalityTest.php
diff --git a/test/Elastica/Aggregation/ChildrenTest.php → tests/Aggregation/ChildrenTest.php b/test/Elastica/Aggregation/ChildrenTest.php → tests/Aggregation/ChildrenTest.php
diff --git a/...lastica/Aggregation/DateHistogramTest.php → tests/Aggregation/DateHistogramTest.php b/...lastica/Aggregation/DateHistogramTest.php → tests/Aggregation/DateHistogramTest.php
diff --git a/test/Elastica/Aggregation/DateRangeTest.php → tests/Aggregation/DateRangeTest.php b/test/Elastica/Aggregation/DateRangeTest.php → tests/Aggregation/DateRangeTest.php
diff --git a/test/Elastica/Aggregation/DerivativeTest.php → tests/Aggregation/DerivativeTest.php b/test/Elastica/Aggregation/DerivativeTest.php → tests/Aggregation/DerivativeTest.php
diff --git a/...ca/Aggregation/DiversifiedSamplerTest.php → tests/Aggregation/DiversifiedSamplerTest.php b/...ca/Aggregation/DiversifiedSamplerTest.php → tests/Aggregation/DiversifiedSamplerTest.php
diff --git a/...lastica/Aggregation/ExtendedStatsTest.php → tests/Aggregation/ExtendedStatsTest.php b/...lastica/Aggregation/ExtendedStatsTest.php → tests/Aggregation/ExtendedStatsTest.php
diff --git a/test/Elastica/Aggregation/FilterTest.php → tests/Aggregation/FilterTest.php b/test/Elastica/Aggregation/FilterTest.php → tests/Aggregation/FilterTest.php
diff --git a/test/Elastica/Aggregation/FiltersTest.php → tests/Aggregation/FiltersTest.php b/test/Elastica/Aggregation/FiltersTest.php → tests/Aggregation/FiltersTest.php
diff --git a/test/Elastica/Aggregation/GeoBoundsTest.php → tests/Aggregation/GeoBoundsTest.php b/test/Elastica/Aggregation/GeoBoundsTest.php → tests/Aggregation/GeoBoundsTest.php
diff --git a/.../Elastica/Aggregation/GeoCentroidTest.php → tests/Aggregation/GeoCentroidTest.php b/.../Elastica/Aggregation/GeoCentroidTest.php → tests/Aggregation/GeoCentroidTest.php
diff --git a/.../Elastica/Aggregation/GeoDistanceTest.php → tests/Aggregation/GeoDistanceTest.php b/.../Elastica/Aggregation/GeoDistanceTest.php → tests/Aggregation/GeoDistanceTest.php
diff --git a/.../Elastica/Aggregation/GeohashGridTest.php → tests/Aggregation/GeohashGridTest.php b/.../Elastica/Aggregation/GeohashGridTest.php → tests/Aggregation/GeohashGridTest.php
diff --git a/...ica/Aggregation/GlobalAggregationTest.php → tests/Aggregation/GlobalAggregationTest.php b/...ica/Aggregation/GlobalAggregationTest.php → tests/Aggregation/GlobalAggregationTest.php
diff --git a/test/Elastica/Aggregation/HistogramTest.php → tests/Aggregation/HistogramTest.php b/test/Elastica/Aggregation/HistogramTest.php → tests/Aggregation/HistogramTest.php
diff --git a/test/Elastica/Aggregation/IpRangeTest.php → tests/Aggregation/IpRangeTest.php b/test/Elastica/Aggregation/IpRangeTest.php → tests/Aggregation/IpRangeTest.php
diff --git a/test/Elastica/Aggregation/MaxTest.php → tests/Aggregation/MaxTest.php b/test/Elastica/Aggregation/MaxTest.php → tests/Aggregation/MaxTest.php
diff --git a/test/Elastica/Aggregation/MinTest.php → tests/Aggregation/MinTest.php b/test/Elastica/Aggregation/MinTest.php → tests/Aggregation/MinTest.php
diff --git a/test/Elastica/Aggregation/MissingTest.php → tests/Aggregation/MissingTest.php b/test/Elastica/Aggregation/MissingTest.php → tests/Aggregation/MissingTest.php
diff --git a/test/Elastica/Aggregation/NestedTest.php → tests/Aggregation/NestedTest.php b/test/Elastica/Aggregation/NestedTest.php → tests/Aggregation/NestedTest.php
diff --git a/...ica/Aggregation/ParentAggregationTest.php → tests/Aggregation/ParentAggregationTest.php b/...ica/Aggregation/ParentAggregationTest.php → tests/Aggregation/ParentAggregationTest.php
diff --git a/.../Elastica/Aggregation/PercentilesTest.php → tests/Aggregation/PercentilesTest.php b/.../Elastica/Aggregation/PercentilesTest.php → tests/Aggregation/PercentilesTest.php
diff --git a/test/Elastica/Aggregation/RangeTest.php → tests/Aggregation/RangeTest.php b/test/Elastica/Aggregation/RangeTest.php → tests/Aggregation/RangeTest.php
diff --git a/...lastica/Aggregation/ReverseNestedTest.php → tests/Aggregation/ReverseNestedTest.php b/...lastica/Aggregation/ReverseNestedTest.php → tests/Aggregation/ReverseNestedTest.php
diff --git a/test/Elastica/Aggregation/SamplerTest.php → tests/Aggregation/SamplerTest.php b/test/Elastica/Aggregation/SamplerTest.php → tests/Aggregation/SamplerTest.php
diff --git a/test/Elastica/Aggregation/ScriptTest.php → tests/Aggregation/ScriptTest.php b/test/Elastica/Aggregation/ScriptTest.php → tests/Aggregation/ScriptTest.php
diff --git a/...astica/Aggregation/ScriptedMetricTest.php → tests/Aggregation/ScriptedMetricTest.php b/...astica/Aggregation/ScriptedMetricTest.php → tests/Aggregation/ScriptedMetricTest.php
diff --git a/test/Elastica/Aggregation/SerialDiffTest.php → tests/Aggregation/SerialDiffTest.php b/test/Elastica/Aggregation/SerialDiffTest.php → tests/Aggregation/SerialDiffTest.php
diff --git a/...tica/Aggregation/SignificantTermsTest.php → tests/Aggregation/SignificantTermsTest.php b/...tica/Aggregation/SignificantTermsTest.php → tests/Aggregation/SignificantTermsTest.php
diff --git a/.../Elastica/Aggregation/StatsBucketTest.php → tests/Aggregation/StatsBucketTest.php b/.../Elastica/Aggregation/StatsBucketTest.php → tests/Aggregation/StatsBucketTest.php
diff --git a/test/Elastica/Aggregation/StatsTest.php → tests/Aggregation/StatsTest.php b/test/Elastica/Aggregation/StatsTest.php → tests/Aggregation/StatsTest.php
diff --git a/test/Elastica/Aggregation/SumBucketTest.php → tests/Aggregation/SumBucketTest.php b/test/Elastica/Aggregation/SumBucketTest.php → tests/Aggregation/SumBucketTest.php
diff --git a/test/Elastica/Aggregation/SumTest.php → tests/Aggregation/SumTest.php b/test/Elastica/Aggregation/SumTest.php → tests/Aggregation/SumTest.php
diff --git a/test/Elastica/Aggregation/TermsTest.php → tests/Aggregation/TermsTest.php b/test/Elastica/Aggregation/TermsTest.php → tests/Aggregation/TermsTest.php
diff --git a/test/Elastica/Aggregation/TopHitsTest.php → tests/Aggregation/TopHitsTest.php b/test/Elastica/Aggregation/TopHitsTest.php → tests/Aggregation/TopHitsTest.php
diff --git a/test/Elastica/Aggregation/ValueCountTest.php → tests/Aggregation/ValueCountTest.php b/test/Elastica/Aggregation/ValueCountTest.php → tests/Aggregation/ValueCountTest.php
diff --git a/test/Elastica/Base.php → tests/Base.php b/test/Elastica/Base.php → tests/Base.php
diff --git a/test/Elastica/BasePipeline.php → tests/BasePipeline.php b/test/Elastica/BasePipeline.php → tests/BasePipeline.php
diff --git a/...tica/Bulk/Action/AbstractDocumentTest.php → tests/Bulk/Action/AbstractDocumentTest.php b/...tica/Bulk/Action/AbstractDocumentTest.php → tests/Bulk/Action/AbstractDocumentTest.php
diff --git a/...astica/Bulk/Action/UpdateDocumentTest.php → tests/Bulk/Action/UpdateDocumentTest.php b/...astica/Bulk/Action/UpdateDocumentTest.php → tests/Bulk/Action/UpdateDocumentTest.php
diff --git a/test/Elastica/Bulk/ActionTest.php → tests/Bulk/ActionTest.php b/test/Elastica/Bulk/ActionTest.php → tests/Bulk/ActionTest.php
diff --git a/test/Elastica/Bulk/ResponseSetTest.php → tests/Bulk/ResponseSetTest.php b/test/Elastica/Bulk/ResponseSetTest.php → tests/Bulk/ResponseSetTest.php
diff --git a/test/Elastica/BulkTest.php → tests/BulkTest.php b/test/Elastica/BulkTest.php → tests/BulkTest.php
diff --git a/test/Elastica/ClientConfigurationTest.php → tests/ClientConfigurationTest.php b/test/Elastica/ClientConfigurationTest.php → tests/ClientConfigurationTest.php
diff --git a/test/Elastica/ClientTest.php → tests/ClientTest.php b/test/Elastica/ClientTest.php → tests/ClientTest.php
diff --git a/test/Elastica/Cluster/Health/IndexTest.php → tests/Cluster/Health/IndexTest.php b/test/Elastica/Cluster/Health/IndexTest.php → tests/Cluster/Health/IndexTest.php
diff --git a/test/Elastica/Cluster/Health/ShardTest.php → tests/Cluster/Health/ShardTest.php b/test/Elastica/Cluster/Health/ShardTest.php → tests/Cluster/Health/ShardTest.php
diff --git a/test/Elastica/Cluster/HealthTest.php → tests/Cluster/HealthTest.php b/test/Elastica/Cluster/HealthTest.php → tests/Cluster/HealthTest.php
diff --git a/test/Elastica/Cluster/SettingsTest.php → tests/Cluster/SettingsTest.php b/test/Elastica/Cluster/SettingsTest.php → tests/Cluster/SettingsTest.php
diff --git a/test/Elastica/ClusterTest.php → tests/ClusterTest.php b/test/Elastica/ClusterTest.php → tests/ClusterTest.php
diff --git a/test/Elastica/Collapse/CollapseTest.php → tests/Collapse/CollapseTest.php b/test/Elastica/Collapse/CollapseTest.php → tests/Collapse/CollapseTest.php
diff --git a/...lastica/Connection/ConnectionPoolTest.php → tests/Connection/ConnectionPoolTest.php b/...lastica/Connection/ConnectionPoolTest.php → tests/Connection/ConnectionPoolTest.php
diff --git a/...nection/Strategy/CallbackStrategyTest.php → ...nection/Strategy/CallbackStrategyTest.php b/...nection/Strategy/CallbackStrategyTest.php → ...nection/Strategy/CallbackStrategyTest.php
diff --git a/...n/Strategy/CallbackStrategyTestHelper.php → ...n/Strategy/CallbackStrategyTestHelper.php b/...n/Strategy/CallbackStrategyTestHelper.php → ...n/Strategy/CallbackStrategyTestHelper.php
diff --git a/...ica/Connection/Strategy/EmptyStrategy.php → tests/Connection/Strategy/EmptyStrategy.php b/...ica/Connection/Strategy/EmptyStrategy.php → tests/Connection/Strategy/EmptyStrategy.php
diff --git a/...ca/Connection/Strategy/RoundRobinTest.php → tests/Connection/Strategy/RoundRobinTest.php b/...ca/Connection/Strategy/RoundRobinTest.php → tests/Connection/Strategy/RoundRobinTest.php
diff --git a/...astica/Connection/Strategy/SimpleTest.php → tests/Connection/Strategy/SimpleTest.php b/...astica/Connection/Strategy/SimpleTest.php → tests/Connection/Strategy/SimpleTest.php
diff --git a/...nnection/Strategy/StrategyFactoryTest.php → ...nnection/Strategy/StrategyFactoryTest.php b/...nnection/Strategy/StrategyFactoryTest.php → ...nnection/Strategy/StrategyFactoryTest.php
diff --git a/test/Elastica/ConnectionTest.php → tests/ConnectionTest.php b/test/Elastica/ConnectionTest.php → tests/ConnectionTest.php
diff --git a/test/Elastica/DeprecatedClassBase.php → tests/DeprecatedClassBase.php b/test/Elastica/DeprecatedClassBase.php → tests/DeprecatedClassBase.php
diff --git a/test/Elastica/DocumentTest.php → tests/DocumentTest.php b/test/Elastica/DocumentTest.php → tests/DocumentTest.php