diff --git a/docs/java-rest/high-level/x-pack/x-pack-info.asciidoc b/docs/java-rest/high-level/miscellaneous/x-pack-info.asciidoc
similarity index 100%
rename from docs/java-rest/high-level/x-pack/x-pack-info.asciidoc
rename to docs/java-rest/high-level/miscellaneous/x-pack-info.asciidoc
diff --git a/docs/java-rest/high-level/x-pack/x-pack-usage.asciidoc b/docs/java-rest/high-level/miscellaneous/x-pack-usage.asciidoc
similarity index 98%
rename from docs/java-rest/high-level/x-pack/x-pack-usage.asciidoc
rename to docs/java-rest/high-level/miscellaneous/x-pack-usage.asciidoc
index 0927ae71c0b..c1e5ccf13e2 100644
--- a/docs/java-rest/high-level/x-pack/x-pack-usage.asciidoc
+++ b/docs/java-rest/high-level/miscellaneous/x-pack-usage.asciidoc
@@ -12,7 +12,7 @@ retrieved using the `usage()` method:
 include-tagged::{doc-tests}/MiscellaneousDocumentationIT.java[x-pack-usage-execute]
 --------------------------------------------------
 
-[[java-rest-high-x-pack-info-response]]
+[[java-rest-high-x-pack-usage-response]]
 ==== Response
 
 The returned `XPackUsageResponse` contains a `Map` keyed by feature name.
diff --git a/docs/java-rest/high-level/supported-apis.asciidoc b/docs/java-rest/high-level/supported-apis.asciidoc
index 8ef58743e48..1acba882226 100644
--- a/docs/java-rest/high-level/supported-apis.asciidoc
+++ b/docs/java-rest/high-level/supported-apis.asciidoc
@@ -54,14 +54,12 @@ The Java High Level REST Client supports the following Miscellaneous APIs:
 * <<java-rest-high-main>>
 * <<java-rest-high-ping>>
 * <<java-rest-high-x-pack-info>>
-* <<java-rest-high-x-pack-watcher-put-watch>>
-* <<java-rest-high-x-pack-watcher-delete-watch>>
+* <<java-rest-high-x-pack-usage>>
 
 include::miscellaneous/main.asciidoc[]
 include::miscellaneous/ping.asciidoc[]
-include::x-pack/x-pack-info.asciidoc[]
-include::x-pack/watcher/put-watch.asciidoc[]
-include::x-pack/watcher/delete-watch.asciidoc[]
+include::miscellaneous/x-pack-info.asciidoc[]
+include::miscellaneous/x-pack-usage.asciidoc[]
 
 == Indices APIs
 
@@ -190,7 +188,6 @@ The Java High Level REST Client supports the following Scripts APIs:
 include::script/get_script.asciidoc[]
 include::script/delete_script.asciidoc[]
 
-
 == Licensing APIs
 
 The Java High Level REST Client supports the following Licensing APIs:
@@ -200,3 +197,13 @@ The Java High Level REST Client supports the following Licensing APIs:
 
 include::licensing/put-license.asciidoc[]
 include::licensing/get-license.asciidoc[]
+
+== Watcher APIs
+
+The Java High Level REST Client supports the following Watcher APIs:
+
+* <<java-rest-high-x-pack-watcher-put-watch>>
+* <<java-rest-high-x-pack-watcher-delete-watch>>
+
+include::watcher/put-watch.asciidoc[]
+include::watcher/delete-watch.asciidoc[]
diff --git a/docs/java-rest/high-level/x-pack/watcher/delete-watch.asciidoc b/docs/java-rest/high-level/watcher/delete-watch.asciidoc
similarity index 98%
rename from docs/java-rest/high-level/x-pack/watcher/delete-watch.asciidoc
rename to docs/java-rest/high-level/watcher/delete-watch.asciidoc
index d5f35817558..615337ba317 100644
--- a/docs/java-rest/high-level/x-pack/watcher/delete-watch.asciidoc
+++ b/docs/java-rest/high-level/watcher/delete-watch.asciidoc
@@ -1,5 +1,5 @@
 [[java-rest-high-x-pack-watcher-delete-watch]]
-=== X-Pack Delete Watch API
+=== Delete Watch API
 
 [[java-rest-high-x-pack-watcher-delete-watch-execution]]
 ==== Execution
diff --git a/docs/java-rest/high-level/x-pack/watcher/put-watch.asciidoc b/docs/java-rest/high-level/watcher/put-watch.asciidoc
similarity index 98%
rename from docs/java-rest/high-level/x-pack/watcher/put-watch.asciidoc
rename to docs/java-rest/high-level/watcher/put-watch.asciidoc
index a76ba407a1a..e5ee87bea34 100644
--- a/docs/java-rest/high-level/x-pack/watcher/put-watch.asciidoc
+++ b/docs/java-rest/high-level/watcher/put-watch.asciidoc
@@ -1,5 +1,5 @@
 [[java-rest-high-x-pack-watcher-put-watch]]
-=== X-Pack Put Watch API
+=== Put Watch API
 
 [[java-rest-high-x-pack-watcher-put-watch-execution]]
 ==== Execution