diff --git a/_attributes/common-attributes.adoc b/_attributes/common-attributes.adoc
index d791f6a5509..aeb806a9dfc 100644
--- a/_attributes/common-attributes.adoc
+++ b/_attributes/common-attributes.adoc
@@ -145,7 +145,7 @@
 :3no: three-node OpenShift
 :3no-caps: Three-node OpenShift
 
-
+:product-title: serverless logic
 :ocp-product-title: OpenShift Container Platform
 :ocp-product-version: 4.13
 :dedicated-product-title: OpenShift Dedicated
diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml
index 06a7504372f..82e10fa5fec 100644
--- a/_topic_maps/_topic_map.yml
+++ b/_topic_maps/_topic_map.yml
@@ -1,113 +1,134 @@
-Name: Serverless Logic
-Dir: serverless-logic
-Distros: openshift-serverless-logic
+Name: What's new
+Dir: release-notes
+Distros: openshift-serverlesslogic
 Topics:
-- Name: What's new
-  Dir: release-notes
-  Topics:
-  - Name: Release notes
-    File: serverless-release-notes
-- Name: Discover
-  Dir: discover
-  Topics:
-  - Name: OpenShift Serverless Logic overview
-    File: serverless-logic-overview
-  - Name: OpenShift Serverless Logic support
-    File: serverless-support
-- Name: Get started
-  Dir: get-started
-  Topics:
-  - Name: Creating and running workflows with Knative Workflow plugin
-    File: serverless-logic-creating-managing-workflows
-- Name: Install
-  Dir: install
-  Topics:
-  - Name: Installing the OpenShift Serverless Logic Operator
-    File: install-serverless-logic-operator
-  - Name: Installing the Knative CLI and Workflow plugin
-    File: serverless-logic-install-kn-workflow-plugin-cli
-- Name: Deploy
-  Dir: deploy
-  Topics:
-  - Name: Deploying workflows
-    File: serverless-logic-deploying-workflows
-- Name: Configure
-  Dir: configure
-  Topics:
-  - Name: Global configuration settings
-    File: serverless-logic-global-config-settings
-  - Name: Configuring workflow services
-    File: serverless-logic-configuring-workflow-services
-  - Name: Managing workflow persistence
-    File: serverless-logic-managing-persistence
-  - Name: Workflow eventing system
-    File: serverless-logic-workflow-eventing-system
-  - Name: Configuring workflow scaling and disruption protection
-    File: serverless-logic-configuring-workflow-scaling
-  - Name: Configuring custom Maven mirrors
-    File: serverless-logic-configuring-custom-maven-mirrors
-  - Name: Configuring the Knative CLI
-    File: advanced-kn-config
-- Name: Integrate
-  Dir: integrate
-  Topics:
-  - Name: Configuring OpenAPI services
-    File: serverless-logic-configuring-openAPI-services
-  - Name: Configuring OpenAPI services endpoints
-    File: serverless-logic-configuring-openAPI-services-endpoints
-- Name: Secure
-  Dir: secure
-  Topics:
-  - Name: Authentication for OpenAPI services
-    File: serverless-logic-authentication-openapi-services
-- Name: Operate
-  Dir: operate
-  Topics:
-  - Name: Managing supporting services
-    File: serverless-logic-managing-supporting-services
-  - Name: Job service
-    File: serverless-logic-job-service
-  - Name: Data Index service
-    File: serverless-logic-data-index
-- Name: Observe
-  Dir: observe
-  Topics:
-  - Name: Administrator metrics
-    Dir: admin-metrics
-    Topics:
-    - Name: Administrator metrics overview
-      File: serverless-admin-metrics
-    - Name: Controller metrics
-      File: serverless-controller-metrics
-    - Name: Webhook metrics
-      File: serverless-webhook-metrics
-  - Name: Tracing
-    Dir: tracing
-    Topics:
-    - Name: Tracing requests
-      File: serverless-tracing
-- Name: Troubleshoot
-  Dir: troubleshoot
-  Topics:
-  - Name: Troubleshooting services
-    File: serverless-logic-troubleshooting-services
-- Name: Upgrade
-  Dir: upgrade
+- Name: Release notes
+  File: serverless-release-notes
+---
+Name: Discover
+Dir: discover
+Distros: openshift-serverlesslogic
+Topics:
+- Name: OpenShift Serverless Logic overview
+  File: serverless-logic-overview
+- Name: OpenShift Serverless Logic support
+  File: serverless-support
+---
+Name: Get started
+Dir: get-started
+Distros: openshift-serverlesslogic
+Topics:
+- Name: Creating and running workflows with the Knative Workflow plugin
+  File: serverless-logic-creating-managing-workflows
+---
+Name: Install
+Dir: install
+Distros: openshift-serverlesslogic
+Topics:
+- Name: Installing the OpenShift Serverless Logic Operator
+  File: install-serverless-logic-operator
+- Name: Installing the Knative CLI and Workflow plugin
+  File: serverless-logic-install-kn-workflow-plugin-cli
+---
+Name: Deploy
+Dir: deploy
+Distros: openshift-serverlesslogic
+Topics:
+- Name: Deploying workflows
+  File: serverless-logic-deploying-workflows
+---
+Name: Configure
+Dir: configure
+Distros: openshift-serverlesslogic
+Topics:
+- Name: Global configuration settings
+  File: serverless-logic-global-config-settings
+- Name: Configuring workflow services
+  File: serverless-logic-configuring-workflow-services
+- Name: Managing workflow persistence
+  File: serverless-logic-managing-persistence
+- Name: Workflow eventing system
+  File: serverless-logic-workflow-eventing-system
+- Name: Configuring workflow scaling and disruption protection
+  File: serverless-logic-configuring-workflow-scaling
+- Name: Configuring custom Maven mirrors
+  File: serverless-logic-configuring-custom-maven-mirrors
+- Name: Configuring the Knative CLI
+  File: advanced-kn-config
+---
+Name: Integrate
+Dir: integrate
+Distros: openshift-serverlesslogic
+Topics:
+- Name: Configuring OpenAPI services
+  File: serverless-logic-configuring-openAPI-services
+- Name: Configuring OpenAPI services endpoints
+  File: serverless-logic-configuring-openAPI-services-endpoints
+---
+Name: Secure
+Dir: secure
+Distros: openshift-serverlesslogic
+Topics:
+- Name: Authentication for OpenAPI services
+  File: serverless-logic-authentication-openapi-services
+---
+Name: Operate
+Dir: operate
+Distros: openshift-serverlesslogic
+Topics:
+- Name: Managing supporting services
+  File: serverless-logic-managing-supporting-services
+- Name: Job service
+  File: serverless-logic-job-service
+- Name: Data Index service
+  File: serverless-logic-data-index
+---
+Name: Observe
+Dir: observe
+Distros: openshift-serverlesslogic
+Topics:
+- Name: Administrator metrics
+  Dir: admin-metrics
   Topics:
-  - Name: Upgrading Serverless Logic Operator from 1.34.0 to 1.35.0
-    File: serverless-logic-upgrading-operator-from-1-34-to-1-35
-  - Name: Upgrading Serverless Logic Operator from 1.35.0 to 1.36.0
-    File: serverless-logic-upgrading-operator-from-1-35-to-1-36
-  - Name: Upgrading Serverless Logic Operator from 1.36.0 to 1.37.0
-    File: serverless-logic-upgrading-operator-from-1-36-to-1-37
-  - Name: Upgrading Serverless Logic Operator from 1.37.0 to 1.37.1
-    File: serverless-logic-upgrading-operator-from-1-37-0-to-1-37-1
-  - Name: Upgrading Serverless Logic Operator from 1.37.2 to 1.38.0
-    File: serverless-logic-upgrading-operator-from-1-37-2-to-1-38-0
-- Name: Uninstall
-  Dir: uninstall
+  - Name: Administrator metrics overview
+    File: serverless-admin-metrics
+  - Name: Controller metrics
+    File: serverless-controller-metrics
+  - Name: Webhook metrics
+    File: serverless-webhook-metrics
+- Name: Tracing
+  Dir: tracing
   Topics:
