diff --git a/docs/src/main/asciidoc/about/doc_overview.adoc b/docs/src/main/asciidoc/about/doc_overview.adoc
index b5e737bf344..0efada55ce6 100644
--- a/docs/src/main/asciidoc/about/doc_overview.adoc
+++ b/docs/src/main/asciidoc/about/doc_overview.adoc
@@ -112,7 +112,7 @@ xref:{rootdir}/mp/guides/overview.adoc[MP Guides]
 .Advanced SE Features
 [icon=hotel_class]
 --
-xref:{rootdir}/se/webserver.adoc[Helidon WebServer]
+xref:{rootdir}/se/webserver/webserver.adoc[Helidon WebServer]
 
 xref:{rootdir}/se/metrics/metrics.adoc[Helidon Metrics]
 
diff --git a/docs/src/main/asciidoc/includes/guides/performance-tuning.adoc b/docs/src/main/asciidoc/includes/guides/performance-tuning.adoc
index b09dacb9ee4..ca5a903b1fe 100644
--- a/docs/src/main/asciidoc/includes/guides/performance-tuning.adoc
+++ b/docs/src/main/asciidoc/includes/guides/performance-tuning.adoc
@@ -27,7 +27,7 @@ Still, there might be cases where you wish to change configuration options from
 
 For details on the following options please see:
 
-* xref:../../se/webserver.adoc#_configuration_options[WebServer Configuration]
+* xref:../../se/webserver/webserver.adoc#_configuration_options[WebServer Configuration]
 * xref:../../config/io_helidon_common_socket_SocketOptions.adoc[WebServer Socket Configuration]
 
 == Summary of Tuning Options
diff --git a/docs/src/main/asciidoc/mp/grpc/client.adoc b/docs/src/main/asciidoc/mp/grpc/client.adoc
index 258c89a67b7..585830012e0 100644
--- a/docs/src/main/asciidoc/mp/grpc/client.adoc
+++ b/docs/src/main/asciidoc/mp/grpc/client.adoc
@@ -114,7 +114,7 @@ grpc:
 
 TLS in the gRPC MP client section is configured in the same way as in other Helidon
 components such as the webserver. For more information see
-xref:{rootdir}/se/webserver.adoc#_configuring_tls[Configuring TLS].
+xref:{rootdir}/se/webserver/webserver.adoc#_configuring_tls[Configuring TLS].
 
 Given that TLS is enabled by default in gRPC, it must be explicitly turned off by
 setting the `enabled` flag to `false` when connecting to an unsecure endpoint.
