diff --git a/docs/best-practices/edgedb-and-edge-flags/edge-db-via-api-simple.md b/docs/best-practices/edgedb-and-edge-flags/edge-db-via-api-simple.md
index 8608093c..b02d03ac 100644
--- a/docs/best-practices/edgedb-and-edge-flags/edge-db-via-api-simple.md
+++ b/docs/best-practices/edgedb-and-edge-flags/edge-db-via-api-simple.md
@@ -40,7 +40,7 @@ To test it yourself, here is the data:
 
 Next, we need to supply the auth. Switch to the authorization tab and change the type to API Key. 
 
-For the “Value”, supply the server SDK key found in your [environments & keys tab.](/essentials/keys)
+For the “Value”, supply the server SDK key found in your [environments & keys tab.](/platform/account-management/keys)
 
 ![Untitled](/sept-6-2022-edge-flags-api-3.png)
 
diff --git a/docs/best-practices/edgedb-and-edge-flags/import-from-anywhere.md b/docs/best-practices/edgedb-and-edge-flags/import-from-anywhere.md
index 680262b3..166b33b3 100644
--- a/docs/best-practices/edgedb-and-edge-flags/import-from-anywhere.md
+++ b/docs/best-practices/edgedb-and-edge-flags/import-from-anywhere.md
@@ -9,7 +9,7 @@ Super Segments are collections of users that are targeted by data from any exter
 
 This means that users or their data can be “imported” into DevCycle for targeting in experiments or features by making use of EdgeDB. 
 
