diff --git a/_data-prepper/common-use-cases/common-use-cases.md b/_data-prepper/common-use-cases/common-use-cases.md
new file mode 100644
index 0000000000..342a8fc819
--- /dev/null
+++ b/_data-prepper/common-use-cases/common-use-cases.md
@@ -0,0 +1,12 @@
+---
+layout: default
+title: Common use cases
+has_children: true
+nav_order: 15
+redirect_from: 
+  - /data-prepper/common-use-cases/
+---
+
+# Common use cases
+
+You can use Data Prepper for several different purposes, including trace analytics, log analytics, Amazon S3 log analytics, and metrics ingestion.
\ No newline at end of file
diff --git a/_data-prepper/log-analytics.md b/_data-prepper/common-use-cases/log-analytics.md
similarity index 99%
rename from _data-prepper/log-analytics.md
rename to _data-prepper/common-use-cases/log-analytics.md
index 4a10cd77cb..54243b6fef 100644
--- a/_data-prepper/log-analytics.md
+++ b/_data-prepper/common-use-cases/log-analytics.md
@@ -1,6 +1,7 @@
 ---
 layout: default
 title: Log analytics
+parent: Common use cases
 nav_order: 15
 ---
 
diff --git a/_data-prepper/getting-started.md b/_data-prepper/getting-started.md
index 0d8b179632..4564d010d7 100644
--- a/_data-prepper/getting-started.md
+++ b/_data-prepper/getting-started.md
@@ -3,8 +3,6 @@ layout: default
 title: Getting started
 nav_order: 5
 redirect_from:
-  - /clients/data-prepper/getting-started/
-  - /data-prepper/get-started/
   - /clients/data-prepper/get-started/
 ---
 