-  - Name: Removing the OpenShift Serverless Logic Operator
-    File: removing-openshift-serverless-logic-operator
-  - Name: Deleting OpenShift Serverless CRDs
-    File: deleting-serverless-crds
+  - Name: Tracing requests
+    File: serverless-tracing
+---
+Name: Troubleshoot
+Dir: troubleshoot
+Distros: openshift-serverlesslogic
+Topics:
+- Name: Troubleshooting services
+  File: serverless-logic-troubleshooting-services
+---
+Name: Upgrade
+Dir: upgrade
+Distros: openshift-serverlesslogic
+Topics:
+- Name: Upgrading Serverless Logic Operator from 1.34.0 to 1.35.0
+  File: serverless-logic-upgrading-operator-from-1-34-to-1-35
+- Name: Upgrading Serverless Logic Operator from 1.35.0 to 1.36.0
+  File: serverless-logic-upgrading-operator-from-1-35-to-1-36
+- Name: Upgrading Serverless Logic Operator from 1.36.0 to 1.37.0
+  File: serverless-logic-upgrading-operator-from-1-36-to-1-37
+- Name: Upgrading Serverless Logic Operator from 1.37.0 to 1.37.1
+  File: serverless-logic-upgrading-operator-from-1-37-0-to-1-37-1
+- Name: Upgrading Serverless Logic Operator from 1.37.2 to 1.38.0
+  File: serverless-logic-upgrading-operator-from-1-37-2-to-1-38-0
+---
+Name: Uninstall
+Dir: uninstall
+Distros: openshift-serverlesslogic
+Topics:
+- Name: Removing the OpenShift Serverless Logic Operator
+  File: removing-openshift-serverless-logic-operator
+- Name: Deleting OpenShift Serverless custom resource definitions (CRDs)
+  File: deleting-serverless-crds
diff --git a/cli_tools/docinfo.xml b/cli_tools/docinfo.xml
deleted file mode 100644
index d1f2979f10d..00000000000
--- a/cli_tools/docinfo.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<title>Knative CLI</title>
-<productname>{product-title}</productname>
-<productnumber>{product-version}</productnumber>
-<subtitle>Overview of CLI commands for Knative Functions, Serving, and Eventing</subtitle>
-<abstract>
-    <para>This document provides an overview of the CLI commands available for Knative Functions, Serving, and Eventing.
-    It also provides information about configuring the Knative CLI and on using plugins.
-    </para>
-</abstract>
-<authorgroup>
-    <orgname>Red Hat OpenShift Documentation Team</orgname>
-</authorgroup>
-<xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/cli_tools/snippets b/cli_tools/snippets
deleted file mode 120000
index 9f5bc7e4dde..00000000000
--- a/cli_tools/snippets
+++ /dev/null
@@ -1 +0,0 @@
-../snippets
\ No newline at end of file
diff --git a/about/_attributes b/configure/_attributes
similarity index 100%
rename from about/_attributes
rename to configure/_attributes
diff --git a/serverless-logic/configure/advanced-kn-config.adoc b/configure/advanced-kn-config.adoc
similarity index 100%
rename from serverless-logic/configure/advanced-kn-config.adoc
rename to configure/advanced-kn-config.adoc
diff --git a/about/docinfo.xml b/configure/docinfo.xml
similarity index 50%
rename from about/docinfo.xml
rename to configure/docinfo.xml
index 7b0ee5f0a21..1e4ed8f29eb 100644
--- a/about/docinfo.xml
+++ b/configure/docinfo.xml
@@ -1,11 +1,9 @@
-<title>About Serverless</title>
+<title>Configuring OpenShift Serverless Logic</title>
 <productname>{product-title}</productname>
 <productnumber>{product-version}</productnumber>
-<subtitle>Introduction to OpenShift Serverless</subtitle>
+<subtitle>Configuring workflow services in OpenShift Serverless Logic</subtitle>
 <abstract>
-    <para>This document provides an overview of OpenShift Serverless features, including Functions, Serving, and Eventing. It also
-    includes release notes and details about how to get support.
-    </para>
+    <para>This document describes how to configure workflow services in OpenShift Serverless Logic.</para>
 </abstract>
 <authorgroup>
     <orgname>Red Hat OpenShift Documentation Team</orgname>
diff --git a/about/images b/configure/images
similarity index 100%
rename from about/images
rename to configure/images
diff --git a/about/modules b/configure/modules
similarity index 100%
rename from about/modules
rename to configure/modules
diff --git a/serverless-logic/configure/serverless-logic-configuring-custom-maven-mirrors.adoc b/configure/serverless-logic-configuring-custom-maven-mirrors.adoc
similarity index 100%
rename from serverless-logic/configure/serverless-logic-configuring-custom-maven-mirrors.adoc
rename to configure/serverless-logic-configuring-custom-maven-mirrors.adoc
diff --git a/serverless-logic/configure/serverless-logic-configuring-workflow-scaling.adoc b/configure/serverless-logic-configuring-workflow-scaling.adoc
similarity index 100%
rename from serverless-logic/configure/serverless-logic-configuring-workflow-scaling.adoc
rename to configure/serverless-logic-configuring-workflow-scaling.adoc
diff --git a/serverless-logic/configure/serverless-logic-configuring-workflow-services.adoc b/configure/serverless-logic-configuring-workflow-services.adoc
similarity index 100%
rename from serverless-logic/configure/serverless-logic-configuring-workflow-services.adoc
rename to configure/serverless-logic-configuring-workflow-services.adoc
diff --git a/serverless-logic/configure/serverless-logic-global-config-settings.adoc b/configure/serverless-logic-global-config-settings.adoc
similarity index 100%
rename from serverless-logic/configure/serverless-logic-global-config-settings.adoc
rename to configure/serverless-logic-global-config-settings.adoc
diff --git a/serverless-logic/configure/serverless-logic-managing-persistence.adoc b/configure/serverless-logic-managing-persistence.adoc
similarity index 100%
rename from serverless-logic/configure/serverless-logic-managing-persistence.adoc
rename to configure/serverless-logic-managing-persistence.adoc
diff --git a/serverless-logic/configure/serverless-logic-workflow-eventing-system.adoc b/configure/serverless-logic-workflow-eventing-system.adoc
similarity index 100%
rename from serverless-logic/configure/serverless-logic-workflow-eventing-system.adoc
rename to configure/serverless-logic-workflow-eventing-system.adoc
diff --git a/about/snippets b/configure/snippets
similarity index 100%
rename from about/snippets
rename to configure/snippets
diff --git a/cli_tools/_attributes b/deploy/_attributes
similarity index 100%
rename from cli_tools/_attributes
rename to deploy/_attributes
diff --git a/deploy/docinfo.xml b/deploy/docinfo.xml
new file mode 100644
index 00000000000..f3aaa426fc7
--- /dev/null
+++ b/deploy/docinfo.xml
@@ -0,0 +1,11 @@
+<title>Deploying OpenShift Serverless Logic workflows</title>
+<productname>{product-title}</productname>
+<productnumber>{product-version}</productnumber>
+<subtitle>Deploying workflows in OpenShift Serverless Logic</subtitle>
+<abstract>
+    <para>This document describes how to deploy workflows in OpenShift Serverless Logic.</para>
+</abstract>
+<authorgroup>
+    <orgname>Red Hat OpenShift Documentation Team</orgname>
+</authorgroup>
+<xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/cli_tools/images b/deploy/images
similarity index 100%
rename from cli_tools/images
rename to deploy/images
diff --git a/cli_tools/modules b/deploy/modules
similarity index 100%
rename from cli_tools/modules
rename to deploy/modules
diff --git a/serverless-logic/deploy/serverless-logic-deploying-workflows.adoc b/deploy/serverless-logic-deploying-workflows.adoc
similarity index 100%
rename from serverless-logic/deploy/serverless-logic-deploying-workflows.adoc
rename to deploy/serverless-logic-deploying-workflows.adoc
diff --git a/observability/snippets b/deploy/snippets
similarity index 100%
rename from observability/snippets
rename to deploy/snippets
diff --git a/observability/_attributes b/discover/_attributes
similarity index 100%
rename from observability/_attributes
rename to discover/_attributes
diff --git a/serverless-logic/docinfo.xml b/discover/docinfo.xml
similarity index 68%
rename from serverless-logic/docinfo.xml
rename to discover/docinfo.xml
index 3f2a28a1588..367db9a9e53 100644
--- a/serverless-logic/docinfo.xml
+++ b/discover/docinfo.xml
@@ -1,11 +1,9 @@
-<title>Serverless Logic</title>
+<title>Discovering OpenShift Serverless Logic</title>
 <productname>{product-title}</productname>
 <productnumber>{product-version}</productnumber>
 <subtitle>Introduction to OpenShift Serverless Logic</subtitle>
 <abstract>
