diff --git a/src/blog/2023/06/flowforge-1-8-released.md b/src/blog/2023/06/flowforge-1-8-released.md
index 0420febf74..e184e5d6b9 100644
--- a/src/blog/2023/06/flowforge-1-8-released.md
+++ b/src/blog/2023/06/flowforge-1-8-released.md
@@ -20,7 +20,7 @@ FlowFuse now makes it possible to deploy business critical applications built in
 
 Additionally, we're pleased to offer a 30-day premium trial license for self-managed installs on Kubernetes. To avail of this offer, book a demo at [flowforge.com/book-demo](/book-demo).
 
-High Availability is our first [preview feature](/handbook/product/versioning/#preview-features), and your feedback is crucial. We encourage you to try out HA in your Node-RED instances and share your experiences with us. Your feedback will help us refine this feature and make it even better.
+High Availability is our first [preview feature](/handbook/engineering/product/versioning/#preview-features), and your feedback is crucial. We encourage you to try out HA in your Node-RED instances and share your experiences with us. Your feedback will help us refine this feature and make it even better.
 
 <iframe width="560" height="315" src="https://www.youtube.com/embed/mbDkjKhVwIw" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 
diff --git a/src/blog/2024/05/product-strategy-updates.md b/src/blog/2024/05/product-strategy-updates.md
index f09a9ea91e..a27e624ef7 100644
--- a/src/blog/2024/05/product-strategy-updates.md
+++ b/src/blog/2024/05/product-strategy-updates.md
@@ -64,4 +64,4 @@ In the mean time, please do reach out if there are any features you'd like to se
 If you're interested in learning more about our company and product strategies, you can read more detail in our Handbook:
 
 - [Company Strategy](/handbook/company/strategy)
-- [Product Mission Statement](/handbook/product/strategy)
\ No newline at end of file
+- [Product Mission Statement](/handbook/engineering/product/strategy)
\ No newline at end of file
diff --git a/src/blog/2024/07/flowfuse-2-6-release.md b/src/blog/2024/07/flowfuse-2-6-release.md
index 46b15fa5a0..30fe98a009 100644
--- a/src/blog/2024/07/flowfuse-2-6-release.md
+++ b/src/blog/2024/07/flowfuse-2-6-release.md
@@ -17,7 +17,7 @@ tags:
    - Node-RED
 ---
 
-FlowFuse 2.6 is packed with great new features, and in this release we've had a heavy focus on improving the development experience of Node-RED, lowering the barrier to entry for new users and aligning to our [Simplified Hosting](https://flowfuse.com/handbook/product/strategy/#simplified-hosting) and [Low-Code](https://flowfuse.com/handbook/product/strategy/#low-code) plans from our [Product Strategy](https://flowfuse.com/handbook/product/strategy/).
+FlowFuse 2.6 is packed with great new features, and in this release we've had a heavy focus on improving the development experience of Node-RED, lowering the barrier to entry for new users and aligning to our [Simplified Hosting](https://flowfuse.com/handbook/engineering/product/strategy/#simplified-hosting) and [Low-Code](https://flowfuse.com/handbook/engineering/product/strategy/#low-code) plans from our [Product Strategy](https://flowfuse.com/handbook/engineering/product/strategy/).
 
 <!--more-->
 
diff --git a/src/blog/2025/08/getting-started-with-flowfuse-tables.md b/src/blog/2025/08/getting-started-with-flowfuse-tables.md
index 1bdc2ce7ec..9ca1f55380 100644
--- a/src/blog/2025/08/getting-started-with-flowfuse-tables.md
+++ b/src/blog/2025/08/getting-started-with-flowfuse-tables.md
@@ -10,7 +10,7 @@ tags:
    - flowfuse
 ---
 
-FlowFuse recently introduced a [beta release](/handbook/development/releases/#beta-release) built-in database service to their platform, making it easier than ever to store Industrial IoT data. In a typical setup, you would need to provision a database, manage connection strings and credentials, configure nodes, and handle security settings. The goal of this new feature is to simplify or even eliminate those steps entirely. In this article, you will learn how it works and how to get started.
+FlowFuse recently introduced a [beta release](/handbook/engineering/releases/#beta-release) built-in database service to their platform, making it easier than ever to store Industrial IoT data. In a typical setup, you would need to provision a database, manage connection strings and credentials, configure nodes, and handle security settings. The goal of this new feature is to simplify or even eliminate those steps entirely. In this article, you will learn how it works and how to get started.
 
 <!--more-->
 
diff --git a/src/changelog/2024/01/security-updates.md b/src/changelog/2024/01/security-updates.md
index 6b25d24e8f..e25404a1cc 100644
--- a/src/changelog/2024/01/security-updates.md
+++ b/src/changelog/2024/01/security-updates.md
@@ -8,7 +8,7 @@ tags:
 ---
 
 As part of our dedication to providing a secure platform for our customers, we
-operate a [Bug Bounty programme](https://flowfuse.com/handbook/development/security/)
+operate a [Bug Bounty programme](https://flowfuse.com/handbook/engineering/security/)
 to encourage responsible disclosure of potential issues.
 
 With all disclosures we evaluate their severity in terms of their direct impact,
@@ -34,7 +34,7 @@ the relevant API responses.
 We value the effort people put into making responsible disclosures to us and look
 to reward the work where it meets our criteria.
 
-Find out more about our [Bug Bounty programme](https://flowfuse.com/handbook/development/security/).
+Find out more about our [Bug Bounty programme](https://flowfuse.com/handbook/engineering/security/).
 
 
 
diff --git a/src/changelog/2025/07/flowfuse-tables.md b/src/changelog/2025/07/flowfuse-tables.md
index a2c38b7cac..a1ea7f9fd2 100644
--- a/src/changelog/2025/07/flowfuse-tables.md
+++ b/src/changelog/2025/07/flowfuse-tables.md
@@ -28,4 +28,4 @@ The database is a Postgres instance and you will be able to connect 3rd party cl
 
 This feature will be available to FlowFuse Cloud Enterprise Tier customers and to Enterprise Licensed Self Hosted customers on Kubernetes to start with, we hope to make it available to Docker Compose users in a future release.
 
-It is currently marked as a [Beta Feature](https://flowfuse.com/handbook/development/releases/#beta-release) while we continue to iterate on adding new features and observe how it is used.
+It is currently marked as a [Beta Feature](https://flowfuse.com/handbook/engineering/releases/#beta-release) while we continue to iterate on adding new features and observe how it is used.
diff --git a/src/handbook/company/security/incident-response.md b/src/handbook/company/security/incident-response.md
index 757ad6c354..a0def6e2a3 100644
--- a/src/handbook/company/security/incident-response.md
+++ b/src/handbook/company/security/incident-response.md
@@ -22,7 +22,7 @@ This policy covers all information security or data privacy events or incidents.
 
 This policy relates to how we deal with security issues internally. For information
 on how to report potential vulnerabilities in the FlowFuse platform and associated
-components from outside the company, please refer to our [Vulnerability Reporting policy](/handbook/development/security).
+components from outside the company, please refer to our [Vulnerability Reporting policy](/handbook/engineering/security).
 
 ## Incident and Event Definitions
 
diff --git a/src/handbook/company/security/information-security.md b/src/handbook/company/security/information-security.md
index c7d7f27837..d3fa7cbee8 100644
--- a/src/handbook/company/security/information-security.md
+++ b/src/handbook/company/security/information-security.md
@@ -62,7 +62,7 @@ In your email please describe the incident or observation along with any relevan
 details.
 
 Any security issue related to vulnerabilities in the product should be reported
-via our [disclosure policy](../../development/security.md).
+via our [disclosure policy](../../engineering/security.md).
 
 ## Device Policy
 
diff --git a/src/handbook/company/security/secure-development.md b/src/handbook/company/security/secure-development.md
index 1a9ee12d20..a0b84ce05a 100644
--- a/src/handbook/company/security/secure-development.md
+++ b/src/handbook/company/security/secure-development.md
@@ -37,7 +37,7 @@ FlowFuse policy requires that:
     - manual product testing and verification prior to release to production
    
    Code reviews should also cover documentation and tests to ensure our
-   [definition of done](../../development/project-management.md#defining-done) is
+   [definition of done](../../engineering/project-management.md#defining-done) is
    achieved.
 
  3. Risk assessment activities (i.e. threat modeling) must be performed for a
diff --git a/src/handbook/company/strategy.md b/src/handbook/company/strategy.md
index c813e44898..480334feb2 100644
--- a/src/handbook/company/strategy.md
+++ b/src/handbook/company/strategy.md
@@ -129,7 +129,7 @@ assess product-market fit.
 We review KPIs every Tuesday as part of our recurring strategy meeting.
 At this time, we review the following KPIs:
 * Product & Engineering
-   * [Engineering Throughput](../development/project-management.md#engineering-throughput)
+   * [Engineering Throughput](../engineering/project-management.md#engineering-throughput)
    * Active Node-RED Instances
 * Marketing
    * Pipeline Generated
diff --git a/src/handbook/design/design-thinking.md b/src/handbook/design/design-thinking.md
index 5834d43117..ef5afae983 100644
--- a/src/handbook/design/design-thinking.md
+++ b/src/handbook/design/design-thinking.md
@@ -17,7 +17,7 @@ found within [FigJam](./tools#figjam-(more-info)), we have also written up some
 
 ## User Personas
 
-Personas are fictional characters that represent the different users we expect to interact with FlowFuse as a brand and/or platform. At FlowFuse, we have many personas that will evolve over time, we have written up some of our Personas [here](../product/personas/).
+Personas are fictional characters that represent the different users we expect to interact with FlowFuse as a brand and/or platform. At FlowFuse, we have many personas that will evolve over time, we have written up some of our Personas [here](../engineering/product/personas/).
 
 <div class="grid grid-cols-2 gap-4">
     <div class="rounded-md bg-gray-900 text-white p-4 border-2 border-black">
diff --git a/src/handbook/design/process.md b/src/handbook/design/process.md
index 4f82204af9..83cbdd1008 100644
--- a/src/handbook/design/process.md
+++ b/src/handbook/design/process.md
@@ -9,7 +9,7 @@ If you want something designed or drawn, then please follow the details in
 
 ### Product design
 
-The Design process is bound by the [Development Cadence](../development/project-management#cadence).
+The Design process is bound by the [Development Cadence](../engineering/project-management#cadence).
 Work begins on formal design (mid and high-fidelity UX and visual design assets)
 two weeks prior to a release cycle beginning.
 
diff --git a/src/handbook/development/contributing/certified-nodes.md b/src/handbook/engineering/contributing/certified-nodes.md
similarity index 100%
rename from src/handbook/development/contributing/certified-nodes.md
rename to src/handbook/engineering/contributing/certified-nodes.md
diff --git a/src/handbook/development/contributing/ff-tables.md b/src/handbook/engineering/contributing/ff-tables.md
similarity index 100%
rename from src/handbook/development/contributing/ff-tables.md
rename to src/handbook/engineering/contributing/ff-tables.md
diff --git a/src/handbook/development/contributing/index.md b/src/handbook/engineering/contributing/index.md
similarity index 100%
rename from src/handbook/development/contributing/index.md
rename to src/handbook/engineering/contributing/index.md
diff --git a/src/handbook/development/contributing/team-npm-registry.md b/src/handbook/engineering/contributing/team-npm-registry.md
similarity index 100%
rename from src/handbook/development/contributing/team-npm-registry.md
rename to src/handbook/engineering/contributing/team-npm-registry.md
diff --git a/src/handbook/development/frontend/data-attributes.md b/src/handbook/engineering/frontend/data-attributes.md
similarity index 100%
rename from src/handbook/development/frontend/data-attributes.md
rename to src/handbook/engineering/frontend/data-attributes.md
diff --git a/src/handbook/development/frontend/index.md b/src/handbook/engineering/frontend/index.md
similarity index 100%
rename from src/handbook/development/frontend/index.md
rename to src/handbook/engineering/frontend/index.md
diff --git a/src/handbook/development/frontend/layouts.md b/src/handbook/engineering/frontend/layouts.md
similarity index 100%
rename from src/handbook/development/frontend/layouts.md
rename to src/handbook/engineering/frontend/layouts.md
diff --git a/src/handbook/development/frontend/services.md b/src/handbook/engineering/frontend/services.md
similarity index 100%
rename from src/handbook/development/frontend/services.md
rename to src/handbook/engineering/frontend/services.md
diff --git a/src/handbook/development/frontend/testing.md b/src/handbook/engineering/frontend/testing.md
similarity index 100%
rename from src/handbook/development/frontend/testing.md
rename to src/handbook/engineering/frontend/testing.md
diff --git a/src/handbook/development/images/npm-registry-team-type.png b/src/handbook/engineering/images/npm-registry-team-type.png
similarity index 100%
rename from src/handbook/development/images/npm-registry-team-type.png
rename to src/handbook/engineering/images/npm-registry-team-type.png
diff --git a/src/handbook/development/images/pm-burn-rate.png b/src/handbook/engineering/images/pm-burn-rate.png
similarity index 100%
rename from src/handbook/development/images/pm-burn-rate.png
rename to src/handbook/engineering/images/pm-burn-rate.png
diff --git a/src/handbook/development/index.md b/src/handbook/engineering/index.md
similarity index 69%
rename from src/handbook/development/index.md
rename to src/handbook/engineering/index.md
index 71e005454b..965460cf84 100644
--- a/src/handbook/development/index.md
+++ b/src/handbook/engineering/index.md
@@ -5,17 +5,27 @@ navGroup: Engineering & Design Practices
 
 # Engineering
 
-The Engineering team is responsible for writing and maintaining the code for
-FlowFuse's product and infrastructure.
+The Engineering department combines product management and software development
+to build and maintain FlowFuse's product and infrastructure.
 
 This includes, but is not limited to:
 
- - Developing new product features in accordance to the Product plan
- - Providing technical input into the Product planning process - assisting with
-   scoping of items, technical prioritization and sizing.
+ - Defining and prioritizing product requirements based on user and customer needs
+ - Developing new product features in accordance with the product strategy
+ - Providing technical input into the planning process - assisting with
+   scoping of items, technical prioritization and sizing
  - Providing technical support to our customers and community members
  - Ensuring the ongoing operations of FlowFuse Cloud
 
+## Product
+
+The product function defines what we build and why.
+
+- [Product Overview](./product/) - how product management works
+- [Strategy](./product/strategy.md) - where the product is headed
+- [Feedback](./product/feedback.md) - how we collect and process feedback
+- [Pricing Principles](./product/pricing.md) - how we decide feature tiers
+
 ## General
 
 - [Security Policy](./security.md)
diff --git a/src/handbook/development/ops/dedicated.md b/src/handbook/engineering/ops/dedicated.md
similarity index 100%
rename from src/handbook/development/ops/dedicated.md
rename to src/handbook/engineering/ops/dedicated.md
diff --git a/src/handbook/development/ops/deployment.md b/src/handbook/engineering/ops/deployment.md
similarity index 100%
rename from src/handbook/development/ops/deployment.md
rename to src/handbook/engineering/ops/deployment.md
diff --git a/src/handbook/development/ops/incident-response.md b/src/handbook/engineering/ops/incident-response.md
similarity index 100%
rename from src/handbook/development/ops/incident-response.md
rename to src/handbook/engineering/ops/incident-response.md
diff --git a/src/handbook/development/ops/index.md b/src/handbook/engineering/ops/index.md
similarity index 97%
rename from src/handbook/development/ops/index.md
rename to src/handbook/engineering/ops/index.md
index 88963e4c4a..c18c2d2efc 100644
--- a/src/handbook/development/ops/index.md
+++ b/src/handbook/engineering/ops/index.md
@@ -26,6 +26,6 @@ As part of our CI/CD pipeline in our [@flowfuse/flowfuse](https://github.com/Flo
 
 You can read more about our various environments here:
 
-- [Pre Staging](https://flowfuse.com/handbook/development/contributing/#test-changes-in-staging) - used for each individual pull request as part of the code review process.
+- [Pre Staging](https://flowfuse.com/handbook/engineering/contributing/#test-changes-in-staging) - used for each individual pull request as part of the code review process.
 - [Staging](./staging.md) - triggered by merge to `main` branch, used for testing the full application, without fear of damaging the production environment.
 - [Production](./production.md) - the live environment that our customers use.
\ No newline at end of file
diff --git a/src/handbook/development/ops/observability.md b/src/handbook/engineering/ops/observability.md
similarity index 100%
rename from src/handbook/development/ops/observability.md
rename to src/handbook/engineering/ops/observability.md
diff --git a/src/handbook/development/ops/production-stack-update.md b/src/handbook/engineering/ops/production-stack-update.md
similarity index 100%
rename from src/handbook/development/ops/production-stack-update.md
rename to src/handbook/engineering/ops/production-stack-update.md
diff --git a/src/handbook/development/ops/production.md b/src/handbook/engineering/ops/production.md
similarity index 100%
rename from src/handbook/development/ops/production.md
rename to src/handbook/engineering/ops/production.md
diff --git a/src/handbook/development/ops/self-hosted-assistant.md b/src/handbook/engineering/ops/self-hosted-assistant.md
similarity index 100%
rename from src/handbook/development/ops/self-hosted-assistant.md
rename to src/handbook/engineering/ops/self-hosted-assistant.md
diff --git a/src/handbook/development/ops/staging.md b/src/handbook/engineering/ops/staging.md
similarity index 100%
rename from src/handbook/development/ops/staging.md
rename to src/handbook/engineering/ops/staging.md
diff --git a/src/handbook/development/packaging.md b/src/handbook/engineering/packaging.md
similarity index 100%
rename from src/handbook/development/packaging.md
rename to src/handbook/engineering/packaging.md
diff --git a/src/handbook/product/blueprints.md b/src/handbook/engineering/product/blueprints.md
similarity index 100%
rename from src/handbook/product/blueprints.md
rename to src/handbook/engineering/product/blueprints.md
diff --git a/src/handbook/product/dashboard.md b/src/handbook/engineering/product/dashboard.md
similarity index 100%
rename from src/handbook/product/dashboard.md
rename to src/handbook/engineering/product/dashboard.md
diff --git a/src/handbook/product/feedback.md b/src/handbook/engineering/product/feedback.md
similarity index 100%
rename from src/handbook/product/feedback.md
rename to src/handbook/engineering/product/feedback.md
diff --git a/src/handbook/product/glossary.md b/src/handbook/engineering/product/glossary.md
similarity index 100%
rename from src/handbook/product/glossary.md
rename to src/handbook/engineering/product/glossary.md
diff --git a/src/handbook/product/index.md b/src/handbook/engineering/product/index.md
similarity index 91%
rename from src/handbook/product/index.md
rename to src/handbook/engineering/product/index.md
index 5273fc637e..9c8defeb0a 100644
--- a/src/handbook/product/index.md
+++ b/src/handbook/engineering/product/index.md
@@ -1,14 +1,13 @@
 ---
 navTitle: Product
-navGroup: Company
 ---
 # Product
 
-The product department, and Product Managers (PM) by extend are responsible for:
+The product function, and Product Managers (PM) by extension, are responsible for:
 
 1. Understanding and communicating the problem of our users and customers.
 2. Defining requirements for a solution that is loved by our users, customers and the community.
-3. Continuously aligning the product strategy with FlowFuse's core [strategic objectives](../company/strategy.md), ensuring not only that the product meets current market demands but also anticipates future trends.
+3. Continuously aligning the product strategy with FlowFuse's core [strategic objectives](../../company/strategy.md), ensuring not only that the product meets current market demands but also anticipates future trends.
 
 ## Core tasks and responsibilities
 
@@ -22,14 +21,14 @@ The product department, and Product Managers (PM) by extend are responsible for:
 | Determine Pricing Tier for Features                            | While the CEO and Sales team handle pricing, the PM is responsible for determining which features belong to specific [tiers](./pricing.md).                                                                                                                       |
 | Product-Related Decisions                                      | The PM is responsible for making strategic decisions that shape the overall direction of the product.                                                                                                                                                                                                         |
 
-## How the product department works
+## How product works
 
 - [Glossary](./glossary.md)
 - [Feedback](./feedback.md)
 - [Product Categories](./verticals.md)
 - [Strategy](./strategy.md)
 - [Pricing Principles](./pricing.md)
-- [Feature Demos](/handbook/development/project-management#feature-demos)
+- [Feature Demos](/handbook/engineering/project-management#feature-demos)
 - [Versioning](./versioning.md)
 - [Metrics](./metrics.md)
 - [Node-RED Dashboard](./dashboard.md)
diff --git a/src/handbook/product/metrics.md b/src/handbook/engineering/product/metrics.md
similarity index 81%
rename from src/handbook/product/metrics.md
rename to src/handbook/engineering/product/metrics.md
index 47c75cca00..aa8fd473a9 100644
--- a/src/handbook/product/metrics.md
+++ b/src/handbook/engineering/product/metrics.md
@@ -11,10 +11,10 @@ This handbook page provides an overview of the metrics we concentrate on, and ho
 ## Principles
 
 #### Data-driven decision making 
-Aligned with our value of [Results](../company/values.md#📈-results), we are staunch advocates for data-driven decision-making. Instead of relying on assumptions or rushing decisions, we let data guide our actions to drive results. This doesn't mean we become paralyzed in the absence of data. Our Iterative Improvement and Bias for Action values remind us that it's crucial to keep moving forward, even when perfect data isn't available. We balance careful analysis with swift action, using the best information available to us at any given moment.
+Aligned with our value of [Results](../../company/values.md#📈-results), we are staunch advocates for data-driven decision-making. Instead of relying on assumptions or rushing decisions, we let data guide our actions to drive results. This doesn't mean we become paralyzed in the absence of data. Our Iterative Improvement and Bias for Action values remind us that it's crucial to keep moving forward, even when perfect data isn't available. We balance careful analysis with swift action, using the best information available to us at any given moment.
 
 #### Continuous learning and improvement
-Consistent with [Iterative Improvement](../company/values.md#🔁-iterative-improvement), we believe even the smallest changes can contribute to our growth. We're committed to consistently reassessing, learning, and evolving based on the insights our data provides.
+Consistent with [Iterative Improvement](../../company/values.md#🔁-iterative-improvement), we believe even the smallest changes can contribute to our growth. We're committed to consistently reassessing, learning, and evolving based on the insights our data provides.
 
 ## Leading Product Metric
 
diff --git a/src/handbook/product/personas/index.md b/src/handbook/engineering/product/personas/index.md
similarity index 99%
rename from src/handbook/product/personas/index.md
rename to src/handbook/engineering/product/personas/index.md
index 35176669ef..04ae992e00 100644
--- a/src/handbook/product/personas/index.md
+++ b/src/handbook/engineering/product/personas/index.md
@@ -128,7 +128,7 @@ What problem does the persona want to solve, or which benefit does the character
 <div class="persona-card rounded-md bg-gray-900 text-white p-4 border-2 border-black flex flex-col">
     <div class="flex gap-6 border-b-2 border-red-400 pb-3 w-full">
         <div class="w-48 py-2 pr-6 text-center border-r-2 border-teal-400">
-            <img class="w-full rounded-md border-2 border-white m-auto" src="../../images/personas/paul.jpg">
+            <img class="w-full rounded-md border-2 border-white m-auto" src="../../../images/personas/paul.jpg">
             <label class="block mt-2 font-medium text-2xl">Paul</label>
             <label class="block">Plant Manager</label>
         </div>
@@ -204,7 +204,7 @@ What problem does the persona want to solve, or which benefit does the character
 <div class="persona-card rounded-md bg-gray-900 text-white p-4 border-2 border-black flex flex-col">
     <div class="flex gap-6 border-b-2 border-red-400 pb-3 w-full">
         <div class="w-48 py-2 pr-6 text-center border-r-2 border-teal-400">
-            <img class="w-full rounded-md border-2 border-white m-auto" src="../../images/personas/steve.jpg">
+            <img class="w-full rounded-md border-2 border-white m-auto" src="../../../images/personas/steve.jpg">
             <label class="block mt-2 font-medium text-2xl">Steve</label>
             <label class="block">Plant Engineer</label>
         </div>
@@ -280,7 +280,7 @@ What problem does the persona want to solve, or which benefit does the character
 <div class="persona-card rounded-md bg-gray-900 text-white p-4 border-2 border-black flex flex-col">
     <div class="flex gap-6 border-b-2 border-red-400 pb-3 w-full">
         <div class="w-48 py-2 pr-6 text-center border-r-2 border-teal-400">
-            <img class="w-full rounded-md border-2 border-white m-auto" src="../../images/personas/sarah.jpg">
+            <img class="w-full rounded-md border-2 border-white m-auto" src="../../../images/personas/sarah.jpg">
             <label class="block mt-2 font-medium text-2xl">Sarah</label>
             <label class="block">Process Engineer</label>
         </div>
@@ -357,7 +357,7 @@ What problem does the persona want to solve, or which benefit does the character
 <div class="persona-card rounded-md bg-gray-900 text-white p-4 border-2 border-black flex flex-col">
     <div class="flex gap-6 border-b-2 border-red-400 pb-3 w-full">
         <div class="w-48 py-2 pr-6 text-center border-r-2 border-teal-400">
-            <img class="w-full rounded-md border-2 border-white m-auto" src="../../images/personas/isabella.jpg">
+            <img class="w-full rounded-md border-2 border-white m-auto" src="../../../images/personas/isabella.jpg">
             <label class="block mt-2 font-medium text-2xl">Isabella</label>
         <label class="block">IIoT Project Lead & Industrial IT Architect</label>
         </div>
@@ -446,7 +446,7 @@ What problem does the persona want to solve, or which benefit does the character
 <div class="persona-card rounded-md bg-gray-900 text-white p-4 border-2 border-black flex flex-col">
     <div class="flex gap-6 border-b-2 border-red-400 pb-3 w-full">
         <div class="w-48 py-2 pr-6 text-center border-r-2 border-teal-400">
-            <img class="w-full rounded-md border-2 border-white m-auto" src="../../images/personas/peter.jpg">
+            <img class="w-full rounded-md border-2 border-white m-auto" src="../../../images/personas/peter.jpg">
             <label class="block mt-2 font-medium text-2xl">Peter</label>
             <label class="block">Automation and Controls Engineer</label>
         </div>
diff --git a/src/handbook/product/pricing.md b/src/handbook/engineering/product/pricing.md
similarity index 100%
rename from src/handbook/product/pricing.md
rename to src/handbook/engineering/product/pricing.md
diff --git a/src/handbook/product/principles.md b/src/handbook/engineering/product/principles.md
similarity index 100%
rename from src/handbook/product/principles.md
rename to src/handbook/engineering/product/principles.md
diff --git a/src/handbook/product/strategy.md b/src/handbook/engineering/product/strategy.md
similarity index 99%
rename from src/handbook/product/strategy.md
rename to src/handbook/engineering/product/strategy.md
index c0d128e035..c98b9ba3ce 100644
--- a/src/handbook/product/strategy.md
+++ b/src/handbook/engineering/product/strategy.md
@@ -20,7 +20,7 @@ These three pillars ensure we are aligned with our product mission statement and
 
 Any new feature requests, product improvements, or other changes to our product can be reflected back to these pillars to ensure they are in line with our product strategy.
 
-We can break down our product pillars into smaller "Areas", which are more specific focus areas on how to optimize the product pillar. You can see how these Areas are used in our product planning [here](../development/project-management.md).
+We can break down our product pillars into smaller "Areas", which are more specific focus areas on how to optimize the product pillar. You can see how these Areas are used in our product planning [here](../project-management.md).
 
 | Build | Manage | Deploy |
 |-------|--------|--------|
diff --git a/src/handbook/product/telemetry.md b/src/handbook/engineering/product/telemetry.md
similarity index 100%
rename from src/handbook/product/telemetry.md
rename to src/handbook/engineering/product/telemetry.md
diff --git a/src/handbook/product/versioning.md b/src/handbook/engineering/product/versioning.md
similarity index 77%
rename from src/handbook/product/versioning.md
rename to src/handbook/engineering/product/versioning.md
index bc0b3e57ca..a68b19056f 100644
--- a/src/handbook/product/versioning.md
+++ b/src/handbook/engineering/product/versioning.md
@@ -6,7 +6,7 @@ navTitle: Versioning
 
 ## Preview Features
 
-As part of our [continuous improvement](../company/values/#🔁-iterative-improvement) process at FlowFuse, we may designate certain functionalities as Preview Features. During this phase, all of our customers are given the unique opportunity to trial and test these features. While we ensure the provision of support services, it's important to understand that standard service-level agreements do not apply to these Preview Features. We highly value [customer feedback](./feedback.md) during this period; it not only contributes to our feature refinement process, but also shapes the future development of our offerings.
+As part of our [continuous improvement](../../company/values/#🔁-iterative-improvement) process at FlowFuse, we may designate certain functionalities as Preview Features. During this phase, all of our customers are given the unique opportunity to trial and test these features. While we ensure the provision of support services, it's important to understand that standard service-level agreements do not apply to these Preview Features. We highly value [customer feedback](./feedback.md) during this period; it not only contributes to our feature refinement process, but also shapes the future development of our offerings.
 
 There are no extra charges associated with the utilization of Preview Features. Nevertheless, we want to clarify that as these features transition from their preview status to being generally available, they may become subject to changes in pricing in subsequent releases.
 
diff --git a/src/handbook/product/verticals.md b/src/handbook/engineering/product/verticals.md
similarity index 98%
rename from src/handbook/product/verticals.md
rename to src/handbook/engineering/product/verticals.md
index a4670b12b1..d64cb534d6 100644
--- a/src/handbook/product/verticals.md
+++ b/src/handbook/engineering/product/verticals.md
@@ -54,7 +54,7 @@ Our market positioning is underpinned by two pivotal hypotheses that address pre
 1. The prevailing landscape of IIoT software solutions is full of off-the-shelf products that seldom meet the unique demands of specific use cases. This gap underscores a pressing need for flexible, adaptable solutions that can be tailored to fit the intricate requirements of diverse operational environments, ensuring a glove-like fit rather than a one-size-fits-all approach.
 2. The notion that true innovation within a manufacturing landscape should emanate from a bottom-up approach is central to our philosophy. Engineers and frontline workers, immersed in the day-to-day challenges and intricacies of manufacturing processes, are uniquely positioned to identify areas ripe for innovation and improvement. By empowering these individuals with the tools and platforms to implement their insights, we can unlock a wellspring of transformative ideas and solutions that drive the industry forward.
 
-[Here](https://flowfuse.com/handbook/product/personas/#common-use-cases) you can find the demands of specific personas and their classic use cases.
+[Here](https://flowfuse.com/handbook/engineering/product/personas/#common-use-cases) you can find the demands of specific personas and their classic use cases.
 
 ## Low-Code Tools
 
diff --git a/src/handbook/development/project-management.md b/src/handbook/engineering/project-management.md
similarity index 98%
rename from src/handbook/development/project-management.md
rename to src/handbook/engineering/project-management.md
index 449be261f5..3c6cfd95e5 100644
--- a/src/handbook/development/project-management.md
+++ b/src/handbook/engineering/project-management.md
@@ -34,7 +34,7 @@ Week 4: The team prepares for the release that occurs during the same week. The
 
 ## Hierarchy
 
-As per our [Product Strategy](../product/strategy.md), our product is broken into three pillars - Build, Manage and Deploy. Within these pillars we have a collection of [Areas](../product/strategy.md#product-pillars).
+As per our [Product Strategy](/handbook/engineering/product/strategy/), our product is broken into three pillars - Build, Manage and Deploy. Within these pillars we have a collection of [Areas](/handbook/engineering/product/strategy/#product-pillars).
 
 Beneath the areas, we then utilize the standard GitHub hierarchy of Epics, Stories, and Tasks. As such, the hierarchy is as follows:
 
@@ -242,7 +242,7 @@ by the Product Manager (PM) and CTO. It is the main entry point for all issues.
 
 #### Area (for Epics)
 
-As per our [Product Strategy](../product/strategy.md), our product is broken into three pillars - Build, Manage and Deploy. Within these pillars we have a collection of [Areas](../product/strategy.md#product-pillars).
+As per our [Product Strategy](/handbook/engineering/product/strategy/), our product is broken into three pillars - Build, Manage and Deploy. Within these pillars we have a collection of [Areas](/handbook/engineering/product/strategy/#product-pillars).
 
 When we create Epics in GitHub, we assign them to an Area. This helps us to understand where the work fits into our overall product strategy, and what fundamental area of the product will be improved by the work.
 
diff --git a/src/handbook/development/releases/dashboard-2.md b/src/handbook/engineering/releases/dashboard-2.md
similarity index 100%
rename from src/handbook/development/releases/dashboard-2.md
rename to src/handbook/engineering/releases/dashboard-2.md
diff --git a/src/handbook/development/releases/digital-ocean.md b/src/handbook/engineering/releases/digital-ocean.md
similarity index 100%
rename from src/handbook/development/releases/digital-ocean.md
rename to src/handbook/engineering/releases/digital-ocean.md
diff --git a/src/handbook/development/releases/index.md b/src/handbook/engineering/releases/index.md
similarity index 100%
rename from src/handbook/development/releases/index.md
rename to src/handbook/engineering/releases/index.md
diff --git a/src/handbook/development/releases/process.md b/src/handbook/engineering/releases/process.md
similarity index 100%
rename from src/handbook/development/releases/process.md
rename to src/handbook/engineering/releases/process.md
diff --git a/src/handbook/development/security.md b/src/handbook/engineering/security.md
similarity index 100%
rename from src/handbook/development/security.md
rename to src/handbook/engineering/security.md
diff --git a/src/handbook/development/support/index.md b/src/handbook/engineering/support/index.md
similarity index 100%
rename from src/handbook/development/support/index.md
rename to src/handbook/engineering/support/index.md
diff --git a/src/handbook/development/support/triage.md b/src/handbook/engineering/support/triage.md
similarity index 100%
rename from src/handbook/development/support/triage.md
rename to src/handbook/engineering/support/triage.md
diff --git a/src/handbook/development/support/troubleshooting.md b/src/handbook/engineering/support/troubleshooting.md
similarity index 100%
rename from src/handbook/development/support/troubleshooting.md
rename to src/handbook/engineering/support/troubleshooting.md
diff --git a/src/handbook/development/tools.md b/src/handbook/engineering/tools.md
similarity index 100%
rename from src/handbook/development/tools.md
rename to src/handbook/engineering/tools.md
diff --git a/src/handbook/index.md b/src/handbook/index.md
index d20305d24a..1b53836baa 100644
--- a/src/handbook/index.md
+++ b/src/handbook/index.md
@@ -73,10 +73,10 @@ To run our company we provide a comprehensive guide outlining policies, procedur
 
 | | |
 |:----|:----|
-| [Product](/handbook/product/)<br /><p>Planning, scheduling, and where the product will be a year from now</p>
-| [Development](/handbook/development/)<br /><p>How features are delivered with velocity and quality</p>|
-| [Design](/handbook/design/)<br /><p>How information is presented through UX/UI to users, prospects, and internally.</p>
-| [Security](/handbook/company/security/)<br /><p>Keeping what's private private, and what needs protecting protected.</p>|
+| [Engineering](/handbook/engineering/)<br /><p>Product management, development, and how features are delivered with velocity and quality</p>
+| [Design](/handbook/design/)<br /><p>How information is presented through UX/UI to users, prospects, and internally.</p>|
+| [Security](/handbook/company/security/)<br /><p>Keeping what's private private, and what needs protecting protected.</p>
+| <!-- placeholder for now --> |
  
 
 ### Bringing the built product to market
diff --git a/src/handbook/marketing/customer-stories.md b/src/handbook/marketing/customer-stories.md
index 294ea3b90a..658f6e63ff 100644
--- a/src/handbook/marketing/customer-stories.md
+++ b/src/handbook/marketing/customer-stories.md
@@ -31,10 +31,10 @@ A customer story is the same as a case study, these are helpful in illustrating
     - Set the PDF URL as the action after submission, under 'Redirect to another page.'
     - Update and publish the form.
     - Copy the form ID from the script generated when you click on publish.
-11. Create a new branch of the website repository. Follow our standard [development processes](/handbook/development/project-management#development-board). Google Docs has an [extension to convert the reviewed draft document to markdown](https://workspace.google.com/marketplace/app/docs_to_markdown/700168918607?hl=en&pann=docs_addon_widget). 
+11. Create a new branch of the website repository. Follow our standard [development processes](/handbook/engineering/project-management#development-board). Google Docs has an [extension to convert the reviewed draft document to markdown](https://workspace.google.com/marketplace/app/docs_to_markdown/700168918607?hl=en&pann=docs_addon_widget). 
 12. Add the HubSpot formId to your story's front matter, so anyone can download the PDF version of the case study.
 13. It is OK for you to merge your own PR to main without review where the content is urgent or has been reviewed outside of Git but where it is practical to follow the
-[standard process](/handbook/development/project-management#development-board) we encourage you to do so.
+[standard process](/handbook/engineering/project-management#development-board) we encourage you to do so.
 
 ## Customer Story CMS
 
diff --git a/src/handbook/marketing/social-media.md b/src/handbook/marketing/social-media.md
index d059ae78e4..c0f5b6850f 100644
--- a/src/handbook/marketing/social-media.md
+++ b/src/handbook/marketing/social-media.md
@@ -22,7 +22,7 @@ Each content type has channels which are appropriate, this table sets out which
 
 ## Strategy for increasing reach
 
-- Share quality content aligned with the [company strategy](/handbook/company/strategy/) and of interest to our [personas](/handbook/product/personas/#personas) and [ideal customer profile](https://docs.google.com/document/d/1krMIUJvosw8xUQog_iq_FEvI9R5WEo9ZyWUCdTb9XnQ/edit#heading=h.3rr2wuny55dl). 
+- Share quality content aligned with the [company strategy](/handbook/company/strategy/) and of interest to our [personas](/handbook/engineering/product/personas/#personas) and [ideal customer profile](https://docs.google.com/document/d/1krMIUJvosw8xUQog_iq_FEvI9R5WEo9ZyWUCdTb9XnQ/edit#heading=h.3rr2wuny55dl). 
 - Position ourselves as thought leaders.
 - Adapt content frequency and type to each channel.
 - Be social:
diff --git a/src/handbook/peopleops/compensation.md b/src/handbook/peopleops/compensation.md
index b2a3900655..924807a088 100644
--- a/src/handbook/peopleops/compensation.md
+++ b/src/handbook/peopleops/compensation.md
@@ -87,7 +87,7 @@ Please note that the benefits offered may be subject to change during your emplo
 #### For everyone
 
 - [Unlimited PTO](./leave#holiday-policy)
-- [Launch Lunch](../development/releases/process#launch-lunch)
+- [Launch Lunch](../engineering/releases/process#launch-lunch)
 - [Dinner Bonus](#dinner-bonus)
 
 ##### 1Password Family
diff --git a/src/redirects.njk b/src/redirects.njk
index f1a25c6f0e..54acba6dd8 100644
--- a/src/redirects.njk
+++ b/src/redirects.njk
@@ -17,20 +17,22 @@ eleventyExcludeFromCollections: true
 /blog/2023/03/comparinig-dashboards/ /blog/2023/03/comparing-node-red-dashboards 301
 /roadmap/ /changelog/ 301
 /product/roadmap/ /changelog/ 301
-/handbook/development/release/ /handbook/development/releases/ 301
+/handbook/development/* /handbook/engineering/:splat 301
+/handbook/product/* /handbook/engineering/product/:splat 301
+/handbook/development/release/ /handbook/engineering/releases/ 301
 /blog/2023/06/Flowforge-as-a-No-Code-Ethernet_IP-to-Profinet-Protocol-Converter/ /blog/2023/06/node-red-as-a-no-code-ethernet_ip-to-s7-protocol-converter/ 301
 /docs/user/devices/ /docs/device-agent/introduction 301
 /blog/2023/06/node-explained-split/ /node-red/core-nodes/split/ 301
 /blog/2023/07/node-explained-filter/ /node-red/core-nodes/rbe/ 301
 /blog/2022/12/node-red-exec-explained/ /node-red/core-nodes/exec/ 301
 /blog/2023/05/Integrating-Modbus-with-Node-RED /blog/2023/05/integrating-modbus-with-node-red/ 301
-/handbook/development/observability/ /handbook/development/ops/observability/ 301
-/handbook/development/staging/ /handbook/development/ops/staging/ 301
-/handbook/development/how-we-work/staging/ /handbook/development/ops/staging/ 301
-/handbook/development/how-we-work/security/ /handbook/development/security/ 301
-/handbook/development/how-we-work/packaging/ /handbook/development/packaging/ 301
-/handbook/development/how-we-work/contributing/ /handbook/development/contributing/ 301
-/handbook/development/how-we-work/ /handbook/development/ 301
+/handbook/development/observability/ /handbook/engineering/ops/observability/ 301
+/handbook/development/staging/ /handbook/engineering/ops/staging/ 301
+/handbook/development/how-we-work/staging/ /handbook/engineering/ops/staging/ 301
+/handbook/development/how-we-work/security/ /handbook/engineering/security/ 301
+/handbook/development/how-we-work/packaging/ /handbook/engineering/packaging/ 301
+/handbook/development/how-we-work/contributing/ /handbook/engineering/contributing/ 301
+/handbook/development/how-we-work/ /handbook/engineering/ 301
 /handbook/development/git-how-to/ /handbook/company/guides/git/ 301
 /handbook/development/guides/git/ /handbook/company/guides/git/ 301
 /handbook/development/markdown-how-to/ /handbook/company/guides/markdown/ 301