diff --git a/docs/java-rest/high-level/builders/aggs.asciidoc b/docs/java-rest/high-level/aggs-builders.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/builders/aggs.asciidoc
rename to docs/java-rest/high-level/aggs-builders.asciidoc
diff --git a/docs/java-rest/high-level/apis/index.asciidoc b/docs/java-rest/high-level/apis/index.asciidoc
deleted file mode 100644
index 8128de65bae..00000000000
--- a/docs/java-rest/high-level/apis/index.asciidoc
+++ /dev/null
@@ -1,35 +0,0 @@
-include::create_index.asciidoc[]
-
-include::indices_exists.asciidoc[]
-
-include::delete_index.asciidoc[]
-
-include::open_index.asciidoc[]
-
-include::close_index.asciidoc[]
-
-include::put_mapping.asciidoc[]
-
-include::update_aliases.asciidoc[]
-
-include::exists_alias.asciidoc[]
-
-include::shrink_index.asciidoc[]
-
-include::split_index.asciidoc[]
-
-include::_index.asciidoc[]
-
-include::get.asciidoc[]
-
-include::delete.asciidoc[]
-
-include::update.asciidoc[]
-
-include::bulk.asciidoc[]
-
-include::search.asciidoc[]
-
-include::scroll.asciidoc[]
-
-include::main.asciidoc[]
diff --git a/docs/java-rest/high-level/apis/bulk.asciidoc b/docs/java-rest/high-level/document/bulk.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/apis/bulk.asciidoc
rename to docs/java-rest/high-level/document/bulk.asciidoc
diff --git a/docs/java-rest/high-level/apis/delete.asciidoc b/docs/java-rest/high-level/document/delete.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/apis/delete.asciidoc
rename to docs/java-rest/high-level/document/delete.asciidoc
diff --git a/docs/java-rest/high-level/apis/get.asciidoc b/docs/java-rest/high-level/document/get.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/apis/get.asciidoc
rename to docs/java-rest/high-level/document/get.asciidoc
diff --git a/docs/java-rest/high-level/apis/_index.asciidoc b/docs/java-rest/high-level/document/index.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/apis/_index.asciidoc
rename to docs/java-rest/high-level/document/index.asciidoc
diff --git a/docs/java-rest/high-level/apis/update.asciidoc b/docs/java-rest/high-level/document/update.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/apis/update.asciidoc
rename to docs/java-rest/high-level/document/update.asciidoc
diff --git a/docs/java-rest/high-level/apis/close_index.asciidoc b/docs/java-rest/high-level/indices/close_index.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/apis/close_index.asciidoc
rename to docs/java-rest/high-level/indices/close_index.asciidoc
diff --git a/docs/java-rest/high-level/apis/create_index.asciidoc b/docs/java-rest/high-level/indices/create_index.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/apis/create_index.asciidoc
rename to docs/java-rest/high-level/indices/create_index.asciidoc
diff --git a/docs/java-rest/high-level/apis/delete_index.asciidoc b/docs/java-rest/high-level/indices/delete_index.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/apis/delete_index.asciidoc
rename to docs/java-rest/high-level/indices/delete_index.asciidoc
diff --git a/docs/java-rest/high-level/apis/exists_alias.asciidoc b/docs/java-rest/high-level/indices/exists_alias.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/apis/exists_alias.asciidoc
rename to docs/java-rest/high-level/indices/exists_alias.asciidoc
diff --git a/docs/java-rest/high-level/apis/indices_exists.asciidoc b/docs/java-rest/high-level/indices/indices_exists.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/apis/indices_exists.asciidoc
rename to docs/java-rest/high-level/indices/indices_exists.asciidoc
diff --git a/docs/java-rest/high-level/apis/open_index.asciidoc b/docs/java-rest/high-level/indices/open_index.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/apis/open_index.asciidoc
rename to docs/java-rest/high-level/indices/open_index.asciidoc
diff --git a/docs/java-rest/high-level/apis/put_mapping.asciidoc b/docs/java-rest/high-level/indices/put_mapping.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/apis/put_mapping.asciidoc
rename to docs/java-rest/high-level/indices/put_mapping.asciidoc
diff --git a/docs/java-rest/high-level/apis/shrink_index.asciidoc b/docs/java-rest/high-level/indices/shrink_index.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/apis/shrink_index.asciidoc
rename to docs/java-rest/high-level/indices/shrink_index.asciidoc
diff --git a/docs/java-rest/high-level/apis/split_index.asciidoc b/docs/java-rest/high-level/indices/split_index.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/apis/split_index.asciidoc
rename to docs/java-rest/high-level/indices/split_index.asciidoc
diff --git a/docs/java-rest/high-level/apis/update_aliases.asciidoc b/docs/java-rest/high-level/indices/update_aliases.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/apis/update_aliases.asciidoc
rename to docs/java-rest/high-level/indices/update_aliases.asciidoc
diff --git a/docs/java-rest/high-level/java-builders.asciidoc b/docs/java-rest/high-level/java-builders.asciidoc
index be5c19293cd..48db23c30cb 100644
--- a/docs/java-rest/high-level/java-builders.asciidoc
+++ b/docs/java-rest/high-level/java-builders.asciidoc
@@ -28,5 +28,5 @@ to compute with a search query in <<java-rest-high-document-search-request-build
 The <<java-rest-high-aggregation-builders, Building Aggregations>> page gives a list of all available
 aggregations with their corresponding `AggregationBuilder` objects and `AggregationBuilders` helper methods.
 