-    <para>
-    This document provides an overview of OpenShift Serverless Logic features.
-    </para>
+    <para>This document provides an overview of OpenShift Serverless Logic features and support information.</para>
 </abstract>
 <authorgroup>
     <orgname>Red Hat OpenShift Documentation Team</orgname>
diff --git a/observability/images b/discover/images
similarity index 100%
rename from observability/images
rename to discover/images
diff --git a/observability/modules b/discover/modules
similarity index 100%
rename from observability/modules
rename to discover/modules
diff --git a/serverless-logic/discover/serverless-logic-overview.adoc b/discover/serverless-logic-overview.adoc
similarity index 100%
rename from serverless-logic/discover/serverless-logic-overview.adoc
rename to discover/serverless-logic-overview.adoc
diff --git a/serverless-logic/discover/serverless-support.adoc b/discover/serverless-support.adoc
similarity index 100%
rename from serverless-logic/discover/serverless-support.adoc
rename to discover/serverless-support.adoc
diff --git a/removing/snippets b/discover/snippets
similarity index 100%
rename from removing/snippets
rename to discover/snippets
diff --git a/observability/developer-metrics/_attributes b/get-started/_attributes
similarity index 100%
rename from observability/developer-metrics/_attributes
rename to get-started/_attributes
diff --git a/get-started/docinfo.xml b/get-started/docinfo.xml
new file mode 100644
index 00000000000..2ffda2c4716
--- /dev/null
+++ b/get-started/docinfo.xml
@@ -0,0 +1,11 @@
+<title>Getting started with OpenShift Serverless Logic</title>
+<productname>{product-title}</productname>
+<productnumber>{product-version}</productnumber>
+<subtitle>Creating and running workflows with the Knative Workflow plugin</subtitle>
+<abstract>
+    <para>This document describes how to create and run workflows with the Knative Workflow plugin.</para>
+</abstract>
+<authorgroup>
+    <orgname>Red Hat OpenShift Documentation Team</orgname>
+</authorgroup>
+<xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/removing/images b/get-started/images
similarity index 100%
rename from removing/images
rename to get-started/images
diff --git a/removing/modules b/get-started/modules
similarity index 100%
rename from removing/modules
rename to get-started/modules
diff --git a/serverless-logic/get-started/serverless-logic-creating-managing-workflows.adoc b/get-started/serverless-logic-creating-managing-workflows.adoc
similarity index 100%
rename from serverless-logic/get-started/serverless-logic-creating-managing-workflows.adoc
rename to get-started/serverless-logic-creating-managing-workflows.adoc
diff --git a/get-started/snippets b/get-started/snippets
new file mode 120000
index 00000000000..9d58b92e505
--- /dev/null
+++ b/get-started/snippets
@@ -0,0 +1 @@
+../snippets/
\ No newline at end of file
diff --git a/install/docinfo.xml b/install/docinfo.xml
index 77ef60e6a6d..29137a55ee8 100644
--- a/install/docinfo.xml
+++ b/install/docinfo.xml
@@ -1,11 +1,9 @@
-<title>Installing Serverless</title>
+<title>Installing OpenShift Serverless Logic</title>
 <productname>{product-title}</productname>
 <productnumber>{product-version}</productnumber>
-<subtitle>Installing the Serverless Operator, Knative CLI, Knative Serving, and Knative Eventing</subtitle>
+<subtitle>Installing the OpenShift Serverless Logic Operator and Knative Workflow plugin CLI</subtitle>
 <abstract>
-    <para>This document contains information about installing the Serverless Operator, Knative CLI, Knative Serving, and Knative Eventing.
-    It also provides details about configuring Knative for Apache Kafka and about configuring Serverless Functions.
-     </para>
+    <para>This document describes how to install the OpenShift Serverless Logic Operator and the Knative Workflow plugin CLI.</para>
 </abstract>
 <authorgroup>
     <orgname>Red Hat OpenShift Documentation Team</orgname>
