helidon-io · romain-grecourt · Jun 19, 2020 · Jun 19, 2020 · Jun 19, 2020 · Jun 19, 2020
diff --git a/docs/about/02_introduction.adoc b/docs/about/02_introduction.adoc
@@ -40,7 +40,7 @@ Helidon libraries interoperate with popular tools from the cloud-native space, s
 * https://opentracing.io/[OpenTracing]
 * https://coreos.com/etcd/[Etcd]
 
-TIP: The <<guides/01_overview.adoc#_getting_started,Helidon Quickstart Examples>>
+TIP: The <<se/guides/01_overview.adoc,Helidon Quickstart Examples>>
  contain support for Docker and Kubernetes.
 
 
@@ -59,7 +59,7 @@ The table below shows to primary differences between Helidon SE and Helidon MP.
 |Microframework model with a very small footprint and limited functionality (~7 MB) | https://projects.eclipse.org/proposals/eclipse-microprofile[Eclipse MicroProfile] implementation; slightly larger footprint than SE (~13 MB) 
 |Functional style is reactive non-blocking   |Declarative style with dependency injection
 |Transparent "no magic" development experience; pure java application development with no annotations and no dependency injections  |Jakarta EE microprofile development experience; all Jakarta components (CDI, JAX-RS, JSON-P/B)
-|Learn more about <<se/01_introduction.adoc, Helidon SE>>. | Learn more about <<mp/01_introduction.adoc, Helidon MP>>.
+|Learn more about <<se/introduction/01_introduction.adoc, Helidon SE>>. | Learn more about <<mp/introduction/01_introduction.adoc, Helidon MP>>.
 |====================
 
 == What's New in Helidon 2.0
@@ -68,18 +68,18 @@ The Helidon 2.0 release contains significant new features, enhancements and fixe
 TIP: For a complete list of fixes and enhancements, see the Helidon 2.0  https://github.com/oracle/helidon/blob/2.0.0/CHANGELOG.md[changelog].
 
 * *GraalVM Native-image Support in Helidon MP* +
-Helidon SE already supports GraalVM, but in 2.0 GraalVM native image support will also be available in Helidon MP. <<guides/36_graalnative.adoc,GraalVM Native Images Guide>> +
+Helidon SE already supports GraalVM, but in 2.0 GraalVM native image support will also be available in Helidon MP. <<mp/guides/36_graalnative.adoc,GraalVM Native Images Guide>> +
 
 * *Helidon Command Line Tool* +
-One of the new features in Helidon 2.0 is the addition of a command line interface. The Helidon CLI enables developers to get started with Helidon with minimal effort: you can create a new application, build it, run it, and more, by writing some simple commands. <<se/cli/01_introduction.adoc, Learn more about Helidon CLI>>.
+One of the new features in Helidon 2.0 is the addition of a command line interface. The Helidon CLI enables developers to get started with Helidon with minimal effort: you can create a new application, build it, run it, and more, by writing some simple commands.
 
 
 * *DB Client for Helidon SE* +
 The new database client for Helidon SE will include support for the MongoDB reactive driver and brings Health Checks, Metrics, and Tracing support to every Helidon API. <<se/dbclient/01_introduction.adoc, Learn more about the DB Client>>.
 
 
 * *Extending MicroProfile Reactive Messaging and Reactive Operators Support* +
-MP Reactive Operators will be included in both frameworks, while MP Reactive Messaging will only be included in Helidon MP. <<mp/reactivemessaging/01_introduction.adoc, Learn more about Reactive Messaging>> and <<mp/reactivestreams/01_introduction.adoc, Reactive Streams>>.
+MP Reactive Operators will be included in both frameworks, while MP Reactive Messaging will only be included in Helidon MP. <<mp/reactivemessaging/01_introduction.adoc, Learn more about Reactive Messaging>> and <<mp/reactivestreams/01_overview.adoc, Reactive Streams>>.
 
 * *Helidon Web Client* +
 The new reactive web client can integrate with other Helidon SE APIs. 
@@ -105,7 +105,7 @@ View the https://github.com/oracle/helidon/blob/2.0.0-M1/CHANGELOG.md#backward-i
 
 == Next Steps
 
-<<guides/01_overview.adoc#_getting_started,Helidon Quickstart Examples>>
+<<se/guides/02_quickstart.adoc,Helidon Quickstart Examples>>
 
 
 

diff --git a/docs/mp/introduction/01_introduction.adoc b/docs/mp/introduction/01_introduction.adoc
@@ -38,24 +38,27 @@ Helidon has added additional APIs to the core set of Microprofile APIs giving yo
 [cols="2,5"]
 |=======
 |CDI Extensions
-|In addition to MicroProfile support, Helidon MP provides CDI extensions to address areas not covered by MicroProfile.<<mp/extensions/01_overview.adoc,Learn more>>.
+|In addition to MicroProfile support, Helidon MP provides CDI extensions to address areas not covered by MicroProfile.
+<<mp/extensions/01_overview.adoc,Learn more>>.
 
 |Configuration
 |The MP Config component provides a Java API to load and process configuration properties in key/value form into a Config object which the application can use to retrieve config data.