@@ -44,7 +42,7 @@ You will configure two files:
 Depending on your use case, we have a few different guides to configuring Data Prepper.
 
 * [Trace Analytics](https://github.com/opensearch-project/data-prepper/blob/main/docs/trace_analytics.md)
-* [Log Ingestion](https://github.com/opensearch-project/data-prepper/blob/main/docs/log_analytics.md): Learn how to set up Data Prepper for log observability.
+* [Log Analytics]({{site.url}}{{site.baseurl}}/data-prepper/common-use-cases/log-analytics/): Learn how to set up Data Prepper for log observability.
 * [Simple Pipeline](https://github.com/opensearch-project/data-prepper/blob/main/docs/simple_pipelines.md): Learn the basics of Data Prepper pipelines with some simple configurations.
 
 ## 3. Defining a pipeline
@@ -71,7 +69,7 @@ docker run --name data-prepper \
     opensearchproject/data-prepper:latest
 ```
 
-This sample pipeline configuration above demonstrates a simple pipeline with a source (`random`) sending data to a sink (`stdout`). For more examples and details about more advanced pipeline configurations, see [Pipelines]({{site.url}}{{site.baseurl}}/clients/data-prepper/pipelines).
+The preceding example pipeline configuration above demonstrates a simple pipeline with a source (`random`) sending data to a sink (`stdout`). For further detailed examples of more advanced pipeline configurations, see [Pipelines]({{site.url}}{{site.baseurl}}/clients/data-prepper/pipelines/).
 
 After starting Data Prepper, you should see log output and some UUIDs after a few seconds:
 
diff --git a/_data-prepper/index.md b/_data-prepper/index.md
index 20662a1149..4988874143 100644
--- a/_data-prepper/index.md
+++ b/_data-prepper/index.md
@@ -4,9 +4,7 @@ title: Data Prepper
 nav_order: 1
 has_children: false
 has_toc: false
-redirect_from:
-  - /clients/tools/data-prepper/
-  - /clients/data-prepper/
+redirect_from: 
   - /clients/data-prepper/index/
 ---
 
diff --git a/_data-prepper/configuration/data-prepper-configuration.md b/_data-prepper/managing-data-prepper/configuring-data-prepper.md
similarity index 91%
rename from _data-prepper/configuration/data-prepper-configuration.md
rename to _data-prepper/managing-data-prepper/configuring-data-prepper.md
index dc262eaee6..e0eb6ff6c3 100644
--- a/_data-prepper/configuration/data-prepper-configuration.md
+++ b/_data-prepper/managing-data-prepper/configuring-data-prepper.md
@@ -1,10 +1,8 @@
 ---
 layout: default
 title: Configuring Data Prepper
-has_children: true
-nav_order: 100
-redirect_from:
-  - /clients/data-prepper/data-prepper-reference/
+parent: Managing Data Prepper
+nav_order: 10
 ---
 
 # Configuring Data Prepper
@@ -31,15 +29,15 @@ peer_forwarder | No | Object | Peer forwarder configurations. See [Peer forwarde
 
 The following section details various configuration options for peer forwarder.
 
-#### General options for peer forwarder
+#### General options for peer forwarding
 
 Option | Required | Type | Description
 :--- | :--- | :--- | :---
-port | No | Integer | The port number peer forwarder server is running on. Valid options are between 0 and 65535. Defaults is 4994.
-request_timeout | No | Integer | Request timeout in milliseconds for peer forwarder HTTP server. Default is 10000.
-server_thread_count | No | Integer | Number of threads used by peer forwarder server. Default is 200.
-client_thread_count | No | Integer | Number of threads used by peer forwarder client. Default is 200.
-max_connection_count | No | Integer | Maximum number of open connections for peer forwarder server. Default is 500.
+port | No | Integer | The peer forwarding server port. Valid options are between 0 and 65535. Defaults is 4994.
+request_timeout | No | Integer | Request timeout for the peer forwarder HTTP server in milliseconds. Default is 10000.
+server_thread_count | No | Integer | Number of threads used by the peer forwarder server. Default is 200.
+client_thread_count | No | Integer | Number of threads used by the peer forwarder client. Default is 200.
+max_connection_count | No | Integer | Maximum number of open connections for the peer forwarder server. Default is 500.
 max_pending_requests | No | Integer | Maximum number of allowed tasks in ScheduledThreadPool work queue. Default is 1024.
 discovery_mode | No | String | Peer discovery mode to use. Valid options are `local_node`, `static`, `dns`, or `aws_cloud_map`. Defaults to `local_node`, which processes events locally.
 static_endpoints | Conditionally | List | A list containing endpoints of all Data Prepper instances. Required if `discovery_mode` is set to static.
diff --git a/_data-prepper/logs.md b/_data-prepper/managing-data-prepper/configuring-log4j.md
similarity index 96%
rename from _data-prepper/logs.md
rename to _data-prepper/managing-data-prepper/configuring-log4j.md
index 6103542590..a4b74a5ccb 100644
--- a/_data-prepper/logs.md
+++ b/_data-prepper/managing-data-prepper/configuring-log4j.md
@@ -1,7 +1,8 @@
 ---
 layout: default
 title: Configuring Log4j
-nav_order: 25
+parent: Managing Data Prepper
+nav_order: 20
 ---
 
 # Configuring Log4j
diff --git a/_data-prepper/core-apis.md b/_data-prepper/managing-data-prepper/core-apis.md
similarity index 98%
rename from _data-prepper/core-apis.md
rename to _data-prepper/managing-data-prepper/core-apis.md
index cc54079277..b3d0966c38 100644
--- a/_data-prepper/core-apis.md
+++ b/_data-prepper/managing-data-prepper/core-apis.md
@@ -1,7 +1,8 @@
 ---
 layout: default
 title: Core APIs
-nav_order: 20
+parent: Managing Data Prepper
+nav_order: 15
 ---
 
 # Core APIs
diff --git a/_data-prepper/managing-data-prepper/managing-data-prepper.md b/_data-prepper/managing-data-prepper/managing-data-prepper.md
new file mode 100644
index 0000000000..ea2d1f111c
--- /dev/null
+++ b/_data-prepper/managing-data-prepper/managing-data-prepper.md
@@ -0,0 +1,10 @@
+---
+layout: default
+title: Managing Data Prepper
+has_children: true
+nav_order: 20
+---
+
+# Managing Data Prepper
+
+You can perform administrator functions for Data Prepper, including system configuration, interacting with core APIs, Log4j configuration, and monitoring. You can set up peer forwarding to coordinate multiple Data Prepper nodes when using stateful aggregation. 
\ No newline at end of file
diff --git a/_data-prepper/monitoring.md b/_data-prepper/managing-data-prepper/monitoring.md
similarity index 98%
rename from _data-prepper/monitoring.md
rename to _data-prepper/managing-data-prepper/monitoring.md
index ea1c2a2667..4304d5f39f 100644
--- a/_data-prepper/monitoring.md
+++ b/_data-prepper/managing-data-prepper/monitoring.md
@@ -1,7 +1,8 @@
 ---
 layout: default
 title: Monitoring
-nav_order: 33
+parent: Administrating Data Prepper
+nav_order: 25
 ---
 
 # Monitoring Data Prepper with metrics
diff --git a/_data-prepper/migrate-open-distro.md b/_data-prepper/migrate-open-distro.md
index f0e764218a..e7fdacbd8f 100644
--- a/_data-prepper/migrate-open-distro.md
+++ b/_data-prepper/migrate-open-distro.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Migrating from Open Distro
-nav_order: 35
+nav_order: 30
 ---
 
 # Migrating from Open Distro
diff --git a/_data-prepper/migrating-from-logstash-data-prepper.md b/_data-prepper/migrating-from-logstash-data-prepper.md
index 6f1e68f3ea..088ef24cd8 100644
--- a/_data-prepper/migrating-from-logstash-data-prepper.md
+++ b/_data-prepper/migrating-from-logstash-data-prepper.md
@@ -1,8 +1,8 @@
 ---
 layout: default
 title: Migrating from Logstash
-nav_order: 30
-redirect_from:
+nav_order: 25
+redirect_from: 
   - /data-prepper/configure-logstash-data-prepper/
 ---
 
@@ -10,7 +10,7 @@ redirect_from:
 
 You can run Data Prepper with a Logstash configuration.
 
-As mentioned in the [Getting started]({{site.url}}{{site.baseurl}}/data-prepper/get-started/) guide, you'll need to configure Data Prepper with a pipeline using a `pipelines.yaml` file.
+As mentioned in [Getting started with Data Prepper]({{site.url}}{{site.baseurl}}/data-prepper/getting-started/), you'll need to configure Data Prepper with a pipeline using a `pipelines.yaml` file.
 
 Alternatively, if you have a Logstash configuration `logstash.conf` to configure Data Prepper instead of `pipelines.yaml`.
 
@@ -28,7 +28,7 @@ As of the Data Prepper 1.2 release, the following plugins from the Logstash conf
 
 ## Running Data Prepper with a Logstash configuration
 
-1. To install Data Prepper's Docker image, see the Installing Data Prepper in [Get Started]({{site.url}}{{site.baseurl}}/data-prepper/getting-started#1-installing-data-prepper).
+1. To install Data Prepper's Docker image, see Installing Data Prepper in [Getting Started]({{site.url}}{{site.baseurl}}/data-prepper/getting-started#1-installing-data-prepper).
 
 2. Run the Docker image installed in Step 1 by supplying your `logstash.conf` configuration.
 
diff --git a/_data-prepper/configuration/buffers/bounded-blocking.md b/_data-prepper/pipelines/configuration/buffers/bounded-blocking.md
similarity index 93%
rename from _data-prepper/configuration/buffers/bounded-blocking.md
rename to _data-prepper/pipelines/configuration/buffers/bounded-blocking.md
index 5f26b2f2e3..44521514a1 100644
--- a/_data-prepper/configuration/buffers/bounded-blocking.md
+++ b/_data-prepper/pipelines/configuration/buffers/bounded-blocking.md
@@ -2,7 +2,7 @@
 layout: default
 title: Bounded blocking
 parent: Buffers
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 50
 ---
 
diff --git a/_data-prepper/configuration/buffers/buffers.md b/_data-prepper/pipelines/configuration/buffers/buffers.md
similarity index 82%
rename from _data-prepper/configuration/buffers/buffers.md
rename to _data-prepper/pipelines/configuration/buffers/buffers.md
index ed4a38c486..5d56638c9c 100644
--- a/_data-prepper/configuration/buffers/buffers.md
+++ b/_data-prepper/pipelines/configuration/buffers/buffers.md
@@ -1,9 +1,9 @@
 ---
 layout: default
 title: Buffers
-parent: Configuring Data Prepper
+parent: Pipelines
 has_children: true
-nav_order: 50
+nav_order: 20
 ---
 
 # Buffers
diff --git a/_data-prepper/configuration/processors/add-entries.md b/_data-prepper/pipelines/configuration/processors/add-entries.md
similarity index 96%
rename from _data-prepper/configuration/processors/add-entries.md
rename to _data-prepper/pipelines/configuration/processors/add-entries.md
index 27322c9e12..e701566816 100644
--- a/_data-prepper/configuration/processors/add-entries.md
+++ b/_data-prepper/pipelines/configuration/processors/add-entries.md
@@ -2,7 +2,7 @@
 layout: default
 title: add_entries
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/processors/aggregate.md b/_data-prepper/pipelines/configuration/processors/aggregate.md
similarity index 97%
rename from _data-prepper/configuration/processors/aggregate.md
rename to _data-prepper/pipelines/configuration/processors/aggregate.md
index 97d8e4fd87..b4bc7959e8 100644
--- a/_data-prepper/configuration/processors/aggregate.md
+++ b/_data-prepper/pipelines/configuration/processors/aggregate.md
@@ -2,7 +2,7 @@
 layout: default
 title: aggregate
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/processors/copy-values.md b/_data-prepper/pipelines/configuration/processors/copy-values.md
similarity index 95%
rename from _data-prepper/configuration/processors/copy-values.md
rename to _data-prepper/pipelines/configuration/processors/copy-values.md
index 304825142f..8a63602447 100644
--- a/_data-prepper/configuration/processors/copy-values.md
+++ b/_data-prepper/pipelines/configuration/processors/copy-values.md
@@ -2,7 +2,7 @@
 layout: default
 title: copy_values
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/processors/csv.md b/_data-prepper/pipelines/configuration/processors/csv.md
similarity index 97%
rename from _data-prepper/configuration/processors/csv.md
rename to _data-prepper/pipelines/configuration/processors/csv.md
index 1753108a72..7245b51789 100644
--- a/_data-prepper/configuration/processors/csv.md
+++ b/_data-prepper/pipelines/configuration/processors/csv.md
@@ -2,7 +2,7 @@
 layout: default
 title: csv
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/processors/date.md b/_data-prepper/pipelines/configuration/processors/date.md
similarity index 98%
rename from _data-prepper/configuration/processors/date.md
rename to _data-prepper/pipelines/configuration/processors/date.md
index 3ca383f018..90f60e5fe2 100644
--- a/_data-prepper/configuration/processors/date.md
+++ b/_data-prepper/pipelines/configuration/processors/date.md
@@ -2,7 +2,7 @@
 layout: default
 title: date
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/processors/delete-entries.md b/_data-prepper/pipelines/configuration/processors/delete-entries.md
similarity index 93%
rename from _data-prepper/configuration/processors/delete-entries.md
rename to _data-prepper/pipelines/configuration/processors/delete-entries.md
index 661d86d562..37f25c40bf 100644
--- a/_data-prepper/configuration/processors/delete-entries.md
+++ b/_data-prepper/pipelines/configuration/processors/delete-entries.md
@@ -2,7 +2,7 @@
 layout: default
 title: delete_entries
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/processors/drop-events.md b/_data-prepper/pipelines/configuration/processors/drop-events.md
similarity index 77%
rename from _data-prepper/configuration/processors/drop-events.md
rename to _data-prepper/pipelines/configuration/processors/drop-events.md
index 8ee03ca671..50d4b78008 100644
--- a/_data-prepper/configuration/processors/drop-events.md
+++ b/_data-prepper/pipelines/configuration/processors/drop-events.md
@@ -2,7 +2,7 @@
 layout: default
 title: drop_events
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
@@ -14,7 +14,7 @@ Drops all the events that are passed into this processor.
 
 Option | Required | Type | Description
 :--- | :--- | :--- | :---
-drop_when | Yes | String | Accepts a Data Prepper Expression string following the [Data Prepper Expression Syntax](https://github.com/opensearch-project/data-prepper/blob/main/docs/expression_syntax.md). Configuring `drop_events` with `drop_when: true` drops all the events received.
+drop_when | Yes | String | Accepts a Data Prepper Expression string following the [Data Prepper Expression Syntax]({{site.url}}{{site.baseurl}}/data-prepper/pipelines/expression-syntax/). Configuring `drop_events` with `drop_when: true` drops all the events received.
 handle_failed_events | No | Enum | Specifies how exceptions are handled when an exception occurs while evaluating an event. Default value is `drop`, which drops the event so it doesn't get sent to OpenSearch. Available options are `drop`, `drop_silently`, `skip`, `skip_silently`. For more information, see [handle_failed_events](https://github.com/opensearch-project/data-prepper/tree/main/data-prepper-plugins/drop-events-processor#handle_failed_events).
 
 <!---## Configuration
diff --git a/_data-prepper/configuration/processors/grok.md b/_data-prepper/pipelines/configuration/processors/grok.md
similarity index 97%
rename from _data-prepper/configuration/processors/grok.md
rename to _data-prepper/pipelines/configuration/processors/grok.md
index 1d28399056..6f2a3b3d11 100644
--- a/_data-prepper/configuration/processors/grok.md
+++ b/_data-prepper/pipelines/configuration/processors/grok.md
@@ -2,7 +2,7 @@
 layout: default
 title: grok
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/processors/json.md b/_data-prepper/pipelines/configuration/processors/json.md
similarity index 96%
rename from _data-prepper/configuration/processors/json.md
rename to _data-prepper/pipelines/configuration/processors/json.md
index 983d5b9949..80d315928a 100644
--- a/_data-prepper/configuration/processors/json.md
+++ b/_data-prepper/pipelines/configuration/processors/json.md
@@ -2,7 +2,7 @@
 layout: default
 title: json
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/processors/key-value.md b/_data-prepper/pipelines/configuration/processors/key-value.md
similarity index 98%
rename from _data-prepper/configuration/processors/key-value.md
rename to _data-prepper/pipelines/configuration/processors/key-value.md
index 6d4fb7f801..6218bb9ce2 100644
--- a/_data-prepper/configuration/processors/key-value.md
+++ b/_data-prepper/pipelines/configuration/processors/key-value.md
@@ -2,7 +2,7 @@
 layout: default
 title: key_value
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/processors/lowercase-string.md b/_data-prepper/pipelines/configuration/processors/lowercase-string.md
similarity index 93%
rename from _data-prepper/configuration/processors/lowercase-string.md
rename to _data-prepper/pipelines/configuration/processors/lowercase-string.md
index 5f9eaf09fe..2c316bd2ac 100644
--- a/_data-prepper/configuration/processors/lowercase-string.md
+++ b/_data-prepper/pipelines/configuration/processors/lowercase-string.md
@@ -2,7 +2,7 @@
 layout: default
 title: lowercase_string
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/processors/otel-trace-raw.md b/_data-prepper/pipelines/configuration/processors/otel-trace-raw.md
similarity index 96%
rename from _data-prepper/configuration/processors/otel-trace-raw.md
rename to _data-prepper/pipelines/configuration/processors/otel-trace-raw.md
index 0509ebf779..a519f91c15 100644
--- a/_data-prepper/configuration/processors/otel-trace-raw.md
+++ b/_data-prepper/pipelines/configuration/processors/otel-trace-raw.md
@@ -2,7 +2,7 @@
 layout: default
 title: otel_trace_raw
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/processors/processors.md b/_data-prepper/pipelines/configuration/processors/processors.md
similarity index 99%
rename from _data-prepper/configuration/processors/processors.md
rename to _data-prepper/pipelines/configuration/processors/processors.md
index 1a6f433ac6..2110bd7239 100644
--- a/_data-prepper/configuration/processors/processors.md
+++ b/_data-prepper/pipelines/configuration/processors/processors.md
@@ -2,8 +2,8 @@
 layout: default
 title: Processors
 has_children: true
-parent: Configuring Data Prepper
-nav_order: 100
+parent: Pipelines
+nav_order: 25
 ---
 
 # Processors
@@ -13,10 +13,6 @@ Processors perform some action on your data: filter, transform, enrich, etc.
 Prior to Data Prepper 1.3, Processors were named Preppers. Starting in Data Prepper 1.3, the term Prepper is deprecated in favor of Processor. Data Prepper will continue to support the term "Prepper" until 2.0, where it will be removed.
 {: .note }
 
-
-
-
-
 ## copy_values
 
 Copy values within an event. `copy_values`  is part of [mutate event](https://github.com/opensearch-project/data-prepper/tree/main/data-prepper-plugins/mutate-event-processors#mutate-event-processors) processors.
diff --git a/_data-prepper/configuration/processors/rename-keys.md b/_data-prepper/pipelines/configuration/processors/rename-keys.md
similarity index 95%
rename from _data-prepper/configuration/processors/rename-keys.md
rename to _data-prepper/pipelines/configuration/processors/rename-keys.md
index b7376fdc74..54dd7eda5f 100644
--- a/_data-prepper/configuration/processors/rename-keys.md
+++ b/_data-prepper/pipelines/configuration/processors/rename-keys.md
@@ -2,7 +2,7 @@
 layout: default
 title: rename_keys
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 44
 ---
 
diff --git a/_data-prepper/configuration/processors/routes.md b/_data-prepper/pipelines/configuration/processors/routes.md
similarity index 93%
rename from _data-prepper/configuration/processors/routes.md
rename to _data-prepper/pipelines/configuration/processors/routes.md
index 7b6f77457f..fb3b742ea2 100644
--- a/_data-prepper/configuration/processors/routes.md
+++ b/_data-prepper/pipelines/configuration/processors/routes.md
@@ -2,7 +2,7 @@
 layout: default
 title: routes
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 
 ---
diff --git a/_data-prepper/configuration/processors/service-map-stateful.md b/_data-prepper/pipelines/configuration/processors/service-map-stateful.md
similarity index 93%
rename from _data-prepper/configuration/processors/service-map-stateful.md
rename to _data-prepper/pipelines/configuration/processors/service-map-stateful.md
index 98cb4faa28..c55a8a26fd 100644
--- a/_data-prepper/configuration/processors/service-map-stateful.md
+++ b/_data-prepper/pipelines/configuration/processors/service-map-stateful.md
@@ -2,7 +2,7 @@
 layout: default
 title: service_map_stateful
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/processors/sinks.md b/_data-prepper/pipelines/configuration/processors/sinks.md
similarity index 87%
rename from _data-prepper/configuration/processors/sinks.md
rename to _data-prepper/pipelines/configuration/processors/sinks.md
index 28d757ede6..91de2abefa 100644
--- a/_data-prepper/configuration/processors/sinks.md
+++ b/_data-prepper/pipelines/configuration/processors/sinks.md
@@ -2,7 +2,7 @@
 layout: default
 title: service_map_stateful
 parent: sinks
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/processors/split-string.md b/_data-prepper/pipelines/configuration/processors/split-string.md
similarity index 96%
rename from _data-prepper/configuration/processors/split-string.md
rename to _data-prepper/pipelines/configuration/processors/split-string.md
index dd0fdaaa3f..2954a8ac07 100644
--- a/_data-prepper/configuration/processors/split-string.md
+++ b/_data-prepper/pipelines/configuration/processors/split-string.md
@@ -2,7 +2,7 @@
 layout: default
 title: split_string
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/processors/string-converter.md b/_data-prepper/pipelines/configuration/processors/string-converter.md
similarity index 92%
rename from _data-prepper/configuration/processors/string-converter.md
rename to _data-prepper/pipelines/configuration/processors/string-converter.md
index 5befff9ce3..9c050e6f11 100644
--- a/_data-prepper/configuration/processors/string-converter.md
+++ b/_data-prepper/pipelines/configuration/processors/string-converter.md
@@ -2,7 +2,7 @@
 layout: default
 title: string_converter
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/processors/substitute-string.md b/_data-prepper/pipelines/configuration/processors/substitute-string.md
similarity index 96%
rename from _data-prepper/configuration/processors/substitute-string.md
rename to _data-prepper/pipelines/configuration/processors/substitute-string.md
index 37b4e1b585..aa7cfa26aa 100644
--- a/_data-prepper/configuration/processors/substitute-string.md
+++ b/_data-prepper/pipelines/configuration/processors/substitute-string.md
@@ -2,7 +2,7 @@
 layout: default
 title: substitute_string
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/processors/trim-string.md b/_data-prepper/pipelines/configuration/processors/trim-string.md
similarity index 93%
rename from _data-prepper/configuration/processors/trim-string.md
rename to _data-prepper/pipelines/configuration/processors/trim-string.md
index d6d4704ffb..05b93a744c 100644
--- a/_data-prepper/configuration/processors/trim-string.md
+++ b/_data-prepper/pipelines/configuration/processors/trim-string.md
@@ -2,7 +2,7 @@
 layout: default
 title: trim_string
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/processors/uppercase-string.md b/_data-prepper/pipelines/configuration/processors/uppercase-string.md
similarity index 93%
rename from _data-prepper/configuration/processors/uppercase-string.md
rename to _data-prepper/pipelines/configuration/processors/uppercase-string.md
index c6119b3783..39147f1bbe 100644
--- a/_data-prepper/configuration/processors/uppercase-string.md
+++ b/_data-prepper/pipelines/configuration/processors/uppercase-string.md
@@ -2,7 +2,7 @@
 layout: default
 title: uppercase_string
 parent: Processors
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/sinks/file.md b/_data-prepper/pipelines/configuration/sinks/file.md
similarity index 91%
rename from _data-prepper/configuration/sinks/file.md
rename to _data-prepper/pipelines/configuration/sinks/file.md
index 4c07d19d9d..5324def35e 100644
--- a/_data-prepper/configuration/sinks/file.md
+++ b/_data-prepper/pipelines/configuration/sinks/file.md
@@ -2,7 +2,7 @@
 layout: default
 title: file sink
 parent: Sinks
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/sinks/opensearch.md b/_data-prepper/pipelines/configuration/sinks/opensearch.md
similarity index 99%
rename from _data-prepper/configuration/sinks/opensearch.md
rename to _data-prepper/pipelines/configuration/sinks/opensearch.md
index 0887bda96e..5ad148bea1 100644
--- a/_data-prepper/configuration/sinks/opensearch.md
+++ b/_data-prepper/pipelines/configuration/sinks/opensearch.md
@@ -2,7 +2,7 @@
 layout: default
 title: OpenSearch sink
 parent: Sinks
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/sinks/pipeline.md b/_data-prepper/pipelines/configuration/sinks/pipeline.md
similarity index 90%
rename from _data-prepper/configuration/sinks/pipeline.md
rename to _data-prepper/pipelines/configuration/sinks/pipeline.md
index bd17ae5e17..5a40ee0aba 100644
--- a/_data-prepper/configuration/sinks/pipeline.md
+++ b/_data-prepper/pipelines/configuration/sinks/pipeline.md
@@ -2,7 +2,7 @@
 layout: default
 title: Pipeline sink
 parent: Sinks
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/sinks/sinks.md b/_data-prepper/pipelines/configuration/sinks/sinks.md
similarity index 87%
rename from _data-prepper/configuration/sinks/sinks.md
rename to _data-prepper/pipelines/configuration/sinks/sinks.md
index ad04207408..be65e7aa03 100644
--- a/_data-prepper/configuration/sinks/sinks.md
+++ b/_data-prepper/pipelines/configuration/sinks/sinks.md
@@ -1,9 +1,9 @@
 ---
 layout: default
 title: Sinks
-parent: Configuring Data Prepper
+parent: Pipelines
 has_children: true
-nav_order: 44
+nav_order: 30
 ---
 
 # Sinks
diff --git a/_data-prepper/configuration/sinks/stdout.md b/_data-prepper/pipelines/configuration/sinks/stdout.md
similarity index 89%
rename from _data-prepper/configuration/sinks/stdout.md
rename to _data-prepper/pipelines/configuration/sinks/stdout.md
index 7b35801778..94d85f2614 100644
--- a/_data-prepper/configuration/sinks/stdout.md
+++ b/_data-prepper/pipelines/configuration/sinks/stdout.md
@@ -2,7 +2,7 @@
 layout: default
 title: stdout sink
 parent: Sinks
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 45
 ---
 
diff --git a/_data-prepper/configuration/sources/http-source.md b/_data-prepper/pipelines/configuration/sources/http-source.md
similarity index 98%
rename from _data-prepper/configuration/sources/http-source.md
rename to _data-prepper/pipelines/configuration/sources/http-source.md
index 46fcc64c95..51b274da0d 100644
--- a/_data-prepper/configuration/sources/http-source.md
+++ b/_data-prepper/pipelines/configuration/sources/http-source.md
@@ -2,7 +2,7 @@
 layout: default
 title: http_source
 parent: Sources
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 5
 ---
 
diff --git a/_data-prepper/configuration/sources/otel-metrics-source.md b/_data-prepper/pipelines/configuration/sources/otel-metrics-source.md
similarity index 98%
rename from _data-prepper/configuration/sources/otel-metrics-source.md
rename to _data-prepper/pipelines/configuration/sources/otel-metrics-source.md
index 3c9ade6947..19ed44285c 100644
--- a/_data-prepper/configuration/sources/otel-metrics-source.md
+++ b/_data-prepper/pipelines/configuration/sources/otel-metrics-source.md
@@ -2,7 +2,7 @@
 layout: default
 title: otel_metrics_source
 parent: Sources
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 10
 ---
 
diff --git a/_data-prepper/configuration/sources/otel-trace.md b/_data-prepper/pipelines/configuration/sources/otel-trace.md
similarity index 98%
rename from _data-prepper/configuration/sources/otel-trace.md
rename to _data-prepper/pipelines/configuration/sources/otel-trace.md
index 0777257950..473bd54055 100644
--- a/_data-prepper/configuration/sources/otel-trace.md
+++ b/_data-prepper/pipelines/configuration/sources/otel-trace.md
@@ -2,7 +2,7 @@
 layout: default
 title: otel_trace_source source
 parent: Sources
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 15
 ---
 
diff --git a/_data-prepper/configuration/sources/s3.md b/_data-prepper/pipelines/configuration/sources/s3.md
similarity index 89%
rename from _data-prepper/configuration/sources/s3.md
rename to _data-prepper/pipelines/configuration/sources/s3.md
index 50bf3ab515..1d838a494b 100644
--- a/_data-prepper/configuration/sources/s3.md
+++ b/_data-prepper/pipelines/configuration/sources/s3.md
@@ -2,7 +2,7 @@
 layout: default
 title: s3
 parent: Sources
-grand_parent: Configuring Data Prepper
+grand_parent: Pipelines
 nav_order: 20
 ---
 
@@ -20,14 +20,14 @@ codec | Yes | Codec | The codec to apply. Must be `newline`, `json`, or `csv`.
 sqs | Yes | sqs | The [Amazon Simple Queue Service](https://aws.amazon.com/sqs/) (Amazon SQS) configuration. See [sqs](#sqs) for details.
 aws | Yes | aws | The AWS configuration. See [aws](#aws) for details.
 on_error | No | String |  Determines how to handle errors in Amazon SQS. Can be either `retain_messages` or `delete_messages`. If `retain_messages`, then Data Prepper will leave the message in the SQS queue and try again. This is recommended for dead-letter queues. If `delete_messages`, then Data Prepper will delete failed messages. Default is `retain_messages`.
-buffer_timeout | No | Duration | The timeout for writing events to the Data Prepper buffer. Any events that the S3 Source cannot write to the buffer in this time will be discarded. Default is 10 seconds.
+buffer_timeout | No | Duration | The timeout for writing events to the Data Prepper buffer. Any events that the S3Source cannot write to the buffer in this time will be discarded. Default is 10 seconds.
 records_to_accumulate | No | Integer | The number of messages that accumulate before writing to the buffer. Default is 100.
 metadata_root_key | No | String | Base key for adding S3 metadata to each Event. The metadata includes the key and bucket for each S3 object. Defaults to `s3/`.
-disable_bucket_ownership_validation | No | Boolean | If `true`, then the S3 Source will not attempt to validate that the bucket is owned by the expected account. The only expected account is the same account that owns the SQS queue. Defaults to `false`.
+disable_bucket_ownership_validation | No | Boolean | If `true`, the S3Source will not attempt to validate that the bucket is owned by the expected account. The expected account is the same account that owns the SQS queue. Defaults to `false`.
 
 ## sqs
 
-The following are configure usage of Amazon SQS in the S3 Source plugin.
+The following parameters allow you to configure usage for Amazon SQS in the S3Source plugin.
 
 Option | Required | Type | Description
 :--- | :--- | :--- | :---
diff --git a/_data-prepper/configuration/sources/sources.md b/_data-prepper/pipelines/configuration/sources/sources.md
similarity index 75%
rename from _data-prepper/configuration/sources/sources.md
rename to _data-prepper/pipelines/configuration/sources/sources.md
index 12de79804f..b684db56e9 100644
--- a/_data-prepper/configuration/sources/sources.md
+++ b/_data-prepper/pipelines/configuration/sources/sources.md
@@ -1,9 +1,9 @@
 ---
 layout: default
 title: Sources
-parent: Configuring Data Prepper
+parent: Pipelines
 has_children: true
-nav_order: 42
+nav_order: 15
 ---
 
 # Sources
diff --git a/_data-prepper/expression-syntax.md b/_data-prepper/pipelines/expression-syntax.md
similarity index 99%
rename from _data-prepper/expression-syntax.md
rename to _data-prepper/pipelines/expression-syntax.md
index 685f98133e..cc7e0ad2ef 100644
--- a/_data-prepper/expression-syntax.md
+++ b/_data-prepper/pipelines/expression-syntax.md
@@ -1,7 +1,8 @@
 ---
 layout: default
 title: Expression syntax
-nav_order: 40
+parent: Pipelines
+nav_order: 12
 ---
 
 # Expression syntax 
diff --git a/_data-prepper/configuration/pipelines-configuration-options.md b/_data-prepper/pipelines/pipelines-configuration-options.md
similarity index 92%
rename from _data-prepper/configuration/pipelines-configuration-options.md
rename to _data-prepper/pipelines/pipelines-configuration-options.md
index 7675ca82c5..73f8adad8e 100644
--- a/_data-prepper/configuration/pipelines-configuration-options.md
+++ b/_data-prepper/pipelines/pipelines-configuration-options.md
@@ -1,8 +1,8 @@
 ---
 layout: default
 title: Pipeline options
-parent: Configuring Data Prepper
-nav_order: 41
+parent: Pipelines
+nav_order: 11
 ---
 
 # Pipeline options
diff --git a/_data-prepper/pipelines.md b/_data-prepper/pipelines/pipelines.md
similarity index 89%
rename from _data-prepper/pipelines.md
rename to _data-prepper/pipelines/pipelines.md
index ddbfbb9b1b..09d058ebb4 100644
--- a/_data-prepper/pipelines.md
+++ b/_data-prepper/pipelines/pipelines.md
@@ -1,8 +1,10 @@
 ---
 layout: default
 title: Pipelines
+has_children: true
 nav_order: 10
-redirect_from: 
+redirect_from:
+  - /data-prepper/pipelines/
   - /clients/data-prepper/pipelines/
 ---
 
@@ -77,7 +79,12 @@ conditional-routing-sample-pipeline:
 
 ## Examples
 
-This section provides some pipeline examples that you can use to start creating your own pipelines. For more information, see [Data Prepper configuration reference]({{site.url}}{{site.baseurl}}/clients/data-prepper/data-prepper-reference/) guide.
+This section provides some pipeline examples that you can use to start creating your own pipelines. For more pipeline configurations, select from the following options for each component:
+
+- [Buffers]({{site.url}}{{site.baseurl}}/data-prepper/pipelines/configuration/buffers/buffers/)
+- [Processors]({{site.url}}{{site.baseurl}}/data-prepper/pipelines/configuration/processors/processors/)
+- [Sinks]({{site.url}}{{site.baseurl}}/data-prepper/pipelines/configuration/sinks/sinks/)
+- [Sources]({{site.url}}{{site.baseurl}}/data-prepper/pipelines/configuration/sources/sources/)
 
 The Data Prepper repository has several [sample applications](https://github.com/opensearch-project/data-prepper/tree/main/examples) to help you get started.
 
@@ -213,10 +220,7 @@ metrics-pipeline:
 
 ### S3 log ingestion pipeline
 
-The following example demonstrates how to use the S3 Source and Grok Processor plugins to process unstructured log data
-from [Amazon Simple Storage Service](https://aws.amazon.com/s3/) (Amazon S3). This example uses Application Load 
-Balancer logs. As the Application Load Balancer writes logs to S3, S3 creates notifications in Amazon SQS. Data Prepper 
-reads those notifications and reads the S3 objects to get the log data and process it.
+The following example demonstrates how to use the S3Source and Grok Processor plugins to process unstructured log data from [Amazon Simple Storage Service](https://aws.amazon.com/s3/) (Amazon S3). This example uses application load balancer logs. As the application load balancer writes logs to S3, S3 creates notifications in Amazon SQS. Data Prepper monitors those notifications and reads the S3 objects to get the log data and process it.
 
 ```yml
 log-pipeline:
@@ -293,13 +297,13 @@ docker run --name data-prepper \
     opensearchproject/data-prepper:latest
 ```
 
-## Configure the peer forwarder
+## Configure peer forwarder
 
 Data Prepper provides an HTTP service to forward Events between Data Prepper nodes for aggregation. This is required for operating Data Prepper in a clustered deployment. Currently, peer forwarding is supported in `aggregate`, `service_map_stateful`, and `otel_trace_raw` processors. Peer forwarder groups events based on the identification keys provided by the processors. For `service_map_stateful` and `otel_trace_raw` it's `traceId` by default and can not be configured. For `aggregate` processor, it is configurable using `identification_keys` option. 
 
-Peer forwarder supports peer discovery through one of three options: a static list, a DNS record lookup , or AWS Cloud Map. This option can be configured using `discovery_mode` option. Peer forwarder also supports SSL for verification and encrytion, and mTLS for mutual authentication in peer forwarding service.
+Peer forwarder supports peer discovery through one of three options: a static list, a DNS record lookup , or AWS Cloud Map. Peer discovery can be configured using `discovery_mode` option. Peer forwarder also supports SSL for verification and encryption, and mTLS for mutual authentication in a peer forwarding service.
 
-To configure the peer forwarder, add configuration options to `data-prepper-config.yaml` mentioned in the previous [Configure the Data Prepper server](#configure-the-data-prepper-server) section:
+To configure peer forwarder, add configuration options to `data-prepper-config.yaml` mentioned in the [Configure the Data Prepper server](#configure-the-data-prepper-server) section:
 
 ```yml
 peer_forwarder:
diff --git a/_observability-plugin/log-analytics.md b/_observability-plugin/log-analytics.md
index 8128d6d561..ad07966117 100644
--- a/_observability-plugin/log-analytics.md
+++ b/_observability-plugin/log-analytics.md
@@ -10,7 +10,7 @@ Log ingestion provides a way to transform unstructured log data into structured
 
 ## Get started with log ingestion
 
-OpenSearch Log Ingestion consists of three components---[Data Prepper]({{site.url}}{{site.baseurl}}/clients/data-prepper/index/), [OpenSearch]({{site.url}}{{site.baseurl}}/) and [OpenSearch Dashboards]({{site.url}}{{site.baseurl}}/)---that fit into the OpenSearch ecosystem. The Data Prepper repository has several [sample applications](https://github.com/opensearch-project/data-prepper/tree/main/examples) to help you get started.
+OpenSearch Log Ingestion consists of three components---[Data Prepper]({{site.url}}{{site.baseurl}}/clients/data-prepper/index/), [OpenSearch]({{site.url}}{{site.baseurl}}/quickstart/) and [OpenSearch Dashboards]({{site.url}}{{site.baseurl}}/dashboards/index/)---that fit into the OpenSearch ecosystem. The Data Prepper repository has several [sample applications](https://github.com/opensearch-project/data-prepper/tree/main/examples) to help you get started.
 
 ### Basic flow of data