diff --git a/serverless-logic/install/install-serverless-logic-operator.adoc b/install/install-serverless-logic-operator.adoc
similarity index 100%
rename from serverless-logic/install/install-serverless-logic-operator.adoc
rename to install/install-serverless-logic-operator.adoc
diff --git a/serverless-logic/install/serverless-logic-install-kn-workflow-plugin-cli.adoc b/install/serverless-logic-install-kn-workflow-plugin-cli.adoc
similarity index 100%
rename from serverless-logic/install/serverless-logic-install-kn-workflow-plugin-cli.adoc
rename to install/serverless-logic-install-kn-workflow-plugin-cli.adoc
diff --git a/removing/_attributes b/integrate/_attributes
similarity index 100%
rename from removing/_attributes
rename to integrate/_attributes
diff --git a/integrate/docinfo.xml b/integrate/docinfo.xml
new file mode 100644
index 00000000000..c187f2c0920
--- /dev/null
+++ b/integrate/docinfo.xml
@@ -0,0 +1,11 @@
+<title>Integrating OpenShift Serverless Logic</title>
+<productname>{product-title}</productname>
+<productnumber>{product-version}</productnumber>
+<subtitle>Configuring OpenAPI services in OpenShift Serverless Logic</subtitle>
+<abstract>
+    <para>This document describes how to configure OpenAPI services and endpoints in OpenShift Serverless Logic.</para>
+</abstract>
+<authorgroup>
+    <orgname>Red Hat OpenShift Documentation Team</orgname>
+</authorgroup>
+<xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/serverless-logic/images b/integrate/images
similarity index 100%
rename from serverless-logic/images
rename to integrate/images
diff --git a/serverless-logic/modules b/integrate/modules
similarity index 100%
rename from serverless-logic/modules
rename to integrate/modules
diff --git a/serverless-logic/integrate/serverless-logic-configuring-openAPI-services-endpoints.adoc b/integrate/serverless-logic-configuring-openAPI-services-endpoints.adoc
similarity index 100%
rename from serverless-logic/integrate/serverless-logic-configuring-openAPI-services-endpoints.adoc
rename to integrate/serverless-logic-configuring-openAPI-services-endpoints.adoc
diff --git a/serverless-logic/integrate/serverless-logic-configuring-openAPI-services.adoc b/integrate/serverless-logic-configuring-openAPI-services.adoc
similarity index 100%
rename from serverless-logic/integrate/serverless-logic-configuring-openAPI-services.adoc
rename to integrate/serverless-logic-configuring-openAPI-services.adoc
diff --git a/integrate/snippets b/integrate/snippets
new file mode 120000
index 00000000000..9d58b92e505
--- /dev/null
+++ b/integrate/snippets
@@ -0,0 +1 @@
+../snippets/
\ No newline at end of file
diff --git a/observability/developer-metrics/images b/observability/developer-metrics/images
deleted file mode 120000
index 847b03ed054..00000000000
--- a/observability/developer-metrics/images
+++ /dev/null
@@ -1 +0,0 @@
-../../images/
\ No newline at end of file
diff --git a/observability/developer-metrics/modules b/observability/developer-metrics/modules
deleted file mode 120000
index 36719b9de74..00000000000
--- a/observability/developer-metrics/modules
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/
\ No newline at end of file
diff --git a/observability/developer-metrics/snippets b/observability/developer-metrics/snippets
deleted file mode 120000
index 5a3f5add140..00000000000
--- a/observability/developer-metrics/snippets
+++ /dev/null
@@ -1 +0,0 @@
-../../snippets/
\ No newline at end of file
diff --git a/observability/docinfo.xml b/observability/docinfo.xml
deleted file mode 100644
index 7365f30cb26..00000000000
--- a/observability/docinfo.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<title>Observability</title>
-<productname>{product-title}</productname>
-<productnumber>{product-version}</productnumber>
-<subtitle>Observability features including administrator and developer metrics, cluster logging, and tracing</subtitle>
-<abstract>
-    <para>This document provides details on how to monitor the performance of Knative services. It also details how to use
-    OpenShift Logging and OpenShift distributed tracing with OpenShift Serverless.
-     </para>
-</abstract>
-<authorgroup>
-    <orgname>Red Hat OpenShift Documentation Team</orgname>
-</authorgroup>
-<xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/observability/tracing/_attributes b/observability/tracing/_attributes
deleted file mode 120000
index 20cc1dcb77b..00000000000
--- a/observability/tracing/_attributes
+++ /dev/null
@@ -1 +0,0 @@
-../../_attributes/
\ No newline at end of file
diff --git a/observability/tracing/images b/observability/tracing/images
deleted file mode 120000
index 847b03ed054..00000000000
--- a/observability/tracing/images
+++ /dev/null
@@ -1 +0,0 @@
-../../images/
\ No newline at end of file
diff --git a/observability/tracing/modules b/observability/tracing/modules
deleted file mode 120000
index 36719b9de74..00000000000
--- a/observability/tracing/modules
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/
\ No newline at end of file
diff --git a/observability/tracing/snippets b/observability/tracing/snippets
deleted file mode 120000
index 5a3f5add140..00000000000
--- a/observability/tracing/snippets
+++ /dev/null
@@ -1 +0,0 @@
-../../snippets/
\ No newline at end of file
diff --git a/serverless-logic/_attributes b/observe/_attributes
similarity index 100%
rename from serverless-logic/_attributes
rename to observe/_attributes
diff --git a/observability/admin-metrics/_attributes b/observe/admin-metrics/_attributes
similarity index 100%
rename from observability/admin-metrics/_attributes
rename to observe/admin-metrics/_attributes
diff --git a/observability/admin-metrics/images b/observe/admin-metrics/images
similarity index 100%
rename from observability/admin-metrics/images
rename to observe/admin-metrics/images
diff --git a/observability/admin-metrics/modules b/observe/admin-metrics/modules
similarity index 100%
rename from observability/admin-metrics/modules
rename to observe/admin-metrics/modules
diff --git a/serverless-logic/observe/admin-metrics/serverless-admin-metrics.adoc b/observe/admin-metrics/serverless-admin-metrics.adoc
similarity index 100%
rename from serverless-logic/observe/admin-metrics/serverless-admin-metrics.adoc
rename to observe/admin-metrics/serverless-admin-metrics.adoc
diff --git a/serverless-logic/observe/admin-metrics/serverless-controller-metrics.adoc b/observe/admin-metrics/serverless-controller-metrics.adoc
similarity index 100%
rename from serverless-logic/observe/admin-metrics/serverless-controller-metrics.adoc
rename to observe/admin-metrics/serverless-controller-metrics.adoc
diff --git a/serverless-logic/observe/admin-metrics/serverless-webhook-metrics.adoc b/observe/admin-metrics/serverless-webhook-metrics.adoc
similarity index 100%
rename from serverless-logic/observe/admin-metrics/serverless-webhook-metrics.adoc
rename to observe/admin-metrics/serverless-webhook-metrics.adoc
diff --git a/observability/admin-metrics/snippets b/observe/admin-metrics/snippets
similarity index 100%
rename from observability/admin-metrics/snippets
rename to observe/admin-metrics/snippets
diff --git a/observe/docinfo.xml b/observe/docinfo.xml
new file mode 100644
index 00000000000..46e802db539
--- /dev/null
+++ b/observe/docinfo.xml
@@ -0,0 +1,11 @@
+<title>Observing OpenShift Serverless Logic</title>
+<productname>{product-title}</productname>
+<productnumber>{product-version}</productnumber>
+<subtitle>Metrics and tracing for OpenShift Serverless Logic</subtitle>
+<abstract>
+    <para>This document describes how to monitor metrics and configure tracing in OpenShift Serverless Logic.</para>
+</abstract>
+<authorgroup>
+    <orgname>Red Hat OpenShift Documentation Team</orgname>
+</authorgroup>
+<xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/observe/images b/observe/images
new file mode 120000
index 00000000000..e4c5bd02a10
--- /dev/null
+++ b/observe/images
@@ -0,0 +1 @@
+../images/
\ No newline at end of file
diff --git a/observe/modules b/observe/modules
new file mode 120000
index 00000000000..43aab75b53c
--- /dev/null
+++ b/observe/modules
@@ -0,0 +1 @@
+../modules/
\ No newline at end of file
diff --git a/observe/snippets b/observe/snippets
new file mode 120000
index 00000000000..9d58b92e505
--- /dev/null
+++ b/observe/snippets
@@ -0,0 +1 @@
+../snippets/
\ No newline at end of file
diff --git a/observability/cluster-logging/_attributes b/observe/tracing/_attributes
similarity index 100%
rename from observability/cluster-logging/_attributes
rename to observe/tracing/_attributes
diff --git a/observability/cluster-logging/images b/observe/tracing/images
similarity index 100%
rename from observability/cluster-logging/images
rename to observe/tracing/images
diff --git a/observability/cluster-logging/modules b/observe/tracing/modules
similarity index 100%
rename from observability/cluster-logging/modules
rename to observe/tracing/modules
diff --git a/serverless-logic/observe/tracing/serverless-tracing.adoc b/observe/tracing/serverless-tracing.adoc
similarity index 100%
rename from serverless-logic/observe/tracing/serverless-tracing.adoc
rename to observe/tracing/serverless-tracing.adoc
diff --git a/observability/cluster-logging/snippets b/observe/tracing/snippets
similarity index 100%
rename from observability/cluster-logging/snippets
rename to observe/tracing/snippets
diff --git a/operate/_attributes b/operate/_attributes
new file mode 120000
index 00000000000..f27fd275ea6
--- /dev/null
+++ b/operate/_attributes
@@ -0,0 +1 @@
+../_attributes/
\ No newline at end of file
diff --git a/operate/docinfo.xml b/operate/docinfo.xml
new file mode 100644
index 00000000000..633c7393d2d
--- /dev/null
+++ b/operate/docinfo.xml
@@ -0,0 +1,11 @@
+<title>Operating OpenShift Serverless Logic</title>
+<productname>{product-title}</productname>
+<productnumber>{product-version}</productnumber>
+<subtitle>Managing supporting services in OpenShift Serverless Logic</subtitle>
+<abstract>
+    <para>This document describes how to manage supporting services, the Job service, and the Data Index service in OpenShift Serverless Logic.</para>
+</abstract>
+<authorgroup>
+    <orgname>Red Hat OpenShift Documentation Team</orgname>
+</authorgroup>
+<xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/operate/images b/operate/images
new file mode 120000
index 00000000000..e4c5bd02a10
--- /dev/null
+++ b/operate/images
@@ -0,0 +1 @@
+../images/
\ No newline at end of file
diff --git a/operate/modules b/operate/modules
new file mode 120000
index 00000000000..43aab75b53c
--- /dev/null
+++ b/operate/modules
@@ -0,0 +1 @@
+../modules/
\ No newline at end of file
diff --git a/serverless-logic/operate/serverless-logic-data-index.adoc b/operate/serverless-logic-data-index.adoc
similarity index 100%
rename from serverless-logic/operate/serverless-logic-data-index.adoc
rename to operate/serverless-logic-data-index.adoc
diff --git a/serverless-logic/operate/serverless-logic-job-service.adoc b/operate/serverless-logic-job-service.adoc
similarity index 100%
rename from serverless-logic/operate/serverless-logic-job-service.adoc
rename to operate/serverless-logic-job-service.adoc
diff --git a/serverless-logic/operate/serverless-logic-managing-supporting-services.adoc b/operate/serverless-logic-managing-supporting-services.adoc
similarity index 100%
rename from serverless-logic/operate/serverless-logic-managing-supporting-services.adoc
rename to operate/serverless-logic-managing-supporting-services.adoc
diff --git a/operate/snippets b/operate/snippets
new file mode 120000
index 00000000000..9d58b92e505
--- /dev/null
+++ b/operate/snippets
@@ -0,0 +1 @@
+../snippets/
\ No newline at end of file
diff --git a/release-notes/_attributes b/release-notes/_attributes
new file mode 120000
index 00000000000..f27fd275ea6
--- /dev/null
+++ b/release-notes/_attributes
@@ -0,0 +1 @@
+../_attributes/
\ No newline at end of file
diff --git a/removing/docinfo.xml b/release-notes/docinfo.xml
similarity index 58%
rename from removing/docinfo.xml
rename to release-notes/docinfo.xml
index 77c46543f6a..1db8ab7e10d 100644
--- a/removing/docinfo.xml
+++ b/release-notes/docinfo.xml
@@ -1,9 +1,9 @@
-<title>Removing Serverless</title>
+<title>OpenShift Serverless Logic release notes</title>
 <productname>{product-title}</productname>
 <productnumber>{product-version}</productnumber>
