cypress-io · jaffrepaul · Jun 14, 2023 · May 1, 2023 · May 15, 2023 · May 15, 2023
diff --git a/docs/api/plugins/after-run-api.mdx b/docs/api/plugins/after-run-api.mdx
@@ -7,8 +7,8 @@ The `after:run` event fires after a run is finished. When running cypress via
 
 When running via `cypress run`, the event will fire each time `cypress run`
 executes. As a result, if running your specs in
-[parallel](/guides/guides/parallelization), the event will fire once for each
-machine on which `cypress run` is called.
+[parallel](/guides/cloud/smart-orchestration/parallelization), the event will
+fire once for each machine on which `cypress run` is called.
 
 ## Syntax
 

diff --git a/docs/api/plugins/before-run-api.mdx b/docs/api/plugins/before-run-api.mdx
@@ -6,8 +6,8 @@ The `before:run` event fires before a run starts. When running cypress via
 `cypress open`, the event will fire when opening a project.
 
 The event will fire each time `cypress run` executes. As a result, if running
-your specs in [parallel](/guides/guides/parallelization), the event will fire
-once for each machine on which the tests are run.
+your specs in [parallel](/guides/cloud/smart-orchestration/parallelization), the
+event will fire once for each machine on which the tests are run.
 
 ## Syntax
 

diff --git a/docs/faq/questions/cloud-faq.mdx b/docs/faq/questions/cloud-faq.mdx
@@ -25,8 +25,8 @@ You can read more [here](/guides/cloud/introduction).
 
 ## <Icon name="angle-right" /> How do I record my tests?
 