-include::builders/queries.asciidoc[]
-include::builders/aggs.asciidoc[]
+include::query-builders.asciidoc[]
+include::aggs-builders.asciidoc[]
diff --git a/docs/java-rest/high-level/apis/main.asciidoc b/docs/java-rest/high-level/miscellaneous/main.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/apis/main.asciidoc
rename to docs/java-rest/high-level/miscellaneous/main.asciidoc
diff --git a/docs/java-rest/high-level/builders/queries.asciidoc b/docs/java-rest/high-level/query-builders.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/builders/queries.asciidoc
rename to docs/java-rest/high-level/query-builders.asciidoc
diff --git a/docs/java-rest/high-level/apis/scroll.asciidoc b/docs/java-rest/high-level/search/scroll.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/apis/scroll.asciidoc
rename to docs/java-rest/high-level/search/scroll.asciidoc
diff --git a/docs/java-rest/high-level/apis/search.asciidoc b/docs/java-rest/high-level/search/search.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/apis/search.asciidoc
rename to docs/java-rest/high-level/search/search.asciidoc
diff --git a/docs/java-rest/high-level/supported-apis.asciidoc b/docs/java-rest/high-level/supported-apis.asciidoc
index c77a063003c..14e4351eb29 100644
--- a/docs/java-rest/high-level/supported-apis.asciidoc
+++ b/docs/java-rest/high-level/supported-apis.asciidoc
@@ -1,35 +1,73 @@
 [[java-rest-high-supported-apis]]
-== Supported APIs
 
-The Java High Level REST Client supports the following APIs:
+== Document APIs
 
-Indices APIs::
-* <<java-rest-high-create-index>>
-* <<java-rest-high-delete-index>>
-* <<java-rest-high-indices-exists>>
-* <<java-rest-high-open-index>>
-* <<java-rest-high-close-index>>
-* <<java-rest-high-put-mapping>>
-* <<java-rest-high-update-aliases>>
-* <<java-rest-high-exists-alias>>
-* <<java-rest-high-shrink-index>>
-* <<java-rest-high-split-index>>
+The Java High Level REST Client supports the following Document APIs:
 
+[[single-doc]]
 Single document APIs::
 * <<java-rest-high-document-index>>
 * <<java-rest-high-document-get>>
 * <<java-rest-high-document-delete>>
 * <<java-rest-high-document-update>>
 
-Multi document APIs::
+[[multi-doc]]
+Multi-document APIs::
 * <<java-rest-high-document-bulk>>
 
-Search APIs::
+include::document/index.asciidoc[]
+include::document/get.asciidoc[]
+include::document/delete.asciidoc[]
+include::document/update.asciidoc[]
+include::document/bulk.asciidoc[]
+
+== Search APIs
+
+The Java High Level REST Client supports the following Search APIs:
+
 * <<java-rest-high-search>>
 * <<java-rest-high-search-scroll>>
 * <<java-rest-high-clear-scroll>>
 
-Miscellaneous APIs::
+include::search/search.asciidoc[]
+include::search/scroll.asciidoc[]
+
+== Miscellaneous APIs
+
+The Java High Level REST Client supports the following Miscellaneous APIs:
+
 * <<java-rest-high-main>>
 
-include::apis/index.asciidoc[]
\ No newline at end of file
+include::miscellaneous/main.asciidoc[]
+
+== Indices APIs
+
+The Java High Level REST Client supports the following Indices APIs:
+
+Index Management::
+* <<java-rest-high-create-index>>
+* <<java-rest-high-delete-index>>
+* <<java-rest-high-indices-exists>>
+* <<java-rest-high-open-index>>
+* <<java-rest-high-close-index>>
+* <<java-rest-high-shrink-index>>
+* <<java-rest-high-split-index>>
+
+Mapping Management::
+* <<java-rest-high-put-mapping>>
+
+Alias Management::
+* <<java-rest-high-update-aliases>>
+* <<java-rest-high-exists-alias>>
+
+include::indices/create_index.asciidoc[]
+include::indices/delete_index.asciidoc[]
+include::indices/indices_exists.asciidoc[]
+include::indices/open_index.asciidoc[]
+include::indices/close_index.asciidoc[]
+include::indices/shrink_index.asciidoc[]
+include::indices/split_index.asciidoc[]
+include::indices/put_mapping.asciidoc[]
+include::indices/update_aliases.asciidoc[]
+include::indices/exists_alias.asciidoc[]
+