-<subtitle>Removing Serverless from your cluster</subtitle>
+<subtitle>Release notes for OpenShift Serverless Logic</subtitle>
 <abstract>
-    <para>This document details how to remove OpenShift Serverless from your cluster.</para>
+    <para>This document provides the release notes for OpenShift Serverless Logic.</para>
 </abstract>
 <authorgroup>
     <orgname>Red Hat OpenShift Documentation Team</orgname>
diff --git a/release-notes/images b/release-notes/images
new file mode 120000
index 00000000000..e4c5bd02a10
--- /dev/null
+++ b/release-notes/images
@@ -0,0 +1 @@
+../images/
\ No newline at end of file
diff --git a/release-notes/modules b/release-notes/modules
new file mode 120000
index 00000000000..43aab75b53c
--- /dev/null
+++ b/release-notes/modules
@@ -0,0 +1 @@
+../modules/
\ No newline at end of file
diff --git a/serverless-logic/release-notes/serverless-release-notes.adoc b/release-notes/serverless-release-notes.adoc
similarity index 100%
rename from serverless-logic/release-notes/serverless-release-notes.adoc
rename to release-notes/serverless-release-notes.adoc
diff --git a/release-notes/snippets b/release-notes/snippets
new file mode 120000
index 00000000000..9d58b92e505
--- /dev/null
+++ b/release-notes/snippets
@@ -0,0 +1 @@
+../snippets/
\ No newline at end of file
diff --git a/secure/_attributes b/secure/_attributes
new file mode 120000
index 00000000000..f27fd275ea6
--- /dev/null
+++ b/secure/_attributes
@@ -0,0 +1 @@
+../_attributes/
\ No newline at end of file
diff --git a/secure/docinfo.xml b/secure/docinfo.xml
new file mode 100644
index 00000000000..89909761aeb
--- /dev/null
+++ b/secure/docinfo.xml
@@ -0,0 +1,11 @@
+<title>Securing OpenShift Serverless Logic</title>
+<productname>{product-title}</productname>
+<productnumber>{product-version}</productnumber>
+<subtitle>Authentication for OpenAPI services in OpenShift Serverless Logic</subtitle>
+<abstract>
+    <para>This document describes how to configure authentication for OpenAPI services in OpenShift Serverless Logic.</para>
+</abstract>
+<authorgroup>
+    <orgname>Red Hat OpenShift Documentation Team</orgname>
+</authorgroup>
+<xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/secure/images b/secure/images
new file mode 120000
index 00000000000..e4c5bd02a10
--- /dev/null
+++ b/secure/images
@@ -0,0 +1 @@
+../images/
\ No newline at end of file
diff --git a/secure/modules b/secure/modules
new file mode 120000
index 00000000000..43aab75b53c
--- /dev/null
+++ b/secure/modules
@@ -0,0 +1 @@
+../modules/
\ No newline at end of file
diff --git a/serverless-logic/secure/serverless-logic-authentication-openapi-services.adoc b/secure/serverless-logic-authentication-openapi-services.adoc
similarity index 100%
rename from serverless-logic/secure/serverless-logic-authentication-openapi-services.adoc
rename to secure/serverless-logic-authentication-openapi-services.adoc
diff --git a/secure/snippets b/secure/snippets
new file mode 120000
index 00000000000..9d58b92e505
--- /dev/null
+++ b/secure/snippets
@@ -0,0 +1 @@
+../snippets/
\ No newline at end of file
diff --git a/serverless-logic/configure/_attributes b/serverless-logic/configure/_attributes
deleted file mode 120000
index 20cc1dcb77b..00000000000
--- a/serverless-logic/configure/_attributes
+++ /dev/null
@@ -1 +0,0 @@
-../../_attributes/
\ No newline at end of file
diff --git a/serverless-logic/configure/images b/serverless-logic/configure/images
deleted file mode 120000
index 847b03ed054..00000000000
--- a/serverless-logic/configure/images
+++ /dev/null
@@ -1 +0,0 @@
-../../images/
\ No newline at end of file
diff --git a/serverless-logic/configure/modules b/serverless-logic/configure/modules
deleted file mode 120000
index 36719b9de74..00000000000
--- a/serverless-logic/configure/modules
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/
\ No newline at end of file
diff --git a/serverless-logic/configure/snippets b/serverless-logic/configure/snippets
deleted file mode 120000
index 5a3f5add140..00000000000
--- a/serverless-logic/configure/snippets
+++ /dev/null
@@ -1 +0,0 @@
-../../snippets/
\ No newline at end of file
diff --git a/serverless-logic/deploy/_attributes b/serverless-logic/deploy/_attributes
deleted file mode 120000
index 20cc1dcb77b..00000000000
--- a/serverless-logic/deploy/_attributes
+++ /dev/null
@@ -1 +0,0 @@
-../../_attributes/
\ No newline at end of file
diff --git a/serverless-logic/deploy/images b/serverless-logic/deploy/images
deleted file mode 120000
index 847b03ed054..00000000000
--- a/serverless-logic/deploy/images
+++ /dev/null
@@ -1 +0,0 @@
-../../images/
\ No newline at end of file
diff --git a/serverless-logic/deploy/modules b/serverless-logic/deploy/modules
deleted file mode 120000
index 36719b9de74..00000000000
--- a/serverless-logic/deploy/modules
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/
\ No newline at end of file
diff --git a/serverless-logic/deploy/snippets b/serverless-logic/deploy/snippets
deleted file mode 120000
index 5a3f5add140..00000000000
--- a/serverless-logic/deploy/snippets
+++ /dev/null
@@ -1 +0,0 @@
-../../snippets/
\ No newline at end of file
diff --git a/serverless-logic/discover/_attributes b/serverless-logic/discover/_attributes
deleted file mode 120000
index 20cc1dcb77b..00000000000
--- a/serverless-logic/discover/_attributes
+++ /dev/null
@@ -1 +0,0 @@
-../../_attributes/
\ No newline at end of file
diff --git a/serverless-logic/discover/images b/serverless-logic/discover/images
deleted file mode 120000
index 847b03ed054..00000000000
--- a/serverless-logic/discover/images
+++ /dev/null
@@ -1 +0,0 @@
-../../images/
\ No newline at end of file
diff --git a/serverless-logic/discover/modules b/serverless-logic/discover/modules
deleted file mode 120000
index 36719b9de74..00000000000
--- a/serverless-logic/discover/modules
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/
\ No newline at end of file
diff --git a/serverless-logic/discover/snippets b/serverless-logic/discover/snippets
deleted file mode 120000
index 5a3f5add140..00000000000
--- a/serverless-logic/discover/snippets
+++ /dev/null
@@ -1 +0,0 @@
-../../snippets/
\ No newline at end of file
diff --git a/serverless-logic/get-started/_attributes b/serverless-logic/get-started/_attributes
deleted file mode 120000
index 20cc1dcb77b..00000000000
--- a/serverless-logic/get-started/_attributes
+++ /dev/null
@@ -1 +0,0 @@
-../../_attributes/
\ No newline at end of file
diff --git a/serverless-logic/get-started/images b/serverless-logic/get-started/images
deleted file mode 120000
index 847b03ed054..00000000000
--- a/serverless-logic/get-started/images
+++ /dev/null
@@ -1 +0,0 @@
-../../images/
\ No newline at end of file
diff --git a/serverless-logic/get-started/modules b/serverless-logic/get-started/modules
deleted file mode 120000
index 36719b9de74..00000000000
--- a/serverless-logic/get-started/modules
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/
\ No newline at end of file
diff --git a/serverless-logic/get-started/snippets b/serverless-logic/get-started/snippets
deleted file mode 120000
index 5a3f5add140..00000000000
--- a/serverless-logic/get-started/snippets
+++ /dev/null
@@ -1 +0,0 @@
-../../snippets/
\ No newline at end of file
diff --git a/serverless-logic/install/_attributes b/serverless-logic/install/_attributes
deleted file mode 120000
index 20cc1dcb77b..00000000000
--- a/serverless-logic/install/_attributes
+++ /dev/null
@@ -1 +0,0 @@
-../../_attributes/
\ No newline at end of file
diff --git a/serverless-logic/install/images b/serverless-logic/install/images
deleted file mode 120000
index 847b03ed054..00000000000
--- a/serverless-logic/install/images
+++ /dev/null
@@ -1 +0,0 @@
-../../images/
\ No newline at end of file
diff --git a/serverless-logic/install/modules b/serverless-logic/install/modules
deleted file mode 120000
index 36719b9de74..00000000000
--- a/serverless-logic/install/modules
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/
\ No newline at end of file
diff --git a/serverless-logic/install/snippets b/serverless-logic/install/snippets
deleted file mode 120000
index 5a3f5add140..00000000000
--- a/serverless-logic/install/snippets
+++ /dev/null
@@ -1 +0,0 @@
-../../snippets/
\ No newline at end of file
diff --git a/serverless-logic/integrate/_attributes b/serverless-logic/integrate/_attributes
deleted file mode 120000
index 20cc1dcb77b..00000000000
--- a/serverless-logic/integrate/_attributes
+++ /dev/null
@@ -1 +0,0 @@
-../../_attributes/
\ No newline at end of file
diff --git a/serverless-logic/integrate/images b/serverless-logic/integrate/images
deleted file mode 120000
index 847b03ed054..00000000000
--- a/serverless-logic/integrate/images
+++ /dev/null
@@ -1 +0,0 @@
-../../images/
\ No newline at end of file
diff --git a/serverless-logic/integrate/modules b/serverless-logic/integrate/modules
deleted file mode 120000
index 36719b9de74..00000000000
--- a/serverless-logic/integrate/modules
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/
\ No newline at end of file
diff --git a/serverless-logic/integrate/snippets b/serverless-logic/integrate/snippets
deleted file mode 120000
index 5a3f5add140..00000000000
--- a/serverless-logic/integrate/snippets
+++ /dev/null
@@ -1 +0,0 @@
-../../snippets/
\ No newline at end of file
diff --git a/serverless-logic/observe/_attributes b/serverless-logic/observe/_attributes
deleted file mode 120000
index 20cc1dcb77b..00000000000
--- a/serverless-logic/observe/_attributes
+++ /dev/null
@@ -1 +0,0 @@
-../../_attributes/
\ No newline at end of file
diff --git a/serverless-logic/observe/admin-metrics/_attributes b/serverless-logic/observe/admin-metrics/_attributes
deleted file mode 120000
index 20cc1dcb77b..00000000000
--- a/serverless-logic/observe/admin-metrics/_attributes
+++ /dev/null
@@ -1 +0,0 @@
-../../_attributes/
\ No newline at end of file
diff --git a/serverless-logic/observe/admin-metrics/images b/serverless-logic/observe/admin-metrics/images
deleted file mode 120000
index 847b03ed054..00000000000
--- a/serverless-logic/observe/admin-metrics/images
+++ /dev/null
@@ -1 +0,0 @@
-../../images/
\ No newline at end of file
diff --git a/serverless-logic/observe/admin-metrics/modules b/serverless-logic/observe/admin-metrics/modules
deleted file mode 120000
index 36719b9de74..00000000000
--- a/serverless-logic/observe/admin-metrics/modules
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/
\ No newline at end of file
diff --git a/serverless-logic/observe/admin-metrics/snippets b/serverless-logic/observe/admin-metrics/snippets
deleted file mode 120000
index 5a3f5add140..00000000000
--- a/serverless-logic/observe/admin-metrics/snippets
+++ /dev/null
@@ -1 +0,0 @@
-../../snippets/
\ No newline at end of file
diff --git a/serverless-logic/observe/images b/serverless-logic/observe/images
deleted file mode 120000
index 847b03ed054..00000000000
--- a/serverless-logic/observe/images
+++ /dev/null
@@ -1 +0,0 @@
-../../images/
\ No newline at end of file
diff --git a/serverless-logic/observe/modules b/serverless-logic/observe/modules
deleted file mode 120000
index 36719b9de74..00000000000
--- a/serverless-logic/observe/modules
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/
\ No newline at end of file
diff --git a/serverless-logic/observe/snippets b/serverless-logic/observe/snippets
deleted file mode 120000
index 5a3f5add140..00000000000
--- a/serverless-logic/observe/snippets
+++ /dev/null
@@ -1 +0,0 @@
-../../snippets/
\ No newline at end of file
diff --git a/serverless-logic/observe/tracing/_attributes b/serverless-logic/observe/tracing/_attributes
deleted file mode 120000
index 20cc1dcb77b..00000000000
--- a/serverless-logic/observe/tracing/_attributes
+++ /dev/null
@@ -1 +0,0 @@
-../../_attributes/
\ No newline at end of file
diff --git a/serverless-logic/observe/tracing/images b/serverless-logic/observe/tracing/images
deleted file mode 120000
index 847b03ed054..00000000000
--- a/serverless-logic/observe/tracing/images
+++ /dev/null
@@ -1 +0,0 @@
-../../images/
\ No newline at end of file
diff --git a/serverless-logic/observe/tracing/modules b/serverless-logic/observe/tracing/modules
deleted file mode 120000
index 36719b9de74..00000000000
--- a/serverless-logic/observe/tracing/modules
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/
\ No newline at end of file
diff --git a/serverless-logic/observe/tracing/snippets b/serverless-logic/observe/tracing/snippets
deleted file mode 120000
index 5a3f5add140..00000000000
--- a/serverless-logic/observe/tracing/snippets
+++ /dev/null
@@ -1 +0,0 @@
-../../snippets/
\ No newline at end of file
diff --git a/serverless-logic/operate/_attributes b/serverless-logic/operate/_attributes
deleted file mode 120000
index 20cc1dcb77b..00000000000
--- a/serverless-logic/operate/_attributes
+++ /dev/null
@@ -1 +0,0 @@
-../../_attributes/
\ No newline at end of file
diff --git a/serverless-logic/operate/images b/serverless-logic/operate/images
deleted file mode 120000
index 847b03ed054..00000000000
--- a/serverless-logic/operate/images
+++ /dev/null
@@ -1 +0,0 @@
-../../images/
\ No newline at end of file
diff --git a/serverless-logic/operate/modules b/serverless-logic/operate/modules
deleted file mode 120000
index 36719b9de74..00000000000
--- a/serverless-logic/operate/modules
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/
\ No newline at end of file
diff --git a/serverless-logic/operate/snippets b/serverless-logic/operate/snippets
deleted file mode 120000
index 5a3f5add140..00000000000
--- a/serverless-logic/operate/snippets
+++ /dev/null
@@ -1 +0,0 @@
-../../snippets/
\ No newline at end of file
diff --git a/serverless-logic/release-notes/_attributes b/serverless-logic/release-notes/_attributes
deleted file mode 120000
index 20cc1dcb77b..00000000000
--- a/serverless-logic/release-notes/_attributes
+++ /dev/null
@@ -1 +0,0 @@
-../../_attributes/
\ No newline at end of file
diff --git a/serverless-logic/release-notes/images b/serverless-logic/release-notes/images
deleted file mode 120000
index 847b03ed054..00000000000
--- a/serverless-logic/release-notes/images
+++ /dev/null
@@ -1 +0,0 @@
-../../images/
\ No newline at end of file
diff --git a/serverless-logic/release-notes/modules b/serverless-logic/release-notes/modules
deleted file mode 120000
index 36719b9de74..00000000000
--- a/serverless-logic/release-notes/modules
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/
\ No newline at end of file
diff --git a/serverless-logic/release-notes/snippets b/serverless-logic/release-notes/snippets
deleted file mode 120000
index 5a3f5add140..00000000000
--- a/serverless-logic/release-notes/snippets
+++ /dev/null
@@ -1 +0,0 @@
-../../snippets/
\ No newline at end of file
diff --git a/serverless-logic/secure/_attributes b/serverless-logic/secure/_attributes
deleted file mode 120000
index 20cc1dcb77b..00000000000
--- a/serverless-logic/secure/_attributes
+++ /dev/null
@@ -1 +0,0 @@
-../../_attributes/
\ No newline at end of file
diff --git a/serverless-logic/secure/images b/serverless-logic/secure/images
deleted file mode 120000
index 847b03ed054..00000000000
--- a/serverless-logic/secure/images
+++ /dev/null
@@ -1 +0,0 @@
-../../images/
\ No newline at end of file
diff --git a/serverless-logic/secure/modules b/serverless-logic/secure/modules
deleted file mode 120000
index 36719b9de74..00000000000
--- a/serverless-logic/secure/modules
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/
\ No newline at end of file
diff --git a/serverless-logic/secure/snippets b/serverless-logic/secure/snippets
deleted file mode 120000
index 5a3f5add140..00000000000
--- a/serverless-logic/secure/snippets
+++ /dev/null
@@ -1 +0,0 @@
-../../snippets/
\ No newline at end of file
diff --git a/serverless-logic/snippets b/serverless-logic/snippets
deleted file mode 120000
index 9f5bc7e4dde..00000000000
--- a/serverless-logic/snippets
+++ /dev/null
@@ -1 +0,0 @@
-../snippets
\ No newline at end of file
diff --git a/serverless-logic/troubleshoot/_attributes b/serverless-logic/troubleshoot/_attributes
deleted file mode 120000
index 20cc1dcb77b..00000000000
--- a/serverless-logic/troubleshoot/_attributes
+++ /dev/null
@@ -1 +0,0 @@
-../../_attributes/
\ No newline at end of file
diff --git a/serverless-logic/troubleshoot/images b/serverless-logic/troubleshoot/images
deleted file mode 120000
index 847b03ed054..00000000000
--- a/serverless-logic/troubleshoot/images
+++ /dev/null
@@ -1 +0,0 @@
-../../images/
\ No newline at end of file
diff --git a/serverless-logic/troubleshoot/modules b/serverless-logic/troubleshoot/modules
deleted file mode 120000
index 36719b9de74..00000000000
--- a/serverless-logic/troubleshoot/modules
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/
\ No newline at end of file
diff --git a/serverless-logic/troubleshoot/snippets b/serverless-logic/troubleshoot/snippets
deleted file mode 120000
index 5a3f5add140..00000000000
--- a/serverless-logic/troubleshoot/snippets
+++ /dev/null
@@ -1 +0,0 @@
-../../snippets/
\ No newline at end of file
diff --git a/serverless-logic/uninstall/_attributes b/serverless-logic/uninstall/_attributes
deleted file mode 120000
index 20cc1dcb77b..00000000000
--- a/serverless-logic/uninstall/_attributes
+++ /dev/null
@@ -1 +0,0 @@
-../../_attributes/
\ No newline at end of file
diff --git a/serverless-logic/uninstall/images b/serverless-logic/uninstall/images
deleted file mode 120000
index 847b03ed054..00000000000
--- a/serverless-logic/uninstall/images
+++ /dev/null
@@ -1 +0,0 @@
-../../images/
\ No newline at end of file
diff --git a/serverless-logic/uninstall/modules b/serverless-logic/uninstall/modules
deleted file mode 120000
index 36719b9de74..00000000000
--- a/serverless-logic/uninstall/modules
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/
\ No newline at end of file
diff --git a/serverless-logic/uninstall/snippets b/serverless-logic/uninstall/snippets
deleted file mode 120000
index 5a3f5add140..00000000000
--- a/serverless-logic/uninstall/snippets
+++ /dev/null
@@ -1 +0,0 @@
-../../snippets/
\ No newline at end of file
diff --git a/serverless-logic/upgrade/_attributes b/serverless-logic/upgrade/_attributes
deleted file mode 120000
index 20cc1dcb77b..00000000000
--- a/serverless-logic/upgrade/_attributes
+++ /dev/null
@@ -1 +0,0 @@
-../../_attributes/
\ No newline at end of file
diff --git a/serverless-logic/upgrade/images b/serverless-logic/upgrade/images
deleted file mode 120000
index 847b03ed054..00000000000
--- a/serverless-logic/upgrade/images
+++ /dev/null
@@ -1 +0,0 @@
-../../images/
\ No newline at end of file
diff --git a/serverless-logic/upgrade/modules b/serverless-logic/upgrade/modules
deleted file mode 120000
index 36719b9de74..00000000000
--- a/serverless-logic/upgrade/modules
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/
\ No newline at end of file
diff --git a/serverless-logic/upgrade/snippets b/serverless-logic/upgrade/snippets
deleted file mode 120000
index 5a3f5add140..00000000000
--- a/serverless-logic/upgrade/snippets
+++ /dev/null
@@ -1 +0,0 @@
-../../snippets/
\ No newline at end of file
diff --git a/troubleshoot/_attributes b/troubleshoot/_attributes
new file mode 120000
index 00000000000..f27fd275ea6
--- /dev/null
+++ b/troubleshoot/_attributes
@@ -0,0 +1 @@
+../_attributes/
\ No newline at end of file
diff --git a/troubleshoot/docinfo.xml b/troubleshoot/docinfo.xml
new file mode 100644
index 00000000000..faa4717d191
--- /dev/null
+++ b/troubleshoot/docinfo.xml
@@ -0,0 +1,11 @@
+<title>Troubleshooting OpenShift Serverless Logic</title>
+<productname>{product-title}</productname>
+<productnumber>{product-version}</productnumber>
+<subtitle>Troubleshooting workflow services in OpenShift Serverless Logic</subtitle>
+<abstract>
+    <para>This document describes how to troubleshoot workflow services in OpenShift Serverless Logic.</para>
+</abstract>
+<authorgroup>
+    <orgname>Red Hat OpenShift Documentation Team</orgname>
+</authorgroup>
+<xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/troubleshoot/images b/troubleshoot/images
new file mode 120000
index 00000000000..e4c5bd02a10
--- /dev/null
+++ b/troubleshoot/images
@@ -0,0 +1 @@
+../images/
\ No newline at end of file
diff --git a/troubleshoot/modules b/troubleshoot/modules
new file mode 120000
index 00000000000..43aab75b53c
--- /dev/null
+++ b/troubleshoot/modules
@@ -0,0 +1 @@
+../modules/
\ No newline at end of file
diff --git a/serverless-logic/troubleshoot/serverless-logic-troubleshooting-services.adoc b/troubleshoot/serverless-logic-troubleshooting-services.adoc
similarity index 100%
rename from serverless-logic/troubleshoot/serverless-logic-troubleshooting-services.adoc
rename to troubleshoot/serverless-logic-troubleshooting-services.adoc
diff --git a/troubleshoot/snippets b/troubleshoot/snippets
new file mode 120000
index 00000000000..9d58b92e505
--- /dev/null
+++ b/troubleshoot/snippets
@@ -0,0 +1 @@
+../snippets/
\ No newline at end of file
diff --git a/uninstall/_attributes b/uninstall/_attributes
new file mode 120000
index 00000000000..f27fd275ea6
--- /dev/null
+++ b/uninstall/_attributes
@@ -0,0 +1 @@
+../_attributes/
\ No newline at end of file
diff --git a/serverless-logic/uninstall/deleting-serverless-crds.adoc b/uninstall/deleting-serverless-crds.adoc
similarity index 100%
rename from serverless-logic/uninstall/deleting-serverless-crds.adoc
rename to uninstall/deleting-serverless-crds.adoc
diff --git a/uninstall/docinfo.xml b/uninstall/docinfo.xml
new file mode 100644
index 00000000000..06ac3189bd3
--- /dev/null
+++ b/uninstall/docinfo.xml
@@ -0,0 +1,11 @@
+<title>Uninstalling OpenShift Serverless Logic</title>
+<productname>{product-title}</productname>
+<productnumber>{product-version}</productnumber>
+<subtitle>Removing the OpenShift Serverless Logic Operator</subtitle>
+<abstract>
+    <para>This document describes how to remove the OpenShift Serverless Logic Operator and delete OpenShift Serverless custom resource definitions (CRDs).</para>
+</abstract>
+<authorgroup>
+    <orgname>Red Hat OpenShift Documentation Team</orgname>
+</authorgroup>
+<xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/uninstall/images b/uninstall/images
new file mode 120000
index 00000000000..e4c5bd02a10
--- /dev/null
+++ b/uninstall/images
@@ -0,0 +1 @@
+../images/
\ No newline at end of file
diff --git a/uninstall/modules b/uninstall/modules
new file mode 120000
index 00000000000..43aab75b53c
--- /dev/null
+++ b/uninstall/modules
@@ -0,0 +1 @@
+../modules/
\ No newline at end of file
diff --git a/serverless-logic/uninstall/removing-openshift-serverless-logic-operator.adoc b/uninstall/removing-openshift-serverless-logic-operator.adoc
similarity index 100%
rename from serverless-logic/uninstall/removing-openshift-serverless-logic-operator.adoc
rename to uninstall/removing-openshift-serverless-logic-operator.adoc
diff --git a/uninstall/snippets b/uninstall/snippets
new file mode 120000
index 00000000000..9d58b92e505
--- /dev/null
+++ b/uninstall/snippets
@@ -0,0 +1 @@
+../snippets/
\ No newline at end of file
diff --git a/upgrade/_attributes b/upgrade/_attributes
new file mode 120000
index 00000000000..f27fd275ea6
--- /dev/null
+++ b/upgrade/_attributes
@@ -0,0 +1 @@
+../_attributes/
\ No newline at end of file
diff --git a/upgrade/docinfo.xml b/upgrade/docinfo.xml
new file mode 100644
index 00000000000..cc4dda3508d
--- /dev/null
+++ b/upgrade/docinfo.xml
@@ -0,0 +1,11 @@
+<title>Upgrading OpenShift Serverless Logic</title>
+<productname>{product-title}</productname>
+<productnumber>{product-version}</productnumber>
+<subtitle>Upgrading the OpenShift Serverless Logic Operator</subtitle>
+<abstract>
+    <para>This document describes how to upgrade the OpenShift Serverless Logic Operator between versions.</para>
+</abstract>
+<authorgroup>
+    <orgname>Red Hat OpenShift Documentation Team</orgname>
+</authorgroup>
+<xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/upgrade/images b/upgrade/images
new file mode 120000
index 00000000000..e4c5bd02a10
--- /dev/null
+++ b/upgrade/images
@@ -0,0 +1 @@
+../images/
\ No newline at end of file
diff --git a/upgrade/modules b/upgrade/modules
new file mode 120000
index 00000000000..43aab75b53c
--- /dev/null
+++ b/upgrade/modules
@@ -0,0 +1 @@
+../modules/
\ No newline at end of file
diff --git a/serverless-logic/upgrade/serverless-logic-upgrading-operator-from-1-34-to-1-35.adoc b/upgrade/serverless-logic-upgrading-operator-from-1-34-to-1-35.adoc
similarity index 100%
rename from serverless-logic/upgrade/serverless-logic-upgrading-operator-from-1-34-to-1-35.adoc
rename to upgrade/serverless-logic-upgrading-operator-from-1-34-to-1-35.adoc
diff --git a/serverless-logic/upgrade/serverless-logic-upgrading-operator-from-1-35-to-1-36.adoc b/upgrade/serverless-logic-upgrading-operator-from-1-35-to-1-36.adoc
similarity index 100%
rename from serverless-logic/upgrade/serverless-logic-upgrading-operator-from-1-35-to-1-36.adoc
rename to upgrade/serverless-logic-upgrading-operator-from-1-35-to-1-36.adoc
diff --git a/serverless-logic/upgrade/serverless-logic-upgrading-operator-from-1-36-to-1-37.adoc b/upgrade/serverless-logic-upgrading-operator-from-1-36-to-1-37.adoc
similarity index 100%
rename from serverless-logic/upgrade/serverless-logic-upgrading-operator-from-1-36-to-1-37.adoc
rename to upgrade/serverless-logic-upgrading-operator-from-1-36-to-1-37.adoc
diff --git a/serverless-logic/upgrade/serverless-logic-upgrading-operator-from-1-37-0-to-1-37-1.adoc b/upgrade/serverless-logic-upgrading-operator-from-1-37-0-to-1-37-1.adoc
similarity index 100%
rename from serverless-logic/upgrade/serverless-logic-upgrading-operator-from-1-37-0-to-1-37-1.adoc
rename to upgrade/serverless-logic-upgrading-operator-from-1-37-0-to-1-37-1.adoc
diff --git a/serverless-logic/upgrade/serverless-logic-upgrading-operator-from-1-37-2-to-1-38-0.adoc b/upgrade/serverless-logic-upgrading-operator-from-1-37-2-to-1-38-0.adoc
similarity index 100%
rename from serverless-logic/upgrade/serverless-logic-upgrading-operator-from-1-37-2-to-1-38-0.adoc
rename to upgrade/serverless-logic-upgrading-operator-from-1-37-2-to-1-38-0.adoc
diff --git a/upgrade/snippets b/upgrade/snippets
new file mode 120000
index 00000000000..9d58b92e505
--- /dev/null
+++ b/upgrade/snippets
@@ -0,0 +1 @@
+../snippets/
\ No newline at end of file