-While this can all be handled via the [EdgeDB API](/bucketing-api/#tag/EdgeDB), as outlined in [here](/platform/edgedb), DevCycle has created a Zapier integration which allows for easy sending of data directly to the desired EdgeDB environment in a project. This makes connecting any tools (like [Amplitude](https://amplitude.com/), [Segment](https://segment.com/) and others) with Zapier integrations directly to DevCycle extremely simple!
+While this can all be handled via the [EdgeDB API](/bucketing-api/#tag/EdgeDB), as outlined in [here](/platform/feature-flags/targeting/edgedb), DevCycle has created a Zapier integration which allows for easy sending of data directly to the desired EdgeDB environment in a project. This makes connecting any tools (like [Amplitude](https://amplitude.com/), [Segment](https://segment.com/) and others) with Zapier integrations directly to DevCycle extremely simple!
 
 ## Salesforce Guide
 
@@ -61,7 +61,7 @@ If you connect your account, the following fields will require input.
 
 ![Authorize DevCycle](/sept_6_2022_zapier_guide_8.png)
 
-[These keys can be found directly on your Organization’s setting page within DevCycle.](/essentials/keys)
+[These keys can be found directly on your Organization’s setting page within DevCycle.](/platform/account-management/keys)
 
 ![Keys Successful](/sept_6_2022_zapier_guide_9.png)
 
@@ -98,7 +98,7 @@ Now, any time a new lead enters SalesForce, it will be sent to EdgeDB with their
 Now that we’ve got data in EdgeDB, it can be used for targeting in any feature within DevCycle.
 
 :::info 
-Any data saved to EdgeDB is considered a “Custom Property” within DevCycle and can be targeted by simply adding that same property in the dashboard. To find out more about Custom Properties, [read here.](/platform/advanced-targeting/custom-properties) 
+Any data saved to EdgeDB is considered a “Custom Property” within DevCycle and can be targeted by simply adding that same property in the dashboard. To find out more about Custom Properties, [read here.](/platform/feature-flags/targeting/custom-properties) 
 :::
 
 To use the SalesForce data from above, simply create a new custom property in the dashboard (if it does not already exist):
diff --git a/docs/best-practices/engineering-led-experiments.md b/docs/best-practices/engineering-led-experiments.md
index faa76e32..3617c2fb 100644
--- a/docs/best-practices/engineering-led-experiments.md
+++ b/docs/best-practices/engineering-led-experiments.md
@@ -14,10 +14,10 @@ While experimentation is often associated with marketing and revenue, experiment
 
 To complete this guide, you may want to review the following topics:
 
-- [Creating and Managing Variations](/essentials/variables)
-- [Random Distribution Targeting](/essentials/targeting)
-- [Feature Experimentation](/essentials/feature-experimentation)
-- [Creating a Metric](/platform/metrics/creating-and-managing-metrics) and [Metric Types](/platform/metrics/creating-and-managing-metrics#types)
+- [Creating and Managing Variations](/platform/feature-flags/variables-and-variations/variations)
+- [Random Distribution Targeting](/platform/feature-flags/targeting/random-variations)
+- [Feature Experimentation](/platform/experimentation/feature-experimentation)
+- [Creating a Metric](/platform/experimentation/creating-and-managing-metrics) and [Metric Types](/platform/experimentation/creating-and-managing-metrics#types)
 
 ## Metrics in DevCycle
 
@@ -25,7 +25,7 @@ Metrics are how DevCycle measures data based on the custom events you choose to
 
 When you create a metric, it is not tied to a specific feature; they can be defined once and applied to as many features as desired. For instance, we could use the same error metric to determine the error rate of other features.
 
-To learn how to create a metric, read [Creating and Managing Metrics](/platform/metrics/creating-and-managing-metrics#creating-a-metric).
+To learn how to create a metric, read [Creating and Managing Metrics](/platform/experimentation/creating-and-managing-metrics#creating-a-metric).
 
 :::info
 Metrics are available to all customers on any plan. However, Metrics rely on custom events that incur extra costs. These costs will be added to your existing plan. To learn more, read about our pricing, or contact us at support@devcycle.com.
@@ -53,7 +53,7 @@ The `type` field in the object must correspond to the Event Type you defined whe
 :::
 ![Use the Event Type, not the Type](/august-2022-event-type-not-metric-type.png)
 
-If your Metric was a [numerical Type](/platform/metrics/creating-and-managing-metrics#types) (such as Sum Per User, Total Average, etc.) you may want to provide a value within your `event`. Some numerical data you may want to track are latency, load time, number of API calls, etc. Adding a numerical value to your object in JavaScript would look something like this:
+If your Metric was a [numerical Type](/platform/experimentation/creating-and-managing-metrics#types) (such as Sum Per User, Total Average, etc.) you may want to provide a value within your `event`. Some numerical data you may want to track are latency, load time, number of API calls, etc. Adding a numerical value to your object in JavaScript would look something like this:
 
 ```jsx
 const event = {
@@ -65,7 +65,7 @@ devcycleClient.track(event)
 
 You can include other data within the `event` object such as date, target, and metadata. For more information about tracking custom events with our other SDKs, refer to [Tracking Custom Events](/sdk/features).
 
-Once you have set up the SDK to send custom events, you can [apply your Metric to a feature](/platform/metrics/creating-and-managing-metrics#attaching-metrics-to-features).
+Once you have set up the SDK to send custom events, you can [apply your Metric to a feature](/platform/experimentation/creating-and-managing-metrics#attaching-metrics-to-features).
 
 ## Suggested Metrics
 
@@ -116,7 +116,7 @@ Some of the simplest and most precise experiments are basic A/B tests comparing
 
 For more complex features you may compare more variations with several combinations of variable values. You would then randomly distribute the variations according to the number of variations you are including in the experiment.
 
-For more information about comparing multiple variations in an experiment, refer to [Feature Experimentation](/essentials/feature-experimentation#comparing-multiple-variations).
+For more information about comparing multiple variations in an experiment, refer to [Feature Experimentation](/platform/experimentation/feature-experimentation#comparing-multiple-variations).
 
 ### Choosing Metrics
 
diff --git a/docs/best-practices/feature-grouping.md b/docs/best-practices/feature-grouping.md
index f6cead11..5997cf60 100644
--- a/docs/best-practices/feature-grouping.md
+++ b/docs/best-practices/feature-grouping.md
@@ -10,7 +10,7 @@ This guide describes how to manage large amounts of feature flags with DevCycle.
 
 ## Why Group Flags?
 
-Feature Flags can accumulate very quickly. Without an organizational mechanism, the feature management dashboard would be extremely cluttered. Imagine developing a complex feature with various parts, such as the [Metrics and Experimentation feature in DevCycle](/essentials/feature-experimentation). Each piece of functionality needs a flag: There’s a flag for the API, the UI, each type of experimentation, string flags for naming, and so on. It would be helpful to have the ability to find all these flags in the same place.
+Feature Flags can accumulate very quickly. Without an organizational mechanism, the feature management dashboard would be extremely cluttered. Imagine developing a complex feature with various parts, such as the [Metrics and Experimentation feature in DevCycle](/platform/experimentation/feature-experimentation). Each piece of functionality needs a flag: There’s a flag for the API, the UI, each type of experimentation, string flags for naming, and so on. It would be helpful to have the ability to find all these flags in the same place.
 
 Not only do we want flags for each part of a feature, but we also want the ability to turn off the entire feature, all at once, in case something goes wrong. Other Feature Flag management solutions require you to create complex feature flag dependencies to set up a “master switch” for a group of flags. In contrast, DevCycle allows you to easily group feature flags and disable them simultaneously with one switch.
 
@@ -38,7 +38,7 @@ We should also rename our variation. Since our `show-metrics-api` flag is no lon
 
 ![Metrics API Variable is Off](/july-2022-metrics-api-false.png)
 
-But what if we only want a specific group of users to have the API disabled? Let’s say we want our Internal QA users to continue seeing the API, but we want it to be hidden from external users. **This leads to the second method to disable Variables: creating a new [Variation](/essentials/variables).** We can create a new Variation called “General Users” and set the `show-metrics-api` variable to `false`.
+But what if we only want a specific group of users to have the API disabled? Let’s say we want our Internal QA users to continue seeing the API, but we want it to be hidden from external users. **This leads to the second method to disable Variables: creating a new [Variation](/platform/feature-flags/variables-and-variations/variations).** We can create a new Variation called “General Users” and set the `show-metrics-api` variable to `false`.
 
 ![General users variation for Metrics Feature](/july-2022-general-users-variation.png)
 
@@ -48,13 +48,13 @@ Doing so will hide the API from users receiving the General Users variation, whi
 
 **Managing multiple Variables and Variations:**
 
-To learn more about managing multiple Variables and Variations within a feature, [Read here](/essentials/variables).
+To learn more about managing multiple Variables and Variations within a feature, [Read here](/platform/feature-flags/variables-and-variations/variables).
 
 :::
 
 ### Using Targeting as a “Master Switch”
 
-One challenge with many Feature Flag management solutions is creating a switch that controls a whole feature and its feature flag dependencies. DevCycle, however, makes it easy to disable an entire Feature and its Remote Variables using [Targeting Rules](/essentials/targeting).
+One challenge with many Feature Flag management solutions is creating a switch that controls a whole feature and its feature flag dependencies. DevCycle, however, makes it easy to disable an entire Feature and its Remote Variables using [Targeting Rules](/platform/feature-flags/targeting/targeting-overview).
 
 **Method 1: Disabling a feature for everyone**
 
@@ -74,7 +74,7 @@ Targeting Rules also allow you to disable the entire feature for only a specific
 
 **Targeting Users:**
 
-[Read here to learn more about how to Target Users](/essentials/targeting).
+[Read here to learn more about how to Target Users](/platform/feature-flags/targeting/targeting-overview).
 
 :::
 
@@ -88,6 +88,6 @@ This guide explained how to manage large amounts of features flags by:
 
 Here are similar resources to help with organizing Feature Flags:
 
-- [Feature Types](/essentials/features)
+- [Feature Types](/platform/feature-flags/features)
 - [Effectively Organizing Your Feature Flags](/best-practices/effectively-organizing-feature-flags)
-- [Creating Variables & Variations](/essentials/variables)
+- [Creating Variables & Variations](/platform/feature-flags/variables-and-variations/variables)
diff --git a/docs/best-practices/product-led-experimentation.md b/docs/best-practices/product-led-experimentation.md
index 94440a28..c7f4c2bf 100644
--- a/docs/best-practices/product-led-experimentation.md
+++ b/docs/best-practices/product-led-experimentation.md
@@ -16,11 +16,11 @@ We've designed experimentation to be accessible across various roles within your
 
 To complete this guide, you may want to review the following topics:
 
-- [DevCycle Feature Hierarchy](/introduction/core-concepts/feature-hierarchy)
-- [Creating and Managing Variations](/essentials/variables)
-- [Random Distribution Targeting](/essentials/targeting)
-- [Feature Experimentation](/essentials/feature-experimentation)
-- [Creating a Metric](/platform/metrics/creating-and-managing-metrics) and [Metric Types](/platform/metrics/creating-and-managing-metrics#types)
+- [DevCycle Feature Hierarchy](/essentials/feature-hierarchy)
+- [Creating and Managing Variations](/platform/feature-flags/variables-and-variations/variations)
+- [Random Distribution Targeting](/platform/feature-flags/targeting/random-variations)
+- [Feature Experimentation](/platform/experimentation/feature-experimentation)
+- [Creating a Metric](/platform/experimentation/creating-and-managing-metrics) and [Metric Types](/platform/experimentation/creating-and-managing-metrics#types)
 
 ## Conducting Experiments: A Collaborative Approach 
 
@@ -34,7 +34,7 @@ Product managers often spearhead the creation of an experiment brief or structur
 
 - **Hypothesis**: A hypothesis should be specific, measurable, and iterative. The simplest and most effective template for hypotheses is: "By doing [X] to [Y], we expect [Z]." 
 - **Description:** Provide a high-level description of the experiment, make sure to note the location of the experiment and any relevant context.
-- **Target Audience:** Depending on your experiment, you may want to target all users or an audience defined by a [custom property](/platform/advanced-targeting/custom-properties)
+- **Target Audience:** Depending on your experiment, you may want to target all users or an audience defined by a [custom property](/platform/feature-flags/targeting/custom-properties)
     - For example, you may want to run your experiment only on users in Canada or only those that have a certain subscription tier.
 - **Variations:** Decide how many variations you wish to test and what those variations are.
     - For example, will you be testing a red checkout button versus a blue checkout button, or will you be testing a red versus a blue versus a green checkout button?
@@ -48,7 +48,7 @@ Engineers translate experiment structures into code and are often responsible fo
 
 ### Creating the Feature, Variables, & Variations:
 
-Depending on the complexity of the experiment or Feature, the engineers responsible may want to create multiple Variables. For example, engineers may want a separate flag or Variable that controls the backend logic and a separate Variable(s) that control the frontend elements. See [Feature Hierarchy](/introduction/core-concepts/feature-hierarchy) for more information on how Features and Variables relate to each other. 
+Depending on the complexity of the experiment or Feature, the engineers responsible may want to create multiple Variables. For example, engineers may want a separate flag or Variable that controls the backend logic and a separate Variable(s) that control the frontend elements. See [Feature Hierarchy](/essentials/feature-hierarchy) for more information on how Features and Variables relate to each other. 
 
 ![Variable Table](/mar-2024-example-variable-table.png) 
 
@@ -64,10 +64,10 @@ After creating the necessary Variations, select the appropriate Metrics for your
 
 For example, if we expect sorting search results to affect page load time significantly, we would create a Metric to track page load time and attach it to our Feature.
 
-To calculate [Metrics](/platform/metrics/creating-and-managing-metrics), DevCycle uses custom events sent via the API or SDKs. Your team may already be passing events to DevCycle, but if not your engineering team may have to implement 
+To calculate [Metrics](/platform/experimentation/creating-and-managing-metrics), DevCycle uses custom events sent via the API or SDKs. Your team may already be passing events to DevCycle, but if not your engineering team may have to implement 
 [custom event tracking](/best-practices/engineering-led-experiments#calculating-metrics-by-tracking-events) to capture all of the data you wish to use in your experiment. 
 
-Once you have set up the SDK to send custom events, you can [create Metrics](/platform/metrics/creating-and-managing-metrics#creating-a-metric) on the Metric tab in DevCycle. You define whether a decrease or an increase in values means improvement. Metrics uses this input to clearly show whether the results were positive or negative when you start your experiment. 
+Once you have set up the SDK to send custom events, you can [create Metrics](/platform/experimentation/creating-and-managing-metrics#creating-a-metric) on the Metric tab in DevCycle. You define whether a decrease or an increase in values means improvement. Metrics uses this input to clearly show whether the results were positive or negative when you start your experiment. 
 
 ![Creating a Metric](/mar-2024-create-metric.gif)
 
@@ -75,7 +75,7 @@ Once you have set up the SDK to send custom events, you can [create Metrics](/pl
 The **Event Type** in the modal must correspond to the `type` field defined in code. This is not to be confused with the Type selected from the dropdown.
 :::
 
-To [apply your Metric to a Feature](/platform/metrics/creating-and-managing-metrics#attaching-metrics-to-features), navigate to the Comparative Analysis section of the Feature page, and select the metric you wish to attach. 
+To [apply your Metric to a Feature](/platform/experimentation/creating-and-managing-metrics#attaching-metrics-to-features), navigate to the Comparative Analysis section of the Feature page, and select the metric you wish to attach. 
 
 ![Attach a Metric](/mar-2024-attach-metric.gif)
 
@@ -83,7 +83,7 @@ If your team wishes to conduct experiment analysis outside of DevCycle, you can
 
 ### QA & Testing
 
-Product managers can still actively participate during the development process, conducting QA checks in each environment. DevCycle's [Self-Targeting feature](/platform/advanced-targeting/self-targeting), allows product managers to serve themselves different Variations of Features safely without altering targeting rules in each environment.
+Product managers can still actively participate during the development process, conducting QA checks in each environment. DevCycle's [Self-Targeting feature](/platform/testing-and-qa/self-targeting), allows product managers to serve themselves different Variations of Features safely without altering targeting rules in each environment.
 
 Alternatively, you can turn on the Feature/experiment in pre-prod or prod environments & **only** target internal users so your team can test the end experience for users. 
 
@@ -97,7 +97,7 @@ Once you are ready to launch, navigate to Feature, and click on the Production e
 
 ![Random Distribution](/march-2024-random-distribution-experiment-.gif)
 
-To run an experiment, you simply have to setup a [Random Distribution Targeting rule](/platform/advanced-targeting/random-variations) and decide roll-out strategy or schedule the launch of the experiment. 
+To run an experiment, you simply have to setup a [Random Distribution Targeting rule](/platform/feature-flags/targeting/rollouts) and decide roll-out strategy or schedule the launch of the experiment. 
 
 ## 4. Monitor & Analyze Experiment Results
 
@@ -111,7 +111,7 @@ Once the planned time has passed, you can review the graphs created by the Metri
 
 ![Feature Experiment Image](/feature-experiment-full.png)
 
-After you decide which flag variation has the impact you want, you can roll that variation out to 100% of your customers by either [completing the Feature/experiment](/essentials/status-and-lifecycle#completed) or change the experiment targeting rule to serve the winning variation.
+After you decide which flag variation has the impact you want, you can roll that variation out to 100% of your customers by either [completing the Feature/experiment](/platform/feature-flags/status-and-lifecycle#completed) or change the experiment targeting rule to serve the winning variation.
 
 ## Summary
 This guide on Product-Led Experimentation in DevCycle explains how to facilitate collaboration between product managers and engineers to conduct experiments, optimize software, and improve user experiences within the DevCycle. 
diff --git a/docs/best-practices/security/api-keys-secret-scanning.md b/docs/best-practices/security/api-keys-secret-scanning.md
index bf655574..ebe3fcb3 100644
--- a/docs/best-practices/security/api-keys-secret-scanning.md
+++ b/docs/best-practices/security/api-keys-secret-scanning.md
@@ -25,13 +25,13 @@ To maintain the security of your API and SDK keys, follow these best practices:
 2. **Limit key access**: Restrict access to your API and SDK keys only to the necessary personnel and services.
 3. **Regularly review key usage**: Periodically review the usage of your API and SDK keys to detect any anomalies or unauthorized access.
 4. **Rotate keys**: Rotate your API and SDK keys periodically, especially when team members leave the project or in case of a security breach as mentioned above.
-5. **Use different keys for different environments**: Use separate API and SDK keys for different environments (e.g., development, staging, and production) to minimize the potential impact of a compromised key. [Luckily, this is made very easy within DevCycle](/essentials/environments)
+5. **Use different keys for different environments**: Use separate API and SDK keys for different environments (e.g., development, staging, and production) to minimize the potential impact of a compromised key. [Luckily, this is made very easy within DevCycle](/platform/account-management/environments)
 
 ### Understanding SDK Key Types and their security implications
 
 DevCycle splits its SDK keys into 3 categories:
 
-1. **Client**: Meant for single-user contexts, these keys are used in SDK's that have a persistent data store for the user while the SDK is being used. Evaluation of Features happens in the Client SDK API Worker, which then returns all valid variables for a given user. These SDKs also include the Mobile SDKs. For more information on the difference between mobile and standard client-side SDK keys, read [API and SDK keys](/essentials/keys).
+1. **Client**: Meant for single-user contexts, these keys are used in SDK's that have a persistent data store for the user while the SDK is being used. Evaluation of Features happens in the Client SDK API Worker, which then returns all valid variables for a given user. These SDKs also include the Mobile SDKs. For more information on the difference between mobile and standard client-side SDK keys, read [API and SDK keys](/platform/account-management/keys).
 These keys are considered safe to be in a client facing application - but should not be checked into source control.
 2. **Mobile**: These keys are used for Mobile SDKs and provide read-only access to the features accessible by a given user on your DevCycle environment. They grant access to the DevCycle SDK API, which returns user-customized configurations including feature information that they are permitted to access. These keys are the same degree of severity as the Client SDK Keys - but should be considered safe to be in built mobile application binaries, but not checked into source control.
 3. **Server**: Used for server-side SDKs, these keys provide read-only access to the features on your DevCycle environment. They are used for SDKs that make continuous calls to the DevCycle APIs for each SDK interaction per user and have access to the full project configuration data. **These are considered the highest security keys, and should be immediately rotated if compromised.**
diff --git a/docs/best-practices/serverless/azure.md b/docs/best-practices/serverless/azure.md
index 1f4ea2e4..6f2d50d0 100644
--- a/docs/best-practices/serverless/azure.md
+++ b/docs/best-practices/serverless/azure.md
@@ -113,7 +113,7 @@ https://github.com/DevCycleHQ/azure-functions-example
     
     ![Screen Shot 2022-09-13 at 3.52.40 PM.png](/Screen_Shot_2022-09-13_at_3.52.40_PM.png)
     
-6. Go back to your Azure Portal and set the environment variable `SERVER_KEY` in your function app configuration and save. [You can learn more about SDK keys and where to find them here.](/essentials/keys)
+6. Go back to your Azure Portal and set the environment variable `SERVER_KEY` in your function app configuration and save. [You can learn more about SDK keys and where to find them here.](/platform/account-management/keys)
     
     ![Screen Shot 2022-09-13 at 3.55.40 PM.png](/Screen_Shot_2022-09-13_at_3.55.40_PM.png)
     
@@ -137,7 +137,7 @@ https://github.com/DevCycleHQ/azure-functions-example
     
 ### Enable EdgeDB (NodeJS SDK Version)
 
-[First, you need to enable EdgeDB in the DevCycle Dashboard](/platform/edgedb)
+[First, you need to enable EdgeDB in the DevCycle Dashboard](/platform/feature-flags/targeting/edgedb)
 
 With the [DevCycle NodeJs SDK](/sdk/server-side-sdks/node) we use the `enableCloudBucketing` and `enableEdgeDB` options to enable EdgeDB usage. ([SDK initialization option details: ](/sdk/server-side-sdks/node/node-gettingstarted#initialization-options))
 
diff --git a/docs/best-practices/serverless/lambda.md b/docs/best-practices/serverless/lambda.md
index 7158f80f..30df33d4 100644
--- a/docs/best-practices/serverless/lambda.md
+++ b/docs/best-practices/serverless/lambda.md
@@ -50,7 +50,7 @@ The [README in the example repo has more details regarding the Lambda Setup.](ht
 1. Clone the [devcycle-lambda-example](https://github.com/DevCycleHQ/devcycle-lambda-example) repo
 2. In this example, we are using a **_server_ key.** Copy your server key as the `<DEVCYCLE_SERVER_SDK_KEY>`
     in the `initializeDevCycle` call.
-   [(You can get your Server SDK key from the DevCycle dashboard)](/essentials/keys)
+   [(You can get your Server SDK key from the DevCycle dashboard)](/platform/account-management/keys)
 
 ```jsx
 const devcycleClient = await initializeDevCycle(
diff --git a/docs/best-practices/serverless/serverless-cloud-functions.md b/docs/best-practices/serverless/serverless-cloud-functions.md
index 7cda0fb2..532db2e8 100644
--- a/docs/best-practices/serverless/serverless-cloud-functions.md
+++ b/docs/best-practices/serverless/serverless-cloud-functions.md
@@ -65,7 +65,7 @@ To set the feature flags, make sure you have a [DevCycle](https://app.devcycle.c
     ![Screen Shot 2022-09-13 at 11.42.38 AM.png](/Screen_Shot_2022-09-13_at_11.42.38_AM.png)
     
 3. Add the environment variable `SERVER_KEY` under “Runtime environment variables” ([Related Google Doc](https://cloud.google.com/functions/docs/configuring/env-var) 
-For getting the server-side SDK key from DevCycle, you can read this section ([https://docs.devcycle.com/essentials/keys](/essentials/keys))
+For getting the server-side SDK key from DevCycle, you can read this section ([https://docs.devcycle.com/platform/account-management/keys](/platform/account-management/keys))
     ![Screen Shot 2022-09-13 at 11.51.57 AM.png](/Screen_Shot_2022-09-13_at_11.51.57_AM.png)
     
 4. Click “Next” and enter the ([contents of the `index.js` from the example repo](https://github.com/DevCycleHQ/google-cloud-functions-example/blob/main/index.js)) into the Console
@@ -100,13 +100,13 @@ EdgeDB is purpose built to work at edge, and when used in conjunction with a ser
 
 Here is some more reading: 
 
-[What is EdgeDB?](/platform/edgedb)
+[What is EdgeDB?](/platform/feature-flags/targeting/edgedb)
 
-[Use Cases of EdgeDB ](/platform/edgedb#use-cases)
+[Use Cases of EdgeDB ](/platform/feature-flags/targeting/edgedb#use-cases)
 
 ### Enable EdgeDB (NodeJS SDK Version)
 
-First, you need to [enable EdgeDB](/platform/edgedb#setup) in the DevCycle Dashboard
+First, you need to [enable EdgeDB](/platform/feature-flags/targeting/edgedb#setup) in the DevCycle Dashboard
 
 With the [DevCycle NodeJs SDK ](/sdk/server-side-sdks/node) we use the `enableCloudBucketing` and `enableEdgeDB` options to enable EdgeDB usage. ([SDK initialization option details: ](/sdk/server-side-sdks/node/node-gettingstarted#initialization-options))
 
diff --git a/docs/best-practices/tech-debt.md b/docs/best-practices/tech-debt.md
index ad7b0ab9..8bd1c783 100644
--- a/docs/best-practices/tech-debt.md
+++ b/docs/best-practices/tech-debt.md
@@ -92,7 +92,7 @@ DevCycle also includes the ability to mark a Feature as "completed", which is a
 a Feature and fully removing it from your code. Completion allows you to serve a single Variation of the Feature to all
 users and prevent further changes to its configuration. In this state, DevCycle will ensure your code continues to 
 receive the correct final state of the Feature, like the "released" state of a Release-type Feature. For more information,
-see [Feature Status & Lifecycle](/essentials/status-and-lifecycle)
+see [Feature Status & Lifecycle](/platform/feature-flags/status-and-lifecycle)
 
 The next step is to remove the Feature's Variables from your code, and eventually archive the Feature in DevCycle
 so that it no longer appears in the list of active Features.
diff --git a/docs/cli-guides/targeting.md b/docs/cli-guides/targeting.md
index 9def8a49..b2472b08 100644
--- a/docs/cli-guides/targeting.md
+++ b/docs/cli-guides/targeting.md
@@ -76,10 +76,10 @@ You will be prompted to select a feature, environment and what you would like to
 
 You should then select `Add Targeting Rule` and will be prompted to define a Name, Variations to serve and a filter. For this case, if you have not yet created any filters, you should select `Add Filter`.
 
-Here you will be prompted to select a definition of all (for all users), user (to target a specific user based on an identifier like email, country, etc.) or audienceMatch [(see Audiences)](/platform/advanced-targeting/audiences).
+Here you will be prompted to select a definition of all (for all users), user (to target a specific user based on an identifier like email, country, etc.) or audienceMatch [(see Audiences)](/platform/feature-flags/targeting/audiences).
 
 :::info
-Looking to reuse an audience in user targeting for features? Be sure to check out the our documentation explaining how to [create and manage Audiences via our API or within the DevCycle dashboard](/platform/advanced-targeting/audiences).
+Looking to reuse an audience in user targeting for features? Be sure to check out the our documentation explaining how to [create and manage Audiences via our API or within the DevCycle dashboard](/platform/feature-flags/targeting/audiences).
 :::
 
 Once you have chosen your relevant definition select `Continue` (twice) when prompted. If successful you should see a flow which resembles the following (which represents added a new targeting rule to `feature-a` in the `Staging Environment` for any users with the email address that contains `devcycle` and will serve them a variation named `New Variation` ):
diff --git a/docs/essentials/_category_.yml b/docs/essentials/_category_.yml
index f61e9afa..e3ca2192 100644
--- a/docs/essentials/_category_.yml
+++ b/docs/essentials/_category_.yml
@@ -1,2 +1,2 @@
 label: 'Essentials'
-position: 3
+position: 2
diff --git a/docs/introduction/architecture.md b/docs/essentials/architecture.md
similarity index 98%
rename from docs/introduction/architecture.md
rename to docs/essentials/architecture.md
index 1a3fa35f..95e68acf 100644
--- a/docs/introduction/architecture.md
+++ b/docs/essentials/architecture.md
@@ -82,7 +82,7 @@ and configuration data locally to bucket users into features and variations to d
 
 For most use cases, local bucketing SDKs provide superior performance and reliability.
 However, the cloud-bucketing SDKs can make integration easier for specific use cases where access to
-[EdgeDB](/platform/edgedb) to integrate user data between client-side and backend applications is needed.
+[EdgeDB](/platform/feature-flags/targeting/edgedb) to integrate user data between client-side and backend applications is needed.
 
 1. On each `variableValue()` / `variable()` call, the Cloud Bucketing Server SDKs fetch data from the 
 [Bucketing API](/bucketing-api/) served by Cloudflare Workers at the edge.
diff --git a/docs/introduction/core-concepts/feature-hierarchy.md b/docs/essentials/feature-hierarchy.md
similarity index 95%
rename from docs/introduction/core-concepts/feature-hierarchy.md
rename to docs/essentials/feature-hierarchy.md
index 4bdca796..c315b1f4 100644
--- a/docs/introduction/core-concepts/feature-hierarchy.md
+++ b/docs/essentials/feature-hierarchy.md
@@ -1,6 +1,6 @@
 ---
 title: Feature Hierarchy
-sidebar_position: 1
+sidebar_position: 4
 ---
 In a traditional feature flagging platform, there is only one type of entity to worry about: a `feature flag`! In these 
 platforms, a `feature flag` contains the targeting rules and possible values for its respective key, all rolled into one.
@@ -40,7 +40,7 @@ For more detail on each of these concepts, see below.
 
 Variables are the main "primitive" that you interact with using the DevCycle SDK. A `Variable` is identified by a unique
 `key`, has a particular data type, and can optionally be defined with a 
-more specific [schema](/platform/advanced-variables/variable-schemas) of possible allowed values.
+more specific [schema](/platform/security-and-guardrails/variable-schemas) of possible allowed values.
 
 > Variables may be the following types: `Boolean`, `JSON`, `Number`, or `String`.
 
@@ -71,7 +71,7 @@ A `Feature` can most simply be thought of as a "new product feature", but could
 
 > By default, upon creation of a Feature, a Boolean Variable will be created which has the same name as the Feature's key for easier reference. Variables cannot be used in multiple existing Features, so their keys must be unique. The Variable Type helps enforce consistent usage across the team to avoid type mismatches in different use cases.
 
-When creating a Feature in the DevCycle, you will be able to choose a [Feature Type](/introduction/core-concepts/feature-types) which will pre-fill some options in the Feature and help kick-start your usage of the Feature. 
+When creating a Feature in the DevCycle, you will be able to choose a [Feature Type](/essentials/feature-types) which will pre-fill some options in the Feature and help kick-start your usage of the Feature. 
 
 
 ## Variations 
diff --git a/docs/introduction/core-concepts/feature-types.md b/docs/essentials/feature-types.md
similarity index 99%
rename from docs/introduction/core-concepts/feature-types.md
rename to docs/essentials/feature-types.md
index fc3583ef..c9a58350 100644
--- a/docs/introduction/core-concepts/feature-types.md
+++ b/docs/essentials/feature-types.md
@@ -1,6 +1,6 @@
 ---
 title: Feature Types
-sidebar_position: 2
+sidebar_position: 5
 ---
 
 Feature Types within the DevCycle dashboard are a way of describing and handling Feature Toggles / Feature Flags in more complex and diverse ways. 
diff --git a/docs/introduction/key-features.md b/docs/essentials/key-features.md
similarity index 81%
rename from docs/introduction/key-features.md
rename to docs/essentials/key-features.md
index e7d0c242..2810a8b6 100644
--- a/docs/introduction/key-features.md
+++ b/docs/essentials/key-features.md
@@ -13,9 +13,9 @@ Here are the core concepts and features behind them that we think make us differ
 For feature flagging to be effective, all team members need to be able to operate without fear of breaking production. We use a balance of guardrails, permissions and observability to ensure all users have confidence in the actions they are taking.
 
 Here's how:
-- Govern who can modify flags in production using [Permissions](/platform/permissions).
-- Allow non-technical users to modify flag values safely, by enforcing [schemas](/platform/advanced-variables/variable-schemas).
-- Easily see a [detailed history](/platform/audit-log) of all changes to flags.
+- Govern who can modify flags in production using [Permissions](/platform/security-and-guardrails/permissions).
+- Allow non-technical users to modify flag values safely, by enforcing [schemas](/platform/security-and-guardrails/variable-schemas).
+- Easily see a [detailed history](/platform/security-and-guardrails/audit-log) of all changes to flags.
 - Write type-safe code using our [Code Generators](/sdk/client-side-sdks/javascript/javascript-typescript).
 - Ensure a predictable process for changing flags using Gitops and [Terraform](/integrations/terraform).
 
@@ -25,16 +25,16 @@ Excellent developer tools reduce context-switching away from code as much as pos
 Here's how:
 - Use the [CLI](/cli) and [Editor Plugins](/integrations#ide-plugins) to manage flags without interrupting your work. 
 - Detect and jump to flag usages in code, and quickly see whether flags are enabled in each environment. 
-- [Override](/platform/advanced-targeting/self-targeting) your own flag values for development or testing in production.
+- [Override](/platform/testing-and-qa/self-targeting) your own flag values for development or testing in production.
 
 ## Feature Flagging is a Team Sport
 Feature flags are most valuable when all team members are part of the process. A feature flag's purpose, state and impact should be obvious and discoverable to all users.
 
 Here's how:
 - We never [bill](https://devcycle.com/pricing) on seats.
-- Group multiple related flags and change their values together using [Features](/introduction/core-concepts/feature-hierarchy).
+- Group multiple related flags and change their values together using [Features](/essentials/feature-hierarchy).
 - Link your flags to productivity tools like [Jira](/integrations/jira) or [Slack](/integrations/slack).
-- Safely QA your flags in development or right in production with [Self-Targeting](/platform/advanced-targeting/self-targeting).
+- Safely QA your flags in development or right in production with [Self-Targeting](/platform/testing-and-qa/self-targeting).
 
 ## Features Aren't Complete Until Flags Have Been Removed
 Old, unused flags are tech-debt that create operational risk. This means that the process of removing flags is as important as creating them.
@@ -42,20 +42,20 @@ Old, unused flags are tech-debt that create operational risk. This means that th
 Here's how you can keep your feature flagging environment clean in DevCycle:
 - Keep on top of which flags are actually being used in your codebase with
 [Code Usage Detection](/best-practices/tech-debt#code-usages). 
-- Mark flags as "[completed](/essentials/status-and-lifecycle)" when a feature is released.
+- Mark flags as "[completed](/platform/feature-flags/status-and-lifecycle)" when a feature is released.
 - Automatically remove your flags with our [CLI Cleanup](/cli/docs/cleanup) command.
 
 ## Let Us Manage User Data
 Modern architecture means distributed systems running at the edge. Relevant targeting data isn't always available in all systems or services. So we've built ways to keep our platform fast while managing targeting data for you.
 
 Here's how:
-- Store user attributes in a [fast, globally-replicated database](/platform/edgedb) and target flags based on those attributes. 
-- Easily add a full [feature opt-in](/platform/advanced-targeting/feature-opt-in) experience to your application to allow end users to control their experience.
+- Store user attributes in a [fast, globally-replicated database](/platform/feature-flags/targeting/edgedb) and target flags based on those attributes. 
+- Easily add a full [feature opt-in](/platform/extras/feature-opt-in) experience to your application to allow end users to control their experience.
 
 ## Integrate with Any Other Tool
 Feature flagging is better when integrated into the rest of your critical tools. While we have a selection of [integrations](/integrations) built and ready for you to install, we understand you may need other integrations so we've made DevCycle as extensible as possible.
 
 See how to integrate your own tools:
-- Notify external systems of changes to your flags using [Outbound Webhooks](/platform/webhooks). 
+- Notify external systems of changes to your flags using [Outbound Webhooks](/platform/extras/webhooks). 
 - See changes in your [monitoring systems](/integrations#observability) and alert on potential issues.
 - A complete [API](/management-api) and [CLI](/cli) are available to run automations or scripts as necessary.
diff --git a/docs/essentials/overview.md b/docs/essentials/overview.md
index a4ca8128..2fe96f61 100644
--- a/docs/essentials/overview.md
+++ b/docs/essentials/overview.md
@@ -106,7 +106,7 @@ By default, Bucketing is performed consistently on DevCycle by leveraging a hash
 
 ## A/B Testing & Experimentation
 
-Experimentation and A/B Testing are important parts of a Feature’s lifecycle. Experiments can be as simple as comparing any audiences against a metric or can be fully [randomized](https://docs.devcycle.com/essentials/targeting#serving-a-random-variation-experimentation--random-distribution) A/B tests using statistical methodologies. 
+Experimentation and A/B Testing are important parts of a Feature’s lifecycle. Experiments can be as simple as comparing any audiences against a metric or can be fully [randomized](https://docs.devcycle.com/platform/feature-flags/targeting/random-variations) A/B tests using statistical methodologies. 
 
 The primary concept of an experiment is the need to have at least two different experiences to compare performance. Any Feature in DevCycle can be turned into an experiment, and it only requires the following:
 
diff --git a/docs/index.mdx b/docs/index.mdx
index 277a28a9..5a964e23 100644
--- a/docs/index.mdx
+++ b/docs/index.mdx
@@ -24,13 +24,13 @@ DevCycle is a feature flag platform built for teams of any size, helping you eas
 
     With tons of built-in features, DevCycle is ready to add to your project today!
 
-**[Follow our Quickstart](/introduction/quickstart) to learn how everything works, or [install an SDK](sdk) for your favorite language to start adding feature flags to a new or existing project.**
+**[Follow our Quickstart](/quickstart) to learn how everything works, or [install an SDK](sdk) for your favorite language to start adding feature flags to a new or existing project.**
 
 <CustomDocCardList
   items={[
     {
       type: 'link',
-      href: '/introduction/quickstart',
+      href: '/quickstart',
       label: 'Quickstart',
       description:
         'Step-by-step guide to adding features to a new or existing project.',
@@ -38,7 +38,7 @@ DevCycle is a feature flag platform built for teams of any size, helping you eas
     },
     {
       type: 'link',
-      href: '/introduction/key-features',
+      href: '/essentials/key-features',
       description:
         'See the key features of the platform.',
       label: 'Key Features',
diff --git a/docs/integrations/index.mdx b/docs/integrations/index.mdx
index ea18fbd9..18bc1703 100644
--- a/docs/integrations/index.mdx
+++ b/docs/integrations/index.mdx
@@ -68,7 +68,7 @@ DevCycle APIs, as well as third party integrations to connect DevCycle to the to
     },
     {
       type: 'link',
-      href: '/platform/webhooks',
+      href: '/platform/extras/webhooks',
       description: 'Connect apps and services to DevCycle. ',
       label: 'Webhooks',
       icon: 'ph:webhooks-logo',
diff --git a/docs/integrations/vercel-edge-config.md b/docs/integrations/vercel-edge-config.md
index 85adcc45..8a1e7211 100644
--- a/docs/integrations/vercel-edge-config.md
+++ b/docs/integrations/vercel-edge-config.md
@@ -45,7 +45,7 @@ After you have made your selections, hit "Submit" to finish configuring the inte
 
 ### Setup SDK
 
-If you haven't already installed the DevCycle [Node.js](https://docs.devcycle.com/sdk/server-side-sdks/node/) or [Next.js](https://docs.devcycle.com/sdk/server-side-sdks/nestjs/) SDK you can follow the installation and usage guides for those SDKs in our [documentation here](https://docs.devcycle.com/sdk/). You can also find helpful setup information like where to find SDK keys in our [Quickstart Tutorial](https://docs.devcycle.com/introduction/quickstart).
+If you haven't already installed the DevCycle [Node.js](https://docs.devcycle.com/sdk/server-side-sdks/node/) or [Next.js](https://docs.devcycle.com/sdk/server-side-sdks/nestjs/) SDK you can follow the installation and usage guides for those SDKs in our [documentation here](https://docs.devcycle.com/sdk/). You can also find helpful setup information like where to find SDK keys in our [Quickstart Tutorial](https://docs.devcycle.com/quickstart).
 
 Make sure the Edge Config you would like to use has been connected to the project where you’re planning to run the DevCycle code. Vercel's documentation for this can be found [here](https://vercel.com/docs/storage/edge-config/get-started#connect-your-vercel-project).
 
diff --git a/docs/introduction/core-concepts/_category_.yml b/docs/introduction/core-concepts/_category_.yml
deleted file mode 100644
index c60ec333..00000000
--- a/docs/introduction/core-concepts/_category_.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-label: 'Core Concepts'
-position: 3
-collapsed: false
diff --git a/docs/platform/_category_.yml b/docs/platform/_category_.yml
index 57bb2fa2..d6b460ce 100644
--- a/docs/platform/_category_.yml
+++ b/docs/platform/_category_.yml
@@ -1,2 +1,2 @@
 label: 'Platform'
-position: 0
+position: 3
diff --git a/docs/platform/account-management/_category_.yml b/docs/platform/account-management/_category_.yml
new file mode 100644
index 00000000..a476a7a9
--- /dev/null
+++ b/docs/platform/account-management/_category_.yml
@@ -0,0 +1,2 @@
+label: 'Account Management'
+position: 3
diff --git a/docs/essentials/environments.md b/docs/platform/account-management/environments.md
similarity index 93%
rename from docs/essentials/environments.md
rename to docs/platform/account-management/environments.md
index ec49c236..a36f39b6 100644
--- a/docs/essentials/environments.md
+++ b/docs/platform/account-management/environments.md
@@ -1,6 +1,6 @@
 ---
 title: Environments
-sidebar_class_name: hidden
+sidebar_position: 3
 ---
 
 Environments in DevCycle map to the environments which traditionally exist within a system's development lifecycle. Every Feature within DevCycle will exist across every Environment in your DevCycle Project, but each Environment manages Features independently. 
@@ -18,11 +18,11 @@ Every new project within DevCycle starts with three initial Environments:
 * Staging
 * Production
 
-Each environment has its own set of SDK keys for Client-Side, Mobile, and Server-Side SDKs. To learn more about these keys and how to use them, read [Access Keys & Tokens](/essentials/keys).
+Each environment has its own set of SDK keys for Client-Side, Mobile, and Server-Side SDKs. To learn more about these keys and how to use them, read [Access Keys & Tokens](/platform/account-management/keys).
 
 > **Every Feature you create will automatically be created on every environment within a project.** Each environment then has its own set of targeting rules. This means that a feature's code can be deployed across every environment, and its access can be managed on an environment level. 
 
-You can easily view a Feature's status across all environments by simply going to that Feature's management page, and the Feature's targeting or availability across each environment can be managed directly from that page in the associated targeting section. More details on [turning features on or off can be found here](/essentials/features), and more details on creating rules for your [Feature on each environment can be found here](/essentials/targeting).
+You can easily view a Feature's status across all environments by simply going to that Feature's management page, and the Feature's targeting or availability across each environment can be managed directly from that page in the associated targeting section. More details on [turning features on or off can be found here](/platform/feature-flags/features), and more details on creating rules for your [Feature on each environment can be found here](/platform/feature-flags/targeting/targeting-overview).
 
 ---
 
diff --git a/docs/essentials/keys.md b/docs/platform/account-management/keys.md
similarity index 97%
rename from docs/essentials/keys.md
rename to docs/platform/account-management/keys.md
index 186273ca..87faa99a 100644
--- a/docs/essentials/keys.md
+++ b/docs/platform/account-management/keys.md
@@ -1,6 +1,6 @@
 ---
 title: Keys
-sidebar_position: 3
+sidebar_position: 4
 ---
 
 > All Environments within a Project have their own set of keys. For more information about Environments, [please read here](/essentials/overview#environments).
@@ -14,7 +14,7 @@ SDK Keys are used to authenticate an SDK with DevCycle.
 
 SDK keys are separated into Server, Mobile and Client due to the unique security requirements and constraints of each platform.
 
-Features can also be targeted to a specific type of SDK using [SDK Visibility](/platform/sdk-visibility)
+Features can also be targeted to a specific type of SDK using [SDK Visibility](/platform/security-and-guardrails/sdk-visibility)
 
 #### Server Keys
 
diff --git a/docs/essentials/organizations.md b/docs/platform/account-management/organizations.md
similarity index 92%
rename from docs/essentials/organizations.md
rename to docs/platform/account-management/organizations.md
index 27282f88..b8808dec 100644
--- a/docs/essentials/organizations.md
+++ b/docs/platform/account-management/organizations.md
@@ -1,15 +1,15 @@
 ---
 title: Organizations
-sidebar_position: 2
+sidebar_position: 1
 ---
 
-Organizations are the top level of the Account hierarchy within DevCycle, and are where all Users and Projects are managed. Users within an organization will have the same [permissions](/platform/permissions) across all projects, and a user may be part of multiple Organizations.
+Organizations are the top level of the Account hierarchy within DevCycle, and are where all Users and Projects are managed. Users within an organization will have the same [permissions](/platform/security-and-guardrails/permissions) across all projects, and a user may be part of multiple Organizations.
 
 To view the current Organization (or change Organizations) click on your user avatar on the top right of the DevCycle Dashboard. The active Organization will have a green badge next to it.
 
 :::tip
 
-[Granular permissions](/platform/permissions) are only available on business or enterprise plans, if you'd like to turn on permissions message us at support[at]devcycle.com
+[Granular permissions](/platform/security-and-guardrails/permissions) are only available on business or enterprise plans, if you'd like to turn on permissions message us at support[at]devcycle.com
 
 :::
  
@@ -35,7 +35,7 @@ On the Organization settings page there are the following fields and items:
 | ------------------------------- | ------------------------------------------------------------------------------------------------------------- |
 | **Organization Name**           | This is your organization's name which will be used throughout the Dashboard as well as in the API responses. |
 | **Organization ID**             | The internal identifier for your organization. Mainly used for billing purposes                               |
-| **Client ID and Client Secret** | Please refer to [API and SDK Keys](/essentials/keys)                                                          |
+| **Client ID and Client Secret** | Please refer to [API and SDK Keys](/platform/account-management/keys)                                                          |
 
 ---
 
@@ -79,7 +79,7 @@ The table below displays the built-in roles and their associated permissions:
 | Edit Team Member Roles        |  ✅   |           |        |
 | Modify Features in Production |  ✅   |    ✅     |        |
 
-For more information, check out the [Permissions](/platform/permissions) documentation.
+For more information, check out the [Permissions](/platform/security-and-guardrails/permissions) documentation.
 
 **Assigning Roles**
 
diff --git a/docs/essentials/projects.md b/docs/platform/account-management/projects.md
similarity index 82%
rename from docs/essentials/projects.md
rename to docs/platform/account-management/projects.md
index 028c2b03..0f162f4b 100644
--- a/docs/essentials/projects.md
+++ b/docs/platform/account-management/projects.md
@@ -1,9 +1,9 @@
 ---
 title: Projects
-sidebar_class_name: hidden
+sidebar_position: 2
 ---
 
-> Projects are nested within [organizations](/essentials/organizations) and contain your [Features](/essentials/overview#features) and [Environments](/essentials/overview#environments) (and through them your [keys](/essentials/keys), [variables](/essentials/variables) and [variations](/essentials/overview#variations)).
+> Projects are nested within [organizations](/platform/account-management/organizations) and contain your [Features](/essentials/overview#features) and [Environments](/essentials/overview#environments) (and through them your [keys](/platform/account-management/keys), [variables](/platform/feature-flags/variables-and-variations/variables) and [variations](/platform/feature-flags/variables-and-variations/variations)).
 
 ---
 
diff --git a/docs/platform/advanced-targeting/_category_.yml b/docs/platform/advanced-targeting/_category_.yml
deleted file mode 100644
index 075d52f1..00000000
--- a/docs/platform/advanced-targeting/_category_.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-label: 'Advanced Targeting'
-position: 2
diff --git a/docs/platform/advanced-variables/_category_.yml b/docs/platform/advanced-variables/_category_.yml
deleted file mode 100644
index bc12144a..00000000
--- a/docs/platform/advanced-variables/_category_.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-label: 'Advanced Variables'
-position: 1
diff --git a/docs/platform/experimentation/_category_.yml b/docs/platform/experimentation/_category_.yml
new file mode 100644
index 00000000..f3bd64c0
--- /dev/null
+++ b/docs/platform/experimentation/_category_.yml
@@ -0,0 +1,2 @@
+label: 'Experimentation'
+position: 2
diff --git a/docs/platform/metrics/creating-and-managing-metrics.md b/docs/platform/experimentation/creating-and-managing-metrics.md
similarity index 94%
rename from docs/platform/metrics/creating-and-managing-metrics.md
rename to docs/platform/experimentation/creating-and-managing-metrics.md
index 5cb689a8..e45dd7b6 100644
--- a/docs/platform/metrics/creating-and-managing-metrics.md
+++ b/docs/platform/experimentation/creating-and-managing-metrics.md
@@ -1,7 +1,7 @@
 ---
 title: Creating and Managing Metrics
 
-sidebar_position: 4
+sidebar_position: 2
 ---
 
 :::info
@@ -48,7 +48,7 @@ To set up a Metric, the following items are needed:
 - **Name** - This is the name of the Metric. It should be descriptive enough that any team member viewing it understands it and can both get the information necessary, and also decide if they would like to re-use the Metric for other Features.
 - **Key** - Like other DevCycle keys, this is how this Metric will be referenced in the Management API and all other non-dashboard interactions with this Metric.
 
-- **Event** - This is the **EXACT** event name that is sent by the [DevCycle Track](/sdk/features#track) methods of the SDKs or via the DevCycle APIs. This event will be used in all calculations of the Metric. How it is used specifically is described below in [How do Metrics get calculated?](/platform/metrics/creating-and-managing-metrics#how-do-metrics-get-calculated)
+- **Event** - This is the **EXACT** event name that is sent by the [DevCycle Track](/sdk/features#track) methods of the SDKs or via the DevCycle APIs. This event will be used in all calculations of the Metric. How it is used specifically is described below in [How do Metrics get calculated?](/platform/experimentation/creating-and-managing-metrics#how-do-metrics-get-calculated)
 
 - **"Optimize For"** - DevCycle represents Metrics as a positive or negative depending on the desired optimization. Often times, tools will always assume that an increase is beneficial. However, in most engineering applications, the opposite is true! Things such as latency, load times, server load, and processing times are Metrics that should be decreased. DevCycle will make obvious whether a Metric is improving in the desired direction, and will soon notify you if a significant impact in either direction has been made.
 
@@ -94,7 +94,7 @@ To run a test, the following fields must be set:
 
 **Feature** - This is the specific feature this Metric should be applied to. Any event that has been sent since the creation of this Metric from a user receiving any variation of this feature will be part of this Metric. In the event that an error is shown, this means the event has not been seen from this feature yet.
 
-**Control** - After selecting a Feature, a "control" variation must be selected. This is what will be used to show a comparative analysis against all other variations in a feature. Typically, an "off" or "Baseline" variation would act as the control. For more information on this, please refer to the [Feature Experimentation documentation](/essentials/feature-experimentation).
+**Control** - After selecting a Feature, a "control" variation must be selected. This is what will be used to show a comparative analysis against all other variations in a feature. Typically, an "off" or "Baseline" variation would act as the control. For more information on this, please refer to the [Feature Experimentation documentation](/platform/experimentation/feature-experimentation).
 
 **Date Range** - This range will default from the moment the Metric (or feature) was created, to now within 30 days. If 30 days have passed since the creation of the Metric or feature, the date range must be a 30 day range.
 
@@ -132,7 +132,7 @@ Here are some steps you can follow to track metrics within a feature:
 
     While the setup has some default values, the Metric requires the following fields to be filled:
 
-    - **Control** - This is what will be used to show a comparative analysis against all other variations in a feature. Typically, an "off" or "Baseline" variation would act as the control. For more information on this, please refer to the [Feature Experimentation documentation](/essentials/feature-experimentation).
+    - **Control** - This is what will be used to show a comparative analysis against all other variations in a feature. Typically, an "off" or "Baseline" variation would act as the control. For more information on this, please refer to the [Feature Experimentation documentation](/platform/experimentation/feature-experimentation).
 
     - **Date Range** - This range will default from the moment the Metric (or feature) was created, to now within 30 days. If 30 days have passed since the creation of the Metric or feature, the date range must be a 30 day range.
 
@@ -150,12 +150,12 @@ From here, useful information such as trends and patterns in the data can be use
 
 ### How do Metrics get calculated?
 
-To calculate Metrics, DevCycle uses [the custom events sent via its API or SDKs](/sdk/features#track). Each Event has the information of which user sent it and which Feature and Variation they were in at that time. For optimal experiments, use Features with variations [randomly distributed across users](/essentials/targeting#serving-a-random-variation-experimentation--random-distribution).
+To calculate Metrics, DevCycle uses [the custom events sent via its API or SDKs](/sdk/features#track). Each Event has the information of which user sent it and which Feature and Variation they were in at that time. For optimal experiments, use Features with variations [randomly distributed across users](/platform/feature-flags/targeting/random-variations).
 
-To read more on the queries behind the Metrics, see [How Metrics Are Calculated](/platform/metrics/how-metrics-are-calculated)
+To read more on the queries behind the Metrics, see [How Metrics Are Calculated](/platform/experimentation/how-metrics-are-calculated)
 
 ### Running Experiments
 
-With Metrics on a feature, experimentation can be easily executed on any Feature. At DevCycle we believe that experimentation should be a part of the natural lifecycle of all features. So no matter the [feature type](/essentials/features) selected, experimentation will always be available for use.
+With Metrics on a feature, experimentation can be easily executed on any Feature. At DevCycle we believe that experimentation should be a part of the natural lifecycle of all features. So no matter the [feature type](/platform/feature-flags/features) selected, experimentation will always be available for use.
 
-To learn more on how to run experiments with DevCycle, read [Feature Experimentation](/essentials/feature-experimentation)
+To learn more on how to run experiments with DevCycle, read [Feature Experimentation](/platform/experimentation/feature-experimentation)
diff --git a/docs/essentials/feature-experimentation.md b/docs/platform/experimentation/feature-experimentation.md
similarity index 94%
rename from docs/essentials/feature-experimentation.md
rename to docs/platform/experimentation/feature-experimentation.md
index 19b9ef1e..b4eb2b83 100644
--- a/docs/essentials/feature-experimentation.md
+++ b/docs/platform/experimentation/feature-experimentation.md
@@ -1,11 +1,11 @@
 ---
 title: Feature Experimentation
-sidebar_position: 6
+sidebar_position: 1
 ---
 
 ##  Overview
 
-At DevCycle we believe that experimentation should be a part of the natural lifecycle of all features. So no matter the [feature type](/essentials/features) selected, can be experimented on. Experiments can be as simple as comparing any target audiences against a metric, or can be fully [randomized](/essentials/targeting#serving-a-random-variation-experimentation--random-distribution) A/B tests using statistical methodologies.
+At DevCycle we believe that experimentation should be a part of the natural lifecycle of all features. So no matter the [feature type](/platform/feature-flags/features) selected, can be experimented on. Experiments can be as simple as comparing any target audiences against a metric, or can be fully [randomized](/platform/feature-flags/targeting/random-variations) A/B tests using statistical methodologies.
 
 This article outlines why and how to run and analyze experiments on your features within DevCycle. 
 
@@ -33,7 +33,7 @@ To run an experiment on any feature, all you need is two things:
 
 ### Comparing Multiple Variations
 
-The primary concept of an experiment is the need to have at least two different experiences to compare performances. There are several ways in DevCycle to run multiple experiences for users. We go into depth on this in our [Targeting documentation](/essentials/targeting).
+The primary concept of an experiment is the need to have at least two different experiences to compare performances. There are several ways in DevCycle to run multiple experiences for users. We go into depth on this in our [Targeting documentation](/platform/feature-flags/targeting/targeting-overview).
 
 To get started with your first feature experiment, it is best to keep it simple and run a basic A/B test comparing two variations, one control and one treatment Variation, delivered randomly to all your users.
 
@@ -55,7 +55,7 @@ To add a metric to your feature, click “Comparative Analysis” under the “D
 
 ![Add Metrics from Feature Editing Page](/august-2022-add-metric-feature-page.png)
 
-For the creation of new metrics check out our documentation [here](/platform/metrics/creating-and-managing-metrics).
+For the creation of new metrics check out our documentation [here](/platform/experimentation/creating-and-managing-metrics).
 
 Once you have metrics in your project, all you need to do is:
 1. Select a metric you want to use to judge the performance of your experiment
@@ -91,7 +91,7 @@ Statistical significance has been achieved if this number is either 0% or 100%.
 ## Experimentation using a Custom Property for Randomization
 
 :::info
-For documentation on this functionality outside of the context of experimentation you can check out our documentation dedicated to this topic [here](/platform/advanced-targeting/randomize-using-custom-property).
+For documentation on this functionality outside of the context of experimentation you can check out our documentation dedicated to this topic [here](/platform/feature-flags/targeting/randomize-using-custom-property).
 :::
 
 DevCycle typically uses the User ID as the primary key for Feature rollouts and randomization. However, in certain scenarios, Features you release are intended to be rolled out to a cohort of users vs an individual user. For example, a new feature in a B2B platform might impact an entire organization rather than a single user within that organization. In such cases, you can randomize and rollout by using a Custom Property. 
diff --git a/docs/platform/metrics/how-metrics-are-calculated.md b/docs/platform/experimentation/how-metrics-are-calculated.md
similarity index 99%
rename from docs/platform/metrics/how-metrics-are-calculated.md
rename to docs/platform/experimentation/how-metrics-are-calculated.md
index 7d6462bd..fe4d9e05 100644
--- a/docs/platform/metrics/how-metrics-are-calculated.md
+++ b/docs/platform/experimentation/how-metrics-are-calculated.md
@@ -1,6 +1,6 @@
 ---
 title: How Metrics are Calculated
-sidebar_position: 2
+sidebar_position: 3
 ---
 
 # How things are calculated
diff --git a/docs/platform/extras/_category_.yml b/docs/platform/extras/_category_.yml
new file mode 100644
index 00000000..2f9f8aaf
--- /dev/null
+++ b/docs/platform/extras/_category_.yml
@@ -0,0 +1,2 @@
+label: 'Extras'
+position: 6
diff --git a/docs/platform/custom-domains.md b/docs/platform/extras/custom-domains.md
similarity index 99%
rename from docs/platform/custom-domains.md
rename to docs/platform/extras/custom-domains.md
index 9da77c19..11f40883 100644
--- a/docs/platform/custom-domains.md
+++ b/docs/platform/extras/custom-domains.md
@@ -1,6 +1,6 @@
 ---
 title: Custom Domains
-sidebar_position: 10
+sidebar_position: 1
 ---
 
 # Custom Domains
diff --git a/docs/platform/advanced-targeting/feature-opt-in.mdx b/docs/platform/extras/feature-opt-in.mdx
similarity index 99%
rename from docs/platform/advanced-targeting/feature-opt-in.mdx
rename to docs/platform/extras/feature-opt-in.mdx
index 4e750697..ef1b688c 100644
--- a/docs/platform/advanced-targeting/feature-opt-in.mdx
+++ b/docs/platform/extras/feature-opt-in.mdx
@@ -1,6 +1,6 @@
 ---
 title: Feature Opt-In
-sidebar_position: 6
+sidebar_position: 2
 ---
 
 # Feature Opt-In
diff --git a/docs/platform/webhooks.md b/docs/platform/extras/webhooks.md
similarity index 99%
rename from docs/platform/webhooks.md
rename to docs/platform/extras/webhooks.md
index b737089f..0d6d45d2 100644
--- a/docs/platform/webhooks.md
+++ b/docs/platform/extras/webhooks.md
@@ -1,6 +1,6 @@
 ---
 title: Webhooks
-sidebar_position: 8
+sidebar_position: 3
 ---
 
 This topic explains how to create and use Webhooks in DevCycle.
diff --git a/docs/platform/feature-flags/_category_.yml b/docs/platform/feature-flags/_category_.yml
new file mode 100644
index 00000000..064a1cb1
--- /dev/null
+++ b/docs/platform/feature-flags/_category_.yml
@@ -0,0 +1,2 @@
+label: 'Feature Flags'
+position: 1
diff --git a/docs/essentials/features.md b/docs/platform/feature-flags/features.md
similarity index 82%
rename from docs/essentials/features.md
rename to docs/platform/feature-flags/features.md
index bcf7316c..93205942 100644
--- a/docs/essentials/features.md
+++ b/docs/platform/feature-flags/features.md
@@ -1,12 +1,12 @@
 ---
 title: Features
-sidebar_class_name: hidden
+sidebar_position: 1
 ---
 
 > Features are the main elements that you want to control or experiment with in your application. They can be anything from a new UI element to a backend algorithm. 
 
 :::info
-When creating a Feature in DevCycle, you will be able to choose a [Feature Type](/introduction/core-concepts/feature-types) which will pre-fill some options in the Feature and help kick-start your usage of the Feature. 
+When creating a Feature in DevCycle, you will be able to choose a [Feature Type](/essentials/feature-types) which will pre-fill some options in the Feature and help kick-start your usage of the Feature. 
 :::
 
 ---
@@ -18,11 +18,11 @@ The Feature Dashboard is where all of your features can be viewed, edited, and f
 |   Column     | Description                            |
 |--------|----------------------------|
 | Creator | This will show the icon of the user who created this Feature. |
-| Status | The Feature's Current [Status](/essentials/status-and-lifecycle). This indicates the Feature's current position in the Development [LifeCycle](/essentials/status-and-lifecycle). |
+| Status | The Feature's Current [Status](/platform/feature-flags/status-and-lifecycle). This indicates the Feature's current position in the Development [LifeCycle](/platform/feature-flags/status-and-lifecycle). |
 | Name | The Feature's name. This can be changed at any time by editing the Feature. |
 | Key | This is the feature's Key. Use this key to reference the Feature in the SDKs or APIs. |
 | Feature type | The selected type of the Feature. Use this to organize your Features. |
-| # Of Variables | This will show a count of how many variables are used within this Feature. To learn more read [Creating Variables and Variations](/essentials/variables) |
+| # Of Variables | This will show a count of how many variables are used within this Feature. To learn more read [Creating Variables and Variations](/platform/feature-flags/variables-and-variations/variables) |
 | Edit | Click this to edit on the row the Feature. |
 
 Use the search input to search by Name, Key, or Description. The filters can be used to filter by Type or Creator. Each column header can be clicked to sort the column. 
@@ -37,7 +37,7 @@ Use the search input to search by Name, Key, or Description. The filters can be
 
 From this page, you can create a Feature Flag by clicking "Create New Feature" or the `+` in the top bar. 
 
-A screen for deciding your Feature Type will now appear. To read more about the feature types and their uses, read [DevCycle Feature Types](/introduction/core-concepts/feature-types).
+A screen for deciding your Feature Type will now appear. To read more about the feature types and their uses, read [DevCycle Feature Types](/essentials/feature-types).
 
 After choosing a type, the information modal will appear prompting you to enter the following information:
 
@@ -66,7 +66,7 @@ If the unassociated variable key submitted is archived, a similar modal will app
 
 If you wish to unarchive & re-associate, click on the toggle and click `Yes, Proceed`. 
 
-The feature will be created along with the newly re-associated variable. The variations and corresponding variable values will be populated depending on the [Feature Type](/essentials/features) selected. 
+The feature will be created along with the newly re-associated variable. The variations and corresponding variable values will be populated depending on the [Feature Type](/platform/feature-flags/features) selected. 
 
 If you attempt to use a duplicate variable key belonging to a variable that's associated with an existing feature, the dashboard will return an error. 
 
@@ -80,9 +80,9 @@ Feature settings including name, key, and type can be changed from feature page
 
 ## Archiving a Feature
 
-Archiving is the terminal state for Features that have reached the end of their lifecycle, were never implemented in code, or have become entirely obsolete. See [Status & Lifecyle](/essentials/status-and-lifecycle) for more information on how to manage Feature Lifecycles in DevCycle. 
+Archiving is the terminal state for Features that have reached the end of their lifecycle, were never implemented in code, or have become entirely obsolete. See [Status & Lifecyle](/platform/feature-flags/status-and-lifecycle) for more information on how to manage Feature Lifecycles in DevCycle. 
 
-Upon Archive, the Feature is put into a read-only mode, and its Audit Logs are accessible and available for teams to review. All [Variables](/essentials/variables) will be archived along with the Feature *but* can be re-used and associated to other Features. All Variables in this Feature will begin to serve Default values in code.
+Upon Archive, the Feature is put into a read-only mode, and its Audit Logs are accessible and available for teams to review. All [Variables](/platform/feature-flags/variables-and-variations/variables) will be archived along with the Feature *but* can be re-used and associated to other Features. All Variables in this Feature will begin to serve Default values in code.
 
 This action cannot be undone.
 
diff --git a/docs/essentials/status-and-lifecycle.md b/docs/platform/feature-flags/status-and-lifecycle.md
similarity index 97%
rename from docs/essentials/status-and-lifecycle.md
rename to docs/platform/feature-flags/status-and-lifecycle.md
index b2e39078..33907f34 100644
--- a/docs/essentials/status-and-lifecycle.md
+++ b/docs/platform/feature-flags/status-and-lifecycle.md
@@ -1,6 +1,6 @@
 ---
 title: Status and Lifecycle
-sidebar_position: 7
+sidebar_position: 4
 ---
 
 # Status and Lifecycle Management in DevCycle
@@ -33,7 +33,7 @@ One could consider a Feature "Complete" once it has been tested, approved, and i
 
 The "Archived" status is designed to be the terminal state for Features that have reached the end of their lifecycle, were never implemented in code, or have become entirely obsolete. 
 
-A Feature should be archived after it has been cleaned up and its Variables removed from the codebase. Ideally, users should have also marked the Feature as **[Completed](/essentials/status-and-lifecycle#completed)**  in DevCycle.
+A Feature should be archived after it has been cleaned up and its Variables removed from the codebase. Ideally, users should have also marked the Feature as **[Completed](/platform/feature-flags/status-and-lifecycle#completed)**  in DevCycle.
 
 Archiving Features helps clean up your dashboard and codebase by essentially putting the Feature into a read-only mode and hiding it from the standard dashboard views. Archived Features' Audit Logs are accessible and available for teams to review.
 
diff --git a/docs/platform/feature-flags/targeting/_category_.yml b/docs/platform/feature-flags/targeting/_category_.yml
new file mode 100644
index 00000000..f72235b3
--- /dev/null
+++ b/docs/platform/feature-flags/targeting/_category_.yml
@@ -0,0 +1,2 @@
+label: 'Targeting'
+position: 3
diff --git a/docs/platform/advanced-targeting/audiences.md b/docs/platform/feature-flags/targeting/audiences.md
similarity index 99%
rename from docs/platform/advanced-targeting/audiences.md
rename to docs/platform/feature-flags/targeting/audiences.md
index 70d04a69..add78c08 100644
--- a/docs/platform/advanced-targeting/audiences.md
+++ b/docs/platform/feature-flags/targeting/audiences.md
@@ -1,6 +1,6 @@
 ---
 title: Audiences
-sidebar_position: 5
+sidebar_position: 2
 ---
 
 This topic explains how to create and manage Audiences via our API or within the DevCycle dashboard. 
diff --git a/docs/platform/advanced-targeting/custom-properties.md b/docs/platform/feature-flags/targeting/custom-properties.md
similarity index 95%
rename from docs/platform/advanced-targeting/custom-properties.md
rename to docs/platform/feature-flags/targeting/custom-properties.md
index 381b8418..b31f0911 100644
--- a/docs/platform/advanced-targeting/custom-properties.md
+++ b/docs/platform/feature-flags/targeting/custom-properties.md
@@ -1,9 +1,9 @@
 ---
 title: Custom Properties
-sidebar_position: 4
+sidebar_position: 3
 ---
 
-Custom Properties are properties on a user which can be used for [Targeting Users for Features](/essentials/targeting). 
+Custom Properties are properties on a user which can be used for [Targeting Users for Features](/platform/feature-flags/targeting/targeting-overview). 
 These properties are set on the user data that you provide to DevCycle when 
 [identifying a user](https://docs.devcycle.com/sdk/features#identifying-a-user-or-setting-properties) in the SDK. 
 
@@ -40,7 +40,7 @@ Every time you identify a particular user, you must pass the custom data into th
 
 DevCycle's EdgeDB feature enables the saving of user data into DevCycle's EdgeDB storage, 
 allowing you to segment by custom properties without having to repeatedly pass the same data to the SDK.
-[View our EdgeDB docs to find out how it works](/platform/edgedb).
+[View our EdgeDB docs to find out how it works](/platform/feature-flags/targeting/edgedb).
 :::
 
 
@@ -95,7 +95,7 @@ Once a property has been created, it will be accessible in the definition dropdo
 
 ![property type open](/march-2022-property-dropdown-with-properties.png)
 
-First, select your property to use it like any other targeting definition as outlined in [Targeting Users](/essentials/targeting)
+First, select your property to use it like any other targeting definition as outlined in [Targeting Users](/platform/feature-flags/targeting/targeting-overview)
 
 Then, finish your Targeting Rule by filling out the comparator and the value fields. 
 
diff --git a/docs/platform/edgedb.md b/docs/platform/feature-flags/targeting/edgedb.md
similarity index 99%
rename from docs/platform/edgedb.md
rename to docs/platform/feature-flags/targeting/edgedb.md
index 7001ad54..9ca190d8 100644
--- a/docs/platform/edgedb.md
+++ b/docs/platform/feature-flags/targeting/edgedb.md
@@ -1,6 +1,6 @@
 ---
 title: EdgeDB (Stored Custom Properties)
-sidebar_position: 4
+sidebar_position: 7
 ---
 
 # EdgeDB and Stored Custom Properties
diff --git a/docs/platform/advanced-targeting/random-variations.md b/docs/platform/feature-flags/targeting/random-variations.md
similarity index 99%
rename from docs/platform/advanced-targeting/random-variations.md
rename to docs/platform/feature-flags/targeting/random-variations.md
index b8821b8e..758f38a6 100644
--- a/docs/platform/advanced-targeting/random-variations.md
+++ b/docs/platform/feature-flags/targeting/random-variations.md
@@ -1,6 +1,6 @@
 ---
 title: Random Variations
-sidebar_position: 1
+sidebar_position: 4
 ---
 
 ## Serving a Random Variation
diff --git a/docs/platform/advanced-targeting/randomize-using-custom-property.md b/docs/platform/feature-flags/targeting/randomize-using-custom-property.md
similarity index 79%
rename from docs/platform/advanced-targeting/randomize-using-custom-property.md
rename to docs/platform/feature-flags/targeting/randomize-using-custom-property.md
index cbd47df4..4246b2d5 100644
--- a/docs/platform/advanced-targeting/randomize-using-custom-property.md
+++ b/docs/platform/feature-flags/targeting/randomize-using-custom-property.md
@@ -1,6 +1,6 @@
 ---
 title: Randomize using a Custom Property
-sidebar_position: 7
+sidebar_position: 6
 ---
 
 :::warning
@@ -16,12 +16,12 @@ To use this functionality in conjunction with Server-Side SDKs you must ensure y
 
 DevCycle uses User ID as the primary key for delivering variations, rolling out a feature, and randomizing distribution. However, there are cases in which a User ID is not the primary identifier of the request to DVC, thus making the usage of DevCycle features, specifically Gradual Rollouts, difficult in these scenarios. 
 
-This functionality allows you to set a [Custom Property](docs/platform/advanced-targeting/custom-properties.md) as the key to roll out / distribute on rather than User ID, such as Account, Organization, Tenant or Store ID.  For example, at DevCycle, we would use this feature to gradually roll out new functionality on an organization-by-organization basis rather than on a user-by-user basis to ensure all users in the org see the same features.
+This functionality allows you to set a [Custom Property](docs/platform/feature-flags/targeting/custom-properties.md) as the key to roll out / distribute on rather than User ID, such as Account, Organization, Tenant or Store ID.  For example, at DevCycle, we would use this feature to gradually roll out new functionality on an organization-by-organization basis rather than on a user-by-user basis to ensure all users in the org see the same features.
 
 ## Setting Up a Targeting Rule using an Custom Property for Randomization
 Since this functionality is only relevant in specific Targeting Rule use cases, the option to randomize using a Custom Property will only appear when you:
 
-* Serve `Random Distribution` (ie. [run an experiment](/essentials/feature-experimentation#experimentation-using-a-custom-property-for-randomization)) 
+* Serve `Random Distribution` (ie. [run an experiment](/platform/experimentation/feature-experimentation#experimentation-using-a-custom-property-for-randomization)) 
 * Select a `Gradual Rollout` 
 * Select a `Multi-Step Rollout` 
 
diff --git a/docs/platform/advanced-targeting/rollouts.md b/docs/platform/feature-flags/targeting/rollouts.md
similarity index 98%
rename from docs/platform/advanced-targeting/rollouts.md
rename to docs/platform/feature-flags/targeting/rollouts.md
index b5369619..0ed46e7b 100644
--- a/docs/platform/advanced-targeting/rollouts.md
+++ b/docs/platform/feature-flags/targeting/rollouts.md
@@ -1,6 +1,6 @@
 ---
 title: Scheduling & Rollouts
-sidebar_position: 2
+sidebar_position: 5
 ---
 
 ## Scheduling a Feature
@@ -102,7 +102,7 @@ the user will *still* not receive a later target.
 
 :::info
 
-For modifications  to or additions of a gradual roll-out, entries in the [Audit Log](/platform/audit-log) will be marked as `Stage 1` and labelled as a `Linear` roll-out. 
+For modifications  to or additions of a gradual roll-out, entries in the [Audit Log](/platform/security-and-guardrails/audit-log) will be marked as `Stage 1` and labelled as a `Linear` roll-out. 
 
 :::
 
diff --git a/docs/essentials/targeting.md b/docs/platform/feature-flags/targeting/targeting-overview.md
similarity index 93%
rename from docs/essentials/targeting.md
rename to docs/platform/feature-flags/targeting/targeting-overview.md
index c352346e..644d4402 100644
--- a/docs/essentials/targeting.md
+++ b/docs/platform/feature-flags/targeting/targeting-overview.md
@@ -1,6 +1,6 @@
 ---
-title: Targeting
-sidebar_position: 5
+title: Targeting Overview
+sidebar_position: 1
 ---
 
 Targeting rules can be used to grant features to specific user groups, 
@@ -8,11 +8,11 @@ incrementally roll out features for monitoring, or create and test different fea
 
 :::tip Already understand the targeting essentials?
 Be sure to check out our advanced targeting documentation which covers topics like:
-- [Audiences](/platform/advanced-targeting/audiences)
-- [Custom Properties](/platform/advanced-targeting/custom-properties)
-- [Random Variations](/platform/advanced-targeting/random-variations)
-- [Rollouts](/platform/advanced-targeting/rollouts)
-- [Self-Targeting](/platform/advanced-targeting/self-targeting)
+- [Audiences](/platform/feature-flags/targeting/audiences)
+- [Custom Properties](/platform/feature-flags/targeting/custom-properties)
+- [Random Variations](/platform/feature-flags/targeting/random-variations)
+- [Rollouts](/platform/feature-flags/targeting/rollouts)
+- [Self-Targeting](/platform/testing-and-qa/self-targeting)
 :::
 
 ## Targeting Properties
@@ -35,7 +35,7 @@ Below is a summary of the properties built into the platform, and how to specify
 | Country          | Country the user is located in. Must be a valid 2 letter [ISO-3166 country code](https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes)      | Set "country" property    |
 
 In addition to these built-in properties, you can specify any other property that suits your needs using the
-[Custom Properties](/platform/advanced-targeting/custom-properties) feature. 
+[Custom Properties](/platform/feature-flags/targeting/custom-properties) feature. 
 
 Here is an example of a user object being passed to an SDK with these properties set:
 ```typescript
@@ -147,13 +147,13 @@ From here you will be able to enable or disable the specific targeting rule by c
 
 :::tip
 
-Looking to use DevCycle to help you QA a new feature? Be sure to check out [Self-Targeting](/platform/advanced-targeting/self-targeting).
+Looking to use DevCycle to help you QA a new feature? Be sure to check out [Self-Targeting](/platform/testing-and-qa/self-targeting).
 
 :::
 
 On the features dashboard page, select `Users & Targeting` from the left hand menu and choose which [environment](/essentials/overview#environments) it should apply to. If a feature is toggled `ON` for an environment, the rules defined within the environment will be followed.
 
-Once the targeting rule is defined, the next step is to determine what Variation users targeted by this rule should receive. Note: The available variations will be determined by the chosen Feature Type, however, [these can](/essentials/variables) be modified and more variations can be added at any time.
+Once the targeting rule is defined, the next step is to determine what Variation users targeted by this rule should receive. Note: The available variations will be determined by the chosen Feature Type, however, [these can](/platform/feature-flags/variables-and-variations/variations) be modified and more variations can be added at any time.
 
 To choose the Variation for this targeted audience, use the "Serve" dropdown and choose the desired variation. When the environment is enabled, and if a user fulfills the targeting rule, they will then be served that variation and its associated variable values.
 
diff --git a/docs/platform/feature-flags/variables-and-variations/_category_.yml b/docs/platform/feature-flags/variables-and-variations/_category_.yml
new file mode 100644
index 00000000..bd6ba8ef
--- /dev/null
+++ b/docs/platform/feature-flags/variables-and-variations/_category_.yml
@@ -0,0 +1,2 @@
+label: 'Variables and Variations'
+position: 2
diff --git a/docs/platform/metrics/feature-flag-reach.md b/docs/platform/feature-flags/variables-and-variations/feature-flag-reach.md
similarity index 98%
rename from docs/platform/metrics/feature-flag-reach.md
rename to docs/platform/feature-flags/variables-and-variations/feature-flag-reach.md
index 44c92bab..cbb9a9a6 100644
--- a/docs/platform/metrics/feature-flag-reach.md
+++ b/docs/platform/feature-flags/variables-and-variations/feature-flag-reach.md
@@ -1,6 +1,6 @@
 ---
 title: Feature Flag Reach
-sidebar_position: 1
+sidebar_position: 4
 ---
 
 When a Feature is running, DevCycle automatically provides a quick way to view how the feature is running across all SDKs or APIs it is being used in by breaking down by variable. This document serves to explain this section in more depth.
diff --git a/docs/platform/advanced-variables/variable-defaults.md b/docs/platform/feature-flags/variables-and-variations/variable-defaults.md
similarity index 99%
rename from docs/platform/advanced-variables/variable-defaults.md
rename to docs/platform/feature-flags/variables-and-variations/variable-defaults.md
index 77036c23..8c7d1c5c 100644
--- a/docs/platform/advanced-variables/variable-defaults.md
+++ b/docs/platform/feature-flags/variables-and-variations/variable-defaults.md
@@ -1,6 +1,6 @@
 ---
 title: Variable Defaults
-sidebar_position: 2
+sidebar_position: 3
 ---
 
 Variable defaults are the values you provide in code which tell DevCycle SDKs what value to assign to a Variable in
diff --git a/docs/essentials/variables.md b/docs/platform/feature-flags/variables-and-variations/variables.md
similarity index 94%
rename from docs/essentials/variables.md
rename to docs/platform/feature-flags/variables-and-variations/variables.md
index 56dbf2ca..80673488 100644
--- a/docs/essentials/variables.md
+++ b/docs/platform/feature-flags/variables-and-variations/variables.md
@@ -1,6 +1,6 @@
 ---
 title: Variables
-sidebar_position: 4
+sidebar_position: 1
 ---
 
 Variables are the elements that can change within a Feature. 
@@ -11,7 +11,7 @@ By default, upon creation of a Feature, a `Boolean Variable`` will be created wh
 
 :::tip Already understand the variable essentials?
 Be sure to check out our advanced variable documentation which covers topics like:
-- [Variable Schemas](/platform/advanced-variables/variable-schemas)
+- [Variable Schemas](/platform/security-and-guardrails/variable-schemas)
 :::
 ---
 
@@ -26,7 +26,7 @@ On the Feature page, there are indicators for each Variable that inform you of t
 - if a Variable has been seen in code (if [Code References](/integrations/github/feature-usage-action) have been enabled)
 - if evaluations have been seen 
 
-These indicators are helpful when setting up features. They help to confirm proper setup, and aid in Variable cleanup once a Feature has completed it's [lifecycle](/essentials/status-and-lifecycle).
+These indicators are helpful when setting up features. They help to confirm proper setup, and aid in Variable cleanup once a Feature has completed it's [lifecycle](/platform/feature-flags/status-and-lifecycle).
 
 Hover over these indicators for more detail about a Variable's code references & evaluation information. 
 
@@ -47,7 +47,7 @@ To navigate to this page, use the `Variables` button on DevCycle dashboard's top
 |        |                            |
 |--------|----------------------------|
 | **Variable Name** | The name given to the Variable upon its creation |
-| **Feature** | The name of the Feature that is currently managing a variable. **Note** that Variables can only be managed by a single Feature at a time. If you wish to change what Feature is managing a Variable, first remove that Variable from a feature as outlined in [Creating Variables and Variations](/essentials/variables). If the Variable is NOT being managed by a Feature, this column will note the lack of Feature. **Click on a Feature name to navigate directly to the Feature managing this Variable** |
+| **Feature** | The name of the Feature that is currently managing a variable. **Note** that Variables can only be managed by a single Feature at a time. If you wish to change what Feature is managing a Variable, first remove that Variable from a feature as outlined in [Creating Variables and Variations](/platform/feature-flags/variables-and-variations/variables). If the Variable is NOT being managed by a Feature, this column will note the lack of Feature. **Click on a Feature name to navigate directly to the Feature managing this Variable** |
 | **Type** | The type of the feature flag. This type can one of: Boolean, JSON, Number, Boolean, or String. |
 | **Created At** | The time this Variable was first created. |
 
diff --git a/docs/essentials/variations.md b/docs/platform/feature-flags/variables-and-variations/variations.md
similarity index 85%
rename from docs/essentials/variations.md
rename to docs/platform/feature-flags/variables-and-variations/variations.md
index 021c65dd..19ff0a44 100644
--- a/docs/essentials/variations.md
+++ b/docs/platform/feature-flags/variables-and-variations/variations.md
@@ -1,6 +1,6 @@
 ---
 title: Variations
-sidebar_class_name: hidden
+sidebar_position: 2
 ---
 
 Variations are different versions of a Feature. Each Variation can have different values for the Variables associated with the Feature. 
@@ -17,7 +17,7 @@ To view the Variables and Variations within a Feature, navigate to the 'Variable
 
 Depending on the Feature type, the default Variations will be pre-set. The most common of which will be the Variations of "Variation OFF" and "Variation ON", with the boolean Variable being set to false and true, respectively.
 
-When a user is "Served" a Variation based on the [Targeting Rules](/essentials/targeting), the Variable Values the user receives on their devices or as an API response will be the values for the served Variation.
+When a user is "Served" a Variation based on the [Targeting Rules](/platform/feature-flags/targeting/targeting-overview), the Variable Values the user receives on their devices or as an API response will be the values for the served Variation.
 
 ---
 
@@ -41,7 +41,7 @@ Give your new Variation a **name** as well as a **key**, as well as its **values
 
 - The Variable values will be what the Variable's value will be in SDK and API responses if a targeting rule is targeting those specific Variations. 
 
-Once this Variation is created, it will become available as an option within the "Serve" dropdown for [Targeting Rules](/essentials/targeting). Users who are served this new Variation will receive the Variable Values associated with this new Variation!
+Once this Variation is created, it will become available as an option within the "Serve" dropdown for [Targeting Rules](/platform/feature-flags/targeting/targeting-overview). Users who are served this new Variation will receive the Variable Values associated with this new Variation!
 
 ---
 
diff --git a/docs/platform/metrics/_category_.yml b/docs/platform/metrics/_category_.yml
deleted file mode 100644
index 7594d7ff..00000000
--- a/docs/platform/metrics/_category_.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-label: 'Metrics'
-position: 7
\ No newline at end of file
diff --git a/docs/platform/security-and-guardrails/_category_.yml b/docs/platform/security-and-guardrails/_category_.yml
new file mode 100644
index 00000000..017dae01
--- /dev/null
+++ b/docs/platform/security-and-guardrails/_category_.yml
@@ -0,0 +1,2 @@
+label: 'Security and Guardrails'
+position: 4
diff --git a/docs/platform/approval-workflows.md b/docs/platform/security-and-guardrails/approval-workflows.md
similarity index 94%
rename from docs/platform/approval-workflows.md
rename to docs/platform/security-and-guardrails/approval-workflows.md
index d5ad54cb..2aaa7ee8 100644
--- a/docs/platform/approval-workflows.md
+++ b/docs/platform/security-and-guardrails/approval-workflows.md
@@ -1,6 +1,6 @@
 ---
 title: Approval Workflows
-sidebar_position: 12
+sidebar_position: 1
 ---
 
 # Approval Workflows
@@ -20,7 +20,7 @@ The following actions do not trigger an approval request:
 ## Setting Up Approval Workflows for a DevCycle Project
 
 :::info
-[Permissions](/platform/permissions) must be enabled for Organizations to use Approval Workflows. Please contact our [support](mailto:support@devcycle.com) team to get started with Permissions if you wish to use this feature.  
+[Permissions](/platform/security-and-guardrails/permissions) must be enabled for Organizations to use Approval Workflows. Please contact our [support](mailto:support@devcycle.com) team to get started with Permissions if you wish to use this feature.  
 :::
 
 Approval Workflows are a Project-level setting within DevCycle. 
diff --git a/docs/platform/audit-log.md b/docs/platform/security-and-guardrails/audit-log.md
similarity index 80%
rename from docs/platform/audit-log.md
rename to docs/platform/security-and-guardrails/audit-log.md
index b6c6c294..75fb559a 100644
--- a/docs/platform/audit-log.md
+++ b/docs/platform/security-and-guardrails/audit-log.md
@@ -1,6 +1,6 @@
 ---
 title: Audit Log
-sidebar_position: 3
+sidebar_position: 2
 ---
 
 The Audit Log tracks all modifications made to a Feature. DevCycle captures the DevCycle user who made the change, a time stamp, and what was modified on each Feature save.
@@ -23,7 +23,7 @@ The title of each modification card highlights the change that was made to the F
 
 Click the `View Details` button on each card for more information about each modification.
 
-Modifications are organized by Environment with each card. The color of each Environment tag corresponds to the [color selected for that Environment](/essentials/environments#from-the-dashboard-1).
+Modifications are organized by Environment with each card. The color of each Environment tag corresponds to the [color selected for that Environment](/platform/account-management/environments#from-the-dashboard-1).
 
 Items that are added to the Feature will be highlighted in green in the left-hand column of the modification card (see below), and removals or deletions of items will be highlighted in red.
 
@@ -33,12 +33,12 @@ For modifications to values, each card will show the orignal value on the left-h
 
 :::info
 
-Please note that [Self-Targeting](/platform/advanced-targeting/self-targeting) actions are not recorded in the Audit Log.
+Please note that [Self-Targeting](/platform/testing-and-qa/self-targeting) actions are not recorded in the Audit Log.
 
 :::
 
 ### Feature Created Modification Cards in the Audit Log
 
-When a Feature is created, you will see multiple modification cards populate in the Audit Log. The first modification card in the Audit Log will outline the initial Feature configuration (initial variable, variations, status, settings, etc.). Then, depending on the [Feature Type](/introduction/core-concepts/feature-types) selected when creating a new Feature, the following cards will highlight the each Environment's Targeting status, along with the templated Targeting Rules (if they exist). See an example below of an Experiment Feature Type.
+When a Feature is created, you will see multiple modification cards populate in the Audit Log. The first modification card in the Audit Log will outline the initial Feature configuration (initial variable, variations, status, settings, etc.). Then, depending on the [Feature Type](/essentials/feature-types) selected when creating a new Feature, the following cards will highlight the each Environment's Targeting status, along with the templated Targeting Rules (if they exist). See an example below of an Experiment Feature Type.
 
 ![Audit Log Experiment Feature Type](/nov2023-audit-log-experiment-feature-type.png)
diff --git a/docs/platform/feature-obfuscation.md b/docs/platform/security-and-guardrails/feature-obfuscation.md
similarity index 98%
rename from docs/platform/feature-obfuscation.md
rename to docs/platform/security-and-guardrails/feature-obfuscation.md
index 8dd01fa9..afe3c7e9 100644
--- a/docs/platform/feature-obfuscation.md
+++ b/docs/platform/security-and-guardrails/feature-obfuscation.md
@@ -1,6 +1,6 @@
 ---
 title: Feature Obfuscation
-sidebar_position: 9
+sidebar_position: 3
 ---
 
 Feature flags are often used to hide upcoming features before release. Normally, not showing the feature on a UI
@@ -87,7 +87,7 @@ export const MY_SECOND_VARIABLE = 'dvc_obfs_359f6c73757fe30a9950ce39333c2329915a
 :::info
 The generated file also includes Typescript definitions of each Variable, which allows you to make your DevCycle usage
 type-safe by enforcing the correct datatype for each Variable. When using an 
-[enum schema](https://devcycle-docs-git-obfuscation-devcyclehq.vercel.app/platform/advanced-variables/variable-schemas), 
+[enum schema](/platform/security-and-guardrails/variable-schemas), 
 the types will also enforce that one of the allowed values is used. For more information, see the documentation for 
 [Typescript with the Javascript SDK](/sdk/client-side-sdks/javascript/javascript-typescript)
 :::
diff --git a/docs/platform/permissions.md b/docs/platform/security-and-guardrails/permissions.md
similarity index 92%
rename from docs/platform/permissions.md
rename to docs/platform/security-and-guardrails/permissions.md
index 2a07f4fa..67e45029 100644
--- a/docs/platform/permissions.md
+++ b/docs/platform/security-and-guardrails/permissions.md
@@ -1,6 +1,6 @@
 ---
 title: Permissions
-sidebar_position: 11
+sidebar_position: 4
 ---
 
 # Permissions
@@ -57,4 +57,4 @@ Everything **Publishers** can do, plus
 
 - Manage Roles of all Users in the Organization
 
-For more information, check out the [Organization Roles](/essentials/organizations#organization-roles) documentation.
+For more information, check out the [Organization Roles](/platform/account-management/organizations#organization-roles) documentation.
diff --git a/docs/platform/sdk-visibility.md b/docs/platform/security-and-guardrails/sdk-visibility.md
similarity index 100%
rename from docs/platform/sdk-visibility.md
rename to docs/platform/security-and-guardrails/sdk-visibility.md
diff --git a/docs/platform/advanced-variables/variable-schemas.md b/docs/platform/security-and-guardrails/variable-schemas.md
similarity index 99%
rename from docs/platform/advanced-variables/variable-schemas.md
rename to docs/platform/security-and-guardrails/variable-schemas.md
index f6233118..5416fed0 100644
--- a/docs/platform/advanced-variables/variable-schemas.md
+++ b/docs/platform/security-and-guardrails/variable-schemas.md
@@ -1,6 +1,6 @@
 ---
 title: Variable Schemas
-sidebar_position: 1
+sidebar_position: 6
 ---
 
 Variable Schemas is a new DevCycle feature that lets you define allowable values for your variables when creating feature variations. Variable Schemas help developers ensure that team members can easily select allowable inputs for variable values without being nervous that a certain value might cause an application crash or negatively impact end user experience. 
diff --git a/docs/platform/testing-and-qa/_category_.yml b/docs/platform/testing-and-qa/_category_.yml
new file mode 100644
index 00000000..802f6270
--- /dev/null
+++ b/docs/platform/testing-and-qa/_category_.yml
@@ -0,0 +1,2 @@
+label: 'Testing and QA'
+position: 5
diff --git a/docs/platform/advanced-targeting/self-targeting.md b/docs/platform/testing-and-qa/self-targeting.md
similarity index 99%
rename from docs/platform/advanced-targeting/self-targeting.md
rename to docs/platform/testing-and-qa/self-targeting.md
index b226594f..d6549ba5 100644
--- a/docs/platform/advanced-targeting/self-targeting.md
+++ b/docs/platform/testing-and-qa/self-targeting.md
@@ -1,6 +1,6 @@
 ---
 title: Self-Targeting
-sidebar_position: 3
+sidebar_position: 2
 ---
 
 Self-Targeting is a DevCycle QA & debugging feature that allows you to easily serve yourself different variations of a feature without having to modify targeting rules in each environment. To leverage this feature, you must set up your DevCycle Identity by associating an SDK User ID to your DevCycle user profile.
diff --git a/docs/platform/web-debugger.mdx b/docs/platform/testing-and-qa/web-debugger.mdx
similarity index 95%
rename from docs/platform/web-debugger.mdx
rename to docs/platform/testing-and-qa/web-debugger.mdx
index c7e03570..cb4a16f2 100644
--- a/docs/platform/web-debugger.mdx
+++ b/docs/platform/testing-and-qa/web-debugger.mdx
@@ -1,6 +1,6 @@
 ---
 title: Web Debugger
-sidebar_position: 6
+sidebar_position: 3
 ---
 
 import WebDebugger from '@site/static/web-debugger.png';
@@ -138,7 +138,7 @@ to log in. The Debugger is only available to those with a DevCycle dashboard acc
 The Debugger has several main features.
 
 ### Self-Targeting
-The Debugger allows you to quickly change your [Self-Targeting Overrides](/platform/advanced-targeting/self-targeting) and see the changes reflected immediately on the current page. If you don't currently have Self-Targeting set up, the Debugger will present an option to quickly set your "DevCycle Identity" to the currently identified user on the page.
+The Debugger allows you to quickly change your [Self-Targeting Overrides](/platform/testing-and-qa/self-targeting) and see the changes reflected immediately on the current page. If you don't currently have Self-Targeting set up, the Debugger will present an option to quickly set your "DevCycle Identity" to the currently identified user on the page.
 
 Once set, you can now view and modify your Overrides for any Feature in your project.
 
diff --git a/docs/introduction/quickstart.md b/docs/quickstart.md
similarity index 94%
rename from docs/introduction/quickstart.md
rename to docs/quickstart.md
index ad086216..ef2efada 100644
--- a/docs/introduction/quickstart.md
+++ b/docs/quickstart.md
@@ -1,9 +1,8 @@
 ---
 title: Quickstart Tutorial
-sidebar_position: 1
 ---
 
-In this tutorial, we'll be showcasing a great use case for feature flags, guiding you through the creation of a simple [React app](https://react.dev), connecting it to DevCycle, and implementing an [Ops feature flag](/introduction/core-concepts/feature-types#ops) to enable/disable a **Maintenance Mode** page. 
+In this tutorial, we'll be showcasing a great use case for feature flags, guiding you through the creation of a simple [React app](https://react.dev), connecting it to DevCycle, and implementing an [Ops feature flag](/essentials/feature-types#ops) to enable/disable a **Maintenance Mode** page. 
 
 You'll learn about some of the core features of DevCycle, while experiencing firsthand just how easy it is to implement feature flags to enhance your application's functionality and flexibility.
 
@@ -23,7 +22,7 @@ On the DevCycle Dashboard, access the "Feature Management" page via the `Feature
 To create a Feature:
 
 1. Click either the "+" button or the "Create new Feature" button.
-2. Choose an `Ops Feature` from the options modal. To read more about the Feature types and their uses, see [DevCycle Feature Types](/introduction/core-concepts/feature-types).
+2. Choose an `Ops Feature` from the options modal. To read more about the Feature types and their uses, see [DevCycle Feature Types](/essentials/feature-types).
 3. After choosing a type, name and describe your Feature:
     - **Feature name:** For our example, this will be `Maintenance Mode`.
     - **Feature key:** This key is how the Feature and its Variables will be referenced in code. (A key of `maintenance-mode` will be automatically suggested based on the entered name.)
@@ -93,7 +92,7 @@ To obtain the SDK key, you'll need to:
 
 ![alt text](/tutorial/tutorial-keys.png)
 
-Depending on which [type of SDK](/sdk/) and which environment you are initializing for, the SDK Key will be different. Read more about [Environments](/essentials/environments) and [keys](/essentials/keys) in the essentials.
+Depending on which [type of SDK](/sdk/) and which environment you are initializing for, the SDK Key will be different. Read more about [Environments](/platform/account-management/environments) and [keys](/platform/account-management/keys) in the essentials.
 
 **4. Initialize DevCycle Provider**
 
@@ -107,7 +106,7 @@ export default withDevCycleProvider({
 
 **5. Access your Variable.** 
 
-Implement the code to evaluate the Variable that is being controlled by the Feature you just created. Read more about Variables [here](/essentials/variables).
+Implement the code to evaluate the Variable that is being controlled by the Feature you just created. Read more about Variables [here](/platform/feature-flags/variables-and-variations/variables).
 
 To access the variable, you'll first need to import the `useVariableValue` hook at the top of `App.js`
 
@@ -193,7 +192,7 @@ If everything is working, your maintenance mode should now be enabled, and you w
 
 ![alt text](/tutorial/tutorial-maintenance.png)
 
-For more information on targeting based on user data, see the documentation on [Custom Properties here](/platform/advanced-targeting/custom-properties).
+For more information on targeting based on user data, see the documentation on [Custom Properties here](/platform/feature-flags/targeting/custom-properties).
 
 ---
 
diff --git a/docs/sdk/client-side-sdks/android/android-usage.md b/docs/sdk/client-side-sdks/android/android-usage.md
index 3d90616e..29284a43 100644
--- a/docs/sdk/client-side-sdks/android/android-usage.md
+++ b/docs/sdk/client-side-sdks/android/android-usage.md
@@ -294,7 +294,7 @@ devcycleClient.flushEvents(new DevCycleCallback<String>() {
 
 ## EdgeDB
 
-EdgeDB allows you to save user data to our EdgeDB storage so that you don't have to pass in all the user data every time you identify a user. Read more about [EdgeDB](/platform/edgedb).
+EdgeDB allows you to save user data to our EdgeDB storage so that you don't have to pass in all the user data every time you identify a user. Read more about [EdgeDB](/platform/feature-flags/targeting/edgedb).
 
 To get started, contact us at support@devcycle.com to enable EdgeDB for your project.
 
diff --git a/docs/sdk/client-side-sdks/flutter/flutter-usage.md b/docs/sdk/client-side-sdks/flutter/flutter-usage.md
index c74e8650..69214f0e 100644
--- a/docs/sdk/client-side-sdks/flutter/flutter-usage.md
+++ b/docs/sdk/client-side-sdks/flutter/flutter-usage.md
@@ -162,7 +162,7 @@ _devcycleClient.flushEvents(([error]) => {
 ## EdgeDB
 
 EdgeDB allows you to save user data to our EdgeDB storage so that you don't have to pass in all the user data every time you identify a user.
-Read more about [EdgeDB](/platform/edgedb).
+Read more about [EdgeDB](/platform/feature-flags/targeting/edgedb).
 
 To get started, contact us at support@devcycle.com to enable EdgeDB for your project.
 
diff --git a/docs/sdk/client-side-sdks/ios/ios-usage.md b/docs/sdk/client-side-sdks/ios/ios-usage.md
index c6bdc782..ea22a9e4 100644
--- a/docs/sdk/client-side-sdks/ios/ios-usage.md
+++ b/docs/sdk/client-side-sdks/ios/ios-usage.md
@@ -279,7 +279,7 @@ devcycleClient.flushEvents()
 
 ## EdgeDB
 
-EdgeDB allows you to save user data to our EdgeDB storage so that you don't have to pass in all the user data every time you identify a user. Read more about [EdgeDB](/platform/edgedb).
+EdgeDB allows you to save user data to our EdgeDB storage so that you don't have to pass in all the user data every time you identify a user. Read more about [EdgeDB](/platform/feature-flags/targeting/edgedb).
 
 To get started, contact us at support@devcycle.com to enable EdgeDB for your project.
 
diff --git a/docs/sdk/client-side-sdks/javascript/javascript-typescript.md b/docs/sdk/client-side-sdks/javascript/javascript-typescript.md
index 119e9259..7b132cb2 100644
--- a/docs/sdk/client-side-sdks/javascript/javascript-typescript.md
+++ b/docs/sdk/client-side-sdks/javascript/javascript-typescript.md
@@ -83,6 +83,6 @@ the latest configuration from DevCycle.
 
 :::info
 
-Any Variables that are a part of a [Completed Feature](https://docs.devcycle.com/essentials/status-and-lifecycle#completing-a-feature) will be marked as deprecated in the types output. This is a powerful aid for Variable cleanup, because you can see which Variables need to be cleaned up right in your code.
+Any Variables that are a part of a [Completed Feature](https://docs.devcycle.com/platform/feature-flags/status-and-lifecycle#completing-a-feature) will be marked as deprecated in the types output. This is a powerful aid for Variable cleanup, because you can see which Variables need to be cleaned up right in your code.
 
 :::
diff --git a/docs/sdk/client-side-sdks/nextjs/nextjs-usage-app.md b/docs/sdk/client-side-sdks/nextjs/nextjs-usage-app.md
index 35583fd0..2f270101 100644
--- a/docs/sdk/client-side-sdks/nextjs/nextjs-usage-app.md
+++ b/docs/sdk/client-side-sdks/nextjs/nextjs-usage-app.md
@@ -218,7 +218,7 @@ that is available from the user getter will be used to provide the values for De
 are received while someone is viewing a statically-rendered page will still trigger a re-render of the page with the
 new configuration data.
 
-If you wish to rebuild your static pages when a DevCycle configuration changes, consider setting up a [DevCycle Webhook](/platform/webhooks) to
+If you wish to rebuild your static pages when a DevCycle configuration changes, consider setting up a [DevCycle Webhook](/platform/extras/webhooks) to
 trigger your build process.
 
 ## Advanced
diff --git a/docs/sdk/client-side-sdks/react/react-typescript.md b/docs/sdk/client-side-sdks/react/react-typescript.md
index ec9c5e26..d42e309c 100644
--- a/docs/sdk/client-side-sdks/react/react-typescript.md
+++ b/docs/sdk/client-side-sdks/react/react-typescript.md
@@ -63,6 +63,6 @@ the latest configuration from DevCycle.
 
 :::info
 
-Any Variables that are a part of a [Completed Feature](https://docs.devcycle.com/essentials/status-and-lifecycle#completing-a-feature) will be marked as deprecated in the types output. This is a powerful aid for Variable cleanup, because you can see which Variables need to be cleaned up right in your code.
+Any Variables that are a part of a [Completed Feature](https://docs.devcycle.com/platform/feature-flags/status-and-lifecycle#completing-a-feature) will be marked as deprecated in the types output. This is a powerful aid for Variable cleanup, because you can see which Variables need to be cleaned up right in your code.
 
 :::
diff --git a/docs/sdk/client-side-sdks/react/react-usage.md b/docs/sdk/client-side-sdks/react/react-usage.md
index 36f0b58d..6509cb03 100644
--- a/docs/sdk/client-side-sdks/react/react-usage.md
+++ b/docs/sdk/client-side-sdks/react/react-usage.md
@@ -273,7 +273,7 @@ If using Typescript, `OldComponent` and `NewComponent` must have compatible prop
 
 EdgeDB allows you to save user data to our EdgeDB storage so that you don't have to pass in all the user data every time you identify a user.
 
-To get started, enable EdgeDB on your project by following the guide [here](/platform/edgedb)
+To get started, enable EdgeDB on your project by following the guide [here](/platform/feature-flags/targeting/edgedb)
 
 Once you have EdgeDB enabled in your project, pass in the `enableEdgeDB` option to turn on EdgeDB mode for the SDK:
 
diff --git a/docs/sdk/client-side-sdks/roku/roku-usage.md b/docs/sdk/client-side-sdks/roku/roku-usage.md
index b257c2d9..8abd2eb2 100644
--- a/docs/sdk/client-side-sdks/roku/roku-usage.md
+++ b/docs/sdk/client-side-sdks/roku/roku-usage.md
@@ -108,7 +108,7 @@ m.devcycleClient.flushEvents()
 
 ## EdgeDB
 
-EdgeDB allows you to save user data to our EdgeDB storage so that you don't have to pass in all the user data every time you identify a user. Read more about [EdgeDB](/platform/edgedb).
+EdgeDB allows you to save user data to our EdgeDB storage so that you don't have to pass in all the user data every time you identify a user. Read more about [EdgeDB](/platform/feature-flags/targeting/edgedb).
 
 To get started, contact us at support@devcycle.com to enable EdgeDB for your project.
 
diff --git a/docs/sdk/features.md b/docs/sdk/features.md
index bab79b39..b460eed8 100644
--- a/docs/sdk/features.md
+++ b/docs/sdk/features.md
@@ -78,7 +78,7 @@ await devcycleClient.onClientInitialized()
 ## Evaluating Features & Using Variables
 
 This section explains how to use retrieve the Variables of a Feature as well as use their values. For information 
-on setting up a Feature for use, read [Variables and Variations](/essentials/variables) and [Targeting Users](/essentials/targeting)
+on setting up a Feature for use, read [Variables and Variations](/platform/feature-flags/variables-and-variations/variables) and [Targeting Users](/platform/feature-flags/targeting/targeting-overview)
 
 Every SDK provides a method to retrieve a Variable's value. It expects to receive the unique key of the Variable, 
 and a default value to serve in case no other value is available.
@@ -107,7 +107,7 @@ The default value will be returned in the following scenarios:
   configuration from breaking your application at runtime.
 - The SDK has finished initializing, but the user has not been targeted for a Feature that controls this Variable
 
-For more information on how the default value is used, see [Variable Defaults](/platform/advanced-variables/variable-defaults).
+For more information on how the default value is used, see [Variable Defaults](/platform/feature-flags/variables-and-variations/variable-defaults).
 
 ## Getting All Features
 
@@ -131,7 +131,7 @@ The response is the following general format, with slight changes depending on t
 }
 ```
 
-Only Features that the User has satisfied [targeting rules](/essentials/targeting) for will be returned by this function. 
+Only Features that the User has satisfied [targeting rules](/platform/feature-flags/targeting/targeting-overview) for will be returned by this function. 
 The feature must also be **enabled** for that environment.
 
 ## Getting all Variables
@@ -157,7 +157,7 @@ The response is the following general format, with slight changes depending on t
 }
 ```
 
-Only Variables in Features that the user has satisfied [targeting rules](/essentials/targeting) for will be part of the response in this method. 
+Only Variables in Features that the user has satisfied [targeting rules](/platform/feature-flags/targeting/targeting-overview) for will be part of the response in this method. 
 The Feature must also be **enabled** for the environment this SDK is being called on.
 
 :::caution
@@ -242,7 +242,7 @@ to represent the user.
 
 User data can also contain "custom data", which is a key-value map of any arbitrary data you want to use for targeting.
 The provided data can be used in Targeting Rules by creating Custom Properties in the DevCycle dashboard. Learn more
-about [Custom Property Targeting](/platform/advanced-targeting/custom-properties)
+about [Custom Property Targeting](/platform/feature-flags/targeting/custom-properties)
 
 When setting custom properties you have a choice between keeping that data completely private or allowing 
 for the data to be logged back to DevCycle's events database. Both options allow for the same targeting capabilities, 
@@ -298,7 +298,7 @@ Custom Domains is an enterprise feature and requires manual setup on both your e
 
 :::
 
-For instructions on setting up a custom domain, see [Custom Domains](/platform/custom-domains).
+For instructions on setting up a custom domain, see [Custom Domains](/platform/extras/custom-domains).
 
 ## Realtime Updates
 
@@ -344,6 +344,6 @@ The SDK determines flag values by making an API call for each decision, using wo
 globally. Every function within the SDK will reach out to these edge workers and respond with
 extremely low latency.
 
-Cloud bucketing is required to use specific features such as [EdgeDB](/platform/edgedb) and
-[Feature Opt-In](/platform/advanced-targeting/feature-opt-in). If you aren't using these features, then Local Bucketing
+Cloud bucketing is required to use specific features such as [EdgeDB](/platform/feature-flags/targeting/edgedb) and
+[Feature Opt-In](/platform/extras/feature-opt-in). If you aren't using these features, then Local Bucketing
 is the recommended mode.
diff --git a/docs/sdk/server-side-sdks/dotnet/dotnet-usage.md b/docs/sdk/server-side-sdks/dotnet/dotnet-usage.md
index 35ea7093..d3376205 100644
--- a/docs/sdk/server-side-sdks/dotnet/dotnet-usage.md
+++ b/docs/sdk/server-side-sdks/dotnet/dotnet-usage.md
@@ -81,7 +81,7 @@ DevCycleResponse result = await client.Track(user, event);
 ## EdgeDB - Cloud Only
 
 EdgeDB allows you to save user data to our EdgeDB storage so that you don't have to pass in all the user data every time you identify a user.
-Read more about [EdgeDB](/platform/edgedb).
+Read more about [EdgeDB](/platform/feature-flags/targeting/edgedb).
 
 To get started, contact us at support@devcycle.com to enable EdgeDB for your project.
 
diff --git a/docs/sdk/server-side-sdks/dotnet/dotnet.md b/docs/sdk/server-side-sdks/dotnet/dotnet.md
index 2becc5aa..a0704482 100644
--- a/docs/sdk/server-side-sdks/dotnet/dotnet.md
+++ b/docs/sdk/server-side-sdks/dotnet/dotnet.md
@@ -11,7 +11,7 @@ The DevCycle .NET / C# SDK has two operation modes; Cloud Bucketing - which inte
 and Local Bucketing - which performs bucketing locally.
 
 We recommend using the Local Bucketing mode by default, as it performs fast local evaluations of your feature flags.
-If you need access to [EdgeDB](https://docs.devcycle.com/platform/edgedb) you will need to use the Cloud Bucketing mode of the SDK. 
+If you need access to [EdgeDB](https://docs.devcycle.com/platform/feature-flags/targeting/edgedb) you will need to use the Cloud Bucketing mode of the SDK. 
 See [Here](/sdk/#difference-between-local-and-cloud-bucketing) for more information. 
 
 <CustomDocCardList items={useCurrentSidebarCategory().items} columnWidth={6} />
diff --git a/docs/sdk/server-side-sdks/go/go-usage.md b/docs/sdk/server-side-sdks/go/go-usage.md
index 9a229a07..2510b8c5 100644
--- a/docs/sdk/server-side-sdks/go/go-usage.md
+++ b/docs/sdk/server-side-sdks/go/go-usage.md
@@ -126,7 +126,7 @@ Client Custom Data is only available for the Local Bucketing SDK
 ## EdgeDB
 
 EdgeDB allows you to save user data to our EdgeDB storage so that you don't have to pass in all the user data every time
-you identify a user. Read more about [EdgeDB](/platform/edgedb).
+you identify a user. Read more about [EdgeDB](/platform/feature-flags/targeting/edgedb).
 
 To get started, contact us at support@devcycle.com to enable EdgeDB for your project.
 
diff --git a/docs/sdk/server-side-sdks/go/go.md b/docs/sdk/server-side-sdks/go/go.md
index 0b6cf7ff..bd3802be 100644
--- a/docs/sdk/server-side-sdks/go/go.md
+++ b/docs/sdk/server-side-sdks/go/go.md
@@ -11,7 +11,7 @@ Welcome to the DevCycle Go Server SDK. There are two modes for the SDK,
 Cloud bucketing (using the [Bucketing API](https://docs.devcycle.com/bucketing-api/)) and Local Bucketing. 
 
 We recommend using the Local Bucketing mode by default, as it performs fast local evaluations of your feature flags.
-If you need access to [EdgeDB](https://docs.devcycle.com/platform/edgedb) you will need to use the Cloud Bucketing mode of the SDK.
+If you need access to [EdgeDB](https://docs.devcycle.com/platform/feature-flags/targeting/edgedb) you will need to use the Cloud Bucketing mode of the SDK.
 
 <CustomDocCardList items={useCurrentSidebarCategory().items} columnWidth={6} />
 
diff --git a/docs/sdk/server-side-sdks/java/java-usage.md b/docs/sdk/server-side-sdks/java/java-usage.md
index 0e3e02a9..c781a13b 100644
--- a/docs/sdk/server-side-sdks/java/java-usage.md
+++ b/docs/sdk/server-side-sdks/java/java-usage.md
@@ -144,7 +144,7 @@ DevCycleLocalOptions options = DevCycleLocalOptions.builder().customLogger(loggi
 **NOTE: EdgeDB is only available with Cloud Bucketing.**
 
 EdgeDB allows you to save user data to our EdgeDB storage so that you don't have to pass in all the user data every time you identify a user.
-Read more about [EdgeDB](/platform/edgedb).
+Read more about [EdgeDB](/platform/feature-flags/targeting/edgedb).
 
 To get started, contact us at support@devcycle.com to enable EdgeDB for your project.
 
diff --git a/docs/sdk/server-side-sdks/java/java.md b/docs/sdk/server-side-sdks/java/java.md
index 3c337132..b286a791 100644
--- a/docs/sdk/server-side-sdks/java/java.md
+++ b/docs/sdk/server-side-sdks/java/java.md
@@ -10,7 +10,7 @@ Welcome to the DevCycle Java Server SDK. There are two modes for the SDK,
 Cloud bucketing (using the [Bucketing API](https://docs.devcycle.com/bucketing-api/)) and Local Bucketing.
 
 We recommend using the Local Bucketing mode by default, as it performs fast local evaluations of your feature flags.
-If you need access to [EdgeDB](https://docs.devcycle.com/platform/edgedb) you will need to use the Cloud Bucketing mode of the SDK.
+If you need access to [EdgeDB](https://docs.devcycle.com/platform/feature-flags/targeting/edgedb) you will need to use the Cloud Bucketing mode of the SDK.
 
 <CustomDocCardList items={useCurrentSidebarCategory().items} columnWidth={6} />
 
diff --git a/docs/sdk/server-side-sdks/node/node-usage.md b/docs/sdk/server-side-sdks/node/node-usage.md
index f5530b9f..f652f193 100644
--- a/docs/sdk/server-side-sdks/node/node-usage.md
+++ b/docs/sdk/server-side-sdks/node/node-usage.md
@@ -112,7 +112,7 @@ EdgeDB is only available with Cloud Bucketing and does not have any impact on Lo
 
 :::
 
-EdgeDB allows you to save user data to our EdgeDB storage so that you don't have to pass in all the user data every time you identify a user. Read more about [EdgeDB](/platform/edgedb).
+EdgeDB allows you to save user data to our EdgeDB storage so that you don't have to pass in all the user data every time you identify a user. Read more about [EdgeDB](/platform/feature-flags/targeting/edgedb).
 
 To get started, contact us at support@devcycle.com to enable EdgeDB for your project.
 
diff --git a/docs/sdk/server-side-sdks/node/node.md b/docs/sdk/server-side-sdks/node/node.md
index 94149d21..f7b14619 100644
--- a/docs/sdk/server-side-sdks/node/node.md
+++ b/docs/sdk/server-side-sdks/node/node.md
@@ -10,7 +10,7 @@ import {useCurrentSidebarCategory} from '@docusaurus/theme-common';
 There are two modes for the SDK, Cloud bucketing (using the [Bucketing API](https://docs.devcycle.com/bucketing-api/)) and Local Bucketing.
 
 We recommend using the Local Bucketing mode by default, as it performs fast local evaluations of your feature flags.
-If you need access to [EdgeDB](https://docs.devcycle.com/platform/edgedb) you will need to use the Cloud Bucketing mode of the SDK.
+If you need access to [EdgeDB](https://docs.devcycle.com/platform/feature-flags/targeting/edgedb) you will need to use the Cloud Bucketing mode of the SDK.
 
 <CustomDocCardList items={useCurrentSidebarCategory().items} columnWidth={6} />
 
diff --git a/docs/sdk/server-side-sdks/php/php-usage.md b/docs/sdk/server-side-sdks/php/php-usage.md
index 17382711..3d8c6157 100644
--- a/docs/sdk/server-side-sdks/php/php-usage.md
+++ b/docs/sdk/server-side-sdks/php/php-usage.md
@@ -98,7 +98,7 @@ try {
 
 ## EdgeDB
 
-EdgeDB allows you to save user data to our EdgeDB storage so that you don't have to pass in all the user data every time you identify a user. Read more about [EdgeDB](/platform/edgedb).
+EdgeDB allows you to save user data to our EdgeDB storage so that you don't have to pass in all the user data every time you identify a user. Read more about [EdgeDB](/platform/feature-flags/targeting/edgedb).
 
 To get started, contact us at support@devcycle.com to enable EdgeDB for your project.
 
diff --git a/docs/sdk/server-side-sdks/php/php.md b/docs/sdk/server-side-sdks/php/php.md
index 0a1462da..ca5540aa 100644
--- a/docs/sdk/server-side-sdks/php/php.md
+++ b/docs/sdk/server-side-sdks/php/php.md
@@ -11,7 +11,7 @@ Welcome to the DevCycle PHP SDK. There are two modes for the SDK,
 Cloud bucketing (using the [Bucketing API](https://docs.devcycle.com/bucketing-api/)) and Local Bucketing.
 
 We recommend using the Local Bucketing mode by default, as it performs fast local evaluations of your feature flags.
-If you need access to [EdgeDB](https://docs.devcycle.com/platform/edgedb) you will need to use the Cloud Bucketing mode of the SDK.
+If you need access to [EdgeDB](https://docs.devcycle.com/platform/feature-flags/targeting/edgedb) you will need to use the Cloud Bucketing mode of the SDK.
 
 <CustomDocCardList items={useCurrentSidebarCategory().items} columnWidth={6} />
 
diff --git a/docs/sdk/server-side-sdks/python/python-usage.md b/docs/sdk/server-side-sdks/python/python-usage.md
index e62eb07a..6a3db599 100644
--- a/docs/sdk/server-side-sdks/python/python-usage.md
+++ b/docs/sdk/server-side-sdks/python/python-usage.md
@@ -131,7 +131,7 @@ Client Custom Data is only available for the Local Bucketing SDK
 
 ## EdgeDB
 
-When utilizing the Cloud Bucketing Python SDK, EdgeDB allows you to save user data to our EdgeDB storage so that you don't have to pass in all the user data every time you identify a user. Read more about [EdgeDB](/platform/edgedb).
+When utilizing the Cloud Bucketing Python SDK, EdgeDB allows you to save user data to our EdgeDB storage so that you don't have to pass in all the user data every time you identify a user. Read more about [EdgeDB](/platform/feature-flags/targeting/edgedb).
 
 To get started, contact us at support@devcycle.com to enable EdgeDB for your project.
 
diff --git a/docs/sdk/server-side-sdks/python/python.md b/docs/sdk/server-side-sdks/python/python.md
index 5e478e14..eb7837c5 100644
--- a/docs/sdk/server-side-sdks/python/python.md
+++ b/docs/sdk/server-side-sdks/python/python.md
@@ -10,7 +10,7 @@ import {useCurrentSidebarCategory} from '@docusaurus/theme-common';
 Welcome to the DevCycle Python Server SDK. There are two modes for the SDK, Local Bucketing (using the local bucketing engine) and Cloud bucketing (using the [DevCycle Bucketing API](/bucketing-api/#tag/devcycle)).
 
 We recommend using the Local Bucketing mode by default, as it performs fast local evaluations of your feature flags.
-If you need access to [EdgeDB](https://docs.devcycle.com/platform/edgedb) you will need to use the Cloud Bucketing mode of the SDK.
+If you need access to [EdgeDB](https://docs.devcycle.com/platform/feature-flags/targeting/edgedb) you will need to use the Cloud Bucketing mode of the SDK.
 
 <CustomDocCardList items={useCurrentSidebarCategory().items} columnWidth={6} />
 
diff --git a/docs/sdk/server-side-sdks/ruby/ruby-usage.md b/docs/sdk/server-side-sdks/ruby/ruby-usage.md
index 8d28966c..0ae4e2f4 100644
--- a/docs/sdk/server-side-sdks/ruby/ruby-usage.md
+++ b/docs/sdk/server-side-sdks/ruby/ruby-usage.md
@@ -137,7 +137,7 @@ Client Custom Data is only available for the Local Bucketing SDK
 ## EdgeDB
 
 EdgeDB allows you to save user data to our EdgeDB storage so that you don't have to pass in all the user data every time you identify a user.
-Read more about [EdgeDB](/platform/edgedb).
+Read more about [EdgeDB](/platform/feature-flags/targeting/edgedb).
 
 To get started, contact us at support@devcycle.com to enable EdgeDB for your project.
 
diff --git a/docs/sdk/server-side-sdks/ruby/ruby.md b/docs/sdk/server-side-sdks/ruby/ruby.md
index 3f2af4a9..833f7d5a 100644
--- a/docs/sdk/server-side-sdks/ruby/ruby.md
+++ b/docs/sdk/server-side-sdks/ruby/ruby.md
@@ -11,7 +11,7 @@ Welcome to the DevCycle Ruby SDK. There are two modes for the SDK,
 Cloud bucketing (using the [Bucketing API](https://docs.devcycle.com/bucketing-api/)) and Local Bucketing.
 
 We recommend using the Local Bucketing mode by default, as it performs fast local evaluations of your feature flags.
-If you need access to [EdgeDB](https://docs.devcycle.com/platform/edgedb) you will need to use the Cloud Bucketing mode of the SDK.
+If you need access to [EdgeDB](https://docs.devcycle.com/platform/feature-flags/targeting/edgedb) you will need to use the Cloud Bucketing mode of the SDK.
 
 <CustomDocCardList items={useCurrentSidebarCategory().items} columnWidth={6} />
 
diff --git a/sidebars.js b/sidebars.js
index 0c154bbc..50331b7a 100644
--- a/sidebars.js
+++ b/sidebars.js
@@ -7,12 +7,10 @@ module.exports = {
       id: 'index', // The internal path
     },
     {
-      type: 'category',
-      label: 'Introduction',
-      items: [{ type: "autogenerated", dirName: "introduction" }],
-      collapsible: true,
-      className: 'section-title introduction',
-      collapsed: false,
+      type: 'doc',
+      label: 'Getting Started',
+      id: 'quickstart',
+      className: 'section-title quickstart',
     },
     {
       type: 'category',
diff --git a/src/css/custom.css b/src/css/custom.css
index 2bf89d52..e2bc8e20 100644
--- a/src/css/custom.css
+++ b/src/css/custom.css
@@ -233,7 +233,7 @@ html[data-theme="dark"] .DocSearch {
   filter: invert(23%) sepia(73%) saturate(3810%) hue-rotate(224deg) brightness(86%) contrast(96%); /* https://codepen.io/sosuke/pen/Pjoqqp */
 }
 
-.section-title.introduction > div >a::before {
+.section-title.quickstart >a::before {
   background-image: url(../../static/sidebar/introduction.svg);
 }
 
diff --git a/static/sidebar/platform.svg b/static/sidebar/platform.svg
index 0c0bcec7..6e1a0f9d 100644
--- a/static/sidebar/platform.svg
+++ b/static/sidebar/platform.svg
@@ -1,12 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-books" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-  <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
-  <path d="M5 4m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v14a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z" />
-  <path d="M9 4m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v14a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z" />
-  <path d="M5 8h4" />
-  <path d="M9 16h4" />
-  <path d="M13.803 4.56l2.184 -.53c.562 -.135 1.133 .19 1.282 .732l3.695 13.418a1.02 1.02 0 0 1 -.634 1.219l-.133 .041l-2.184 .53c-.562 .135 -1.133 -.19 -1.282 -.732l-3.695 -13.418a1.02 1.02 0 0 1 .634 -1.219l.133 -.041z" />
-  <path d="M14 9l4 -1" />
-  <path d="M16 16l3.923 -.98" />
-</svg>
-
-
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" fill-rule="evenodd"><path d="m12.593 23.258l-.011.002l-.071.035l-.02.004l-.014-.004l-.071-.035q-.016-.005-.024.005l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.017-.018m.265-.113l-.013.002l-.185.093l-.01.01l-.003.011l.018.43l.005.012l.008.007l.201.093q.019.005.029-.008l.004-.014l-.034-.614q-.005-.018-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.004-.011l.017-.43l-.003-.012l-.01-.01z"/><path fill="currentColor" fill-rule="nonzero" d="M19 3a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2h-4v1h1a1 1 0 1 1 0 2H8a1 1 0 1 1 0-2h1v-1H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2Zm-6 15h-2v1h2zm6-13H5v11h14z"/></g></svg>
\ No newline at end of file
diff --git a/vercel.json b/vercel.json
index e6e3fff8..1ca5e32a 100644
--- a/vercel.json
+++ b/vercel.json
@@ -9,25 +9,70 @@
     { "source": "/home", "destination": "/", "statusCode": 301 },
     { "source": "/home/", "destination": "/", "statusCode": 301 },
     { "source": "/tools-and-integrations/cli", "destination": "/cli", "statusCode": 301 },
-    { "source": "/:path*/getting-started/:path*", "destination": "/introduction/quickstart", "statusCode": 301 },
-    { "source": "/home/feature-management/features-and-variables/targeting-users", "destination": "/essentials/targeting", "statusCode": 301 },
-    { "source": "/home/feature-management/features-and-variables/variables-and-variations", "destination": "/essentials/variables", "statusCode": 301 },
-    { "source": "/home/feature-management/features-and-variables/custom-properties", "destination": "/platform/advanced-targeting/custom-properties", "statusCode": 301 },
-    { "source": "/home/feature-management/features-and-variables/sdk-visibility", "destination": "/platform/sdk-visibility", "statusCode": 301 },
+    { "source": "/:path*/getting-started/:path*", "destination": "/quickstart", "statusCode": 301 },
+    { "source": "/home/feature-management/features-and-variables/targeting-users", "destination": "/platform/feature-flags/targeting/targeting-overview", "statusCode": 301 },
+    { "source": "/home/feature-management/features-and-variables/variables-and-variations", "destination": "/platform/feature-flags/variables-and-variations/variables", "statusCode": 301 },
+    { "source": "/home/feature-management/features-and-variables/custom-properties", "destination": "/platform/feature-flags/targeting/custom-properties", "statusCode": 301 },
+    { "source": "/home/feature-management/features-and-variables/sdk-visibility", "destination": "/platform/security-and-guardrails/sdk-visibility", "statusCode": 301 },
     { "source": "/home/feature-management/features-and-variables/metrics-and-analysis/:path*", "destination": "/platform/metrics/:path*", "statusCode": 301 },
-    { "source": "/home/feature-management/organizing-your-flags-and-variables/feature-dashboard", "destination": "/essentials/features", "statusCode": 301 },
-    { "source": "/home/feature-management/organizing-your-flags-and-variables/environments", "destination": "/essentials/environments", "statusCode": 301 },
-    { "source": "/home/feature-management/organizing-your-flags-and-variables/api-and-sdk-keys", "destination": "/essentials/keys", "statusCode": 301 },
-    { "source": "/home/feature-management/organizing-your-flags-and-variables/variable-dashboard", "destination": "/essentials/variables", "statusCode": 301 },
-    { "source": "/home/feature-management/organizing-your-flags-and-variables/organizations-projects", "destination": "/essentials/organizations", "statusCode": 301 },
-    { "source": "/home/your-organization/:path*", "destination": "/essentials/organizations", "statusCode": 301 },
+    { "source": "/home/feature-management/organizing-your-flags-and-variables/feature-dashboard", "destination": "/platform/feature-flags/features", "statusCode": 301 },
+    { "source": "/home/feature-management/organizing-your-flags-and-variables/environments", "destination": "/platform/account-management/environments", "statusCode": 301 },
+    { "source": "/home/feature-management/organizing-your-flags-and-variables/api-and-sdk-keys", "destination": "/platform/account-management/keys", "statusCode": 301 },
+    { "source": "/home/feature-management/organizing-your-flags-and-variables/variable-dashboard", "destination": "/platform/feature-flags/variables-and-variations/variables", "statusCode": 301 },
+    { "source": "/home/feature-management/organizing-your-flags-and-variables/organizations-projects", "destination": "/platform/account-management/organizations", "statusCode": 301 },
+    { "source": "/home/your-organization/:path*", "destination": "/platform/account-management/organizations", "statusCode": 301 },
     { "source": "/home/demos/:path*", "destination": "/examples", "statusCode": 301 },
-    { "source": "/home/feature-management/edgedb/:path*", "destination": "/platform/edgedb", "statusCode": 301 },
-    { "source": "/home/feature-management/feature-opt-in/:path*", "destination": "/platform/advanced-targeting/feature-opt-in", "statusCode": 301 },
+    { "source": "/home/feature-management/edgedb/:path*", "destination": "/platform/feature-flags/targeting/edgedb", "statusCode": 301 },
+    { "source": "/home/feature-management/feature-opt-in/:path*", "destination": "/platform/extras/feature-opt-in", "statusCode": 301 },
     { "source": "/tools-and-integrations/:path*", "destination": "/integrations/:path*", "statusCode": 301 },
     { "source": "/tools-and-integrations/", "destination": "/integrations", "statusCode": 301 },
     { "source": "/extras/:path*", "destination": "/platform/:path*", "statusCode": 301 },
-    { "source": "/extras/:path*/", "destination": "/platform/:path*", "statusCode": 301 }
+    { "source": "/extras/:path*/", "destination": "/platform/:path*", "statusCode": 301 },
+
+    { "source": "/introduction/quickstart", "destination": "/quickstart", "statusCode": 301 },
+    { "source": "/introduction/key-features", "destination": "/essentials/key-features", "statusCode": 301 },
+    { "source": "/introduction/architecture", "destination": "/essentials/architecture", "statusCode": 301 },
+
+    { "source": "/essentials/features", "destination": "/platform/feature-flags/features", "statusCode": 301 },
+    { "source": "/essentials/status-and-lifecycle", "destination": "/platform/feature-flags/status-and-lifecycle", "statusCode": 301 },
+    { "source": "/essentials/targeting", "destination": "/platform/feature-flags/targeting/targeting-overview", "statusCode": 301 },
+    { "source": "/platform/advanced-targeting/audiences", "destination": "/platform/feature-flags/targeting/audiences", "statusCode": 301 },
+    { "source": "/platform/advanced-targeting/custom-properties", "destination": "/platform/feature-flags/targeting/custom-properties", "statusCode": 301 },
+    { "source": "/platform/advanced-targeting/random-variations", "destination": "/platform/feature-flags/targeting/random-variations", "statusCode": 301 },
+    { "source": "/platform/advanced-targeting/randomize-using-custom-property", "destination": "/platform/feature-flags/targeting/randomize-using-custom-property", "statusCode": 301 },
+    { "source": "/platform/advanced-targeting/rollouts", "destination": "/platform/feature-flags/targeting/rollouts", "statusCode": 301 },
+    { "source": "/platform/edgedb", "destination": "/platform/feature-flags/targeting/edgedb", "statusCode": 301 },
+    { "source": "/essentials/variables", "destination": "/platform/feature-flags/variables-and-variations/variables", "statusCode": 301 },
+    { "source": "/essentials/variations", "destination": "/platform/feature-flags/variables-and-variations/variations", "statusCode": 301 },
+    { "source": "/platform/advanced-variables/variable-defaults", "destination": "/platform/feature-flags/variables-and-variations/variable-defaults", "statusCode": 301 },
+    { "source": "/platform/metrics/feature-flag-reach", "destination": "/platform/feature-flags/variables-and-variations/feature-flag-reach", "statusCode": 301 },
+
+    { "source": "/essentials/organizations", "destination": "/platform/account-management/organizations", "statusCode": 301 },
+    { "source": "/essentials/projects", "destination": "/platform/account-management/projects", "statusCode": 301 },
+    { "source": "/essentials/environments", "destination": "/platform/account-management/environments", "statusCode": 301 },
+    { "source": "/essentials/keys", "destination": "/platform/account-management/keys", "statusCode": 301 },
+
+    { "source": "/platform/metrics/creating-and-managing-metrics", "destination": "/platform/experimentation/creating-and-managing-metrics", "statusCode": 301 },
+    { "source": "/platform/metrics/how-metrics-are-calculated", "destination": "/platform/experimentation/how-metrics-are-calculated", "statusCode": 301 },
+    { "source": "/essentials/feature-experimentation", "destination": "/platform/experimentation/feature-experimentation", "statusCode": 301 },
+
+    { "source": "/introduction/core-concepts/feature-hierarchy", "destination": "/essentials/feature-hierarchy", "statusCode": 301 },
+    { "source": "/introduction/core-concepts/feature-types", "destination": "/essentials/feature-types", "statusCode": 301 },
+
+    { "source": "/platform/approval-workflows", "destination": "/platform/security-and-guardrails/approval-workflows", "statusCode": 301 },
+    { "source": "/platform/audit-log", "destination": "/platform/security-and-guardrails/audit-log", "statusCode": 301 },
+    { "source": "/platform/feature-obfuscation", "destination": "/platform/security-and-guardrails/feature-obfuscation", "statusCode": 301 },
+    { "source": "/platform/permissions", "destination": "/platform/security-and-guardrails/permissions", "statusCode": 301 },
+    { "source": "/platform/sdk-visibility", "destination": "/platform/security-and-guardrails/sdk-visibility", "statusCode": 301 },
+    { "source": "/platform/advanced-variables/variable-schemas", "destination": "/platform/security-and-guardrails/variable-schemas", "statusCode": 301 },
+    
+    { "source": "/platform/web-debugger", "destination": "/platform/testing-and-qa/web-debugger", "statusCode": 301 },
+    { "source": "/platform/advanced-targeting/self-targeting", "destination": "/platform/testing-and-qa/self-targeting", "statusCode": 301 },
+
+    { "source": "/platform/custom-domains", "destination": "/platform/extras/custom-domains", "statusCode": 301 },
+    { "source": "/platform/webhooks", "destination": "/platform/extras/webhooks", "statusCode": 301 },
+    { "source": "/platform/advanced-targeting/feature-opt-in", "destination": "/platform/extras/feature-opt-in", "statusCode": 301 }
+
   ],
   "rewrites": [
     { "source": "/.well-known/ai-plugin.json", "destination": "/.well-known/ai-plugin.json" }