-1. First [set up the project to record](/guides/cloud/projects#Setup).
-2. Then [record your runs](/guides/cloud/runs).
+1. First [set up the project to record](/guides/cloud/getting-started#Setup).
+2. Then [record your runs](/guides/cloud/recorded-runs#Latest-Runs).
 
 After recording your tests, you will see them in
 [Cypress Cloud](https://on.cypress.io/cloud) and in the "Runs" tab.
@@ -42,8 +42,8 @@ the number of tests you record each month in your organization.
 
 Tests are recorded when [cypress run](/guides/guides/command-line#cypress-run)
 is called with the `--record` flag while supplying the record `--key`. This
-means your [test run data](/guides/cloud/runs) is being "recorded" to Cypress
-Cloud.
+means your [test run data](/guides/cloud/recorded-runs#Latest-Runs) is being
+"recorded" to Cypress Cloud.
 
 We consider each time the `it()` function is called to be a single test. So you
 will generally have several tests recorded within each spec file and likely
@@ -52,18 +52,19 @@ several spec files within a single run. Only the
 are counted. The pending and skipped tests are NOT counted.
 
 You can always see how many tests you've recorded from your organization's
-[Billing & Usage](/guides/cloud/organizations#Billing-Usage) page within Cypress
-Cloud.
+[Billing & Usage](/guides/cloud/account-management/billing-and-usage) page
+within Cypress Cloud.
 
 ## <Icon name="angle-right" /> What counts as a user?
 
-A [user](/guides/cloud/users) is anyone with a login to Cypress Cloud who has
-been invited to see and review the test results of your organization.
+A [user](/guides/cloud/account-management/users) is anyone with a login to
+Cypress Cloud who has been invited to see and review the test results of your
+organization.
 
 ## <Icon name="angle-right" /> What if I can't access my Cypress Cloud account?
 
 1. If you haven't signed up, see the
-   [Sign Up with an Invitation](/guides/cloud/users#Sign-Up-with-an-Invitation)
+   [Sign Up with an Invitation](/guides/cloud/account-management/users#Sign-Up-with-an-Invitation)
    instructions.
 
 2. Try resetting your password. If you never received the email, try the
@@ -83,10 +84,11 @@ similar to how public projects on Github, Travis, or CircleCI are handled.
 Anyone who knows your `projectId` will be able to see the recorded runs,
 screenshots, and videos for public projects.
 
-**A private project** means that only [users](/guides/cloud/users) you
-explicitly invite to your [organization](/guides/cloud/organizations) can see
-its recorded runs. Even if someone knows your `projectId`, they will not have
-access to your runs unless you have invited them.
+**A private project** means that only
+[users](/guides/cloud/account-management/users) you explicitly invite to your
+[organization](/guides/cloud/account-management/organizations) can see its
+recorded runs. Even if someone knows your `projectId`, they will not have access
+to your runs unless you have invited them.
 
 ## <Icon name="angle-right" /> How is this different than CI?
 
@@ -131,7 +133,7 @@ any test results.
 
 Your Organization ID is a unique identifier that is linked to your organization.
 Instructions on how to find your ID are in the
-[Cypress Cloud Guide.](/guides/cloud/organizations#Organization-ID)
+[Cypress Cloud Guide.](/guides/cloud/account-management/organizations#Organization-ID)
 
 ## <Icon name="angle-right" /> What does Cypress record?
 
@@ -153,11 +155,12 @@ These will be added in subsequent releases.
 
 ## <Icon name="angle-right" /> Why is test parallelization based on spec files and not on the individual functions?
 
-Cypress [test parallelization](/guides/guides/parallelization) is indeed based
-on specs. For each spec Cypress scaffolds the new running context, in a sense
-isolating each spec file from any previous spec files, and ensuring a clean
-slate for the next spec. Doing this for each _individual_ test would be very
-very expensive and would slow down the test runs significantly.
+Cypress
+[test parallelization](/guides/cloud/smart-orchestration/parallelization) is
+indeed based on specs. For each spec Cypress scaffolds the new running context,
+in a sense isolating each spec file from any previous spec files, and ensuring a
+clean slate for the next spec. Doing this for each _individual_ test would be
+very very expensive and would slow down the test runs significantly.
 
 Spec file durations are also more meaningful and consistent than timings of
 individual tests, we can order specs by the moving average of the previously
@@ -199,8 +202,8 @@ it might be good enough for the job.
 
 ## <Icon name="angle-right" /> Can I delete a run from Cypress Cloud?
 
-You can [archive a run](/guides/cloud/runs#Archive-run) so that it does not
-display in the runs list or in analytics.
+You can [archive a run](/guides/cloud/recorded-runs#Archive-run) so that it does
+not display in the runs list or in analytics.
 
 **Note:** Archiving the recorded runs has no effect on the amount of tests
 recorded and counted as your usage billed for the month.

diff --git a/docs/faq/questions/using-cypress-faq.mdx b/docs/faq/questions/using-cypress-faq.mdx
@@ -603,7 +603,8 @@ parts of the longer user feature in the separate tests as described in
 
 ## <Icon name="angle-right" /> How can I parallelize my runs?
 
-You can read more about parallelization [here](/guides/guides/parallelization).
+You can read more about parallelization
+[here](/guides/cloud/smart-orchestration/parallelization).
 
 ## <Icon name="angle-right" /> Can I run a single test or group of tests?
 
@@ -631,8 +632,8 @@ You can read more about uploading files in
 ## <Icon name="angle-right" /> What is the projectId for?
 
 The `projectId` is a 6 character string that helps identify your project once
-you've [set up your tests to record](/guides/cloud/runs). It's generated by
-Cypress and typically is found in your
+you've [set up your tests to record](/guides/cloud/recorded-runs#Latest-Runs).
+It's generated by Cypress and typically is found in your
 [Cypress configuration](/guides/references/configuration).
 
 :::cypress-config-example
@@ -646,14 +647,15 @@ Cypress and typically is found in your
 :::
 
 For further detail see the
-[Identification](/guides/cloud/projects#Identification) section of the
-[Cypress Cloud](/guides/cloud/introduction) docs.
+[Identification](/guides/cloud/account-management/projects#Identification)
+section of the [Cypress Cloud](/guides/cloud/introduction) docs.
 
 ## <Icon name="angle-right" /> What is a Record Key?
 
 A _Record Key_ is a GUID that's generated automatically by Cypress once you've
-[set up your tests to record](/guides/cloud/runs). It helps identify your
-project and authenticate that your project is even _allowed_ to record tests.
+[set up your tests to record](/guides/cloud/recorded-runs#Latest-Runs). It helps
+identify your project and authenticate that your project is even _allowed_ to
+record tests.
 
 You can find your project's record key inside of the _Settings_ tab.
 
@@ -664,8 +666,8 @@ You can find your project's record key inside of the _Settings_ tab.
 />
 
 For further detail see the
-[Identification](/guides/cloud/projects#Identification) section of the
-[Cypress Cloud](/guides/cloud/introduction) docs.
+[Identification](/guides/cloud/account-management/projects#Identification)
+section of the [Cypress Cloud](/guides/cloud/introduction) docs.
 
 ## <Icon name="angle-right" /> How do I check that an email was sent out?
 

diff --git a/docs/guides/cloud/account-management/_category_.json b/docs/guides/cloud/account-management/_category_.json
@@ -0,0 +1,6 @@
+{
+  "label": "Account Management",
+  "position": 30,
+  "collapsible": true,
+  "collapsed": true
+}
diff --git a/docs/guides/cloud/account-management/billing-and-usage.mdx b/docs/guides/cloud/account-management/billing-and-usage.mdx
@@ -0,0 +1,84 @@
+---
+title: Billing & Usage
+sidebar_position: 50
+---
+
+:::info
+
+## <Icon name="graduation-cap" /> What you'll learn
+
+- How to identify Cypress Cloud billing & usage
+- How to upgrade your Cypress Cloud plan
+- How to apply for an Open Source (OSS) plan
+
+:::
+
+<DocsImage
+  src="/img/guides/cloud/billing/billing-and-usage-results.jpg"
+  alt="Billing and Usage Results"
+/>
+
+## Open Source Plan
+
+To support the community, we provide the Open Source (OSS) plan to take
+advantage of Cypress Cloud with unlimited test runs. To qualify, all Projects in
+your Organization must meet the following criteria:
+
+- Be a non-commercial entity
+- Be [Public](https://on.cypress.io/projects#Change-project-access) in Cypress
+  Cloud
+- Your Project source code is available in a public location with an
+  [OSI-approved license](https://opensource.org/licenses)
+- Record minimum of 500
+  [tests](https://on.cypress.io/cloud-faq#What-counts-as-a-test-result) included
+  with the [Free Plan](https://www.cypress.io/pricing)
+
+## Requesting OSS plan for an Org
+
+:::info
+
+<Icon name="exclamation-triangle" /> Personal organizations cannot be used with an
+OSS plan.
+
+:::
+
+1. [Login](https://on.cypress.io/dashboard) to the Cypress Dashboard, or
+   [create an account](https://on.cypress.io/dashboard) if you are a new user.
+
+2. Go the [Organizations page](https://on.cypress.io/dashboard/organizations) to
+   select the Organization you want to associate with an OSS plan. If you have
+   no Organizations, you can create one by clicking the **+ Create New
+   Organization** button.
+
+   <DocsImage
+     src="/img/guides/cloud/organizations/oss-plan-2-select-org.jpg"
+     alt="Select or add organization"
+     width="80%"
+   />
+
+3. Go to the **Billing & Usage** page, click **Upgrade** and then click on the
+   **Apply for an open source plan** link at the bottom of the page. _Note:
+   Access to all Projects must be set to **public** to enable this link._
+
+   <DocsImage
+     src="/img/guides/cloud/organizations/oss-plan-3-billing.jpg"
+     alt="Upgrade Plan"
+   />
+   <DocsImage
+     src="/img/guides/cloud/organizations/oss-plan-4-billing.jpg"
+     alt="Click Apply for an open source plan"
+   />
+
+4. Fill in and submit the OSS plan request form.
+
+   <DocsImage
+     src="/img/guides/cloud/organizations/oss-plan-5-billing.jpg"
+     alt="OSS plan request form"
+   />
+
+5. You'll receive an email confirming your request. The Cypress Team will review
+   your request and, if approved, an OSS plan subscription will be applied to
+   your Organization.
+
+If you have any questions regarding the OSS plan, please feel free
+[contact us](mailto:hello@cypress.io).