Renamed modules to use common prefixes

zettelmj · Dec 30, 2018 · 90ea19b · 90ea19b
1 parent 2a49e50
commit 90ea19b
Show file tree

Hide file tree

Showing 262 changed files with 35 additions and 368 deletions.
diff --git a/build.sbt b/build.sbt
@@ -18,9 +18,10 @@ lazy val root = Project("elastic4s", file("."))
     playjson,
     sprayjson,
     aws,
-    sttp,
-    akka,
-    httpstreams
+    clientsttp,
+    clientakka,
+    httpstreams,
+    akkastreams
   )
 
 lazy val core = Project("elastic4s-core", file("elastic4s-core"))
@@ -34,9 +35,9 @@ lazy val core = Project("elastic4s-core", file("elastic4s-core"))
     )
   )
 
-lazy val http = Project("elastic4s-http", file("elastic4s-http"))
+lazy val http = Project("elastic4s-client-esjava", file("elastic4s-client-esjava"))
   .settings(
-    name := "elastic4s-http",
+    name := "elastic4s-client-esjava",
     libraryDependencies ++= Seq(
       "org.elasticsearch.client"     % "elasticsearch-rest-client" % ElasticsearchVersion,
       "org.apache.logging.log4j"     % "log4j-api"                 % Log4jVersion % "test",
@@ -47,17 +48,17 @@ lazy val http = Project("elastic4s-http", file("elastic4s-http"))
   )
   .dependsOn(core)
 
-lazy val cats_effect = Project("elastic4s-cats-effect", file("elastic4s-cats-effect"))
-  .settings(name := "elastic4s-cats-effect")
+lazy val cats_effect = Project("elastic4s-effect-cats", file("elastic4s-effect-cats"))
+  .settings(name := "elastic4s-effect-cats")
   .settings(
     libraryDependencies ++= Seq(
       "org.typelevel" %% "cats-effect" % CatsEffectVersion
     )
   )
   .dependsOn(http)
 
-lazy val scalaz = Project("elastic4s-scalaz", file("elastic4s-scalaz"))
-  .settings(name := "elastic4s-scalaz")
+lazy val scalaz = Project("elastic4s-effect-scalaz", file("elastic4s-effect-scalaz"))
+  .settings(name := "elastic4s-effect-scalaz")
   .settings(
     libraryDependencies ++= Seq(
       "org.scalaz" %% "scalaz-core"       % ScalazVersion,
@@ -66,8 +67,8 @@ lazy val scalaz = Project("elastic4s-scalaz", file("elastic4s-scalaz"))
   )
   .dependsOn(http)
 
-lazy val monix = Project("elastic4s-monix", file("elastic4s-monix"))
-  .settings(name := "elastic4s-monix")
+lazy val monix = Project("elastic4s-effect-monix", file("elastic4s-effect-monix"))
+  .settings(name := "elastic4s-effect-monix")
   .settings(
     libraryDependencies ++= Seq(
       "io.monix" %% "monix" % MonixVersion
@@ -93,67 +94,74 @@ lazy val httpstreams = Project("elastic4s-http-streams", file("elastic4s-http-st
   )
   .dependsOn(http, testkit % "test", jackson % "test")
 
-lazy val jackson = Project("elastic4s-jackson", file("elastic4s-jackson"))
+lazy val akkastreams = Project("elastic4s-streams-akka", file("elastic4s-streams-akka"))
   .settings(
-    name := "elastic4s-jackson",
+    name := "elastic4s-streams-akka",
+    libraryDependencies += "com.typesafe.akka" % "akka-stream_2.11" % AkkaVersion
+  )
+  .dependsOn(http, testkit % "test", jackson % "test")
+
+lazy val jackson = Project("elastic4s-json-jackson", file("elastic4s-json-jackson"))
+  .settings(
+    name := "elastic4s-json-jackson",
     libraryDependencies += "com.fasterxml.jackson.core"     % "jackson-core"          % JacksonVersion,
     libraryDependencies += "com.fasterxml.jackson.core"     % "jackson-databind"      % JacksonVersion,
     libraryDependencies += "com.fasterxml.jackson.module"   %% "jackson-module-scala" % JacksonVersion exclude ("org.scala-lang", "scala-library"),
     libraryDependencies += "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % JacksonVersion
   )
   .dependsOn(core)
 
-lazy val circe = Project("elastic4s-circe", file("elastic4s-circe"))
+lazy val circe = Project("elastic4s-json-circe", file("elastic4s-json-circe"))
   .settings(
-    name := "elastic4s-circe",
+    name := "elastic4s-json-circe",
     libraryDependencies += "io.circe" %% "circe-core"    % CirceVersion,
     libraryDependencies += "io.circe" %% "circe-generic" % CirceVersion,
     libraryDependencies += "io.circe" %% "circe-parser"  % CirceVersion
   )
   .dependsOn(core)
 
-lazy val json4s = Project("elastic4s-json4s", file("elastic4s-json4s"))
+lazy val json4s = Project("elastic4s-json-json4s", file("elastic4s-json-json4s"))
   .settings(
-    name := "elastic4s-json4s",
+    name := "elastic4s-json-json4s",
     libraryDependencies += "org.json4s" %% "json4s-core"    % Json4sVersion,
     libraryDependencies += "org.json4s" %% "json4s-jackson" % Json4sVersion
   )
   .dependsOn(core)
 
-lazy val playjson = Project("elastic4s-play-json", file("elastic4s-play-json"))
+lazy val playjson = Project("elastic4s-json-play", file("elastic4s-json-play"))
   .settings(
-    name := "elastic4s-play-json",
+    name := "elastic4s-json-play",
     libraryDependencies += "com.typesafe.play" %% "play-json" % PlayJsonVersion
   )
   .dependsOn(core)
 
-lazy val sprayjson = Project("elastic4s-spray-json", file("elastic4s-spray-json"))
+lazy val sprayjson = Project("elastic4s-json-spray", file("elastic4s-json-spray"))
   .settings(
-    name := "elastic4s-spray-json",
+    name := "elastic4s-json-spray",
     libraryDependencies += "io.spray" %% "spray-json" % SprayJsonVersion
   )
   .dependsOn(core)
 
-lazy val sttp = Project("elastic4s-sttp", file("elastic4s-sttp"))
+lazy val clientsttp = Project("elastic4s-client-sttp", file("elastic4s-client-sttp"))
   .settings(
-    name := "elastic4s-sttp",
+    name := "elastic4s-client-sttp",
     libraryDependencies += "com.softwaremill.sttp" %% "core"                             % SttpVersion,
     libraryDependencies += "com.softwaremill.sttp" %% "async-http-client-backend-future" % SttpVersion
   )
   .dependsOn(core, http)
 
-lazy val akka = Project("elastic4s-akka", file("elastic4s-akka"))
+lazy val clientakka = Project("elastic4s-client-akka", file("elastic4s-client-akka"))
   .settings(
-    name := "elastic4s-akka",
+    name := "elastic4s-client-akka",
     libraryDependencies += "com.typesafe.akka" %% "akka-http" % AkkaHttpVersion,
     libraryDependencies += "com.typesafe.akka" %% "akka-stream" % AkkaVersion,
     libraryDependencies += "org.scalamock" %% "scalamock" % ScalamockVersion % "test"
   )
   .dependsOn(core, http, testkit % "test")
 
-lazy val aws = Project("elastic4s-aws", file("elastic4s-aws"))
+lazy val aws = Project("elastic4s-client-aws", file("elastic4s-client-aws"))
   .settings(
-    name := "elastic4s-aws",
+    name := "elastic4s-client-aws",
     libraryDependencies += "com.amazonaws" % "aws-java-sdk-core" % AWSJavaSdkVersion
   )
   .dependsOn(core, http)

diff --git a/...4s-akka/src/main/resources/reference.conf → ...nt-akka/src/main/resources/reference.conf b/...4s-akka/src/main/resources/reference.conf → ...nt-akka/src/main/resources/reference.conf
diff --git a/...amuel/elastic4s/akka/AkkaHttpClient.scala → ...amuel/elastic4s/akka/AkkaHttpClient.scala b/...amuel/elastic4s/akka/AkkaHttpClient.scala → ...amuel/elastic4s/akka/AkkaHttpClient.scala
diff --git a/...astic4s/akka/AkkaHttpClientSettings.scala → ...astic4s/akka/AkkaHttpClientSettings.scala b/...astic4s/akka/AkkaHttpClientSettings.scala → ...astic4s/akka/AkkaHttpClientSettings.scala
diff --git a/...m/sksamuel/elastic4s/akka/Blacklist.scala → ...m/sksamuel/elastic4s/akka/Blacklist.scala b/...m/sksamuel/elastic4s/akka/Blacklist.scala → ...m/sksamuel/elastic4s/akka/Blacklist.scala
diff --git a/...uel/elastic4s/akka/DefaultBlacklist.scala → ...uel/elastic4s/akka/DefaultBlacklist.scala b/...uel/elastic4s/akka/DefaultBlacklist.scala → ...uel/elastic4s/akka/DefaultBlacklist.scala
diff --git a/...astic4s/akka/DefaultHttpPoolFactory.scala → ...astic4s/akka/DefaultHttpPoolFactory.scala b/...astic4s/akka/DefaultHttpPoolFactory.scala → ...astic4s/akka/DefaultHttpPoolFactory.scala
diff --git a/...muel/elastic4s/akka/HttpPoolFactory.scala → ...muel/elastic4s/akka/HttpPoolFactory.scala b/...muel/elastic4s/akka/HttpPoolFactory.scala → ...muel/elastic4s/akka/HttpPoolFactory.scala
diff --git a/...astic4s/akka/AkkaHttpClientMockTest.scala → ...astic4s/akka/AkkaHttpClientMockTest.scala b/...astic4s/akka/AkkaHttpClientMockTest.scala → ...astic4s/akka/AkkaHttpClientMockTest.scala
diff --git a/...l/elastic4s/akka/AkkaHttpClientTest.scala → ...l/elastic4s/akka/AkkaHttpClientTest.scala b/...l/elastic4s/akka/AkkaHttpClientTest.scala → ...l/elastic4s/akka/AkkaHttpClientTest.scala
diff --git a/...elastic4s/akka/DefaultBlacklistTest.scala → ...elastic4s/akka/DefaultBlacklistTest.scala b/...elastic4s/akka/DefaultBlacklistTest.scala → ...elastic4s/akka/DefaultBlacklistTest.scala
diff --git a/.../elastic4s/akka/TestHttpPoolFactory.scala → .../elastic4s/akka/TestHttpPoolFactory.scala b/.../elastic4s/akka/TestHttpPoolFactory.scala → .../elastic4s/akka/TestHttpPoolFactory.scala
diff --git a/...uel/elastic4s/aws/Aws4ElasticClient.scala → ...uel/elastic4s/aws/Aws4ElasticClient.scala b/...uel/elastic4s/aws/Aws4ElasticClient.scala → ...uel/elastic4s/aws/Aws4ElasticClient.scala
diff --git a/...uel/elastic4s/aws/Aws4RequestSigner.scala → ...uel/elastic4s/aws/Aws4RequestSigner.scala b/...uel/elastic4s/aws/Aws4RequestSigner.scala → ...uel/elastic4s/aws/Aws4RequestSigner.scala
diff --git a/...muel/elastic4s/aws/CanonicalRequest.scala → ...muel/elastic4s/aws/CanonicalRequest.scala b/...muel/elastic4s/aws/CanonicalRequest.scala → ...muel/elastic4s/aws/CanonicalRequest.scala
diff --git a/...a/com/sksamuel/elastic4s/aws/Crypto.scala → ...a/com/sksamuel/elastic4s/aws/Crypto.scala b/...a/com/sksamuel/elastic4s/aws/Crypto.scala → ...a/com/sksamuel/elastic4s/aws/Crypto.scala
diff --git a/...sksamuel/elastic4s/aws/StringToSign.scala → ...sksamuel/elastic4s/aws/StringToSign.scala b/...sksamuel/elastic4s/aws/StringToSign.scala → ...sksamuel/elastic4s/aws/StringToSign.scala
diff --git a/...samuel/elastic4s/http/ElasticClient.scala → ...samuel/elastic4s/http/ElasticClient.scala b/...samuel/elastic4s/http/ElasticClient.scala → ...samuel/elastic4s/http/ElasticClient.scala
diff --git a/.../sksamuel/elastic4s/http/ElasticDsl.scala → .../sksamuel/elastic4s/http/ElasticDsl.scala b/.../sksamuel/elastic4s/http/ElasticDsl.scala → .../sksamuel/elastic4s/http/ElasticDsl.scala
diff --git a/...ksamuel/elastic4s/http/ElasticError.scala → ...ksamuel/elastic4s/http/ElasticError.scala b/...ksamuel/elastic4s/http/ElasticError.scala → ...ksamuel/elastic4s/http/ElasticError.scala
diff --git a/...el/elastic4s/http/ElasticProperties.scala → ...el/elastic4s/http/ElasticProperties.scala b/...el/elastic4s/http/ElasticProperties.scala → ...el/elastic4s/http/ElasticProperties.scala
diff --git a/...amuel/elastic4s/http/ElasticRequest.scala → ...amuel/elastic4s/http/ElasticRequest.scala b/...amuel/elastic4s/http/ElasticRequest.scala → ...amuel/elastic4s/http/ElasticRequest.scala
diff --git a/...4s/http/ElasticsearchJavaRestClient.scala → ...4s/http/ElasticsearchJavaRestClient.scala b/...4s/http/ElasticsearchJavaRestClient.scala → ...4s/http/ElasticsearchJavaRestClient.scala
diff --git a/...muel/elastic4s/http/EnumConversions.scala → ...muel/elastic4s/http/EnumConversions.scala b/...muel/elastic4s/http/EnumConversions.scala → ...muel/elastic4s/http/EnumConversions.scala
diff --git a/...om/sksamuel/elastic4s/http/Executor.scala → ...om/sksamuel/elastic4s/http/Executor.scala b/...om/sksamuel/elastic4s/http/Executor.scala → ...om/sksamuel/elastic4s/http/Executor.scala
diff --git a/...com/sksamuel/elastic4s/http/Functor.scala → ...com/sksamuel/elastic4s/http/Functor.scala b/...com/sksamuel/elastic4s/http/Functor.scala → ...com/sksamuel/elastic4s/http/Functor.scala
diff --git a/...com/sksamuel/elastic4s/http/Handler.scala → ...com/sksamuel/elastic4s/http/Handler.scala b/...com/sksamuel/elastic4s/http/Handler.scala → ...com/sksamuel/elastic4s/http/Handler.scala
diff --git a/.../sksamuel/elastic4s/http/HttpClient.scala → .../sksamuel/elastic4s/http/HttpClient.scala b/.../sksamuel/elastic4s/http/HttpClient.scala → .../sksamuel/elastic4s/http/HttpClient.scala
diff --git a/...elastic4s/http/IndicesOptionsParams.scala → ...elastic4s/http/IndicesOptionsParams.scala b/...elastic4s/http/IndicesOptionsParams.scala → ...elastic4s/http/IndicesOptionsParams.scala
diff --git a/...astic4s/http/RefreshPolicyHttpValue.scala → ...astic4s/http/RefreshPolicyHttpValue.scala b/...astic4s/http/RefreshPolicyHttpValue.scala → ...astic4s/http/RefreshPolicyHttpValue.scala
diff --git a/...muel/elastic4s/http/ResponseHandler.scala → ...muel/elastic4s/http/ResponseHandler.scala b/...muel/elastic4s/http/ResponseHandler.scala → ...muel/elastic4s/http/ResponseHandler.scala
diff --git a/...muel/elastic4s/http/ScriptBuilderFn.scala → ...muel/elastic4s/http/ScriptBuilderFn.scala b/...muel/elastic4s/http/ScriptBuilderFn.scala → ...muel/elastic4s/http/ScriptBuilderFn.scala
diff --git a/.../com/sksamuel/elastic4s/http/Shards.scala → .../com/sksamuel/elastic4s/http/Shards.scala b/.../com/sksamuel/elastic4s/http/Shards.scala → .../com/sksamuel/elastic4s/http/Shards.scala
diff --git a/...astic4s/http/SourceAsContentBuilder.scala → ...astic4s/http/SourceAsContentBuilder.scala b/...astic4s/http/SourceAsContentBuilder.scala → ...astic4s/http/SourceAsContentBuilder.scala
diff --git a/...l/elastic4s/http/bulk/BulkBuilderFn.scala → ...l/elastic4s/http/bulk/BulkBuilderFn.scala b/...l/elastic4s/http/bulk/BulkBuilderFn.scala → ...l/elastic4s/http/bulk/BulkBuilderFn.scala
diff --git a/...el/elastic4s/http/bulk/BulkHandlers.scala → ...el/elastic4s/http/bulk/BulkHandlers.scala b/...el/elastic4s/http/bulk/BulkHandlers.scala → ...el/elastic4s/http/bulk/BulkHandlers.scala
diff --git a/...sksamuel/elastic4s/http/bulk/domain.scala → ...sksamuel/elastic4s/http/bulk/domain.scala b/...sksamuel/elastic4s/http/bulk/domain.scala → ...sksamuel/elastic4s/http/bulk/domain.scala
diff --git a/...muel/elastic4s/http/cat/CatHandlers.scala → ...muel/elastic4s/http/cat/CatHandlers.scala b/...muel/elastic4s/http/cat/CatHandlers.scala → ...muel/elastic4s/http/cat/CatHandlers.scala
diff --git a/.../sksamuel/elastic4s/http/cat/domain.scala → .../sksamuel/elastic4s/http/cat/domain.scala b/.../sksamuel/elastic4s/http/cat/domain.scala → .../sksamuel/elastic4s/http/cat/domain.scala
diff --git a/...s/http/cluster/ClusterBodyBuilderFn.scala → ...s/http/cluster/ClusterBodyBuilderFn.scala b/...s/http/cluster/ClusterBodyBuilderFn.scala → ...s/http/cluster/ClusterBodyBuilderFn.scala
diff --git a/...stic4s/http/cluster/ClusterHandlers.scala → ...stic4s/http/cluster/ClusterHandlers.scala b/...stic4s/http/cluster/ClusterHandlers.scala → ...stic4s/http/cluster/ClusterHandlers.scala
diff --git a/...tic4s/http/count/CountBodyBuilderFn.scala → ...tic4s/http/count/CountBodyBuilderFn.scala b/...tic4s/http/count/CountBodyBuilderFn.scala → ...tic4s/http/count/CountBodyBuilderFn.scala
diff --git a/.../elastic4s/http/count/CountHandlers.scala → .../elastic4s/http/count/CountHandlers.scala b/.../elastic4s/http/count/CountHandlers.scala → .../elastic4s/http/count/CountHandlers.scala
diff --git a/...s/http/delete/DeleteByQueryResponse.scala → ...s/http/delete/DeleteByQueryResponse.scala b/...s/http/delete/DeleteByQueryResponse.scala → ...s/http/delete/DeleteByQueryResponse.scala
diff --git a/...lastic4s/http/delete/DeleteHandlers.scala → ...lastic4s/http/delete/DeleteHandlers.scala b/...lastic4s/http/delete/DeleteHandlers.scala → ...lastic4s/http/delete/DeleteHandlers.scala
diff --git a/...lastic4s/http/delete/DeleteResponse.scala → ...lastic4s/http/delete/DeleteResponse.scala b/...lastic4s/http/delete/DeleteResponse.scala → ...lastic4s/http/delete/DeleteResponse.scala
diff --git a/...lastic4s/http/explain/ExplainBodyFn.scala → ...lastic4s/http/explain/ExplainBodyFn.scala b/...lastic4s/http/explain/ExplainBodyFn.scala → ...lastic4s/http/explain/ExplainBodyFn.scala
diff --git a/...stic4s/http/explain/ExplainHandlers.scala → ...stic4s/http/explain/ExplainHandlers.scala b/...stic4s/http/explain/ExplainHandlers.scala → ...stic4s/http/explain/ExplainHandlers.scala
diff --git a/...stic4s/http/explain/ExplainResponse.scala → ...stic4s/http/explain/ExplainResponse.scala b/...stic4s/http/explain/ExplainResponse.scala → ...stic4s/http/explain/ExplainResponse.scala
diff --git a/...elastic4s/http/fetchContextBuilders.scala → ...elastic4s/http/fetchContextBuilders.scala b/...elastic4s/http/fetchContextBuilders.scala → ...elastic4s/http/fetchContextBuilders.scala
diff --git a/...muel/elastic4s/http/get/GetHandlers.scala → ...muel/elastic4s/http/get/GetHandlers.scala b/...muel/elastic4s/http/get/GetHandlers.scala → ...muel/elastic4s/http/get/GetHandlers.scala
diff --git a/...muel/elastic4s/http/get/GetResponse.scala → ...muel/elastic4s/http/get/GetResponse.scala b/...muel/elastic4s/http/get/GetResponse.scala → ...muel/elastic4s/http/get/GetResponse.scala
diff --git a/...l/elastic4s/http/get/MetaDataFields.scala → ...l/elastic4s/http/get/MetaDataFields.scala b/...l/elastic4s/http/get/MetaDataFields.scala → ...l/elastic4s/http/get/MetaDataFields.scala
diff --git a/...stic4s/http/get/MultiGetBodyBuilder.scala → ...stic4s/http/get/MultiGetBodyBuilder.scala b/...stic4s/http/get/MultiGetBodyBuilder.scala → ...stic4s/http/get/MultiGetBodyBuilder.scala
diff --git a/...ttp/index/CreateIndexContentBuilder.scala → ...ttp/index/CreateIndexContentBuilder.scala b/...ttp/index/CreateIndexContentBuilder.scala → ...ttp/index/CreateIndexContentBuilder.scala
diff --git a/...ic4s/http/index/CreateIndexResponse.scala → ...ic4s/http/index/CreateIndexResponse.scala b/...ic4s/http/index/CreateIndexResponse.scala → ...ic4s/http/index/CreateIndexResponse.scala
diff --git a/...elastic4s/http/index/ExistsHandlers.scala → ...elastic4s/http/index/ExistsHandlers.scala b/...elastic4s/http/index/ExistsHandlers.scala → ...elastic4s/http/index/ExistsHandlers.scala
diff --git a/.../elastic4s/http/index/IndexHandlers.scala → .../elastic4s/http/index/IndexHandlers.scala b/.../elastic4s/http/index/IndexHandlers.scala → .../elastic4s/http/index/IndexHandlers.scala
diff --git a/.../elastic4s/http/index/IndexResponse.scala → .../elastic4s/http/index/IndexResponse.scala b/.../elastic4s/http/index/IndexResponse.scala → .../elastic4s/http/index/IndexResponse.scala
diff --git a/...tic4s/http/index/IndexStatsHandlers.scala → ...tic4s/http/index/IndexStatsHandlers.scala b/...tic4s/http/index/IndexStatsHandlers.scala → ...tic4s/http/index/IndexStatsHandlers.scala
diff --git a/...4s/http/index/IndexTemplateHandlers.scala → ...4s/http/index/IndexTemplateHandlers.scala b/...4s/http/index/IndexTemplateHandlers.scala → ...4s/http/index/IndexTemplateHandlers.scala
diff --git a/...astic4s/http/index/RolloverHandlers.scala → ...astic4s/http/index/RolloverHandlers.scala b/...astic4s/http/index/RolloverHandlers.scala → ...astic4s/http/index/RolloverHandlers.scala
diff --git a/...4s/http/index/VersionTypeHttpString.scala → ...4s/http/index/VersionTypeHttpString.scala b/...4s/http/index/VersionTypeHttpString.scala → ...4s/http/index/VersionTypeHttpString.scala
diff --git a/...http/index/admin/IndexAdminHandlers.scala → ...http/index/admin/IndexAdminHandlers.scala b/...http/index/admin/IndexAdminHandlers.scala → ...http/index/admin/IndexAdminHandlers.scala
diff --git a/...l/elastic4s/http/index/admin/domain.scala → ...l/elastic4s/http/index/admin/domain.scala b/...l/elastic4s/http/index/admin/domain.scala → ...l/elastic4s/http/index/admin/domain.scala
diff --git a/...http/index/alias/AliasActionBuilder.scala → ...http/index/alias/AliasActionBuilder.scala b/...http/index/alias/AliasActionBuilder.scala → ...http/index/alias/AliasActionBuilder.scala
diff --git a/...http/index/alias/IndexAliasHandlers.scala → ...http/index/alias/IndexAliasHandlers.scala b/...http/index/alias/IndexAliasHandlers.scala → ...http/index/alias/IndexAliasHandlers.scala
diff --git a/...http/index/mappings/MappingHandlers.scala → ...http/index/mappings/MappingHandlers.scala b/...http/index/mappings/MappingHandlers.scala → ...http/index/mappings/MappingHandlers.scala
diff --git a/.../elastic4s/http/locks/LocksHandlers.scala → .../elastic4s/http/locks/LocksHandlers.scala b/.../elastic4s/http/locks/LocksHandlers.scala → .../elastic4s/http/locks/LocksHandlers.scala
diff --git a/.../elastic4s/http/nodes/NodesHandlers.scala → .../elastic4s/http/nodes/NodesHandlers.scala b/.../elastic4s/http/nodes/NodesHandlers.scala → .../elastic4s/http/nodes/NodesHandlers.scala
diff --git a/...tic4s/http/reindex/ReindexBuilderFn.scala → ...tic4s/http/reindex/ReindexBuilderFn.scala b/...tic4s/http/reindex/ReindexBuilderFn.scala → ...tic4s/http/reindex/ReindexBuilderFn.scala
diff --git a/...stic4s/http/reindex/ReindexHandlers.scala → ...stic4s/http/reindex/ReindexHandlers.scala b/...stic4s/http/reindex/ReindexHandlers.scala → ...stic4s/http/reindex/ReindexHandlers.scala
diff --git a/...m/sksamuel/elastic4s/http/responses.scala → ...m/sksamuel/elastic4s/http/responses.scala b/...m/sksamuel/elastic4s/http/responses.scala → ...m/sksamuel/elastic4s/http/responses.scala
diff --git a/...ic4s/http/search/HighlightBuilderFn.scala → ...ic4s/http/search/HighlightBuilderFn.scala b/...ic4s/http/search/HighlightBuilderFn.scala → ...ic4s/http/search/HighlightBuilderFn.scala
diff --git a/...http/search/HighlightFieldBuilderFn.scala → ...http/search/HighlightFieldBuilderFn.scala b/...http/search/HighlightFieldBuilderFn.scala → ...http/search/HighlightFieldBuilderFn.scala
diff --git a/...4s/http/search/MultiSearchBuilderFn.scala → ...4s/http/search/MultiSearchBuilderFn.scala b/...4s/http/search/MultiSearchBuilderFn.scala → ...4s/http/search/MultiSearchBuilderFn.scala
diff --git a/...c4s/http/search/MultiSearchResponse.scala → ...c4s/http/search/MultiSearchResponse.scala b/...c4s/http/search/MultiSearchResponse.scala → ...c4s/http/search/MultiSearchResponse.scala
diff --git a/...lastic4s/http/search/RawQueryBodyFn.scala → ...lastic4s/http/search/RawQueryBodyFn.scala b/...lastic4s/http/search/RawQueryBodyFn.scala → ...lastic4s/http/search/RawQueryBodyFn.scala
diff --git a/...c4s/http/search/SearchBodyBuilderFn.scala → ...c4s/http/search/SearchBodyBuilderFn.scala b/...c4s/http/search/SearchBodyBuilderFn.scala → ...c4s/http/search/SearchBodyBuilderFn.scala
diff --git a/...lastic4s/http/search/SearchHandlers.scala → ...lastic4s/http/search/SearchHandlers.scala b/...lastic4s/http/search/SearchHandlers.scala → ...lastic4s/http/search/SearchHandlers.scala
diff --git a/...lastic4s/http/search/SearchIterator.scala → ...lastic4s/http/search/SearchIterator.scala b/...lastic4s/http/search/SearchIterator.scala → ...lastic4s/http/search/SearchIterator.scala
diff --git a/...4s/http/search/SearchScrollHandlers.scala → ...4s/http/search/SearchScrollHandlers.scala b/...4s/http/search/SearchScrollHandlers.scala → ...4s/http/search/SearchScrollHandlers.scala
diff --git a/...ttp/search/SearchTypeHttpParameters.scala → ...ttp/search/SearchTypeHttpParameters.scala b/...ttp/search/SearchTypeHttpParameters.scala → ...ttp/search/SearchTypeHttpParameters.scala
diff --git a/.../elastic4s/http/search/aggresponses.scala → .../elastic4s/http/search/aggresponses.scala b/.../elastic4s/http/search/aggresponses.scala → .../elastic4s/http/search/aggresponses.scala
diff --git a/...tp/search/aggs/AggregationBuilderFn.scala → ...tp/search/aggs/AggregationBuilderFn.scala b/...tp/search/aggs/AggregationBuilderFn.scala → ...tp/search/aggs/AggregationBuilderFn.scala
diff --git a/...p/search/aggs/AvgAggregationBuilder.scala → ...p/search/aggs/AvgAggregationBuilder.scala b/...p/search/aggs/AvgAggregationBuilder.scala → ...p/search/aggs/AvgAggregationBuilder.scala
diff --git a/.../aggs/CardinalityAggregationBuilder.scala → .../aggs/CardinalityAggregationBuilder.scala b/.../aggs/CardinalityAggregationBuilder.scala → .../aggs/CardinalityAggregationBuilder.scala
diff --git a/...rch/aggs/ChildrenAggregationBuilder.scala → ...rch/aggs/ChildrenAggregationBuilder.scala b/...rch/aggs/ChildrenAggregationBuilder.scala → ...rch/aggs/ChildrenAggregationBuilder.scala
diff --git a/...ch/aggs/CompositeAggregationBuilder.scala → ...ch/aggs/CompositeAggregationBuilder.scala b/...ch/aggs/CompositeAggregationBuilder.scala → ...ch/aggs/CompositeAggregationBuilder.scala
diff --git a/...ggs/DateHistogramAggregationBuilder.scala → ...ggs/DateHistogramAggregationBuilder.scala b/...ggs/DateHistogramAggregationBuilder.scala → ...ggs/DateHistogramAggregationBuilder.scala
diff --git a/...ch/aggs/DateRangeAggregationBuilder.scala → ...ch/aggs/DateRangeAggregationBuilder.scala b/...ch/aggs/DateRangeAggregationBuilder.scala → ...ch/aggs/DateRangeAggregationBuilder.scala
diff --git a/...search/aggs/ExtendedBoundsBuilderFn.scala → ...search/aggs/ExtendedBoundsBuilderFn.scala b/...search/aggs/ExtendedBoundsBuilderFn.scala → ...search/aggs/ExtendedBoundsBuilderFn.scala
diff --git a/...ggs/ExtendedStatsAggregationBuilder.scala → ...ggs/ExtendedStatsAggregationBuilder.scala b/...ggs/ExtendedStatsAggregationBuilder.scala → ...ggs/ExtendedStatsAggregationBuilder.scala
diff --git a/...earch/aggs/FilterAggregationBuilder.scala → ...earch/aggs/FilterAggregationBuilder.scala b/...earch/aggs/FilterAggregationBuilder.scala → ...earch/aggs/FilterAggregationBuilder.scala
diff --git a/...arch/aggs/FiltersAggregationBuilder.scala → ...arch/aggs/FiltersAggregationBuilder.scala b/...arch/aggs/FiltersAggregationBuilder.scala → ...arch/aggs/FiltersAggregationBuilder.scala
diff --git a/...ch/aggs/GeoBoundsAggregationBuilder.scala → ...ch/aggs/GeoBoundsAggregationBuilder.scala b/...ch/aggs/GeoBoundsAggregationBuilder.scala → ...ch/aggs/GeoBoundsAggregationBuilder.scala
diff --git a/.../aggs/GeoCentroidAggregationBuilder.scala → .../aggs/GeoCentroidAggregationBuilder.scala b/.../aggs/GeoCentroidAggregationBuilder.scala → .../aggs/GeoCentroidAggregationBuilder.scala
diff --git a/.../aggs/GeoDistanceAggregationBuilder.scala → .../aggs/GeoDistanceAggregationBuilder.scala b/.../aggs/GeoDistanceAggregationBuilder.scala → .../aggs/GeoDistanceAggregationBuilder.scala
diff --git a/.../aggs/GeoHashGridAggregationBuilder.scala → .../aggs/GeoHashGridAggregationBuilder.scala b/.../aggs/GeoHashGridAggregationBuilder.scala → .../aggs/GeoHashGridAggregationBuilder.scala
diff --git a/...earch/aggs/GlobalAggregationBuilder.scala → ...earch/aggs/GlobalAggregationBuilder.scala b/...earch/aggs/GlobalAggregationBuilder.scala → ...earch/aggs/GlobalAggregationBuilder.scala
diff --git a/...ch/aggs/HistogramAggregationBuilder.scala → ...ch/aggs/HistogramAggregationBuilder.scala b/...ch/aggs/HistogramAggregationBuilder.scala → ...ch/aggs/HistogramAggregationBuilder.scala
diff --git a/...arch/aggs/IpRangeAggregationBuilder.scala → ...arch/aggs/IpRangeAggregationBuilder.scala b/...arch/aggs/IpRangeAggregationBuilder.scala → ...arch/aggs/IpRangeAggregationBuilder.scala
diff --git a/...aggs/KeyedFiltersAggregationBuilder.scala → ...aggs/KeyedFiltersAggregationBuilder.scala b/...aggs/KeyedFiltersAggregationBuilder.scala → ...aggs/KeyedFiltersAggregationBuilder.scala
diff --git a/...p/search/aggs/MaxAggregationBuilder.scala → ...p/search/aggs/MaxAggregationBuilder.scala b/...p/search/aggs/MaxAggregationBuilder.scala → ...p/search/aggs/MaxAggregationBuilder.scala
diff --git a/...p/search/aggs/MinAggregationBuilder.scala → ...p/search/aggs/MinAggregationBuilder.scala b/...p/search/aggs/MinAggregationBuilder.scala → ...p/search/aggs/MinAggregationBuilder.scala
diff --git a/...arch/aggs/MissingAggregationBuilder.scala → ...arch/aggs/MissingAggregationBuilder.scala b/...arch/aggs/MissingAggregationBuilder.scala → ...arch/aggs/MissingAggregationBuilder.scala
diff --git a/...earch/aggs/NestedAggregationBuilder.scala → ...earch/aggs/NestedAggregationBuilder.scala b/...earch/aggs/NestedAggregationBuilder.scala → ...earch/aggs/NestedAggregationBuilder.scala
diff --git a/.../aggs/PercentilesAggregationBuilder.scala → .../aggs/PercentilesAggregationBuilder.scala b/.../aggs/PercentilesAggregationBuilder.scala → .../aggs/PercentilesAggregationBuilder.scala
diff --git a/...search/aggs/RangeAggregationBuilder.scala → ...search/aggs/RangeAggregationBuilder.scala b/...search/aggs/RangeAggregationBuilder.scala → ...search/aggs/RangeAggregationBuilder.scala
diff --git a/...ggs/ReverseNestedAggregationBuilder.scala → ...ggs/ReverseNestedAggregationBuilder.scala b/...ggs/ReverseNestedAggregationBuilder.scala → ...ggs/ReverseNestedAggregationBuilder.scala
diff --git a/...arch/aggs/SamplerAggregationBuilder.scala → ...arch/aggs/SamplerAggregationBuilder.scala b/...arch/aggs/SamplerAggregationBuilder.scala → ...arch/aggs/SamplerAggregationBuilder.scala
diff --git a/...gs/ScriptedMetricAggregationBuilder.scala → ...gs/ScriptedMetricAggregationBuilder.scala b/...gs/ScriptedMetricAggregationBuilder.scala → ...gs/ScriptedMetricAggregationBuilder.scala
diff --git a/...rch/aggs/SigTermsAggregationBuilder.scala → ...rch/aggs/SigTermsAggregationBuilder.scala b/...rch/aggs/SigTermsAggregationBuilder.scala → ...rch/aggs/SigTermsAggregationBuilder.scala
diff --git a/...arch/aggs/SigTextAggregationBuilder.scala → ...arch/aggs/SigTextAggregationBuilder.scala b/...arch/aggs/SigTextAggregationBuilder.scala → ...arch/aggs/SigTextAggregationBuilder.scala
diff --git a/...search/aggs/StatsAggregationBuilder.scala → ...search/aggs/StatsAggregationBuilder.scala b/...search/aggs/StatsAggregationBuilder.scala → ...search/aggs/StatsAggregationBuilder.scala
diff --git a/...p/search/aggs/SumAggregationBuilder.scala → ...p/search/aggs/SumAggregationBuilder.scala b/...p/search/aggs/SumAggregationBuilder.scala → ...p/search/aggs/SumAggregationBuilder.scala
diff --git a/...search/aggs/TermsAggregationBuilder.scala → ...search/aggs/TermsAggregationBuilder.scala b/...search/aggs/TermsAggregationBuilder.scala → ...search/aggs/TermsAggregationBuilder.scala
diff --git a/...arch/aggs/TopHitsAggregationBuilder.scala → ...arch/aggs/TopHitsAggregationBuilder.scala b/...arch/aggs/TopHitsAggregationBuilder.scala → ...arch/aggs/TopHitsAggregationBuilder.scala
diff --git a/...h/aggs/ValueCountAggregationBuilder.scala → ...h/aggs/ValueCountAggregationBuilder.scala b/...h/aggs/ValueCountAggregationBuilder.scala → ...h/aggs/ValueCountAggregationBuilder.scala
diff --git a/...ipeline/AvgBucketPipelineAggBuilder.scala → ...ipeline/AvgBucketPipelineAggBuilder.scala b/...ipeline/AvgBucketPipelineAggBuilder.scala → ...ipeline/AvgBucketPipelineAggBuilder.scala
diff --git a/...eline/BucketSelectorPipelineBuilder.scala → ...eline/BucketSelectorPipelineBuilder.scala b/...eline/BucketSelectorPipelineBuilder.scala → ...eline/BucketSelectorPipelineBuilder.scala
diff --git a/...peline/BucketSortPipelineAggBuilder.scala → ...peline/BucketSortPipelineAggBuilder.scala b/...peline/BucketSortPipelineAggBuilder.scala → ...peline/BucketSortPipelineAggBuilder.scala
diff --git a/...tendedStatsBucketPipelineAggBuilder.scala → ...tendedStatsBucketPipelineAggBuilder.scala b/...tendedStatsBucketPipelineAggBuilder.scala → ...tendedStatsBucketPipelineAggBuilder.scala
diff --git a/...ipeline/MinBucketPipelineAggBuilder.scala → ...ipeline/MinBucketPipelineAggBuilder.scala b/...ipeline/MinBucketPipelineAggBuilder.scala → ...ipeline/MinBucketPipelineAggBuilder.scala
diff --git a/...s/pipeline/MovAvgPipelineAggBuilder.scala → ...s/pipeline/MovAvgPipelineAggBuilder.scala b/...s/pipeline/MovAvgPipelineAggBuilder.scala → ...s/pipeline/MovAvgPipelineAggBuilder.scala
diff --git a/...PercentilesBucketPipelineAggBuilder.scala → ...PercentilesBucketPipelineAggBuilder.scala b/...PercentilesBucketPipelineAggBuilder.scala → ...PercentilesBucketPipelineAggBuilder.scala
diff --git a/...peline/SerialDiffPipelineAggBuilder.scala → ...peline/SerialDiffPipelineAggBuilder.scala b/...peline/SerialDiffPipelineAggBuilder.scala → ...peline/SerialDiffPipelineAggBuilder.scala
diff --git a/...eline/StatsBucketPipelineAggBuilder.scala → ...eline/StatsBucketPipelineAggBuilder.scala b/...eline/StatsBucketPipelineAggBuilder.scala → ...eline/StatsBucketPipelineAggBuilder.scala
diff --git a/...p/search/collapse/CollapseBuilderFn.scala → ...p/search/collapse/CollapseBuilderFn.scala b/...p/search/collapse/CollapseBuilderFn.scala → ...p/search/collapse/CollapseBuilderFn.scala
diff --git a/.../http/search/queries/MatchAllBodyFn.scala → .../http/search/queries/MatchAllBodyFn.scala b/.../http/search/queries/MatchAllBodyFn.scala → .../http/search/queries/MatchAllBodyFn.scala
diff --git a/.../http/search/queries/QueryBuilderFn.scala → .../http/search/queries/QueryBuilderFn.scala b/.../http/search/queries/QueryBuilderFn.scala → .../http/search/queries/QueryBuilderFn.scala
diff --git a/...s/http/search/queries/SortBuilderFn.scala → ...s/http/search/queries/SortBuilderFn.scala b/...s/http/search/queries/SortBuilderFn.scala → ...s/http/search/queries/SortBuilderFn.scala
diff --git a/...queries/compound/BoolQueryBuilderFn.scala → ...queries/compound/BoolQueryBuilderFn.scala b/...queries/compound/BoolQueryBuilderFn.scala → ...queries/compound/BoolQueryBuilderFn.scala
diff --git a/...ueries/compound/BoostingQueryBodyFn.scala → ...ueries/compound/BoostingQueryBodyFn.scala b/...ueries/compound/BoostingQueryBodyFn.scala → ...ueries/compound/BoostingQueryBodyFn.scala
diff --git a/...ueries/compound/ConstantScoreBodyFn.scala → ...ueries/compound/ConstantScoreBodyFn.scala b/...ueries/compound/ConstantScoreBodyFn.scala → ...ueries/compound/ConstantScoreBodyFn.scala
diff --git a/.../queries/compound/DisMaxQueryBodyFn.scala → .../queries/compound/DisMaxQueryBodyFn.scala b/.../queries/compound/DisMaxQueryBodyFn.scala → .../queries/compound/DisMaxQueryBodyFn.scala
diff --git a/...eries/geo/GeoBoundingBoxQueryBodyFn.scala → ...eries/geo/GeoBoundingBoxQueryBodyFn.scala b/...eries/geo/GeoBoundingBoxQueryBodyFn.scala → ...eries/geo/GeoBoundingBoxQueryBodyFn.scala
diff --git a/.../queries/geo/GeoDistanceQueryBodyFn.scala → .../queries/geo/GeoDistanceQueryBodyFn.scala b/.../queries/geo/GeoDistanceQueryBodyFn.scala → .../queries/geo/GeoDistanceQueryBodyFn.scala
diff --git a/...ch/queries/geo/GeoPolyonQueryBodyFn.scala → ...ch/queries/geo/GeoPolyonQueryBodyFn.scala b/...ch/queries/geo/GeoPolyonQueryBodyFn.scala → ...ch/queries/geo/GeoPolyonQueryBodyFn.scala
diff --git a/...rch/queries/geo/GeoShapeQueryBodyFn.scala → ...rch/queries/geo/GeoShapeQueryBodyFn.scala b/...rch/queries/geo/GeoShapeQueryBodyFn.scala → ...rch/queries/geo/GeoShapeQueryBodyFn.scala
diff --git a/...earch/queries/nested/HasChildBodyFn.scala → ...earch/queries/nested/HasChildBodyFn.scala b/...earch/queries/nested/HasChildBodyFn.scala → ...earch/queries/nested/HasChildBodyFn.scala
diff --git a/...arch/queries/nested/HasParentBodyFn.scala → ...arch/queries/nested/HasParentBodyFn.scala b/...arch/queries/nested/HasParentBodyFn.scala → ...arch/queries/nested/HasParentBodyFn.scala
diff --git a/.../queries/nested/InnerHitQueryBodyFn.scala → .../queries/nested/InnerHitQueryBodyFn.scala b/.../queries/nested/InnerHitQueryBodyFn.scala → .../queries/nested/InnerHitQueryBodyFn.scala
diff --git a/...ch/queries/nested/NestedQueryBodyFn.scala → ...ch/queries/nested/NestedQueryBodyFn.scala b/...ch/queries/nested/NestedQueryBodyFn.scala → ...ch/queries/nested/NestedQueryBodyFn.scala
diff --git a/.../queries/nested/ParentIdQueryBodyFn.scala → .../queries/nested/ParentIdQueryBodyFn.scala b/.../queries/nested/ParentIdQueryBodyFn.scala → .../queries/nested/ParentIdQueryBodyFn.scala
diff --git a/...ries/span/SpanContainingQueryBodyFn.scala → ...ries/span/SpanContainingQueryBodyFn.scala b/...ries/span/SpanContainingQueryBodyFn.scala → ...ries/span/SpanContainingQueryBodyFn.scala
diff --git a/...h/queries/span/SpanFirstQueryBodyFn.scala → ...h/queries/span/SpanFirstQueryBodyFn.scala b/...h/queries/span/SpanFirstQueryBodyFn.scala → ...h/queries/span/SpanFirstQueryBodyFn.scala
diff --git a/...eries/span/SpanMultiTermQueryBodyFn.scala → ...eries/span/SpanMultiTermQueryBodyFn.scala b/...eries/span/SpanMultiTermQueryBodyFn.scala → ...eries/span/SpanMultiTermQueryBodyFn.scala
diff --git a/...ch/queries/span/SpanNearQueryBodyFn.scala → ...ch/queries/span/SpanNearQueryBodyFn.scala b/...ch/queries/span/SpanNearQueryBodyFn.scala → ...ch/queries/span/SpanNearQueryBodyFn.scala
diff --git a/...rch/queries/span/SpanNotQueryBodyFn.scala → ...rch/queries/span/SpanNotQueryBodyFn.scala b/...rch/queries/span/SpanNotQueryBodyFn.scala → ...rch/queries/span/SpanNotQueryBodyFn.scala
diff --git a/...arch/queries/span/SpanOrQueryBodyFn.scala → ...arch/queries/span/SpanOrQueryBodyFn.scala b/...arch/queries/span/SpanOrQueryBodyFn.scala → ...arch/queries/span/SpanOrQueryBodyFn.scala
diff --git a/...ch/queries/span/SpanTermQueryBodyFn.scala → ...ch/queries/span/SpanTermQueryBodyFn.scala b/...ch/queries/span/SpanTermQueryBodyFn.scala → ...ch/queries/span/SpanTermQueryBodyFn.scala
diff --git a/.../queries/span/SpanWithinQueryBodyFn.scala → .../queries/span/SpanWithinQueryBodyFn.scala b/.../queries/span/SpanWithinQueryBodyFn.scala → .../queries/span/SpanWithinQueryBodyFn.scala
diff --git a/...ialized/FunctionScoreQueryBuilderFn.scala → ...ialized/FunctionScoreQueryBuilderFn.scala b/...ialized/FunctionScoreQueryBuilderFn.scala → ...ialized/FunctionScoreQueryBuilderFn.scala
diff --git a/...ialized/GaussianDecayScoreBuilderFn.scala → ...ialized/GaussianDecayScoreBuilderFn.scala b/...ialized/GaussianDecayScoreBuilderFn.scala → ...ialized/GaussianDecayScoreBuilderFn.scala
diff --git a/...s/specialized/MoreLikeThisBuilderFn.scala → ...s/specialized/MoreLikeThisBuilderFn.scala b/...s/specialized/MoreLikeThisBuilderFn.scala → ...s/specialized/MoreLikeThisBuilderFn.scala
diff --git a/.../specialized/ScoreFunctionBuilderFn.scala → .../specialized/ScoreFunctionBuilderFn.scala b/.../specialized/ScoreFunctionBuilderFn.scala → .../specialized/ScoreFunctionBuilderFn.scala
diff --git a/...eries/specialized/ScriptQueryBodyFn.scala → ...eries/specialized/ScriptQueryBodyFn.scala b/...eries/specialized/ScriptQueryBodyFn.scala → ...eries/specialized/ScriptQueryBodyFn.scala
diff --git a/.../specialized/ScriptScoreQueryBodyFn.scala → .../specialized/ScriptScoreQueryBodyFn.scala b/.../specialized/ScriptScoreQueryBodyFn.scala → .../specialized/ScriptScoreQueryBodyFn.scala
diff --git a/...arch/queries/term/ExistsQueryBodyFn.scala → ...arch/queries/term/ExistsQueryBodyFn.scala b/...arch/queries/term/ExistsQueryBodyFn.scala → ...arch/queries/term/ExistsQueryBodyFn.scala
diff --git a/...earch/queries/term/FuzzyQueryBodyFn.scala → ...earch/queries/term/FuzzyQueryBodyFn.scala b/...earch/queries/term/FuzzyQueryBodyFn.scala → ...earch/queries/term/FuzzyQueryBodyFn.scala
diff --git a/...p/search/queries/term/IdQueryBodyFn.scala → ...p/search/queries/term/IdQueryBodyFn.scala b/...p/search/queries/term/IdQueryBodyFn.scala → ...p/search/queries/term/IdQueryBodyFn.scala
diff --git a/...arch/queries/term/PrefixQueryBodyFn.scala → ...arch/queries/term/PrefixQueryBodyFn.scala b/...arch/queries/term/PrefixQueryBodyFn.scala → ...arch/queries/term/PrefixQueryBodyFn.scala
diff --git a/...earch/queries/term/RangeQueryBodyFn.scala → ...earch/queries/term/RangeQueryBodyFn.scala b/...earch/queries/term/RangeQueryBodyFn.scala → ...earch/queries/term/RangeQueryBodyFn.scala
diff --git a/...earch/queries/term/RegexQueryBodyFn.scala → ...earch/queries/term/RegexQueryBodyFn.scala b/...earch/queries/term/RegexQueryBodyFn.scala → ...earch/queries/term/RegexQueryBodyFn.scala
diff --git a/...search/queries/term/TermQueryBodyFn.scala → ...search/queries/term/TermQueryBodyFn.scala b/...search/queries/term/TermQueryBodyFn.scala → ...search/queries/term/TermQueryBodyFn.scala
diff --git a/...queries/term/TermsLookupQueryBodyFn.scala → ...queries/term/TermsLookupQueryBodyFn.scala b/...queries/term/TermsLookupQueryBodyFn.scala → ...queries/term/TermsLookupQueryBodyFn.scala
diff --git a/...earch/queries/term/TermsQueryBodyFn.scala → ...earch/queries/term/TermsQueryBodyFn.scala b/...earch/queries/term/TermsQueryBodyFn.scala → ...earch/queries/term/TermsQueryBodyFn.scala
diff --git a/...search/queries/term/TypeQueryBodyFn.scala → ...search/queries/term/TypeQueryBodyFn.scala b/...search/queries/term/TypeQueryBodyFn.scala → ...search/queries/term/TypeQueryBodyFn.scala
diff --git a/...ch/queries/term/WildcardQueryBodyFn.scala → ...ch/queries/term/WildcardQueryBodyFn.scala b/...ch/queries/term/WildcardQueryBodyFn.scala → ...ch/queries/term/WildcardQueryBodyFn.scala
diff --git a/...queries/text/CommonTermsQueryBodyFn.scala → ...queries/text/CommonTermsQueryBodyFn.scala b/...queries/text/CommonTermsQueryBodyFn.scala → ...queries/text/CommonTermsQueryBodyFn.scala
diff --git a/...ueries/text/MatchPhrasePrefixBodyFn.scala → ...ueries/text/MatchPhrasePrefixBodyFn.scala b/...ueries/text/MatchPhrasePrefixBodyFn.scala → ...ueries/text/MatchPhrasePrefixBodyFn.scala
diff --git a/...queries/text/MatchPhraseQueryBodyFn.scala → ...queries/text/MatchPhraseQueryBodyFn.scala b/...queries/text/MatchPhraseQueryBodyFn.scala → ...queries/text/MatchPhraseQueryBodyFn.scala
diff --git a/...ch/queries/text/MatchQueryBuilderFn.scala → ...ch/queries/text/MatchQueryBuilderFn.scala b/...ch/queries/text/MatchQueryBuilderFn.scala → ...ch/queries/text/MatchQueryBuilderFn.scala
diff --git a/...earch/queries/text/MultiMatchBodyFn.scala → ...earch/queries/text/MultiMatchBodyFn.scala b/...earch/queries/text/MultiMatchBodyFn.scala → ...earch/queries/text/MultiMatchBodyFn.scala
diff --git a/...arch/queries/text/QueryStringBodyFn.scala → ...arch/queries/text/QueryStringBodyFn.scala b/...arch/queries/text/QueryStringBodyFn.scala → ...arch/queries/text/QueryStringBodyFn.scala
diff --git a/...rch/queries/text/SimpleStringBodyFn.scala → ...rch/queries/text/SimpleStringBodyFn.scala b/...rch/queries/text/SimpleStringBodyFn.scala → ...rch/queries/text/SimpleStringBodyFn.scala
diff --git a/...uel/elastic4s/http/search/responses.scala → ...uel/elastic4s/http/search/responses.scala b/...uel/elastic4s/http/search/responses.scala → ...uel/elastic4s/http/search/responses.scala
diff --git a/...elastic4s/http/search/suggresponses.scala → ...elastic4s/http/search/suggresponses.scala b/...elastic4s/http/search/suggresponses.scala → ...elastic4s/http/search/suggresponses.scala
diff --git a/...suggs/CompletionSuggestionBuilderFn.scala → ...suggs/CompletionSuggestionBuilderFn.scala b/...suggs/CompletionSuggestionBuilderFn.scala → ...suggs/CompletionSuggestionBuilderFn.scala
diff --git a/...rch/suggs/PhraseSuggestionBuilderFn.scala → ...rch/suggs/PhraseSuggestionBuilderFn.scala b/...rch/suggs/PhraseSuggestionBuilderFn.scala → ...rch/suggs/PhraseSuggestionBuilderFn.scala
diff --git a/...earch/suggs/TermSuggestionBuilderFn.scala → ...earch/suggs/TermSuggestionBuilderFn.scala b/...earch/suggs/TermSuggestionBuilderFn.scala → ...earch/suggs/TermSuggestionBuilderFn.scala
diff --git a/...template/PutSearchTemplateBuilderFn.scala → ...template/PutSearchTemplateBuilderFn.scala b/...template/PutSearchTemplateBuilderFn.scala → ...template/PutSearchTemplateBuilderFn.scala
diff --git a/...rch/template/SearchTemplateHandlers.scala → ...rch/template/SearchTemplateHandlers.scala b/...rch/template/SearchTemplateHandlers.scala → ...rch/template/SearchTemplateHandlers.scala
diff --git a/...ch/template/TemplateSearchBuilderFn.scala → ...ch/template/TemplateSearchBuilderFn.scala b/...ch/template/TemplateSearchBuilderFn.scala → ...ch/template/TemplateSearchBuilderFn.scala
diff --git a/...ic4s/http/settings/SettingsHandlers.scala → ...ic4s/http/settings/SettingsHandlers.scala b/...ic4s/http/settings/SettingsHandlers.scala → ...ic4s/http/settings/SettingsHandlers.scala
diff --git a/...c4s/http/snapshots/SnapshotHandlers.scala → ...c4s/http/snapshots/SnapshotHandlers.scala b/...c4s/http/snapshots/SnapshotHandlers.scala → ...c4s/http/snapshots/SnapshotHandlers.scala
diff --git a/...el/elastic4s/http/task/TaskHandlers.scala → ...el/elastic4s/http/task/TaskHandlers.scala b/...el/elastic4s/http/task/TaskHandlers.scala → ...el/elastic4s/http/task/TaskHandlers.scala
diff --git a/...http/termvectors/TermVectorHandlers.scala → ...http/termvectors/TermVectorHandlers.scala b/...http/termvectors/TermVectorHandlers.scala → ...http/termvectors/TermVectorHandlers.scala
diff --git a/...astic4s/http/update/UpdateBuilderFn.scala → ...astic4s/http/update/UpdateBuilderFn.scala b/...astic4s/http/update/UpdateBuilderFn.scala → ...astic4s/http/update/UpdateBuilderFn.scala
diff --git a/...s/http/update/UpdateByQueryResponse.scala → ...s/http/update/UpdateByQueryResponse.scala b/...s/http/update/UpdateByQueryResponse.scala → ...s/http/update/UpdateByQueryResponse.scala
diff --git a/...lastic4s/http/update/UpdateHandlers.scala → ...lastic4s/http/update/UpdateHandlers.scala b/...lastic4s/http/update/UpdateHandlers.scala → ...lastic4s/http/update/UpdateHandlers.scala
diff --git a/...ic4s/http/validate/ValidateHandlers.scala → ...ic4s/http/validate/ValidateHandlers.scala b/...ic4s/http/validate/ValidateHandlers.scala → ...ic4s/http/validate/ValidateHandlers.scala
diff --git a/...el/elastic4s/http/ElasticClientTest.scala → ...el/elastic4s/http/ElasticClientTest.scala b/...el/elastic4s/http/ElasticClientTest.scala → ...el/elastic4s/http/ElasticClientTest.scala
diff --git a/...m/sksamuel/elastic4s/http/JsonSugar.scala → ...m/sksamuel/elastic4s/http/JsonSugar.scala b/...m/sksamuel/elastic4s/http/JsonSugar.scala → ...m/sksamuel/elastic4s/http/JsonSugar.scala
diff --git a/.../elastic4s/http/ScriptBuilderFnTest.scala → .../elastic4s/http/ScriptBuilderFnTest.scala b/.../elastic4s/http/ScriptBuilderFnTest.scala → .../elastic4s/http/ScriptBuilderFnTest.scala
diff --git a/...c4s/http/SourceAsContentBuilderTest.scala → ...c4s/http/SourceAsContentBuilderTest.scala b/...c4s/http/SourceAsContentBuilderTest.scala → ...c4s/http/SourceAsContentBuilderTest.scala
diff --git a/...astic4s/http/bulk/BulkBuilderFnTest.scala → ...astic4s/http/bulk/BulkBuilderFnTest.scala b/...astic4s/http/bulk/BulkBuilderFnTest.scala → ...astic4s/http/bulk/BulkBuilderFnTest.scala
diff --git a/...lastic4s/http/bulk/BulkHandlersTest.scala → ...lastic4s/http/bulk/BulkHandlersTest.scala b/...lastic4s/http/bulk/BulkHandlersTest.scala → ...lastic4s/http/bulk/BulkHandlersTest.scala
diff --git a/...index/CreateIndexContentBuilderTest.scala → ...index/CreateIndexContentBuilderTest.scala b/...index/CreateIndexContentBuilderTest.scala → ...index/CreateIndexContentBuilderTest.scala
diff --git a/.../index/alias/AliasActionBuilderTest.scala → .../index/alias/AliasActionBuilderTest.scala b/.../index/alias/AliasActionBuilderTest.scala → .../index/alias/AliasActionBuilderTest.scala
diff --git a/...m/sksamuel/elastic4s/http/responses.scala → ...m/sksamuel/elastic4s/http/responses.scala b/...m/sksamuel/elastic4s/http/responses.scala → ...m/sksamuel/elastic4s/http/responses.scala
diff --git a/.../BucketScriptPipelineAggBuilderTest.scala → .../BucketScriptPipelineAggBuilderTest.scala b/.../BucketScriptPipelineAggBuilderTest.scala → .../BucketScriptPipelineAggBuilderTest.scala
diff --git a/...ggs/CompositeAggregationBuilderTest.scala → ...ggs/CompositeAggregationBuilderTest.scala b/...ggs/CompositeAggregationBuilderTest.scala → ...ggs/CompositeAggregationBuilderTest.scala
diff --git a/...ch/aggs/CumulativeSumAggBuilderTest.scala → ...ch/aggs/CumulativeSumAggBuilderTest.scala b/...ch/aggs/CumulativeSumAggBuilderTest.scala → ...ch/aggs/CumulativeSumAggBuilderTest.scala
diff --git a/...earch/aggs/DerivativeAggBuilderTest.scala → ...earch/aggs/DerivativeAggBuilderTest.scala b/...earch/aggs/DerivativeAggBuilderTest.scala → ...earch/aggs/DerivativeAggBuilderTest.scala
diff --git a/...search/aggs/MaxBucketAggBuilderTest.scala → ...search/aggs/MaxBucketAggBuilderTest.scala b/...search/aggs/MaxBucketAggBuilderTest.scala → ...search/aggs/MaxBucketAggBuilderTest.scala
diff --git a/...ch/aggs/RangeAggregationBuilderTest.scala → ...ch/aggs/RangeAggregationBuilderTest.scala b/...ch/aggs/RangeAggregationBuilderTest.scala → ...ch/aggs/RangeAggregationBuilderTest.scala
diff --git a/...criptedMetricAggregationBuilderTest.scala → ...criptedMetricAggregationBuilderTest.scala b/...criptedMetricAggregationBuilderTest.scala → ...criptedMetricAggregationBuilderTest.scala
diff --git a/...aggs/SigTermsAggregationBuilderTest.scala → ...aggs/SigTermsAggregationBuilderTest.scala b/...aggs/SigTermsAggregationBuilderTest.scala → ...aggs/SigTermsAggregationBuilderTest.scala
diff --git a/...search/aggs/SumBucketAggBuilderTest.scala → ...search/aggs/SumBucketAggBuilderTest.scala b/...search/aggs/SumBucketAggBuilderTest.scala → ...search/aggs/SumBucketAggBuilderTest.scala
diff --git a/.../aggs/TopHitsAggregationBuilderTest.scala → .../aggs/TopHitsAggregationBuilderTest.scala b/.../aggs/TopHitsAggregationBuilderTest.scala → .../aggs/TopHitsAggregationBuilderTest.scala
diff --git a/...e/BucketSelectorPipelineBuilderTest.scala → ...e/BucketSelectorPipelineBuilderTest.scala b/...e/BucketSelectorPipelineBuilderTest.scala → ...e/BucketSelectorPipelineBuilderTest.scala
diff --git a/...arch/collapse/CollapseBuilderFnTest.scala → ...arch/collapse/CollapseBuilderFnTest.scala b/...arch/collapse/CollapseBuilderFnTest.scala → ...arch/collapse/CollapseBuilderFnTest.scala
diff --git a/...p/search/queries/HasChildBodyFnTest.scala → ...p/search/queries/HasChildBodyFnTest.scala b/...p/search/queries/HasChildBodyFnTest.scala → ...p/search/queries/HasChildBodyFnTest.scala
diff --git a/.../search/queries/HasParentBodyFnTest.scala → .../search/queries/HasParentBodyFnTest.scala b/.../search/queries/HasParentBodyFnTest.scala → .../search/queries/HasParentBodyFnTest.scala
diff --git a/...queries/HighlightFieldBuilderFnTest.scala → ...queries/HighlightFieldBuilderFnTest.scala b/...queries/HighlightFieldBuilderFnTest.scala → ...queries/HighlightFieldBuilderFnTest.scala
diff --git a/...rch/queries/InnerHitQueryBodyFnTest.scala → ...rch/queries/InnerHitQueryBodyFnTest.scala b/...rch/queries/InnerHitQueryBodyFnTest.scala → ...rch/queries/InnerHitQueryBodyFnTest.scala
diff --git a/...search/queries/RegexQueryBodyFnTest.scala → ...search/queries/RegexQueryBodyFnTest.scala b/...search/queries/RegexQueryBodyFnTest.scala → ...search/queries/RegexQueryBodyFnTest.scala
diff --git a/...rch/queries/SearchBodyBuilderFnTest.scala → ...rch/queries/SearchBodyBuilderFnTest.scala b/...rch/queries/SearchBodyBuilderFnTest.scala → ...rch/queries/SearchBodyBuilderFnTest.scala
diff --git a/...tp/search/queries/SortBuilderFnTest.scala → ...tp/search/queries/SortBuilderFnTest.scala b/...tp/search/queries/SortBuilderFnTest.scala → ...tp/search/queries/SortBuilderFnTest.scala
diff --git a/...s/geo/GeoBoundingBoxQueryBodyFnTest.scala → ...s/geo/GeoBoundingBoxQueryBodyFnTest.scala b/...s/geo/GeoBoundingBoxQueryBodyFnTest.scala → ...s/geo/GeoBoundingBoxQueryBodyFnTest.scala
diff --git a/...queries/geo/GeoShapeQueryBodyFnTest.scala → ...queries/geo/GeoShapeQueryBodyFnTest.scala b/...queries/geo/GeoShapeQueryBodyFnTest.scala → ...queries/geo/GeoShapeQueryBodyFnTest.scala
diff --git a/...ueries/nested/NestedQueryBodyFnTest.scala → ...ueries/nested/NestedQueryBodyFnTest.scala b/...ueries/nested/NestedQueryBodyFnTest.scala → ...ueries/nested/NestedQueryBodyFnTest.scala
diff --git a/...eries/span/SpanFirstQueryBodyFnTest.scala → ...eries/span/SpanFirstQueryBodyFnTest.scala b/...eries/span/SpanFirstQueryBodyFnTest.scala → ...eries/span/SpanFirstQueryBodyFnTest.scala
diff --git a/...s/span/SpanMultiTermQueryBodyFnTest.scala → ...s/span/SpanMultiTermQueryBodyFnTest.scala b/...s/span/SpanMultiTermQueryBodyFnTest.scala → ...s/span/SpanMultiTermQueryBodyFnTest.scala
diff --git a/...ueries/span/SpanNearQueryBodyFnTest.scala → ...ueries/span/SpanNearQueryBodyFnTest.scala b/...ueries/span/SpanNearQueryBodyFnTest.scala → ...ueries/span/SpanNearQueryBodyFnTest.scala
diff --git a/.../queries/span/SpanOrQueryBodyFnTest.scala → .../queries/span/SpanOrQueryBodyFnTest.scala b/.../queries/span/SpanOrQueryBodyFnTest.scala → .../queries/span/SpanOrQueryBodyFnTest.scala
diff --git a/...zed/FunctionScoreQueryBuilderFnTest.scala → ...zed/FunctionScoreQueryBuilderFnTest.scala b/...zed/FunctionScoreQueryBuilderFnTest.scala → ...zed/FunctionScoreQueryBuilderFnTest.scala
diff --git a/...cialized/ScoreFunctionBuilderFnTest.scala → ...cialized/ScoreFunctionBuilderFnTest.scala b/...cialized/ScoreFunctionBuilderFnTest.scala → ...cialized/ScoreFunctionBuilderFnTest.scala
diff --git a/...c4s/http/testutils/StringExtensions.scala → ...c4s/http/testutils/StringExtensions.scala b/...c4s/http/testutils/StringExtensions.scala → ...c4s/http/testutils/StringExtensions.scala
diff --git a/...http/testutils/StringExtensionsTest.scala → ...http/testutils/StringExtensionsTest.scala b/...http/testutils/StringExtensionsTest.scala → ...http/testutils/StringExtensionsTest.scala
diff --git a/...http/update/UpdateByQueryBodyFnTest.scala → ...http/update/UpdateByQueryBodyFnTest.scala b/...http/update/UpdateByQueryBodyFnTest.scala → ...http/update/UpdateByQueryBodyFnTest.scala
diff --git a/...lastic4s/sttp/SttpRequestHttpClient.scala → ...lastic4s/sttp/SttpRequestHttpClient.scala b/...lastic4s/sttp/SttpRequestHttpClient.scala → ...lastic4s/sttp/SttpRequestHttpClient.scala
diff --git a/...el/elastic4s/cats/effect/IOExecutor.scala → ...el/elastic4s/cats/effect/IOExecutor.scala b/...el/elastic4s/cats/effect/IOExecutor.scala → ...el/elastic4s/cats/effect/IOExecutor.scala
diff --git a/...s/cats/effect/instances/IOInstances.scala → ...s/cats/effect/instances/IOInstances.scala b/...s/cats/effect/instances/IOInstances.scala → ...s/cats/effect/instances/IOInstances.scala
diff --git a/...tic4s/cats/effect/instances/package.scala → ...tic4s/cats/effect/instances/package.scala b/...tic4s/cats/effect/instances/package.scala → ...tic4s/cats/effect/instances/package.scala
diff --git a/...samuel/elastic4s/monix/TaskExecutor.scala → ...samuel/elastic4s/monix/TaskExecutor.scala b/...samuel/elastic4s/monix/TaskExecutor.scala → ...samuel/elastic4s/monix/TaskExecutor.scala
diff --git a/...tic4s/monix/instances/TaskInstances.scala → ...tic4s/monix/instances/TaskInstances.scala b/...tic4s/monix/instances/TaskInstances.scala → ...tic4s/monix/instances/TaskInstances.scala
diff --git a/...l/elastic4s/monix/instances/package.scala → ...l/elastic4s/monix/instances/package.scala b/...l/elastic4s/monix/instances/package.scala → ...l/elastic4s/monix/instances/package.scala
diff --git a/...amuel/elastic4s/scalaz/TaskExecutor.scala → ...amuel/elastic4s/scalaz/TaskExecutor.scala b/...amuel/elastic4s/scalaz/TaskExecutor.scala → ...amuel/elastic4s/scalaz/TaskExecutor.scala
diff --git a/...ic4s/scalaz/instances/TaskInstances.scala → ...ic4s/scalaz/instances/TaskInstances.scala b/...ic4s/scalaz/instances/TaskInstances.scala → ...ic4s/scalaz/instances/TaskInstances.scala
diff --git a/.../elastic4s/scalaz/instances/package.scala → .../elastic4s/scalaz/instances/package.scala b/.../elastic4s/scalaz/instances/package.scala → .../elastic4s/scalaz/instances/package.scala
diff --git a/elastic4s-embedded/src/main/scala/com/sksamuel/elastic4s/embedded/LocalNode.scala b/elastic4s-embedded/src/main/scala/com/sksamuel/elastic4s/embedded/LocalNode.scala
diff --git a/elastic4s-http/src/test/resources/filter_scorer.json b/elastic4s-http/src/test/resources/filter_scorer.json
diff --git a/elastic4s-http/src/test/resources/gauss_scorer.json b/elastic4s-http/src/test/resources/gauss_scorer.json
diff --git a/elastic4s-http/src/test/resources/score_exponential.json b/elastic4s-http/src/test/resources/score_exponential.json