diff --git a/docs/src/main/asciidoc/se/cors.adoc b/docs/src/main/asciidoc/se/cors.adoc
index 682bbe17ce1..8dd573d60e8 100644
--- a/docs/src/main/asciidoc/se/cors.adoc
+++ b/docs/src/main/asciidoc/se/cors.adoc
@@ -139,7 +139,7 @@ The link:{helidon-github-examples-url}/quickstarts/helidon-quickstart-se[Helidon
  lets you change the greeting by sending a `PUT` request to the `/greet/greeting` resource.
 
 This example, based on the QuickStart greeting app, uses the low-level `CrossOriginConfig` API and
-the `CorsSupport` API to influence the xref:{rootdir}/se/webserver.adoc#routing[routing],
+the `CorsSupport` API to influence the xref:{rootdir}/se/webserver/webserver.adoc#routing[routing],
 thereby determining how that resource is shared. (If desired, you can use <<Configuration, configuration>> instead
 of the low-level API.)
 
@@ -251,7 +251,7 @@ For a complete example, see {helidon-github-examples-url}/cors[Helidon SE CORS E
 
 include::{rootdir}/includes/cors.adoc[tag=cors-and-requested-uri-intro]
 You can configure how the Helidon server handles these headers as described in the documentation for
-xref:{rootdir}/se/webserver.adoc#_requested_uri_discovery[requested URI discovery].
+xref:{rootdir}/se/webserver/webserver.adoc#_requested_uri_discovery[requested URI discovery].
 
 include::{rootdir}/includes/cors.adoc[tag=cors-and-requested-uri-wrapup]
 
diff --git a/docs/src/main/asciidoc/se/guides/upgrade_3x.adoc b/docs/src/main/asciidoc/se/guides/upgrade_3x.adoc
index b853362f446..593c52e6383 100644
--- a/docs/src/main/asciidoc/se/guides/upgrade_3x.adoc
+++ b/docs/src/main/asciidoc/se/guides/upgrade_3x.adoc
@@ -37,7 +37,7 @@ Please follow the instructions in xref:{rootdir}/about/prerequisites.adoc[Prereq
 Handling routes based on the protocol version is now possible by registering specific routes
 on routing builder.
 
-For further information check xref:../webserver.adoc[WebServer Documentation]
+For further information check xref:../webserver/webserver.adoc[WebServer Documentation]
 
 == Http/2 Support
 
@@ -82,7 +82,7 @@ server:
   max-upgrade-content-length: 16384
 ----
 
-For further information check xref:../webserver.adoc[WebServer Documentation]
+For further information check xref:../webserver/webserver.adoc[WebServer Documentation]
 
 == WebSocket
 
diff --git a/docs/src/main/asciidoc/se/guides/upgrade_4x.adoc b/docs/src/main/asciidoc/se/guides/upgrade_4x.adoc
index a88786aaf65..067684ed328 100644
--- a/docs/src/main/asciidoc/se/guides/upgrade_4x.adoc
+++ b/docs/src/main/asciidoc/se/guides/upgrade_4x.adoc
@@ -103,7 +103,7 @@ If you want full control using the API, you still have that option.
 For more information see:
 
 * xref:../observability.adoc[Observability feature support]
-* xref:../webserver.adoc#_media_types_support[Media types support]
+* xref:../webserver/webserver.adoc#_media_types_support[Media types support]
 
 == Routing Configuration
 
@@ -176,7 +176,7 @@ It receives `HttpRules` object with routes description.
 
 WARNING: These changes make Helidon 4 incompatible with previous versions.
 
-Learn more about `HttpService` and `Routing` at xref:../webserver.adoc[Helidon SE WebServer]
+Learn more about `HttpService` and `Routing` at xref:../webserver/webserver.adoc[Helidon SE WebServer]
 
 === Other Significant Changes
 
diff --git a/docs/src/main/asciidoc/se/introduction.adoc b/docs/src/main/asciidoc/se/introduction.adoc
index 7c6d56baf2d..186d39ffd92 100644
--- a/docs/src/main/asciidoc/se/introduction.adoc
+++ b/docs/src/main/asciidoc/se/introduction.adoc
@@ -133,7 +133,7 @@ HTTP client that handles responses to the HTTP requests.
 //WebServer
 [CARD]
 .WebServer
-[icon=settings_ethernet,link=webserver.adoc]
+[icon=settings_ethernet,link=webserver/webserver.adoc]
 --
 A programmatic HTTP API that uses virtual threads to handle nearly unlimited concurrent requests without blocking a platform thread or starving other requests.
 // Each request runs in its own dedicated thread, so it is free to perform blocking operations in a simple synchronous way without blocking a platform thread or starving other requests.
diff --git a/docs/src/main/asciidoc/se/security/containers-integration.adoc b/docs/src/main/asciidoc/se/security/containers-integration.adoc
index b7b66f97371..f4bceb29bc6 100644
--- a/docs/src/main/asciidoc/se/security/containers-integration.adoc
+++ b/docs/src/main/asciidoc/se/security/containers-integration.adoc
@@ -25,7 +25,7 @@ include::{rootdir}/includes/se.adoc[]
 
 == WebServer
 
-To integrate xref:../webserver.adoc[web server], add the following dependency to your project's pom.xml file:
+To integrate xref:../webserver/webserver.adoc[web server], add the following dependency to your project's pom.xml file:
 
 [source,xml]
 .Maven Dependency
diff --git a/docs/src/main/asciidoc/se/guides/concurrency-limits.adoc b/docs/src/main/asciidoc/se/webserver/concurrency-limits.adoc
similarity index 100%
rename from docs/src/main/asciidoc/se/guides/concurrency-limits.adoc
rename to docs/src/main/asciidoc/se/webserver/concurrency-limits.adoc
diff --git a/docs/src/main/asciidoc/se/webserver.adoc b/docs/src/main/asciidoc/se/webserver/webserver.adoc
similarity index 99%
rename from docs/src/main/asciidoc/se/webserver.adoc
rename to docs/src/main/asciidoc/se/webserver/webserver.adoc
index a852443ac86..acecbb57004 100644
--- a/docs/src/main/asciidoc/se/webserver.adoc
+++ b/docs/src/main/asciidoc/se/webserver/webserver.adoc
@@ -20,7 +20,7 @@
 :description: Helidon WebServer Introduction
 :keywords: helidon, java, webserver, tls
 :feature-name: WebServer
-:rootdir: {docdir}/..
+:rootdir: {docdir}/../..
 :requested-uri-discovery-inc: {rootdir}/includes/server/requested-uri-discovery.adoc
 
 include::{rootdir}/includes/se.adoc[]
@@ -526,22 +526,22 @@ first.
 |<<Access Log, Access Log>>
 |1000
 
-|xref:tracing.adoc[Tracing]
+|xref:{rootdir}/se/tracing.adoc[Tracing]
 |900
 
-|xref:cors.adoc[CORS]
+|xref:{rootdir}/se/cors.adoc[CORS]
 |850
 
-|xref:security/introduction.adoc[Security]
+|xref:{rootdir}/se/security/introduction.adoc[Security]
 |800
 
 |Routing (all handlers and filters)
 |100
 
-|xref:openapi/openapi.adoc[OpenAPI]
+|xref:{rootdir}/se/openapi/openapi.adoc[OpenAPI]
 |90
 
-|xref:observability.adoc[Observability]
+|xref:{rootdir}/se/observability.adoc[Observability]
 |80
 |===
 
diff --git a/docs/src/main/asciidoc/sitegen.yaml b/docs/src/main/asciidoc/sitegen.yaml
index 37a35de20f4..6e759225c94 100644
--- a/docs/src/main/asciidoc/sitegen.yaml
+++ b/docs/src/main/asciidoc/sitegen.yaml
@@ -331,7 +331,6 @@ backend:
                   - "webclient.adoc"
                   - "dbclient.adoc"
                   - "performance-tuning.adoc"
-                  - "concurrency-limits.adoc"
               - type: "MENU"
                 title: "Config"
                 dir: "config"
@@ -436,12 +435,15 @@ backend:
                 sources:
                   - "engine.adoc"
                   - "rsoperators.adoc"
-              - type: "PAGE"
+              - type: "MENU"
                 title: "Webserver"
-                source: "webserver.adoc"
+                dir: "webserver"
                 glyph:
                   type: "icon"
                   value: "settings_ethernet"
+                sources:
+                  - "webserver.adoc"
+                  - "concurrency-limits.adoc"
               - type: "PAGE"
                 title: "Scheduling"
                 source: "scheduling.adoc"