-<<mp/config/introduction.adoc, Learn more>>. 
+<<mp/config/01_introduction.adoc, Learn more>>.
 
 |  CORS Support
-|  Although it is possible for any Helidon application to implement its own support for CORS, there are common tasks (such as processing preflight requests) that can be provided in a Helidon module. <<mp/cors/01_introduction.adoc, Learn more>>. 
+|  Although it is possible for any Helidon application to implement its own support for CORS, there are common tasks (such as processing preflight requests) that can be provided in a Helidon module. 
+<<mp/cors/01_introduction.adoc, Learn more>>. 
 
 |GraalVM Native Image Support for Helidon MP
-|GraalVM native-image support is now available for both Helidon MP and Helidon SE. Helidon MP includes support for GraalVM to enable the conversion of Helidon MP applications to native executable code via the native-image utility.<<mp/guides/36_graalnative.adoc, Learn more>>.
+|GraalVM native-image support is now available for both Helidon MP and Helidon SE. Helidon MP includes support for GraalVM to enable the conversion of Helidon MP applications to native executable code via the native-image utility. <<mp/guides/36_graalnative.adoc, Learn more>>.
 
 | gRPC 
-|  Helidon gRPC Server provides a framework for creating gRPC (general-purpose Remote Procedure Calls) applications.
+|  Helidon gRPC Server provides a framework for creating gRPC (general-purpose Remote Procedure Calls) applications. 
 <<mp/grpc/01_introduction.adoc, Learn more>>.
 
 | Health Checks 
-|  The health check API combines the statuses of all the dependencies that affect availability and the ability to perform correctly such as network latency and storage. <<mp/health/01_health.adoc, Learn more>>.
+|  The health check API combines the statuses of all the dependencies that affect availability and the ability to perform correctly such as network latency and storage.
+<<mp/health/01_introduction.adoc, Learn more>>.
 
 
 |JAX-RS/Jersey
@@ -68,7 +71,7 @@ Helidon has added additional APIs to the core set of Microprofile APIs giving yo
 
 |Metrics 
 |Heldion supports both a base set and a Helidon-specific set of metrics that expose information in JSON format (as specified by the MicroProfile Metrics specification) or in plain text (for Prometheus metrics). 
-<<mp/metrics/01_metrics.adoc, Learn more>>.
+<<mp/metrics/01_introduction.adoc, Learn more>>.
 
 
 |OpenAPI  
@@ -81,11 +84,11 @@ Helidon has added additional APIs to the core set of Microprofile APIs giving yo
 
 
 |Reactive Messaging and Reactive Operators
-|With Helidon MP 2.0 you can now formalize manipulation with reactive streams and reactive messaging. Reactive messaging heavily depends on standardized operators so together they provide great portability between existing implementations. <<mp/reactivemessaging/01_introduction.adoc, Learn more about Reactive Messaging>> and <<mp/reactivestreams/01_introduction.adoc, Reactive Streams>>.
+|With Helidon MP 2.0 you can now formalize manipulation with reactive streams and reactive messaging. Reactive messaging heavily depends on standardized operators so together they provide great portability between existing implementations. <<mp/reactivemessaging/01_introduction.adoc, Learn more about Reactive Messaging>> and <<mp/reactivestreams/01_overview.adoc, Reactive Streams>>.
 
 |Security 
 |The MP security modules support authentication, authorization, outbound security and audits for your applications.
-<<mp/security/01_introduction.adoc, Learn more>>.
+<<mp/security/01_security.adoc, Learn more>>.
 
 
 |=======
@@ -98,5 +101,5 @@ Learn about the steps needed to get started with Helidon MP <<mp/introduction/02
 
 For more information about the Helidon MicroProfile APIs see  https://github.com/oracle/helidon/wiki/Supported-APIs[the Helidon API Wiki page].
 
-Try the <<mp/guides/03_quickstart.adoc,Helidon MP quickstart>> to get your
+Try the <<mp/guides/02_quickstart.adoc,Helidon MP quickstart>> to get your
 first Helidon MP application up and running in minutes.
diff --git a/docs/se/introduction/01_introduction.adoc b/docs/se/introduction/01_introduction.adoc
@@ -52,7 +52,7 @@ number of additional Helidon features:
 
 |Configuration  
 | The Config component provides a Java API to load and process configuration properties in key/value form into a Config object which the application can use to retrieve config data.
-<<se/config/introduction.adoc, Learn more>>. 
+<<se/config/01_introduction.adoc, Learn more>>. 
 
 | Metrics 
 |  Heldion supports both a base set and a Helidon-specific set of metrics that expose information in JSON format (as specified by the MicroProfile Metrics specification) or in plain text (for Prometheus metrics).