docs: restructure Platform accounts, security, and billing IA

.github/CODEOWNERS

@@ -25,14 +25,12 @@
 
 /content/reference/cli/ @dvdksn
 
-/content/manuals/subscription/ @sarahsanders-docker
+/content/manuals/subscription-billing/ @sarahsanders-docker
 
 /content/manuals/security/ @aevesdocker @sarahsanders-docker
 
 /content/manuals/admin/ @sarahsanders-docker
 
-/content/manuals/billing/ @sarahsanders-docker
-
 /content/manuals/accounts/ @sarahsanders-docker
 
 /content/manuals/ai/ @dvdksn

.github/labeler.yml

@@ -143,17 +143,17 @@ area/scout:
 area/billing:
   - changed-files:
       - any-glob-to-any-file:
-          - content/manuals/billing/**
+          - content/manuals/subscription-billing/**
 
 area/subscription:
   - changed-files:
       - any-glob-to-any-file:
-          - content/manuals/subscription/**
+          - content/manuals/subscription-billing/**
 
 area/admin:
   - changed-files:
       - any-glob-to-any-file:
-          - content/manuals/admin/**
+          - content/manuals/accounts/organization/**
 
 area/extensions:
   - changed-files:
@@ -175,6 +175,7 @@ area/accounts:
   - changed-files:
       - any-glob-to-any-file:
           - content/manuals/accounts/**
+          - content/manuals/faqs/**
 
 area/copilot:
   - changed-files:

content/guides/admin-set-up.md

@@ -51,7 +51,7 @@ policies.
 
 This guide covers the following Docker features:
 
-- [Organizations](/manuals/admin/organization/_index.md): The core structure
+- [Organizations](/manuals/accounts/organization/_index.md): The core structure
   for managing your Docker environment, grouping users, teams, and image
   repositories. Your organization was created with your subscription and is
   managed by one or more owners. Users signed into the organization are
@@ -60,7 +60,7 @@ This guide covers the following Docker features:
   By default, Docker Desktop doesn't require sign-in. You can configure
   settings to enforce this and ensure your developers sign in to your
   Docker organization.
-- [SSO](/manuals/enterprise/security/single-sign-on/_index.md): Without SSO,
+- [SSO](/manuals/security/authentication/single-sign-on/_index.md): Without SSO,
   user management in a Docker organization is manual. Setting
   up an SSO connection between your identity provider and Docker ensures
   compliance with your security policy and automates user provisioning. Adding
@@ -130,7 +130,7 @@ files to be distributed to developer machines. Use MDM tools to deploy these con
 ### Identify Docker organizations
 
 Some companies may have more than one
-[Docker organization](/manuals/admin/organization/_index.md) created. These
+[Docker organization](/manuals/accounts/organization/_index.md) created. These
 organizations may have been created for specific purposes, or may not be
 needed anymore.
 
@@ -185,8 +185,8 @@ settings, along with your chosen method for [enforcing sign-in](/manuals/enterpr
 ### Manage your organizations
 
 If you have more than one organization, consider either [consolidating them
-into one organization](/manuals/admin/organization/setup/orgs.md) or creating a
-[Docker company](/manuals/admin/company/_index.md) to manage multiple
+into one organization](/manuals/accounts/organization/setup/orgs.md) or creating a
+[Docker company](/manuals/accounts/organization/company/_index.md) to manage multiple
 organizations.
 
 ### Begin setup
@@ -196,9 +196,9 @@ organizations.
 Single sign-on (SSO) lets developers authenticate using their identity
 providers (IdPs) to access Docker. SSO is available for a whole company and all associated organizations, or an individual organization that has a Docker
 Business subscription. For more information, see the
-[documentation](/manuals/enterprise/security/single-sign-on/_index.md).
+[documentation](/manuals/security/authentication/single-sign-on/_index.md).
 
-You can also enable [SCIM](/manuals/enterprise/security/provisioning/scim/_index.md)
+You can also enable [SCIM](/manuals/security/provisioning/scim/_index.md)
 for further automation of provisioning and deprovisioning of users.
 
 #### Set up Docker product entitlements included in the subscription
@@ -252,7 +252,7 @@ SSO and SCIM setup.
 > [!IMPORTANT]
 >
 > Some users may need CLI based logins to Docker Hub, and for this they will
-> need a [personal access token (PAT)](/manuals/security/access-tokens.md).
+> need a [personal access token (PAT)](/manuals/security/access-tokens/personal-access-tokens.md).
 
 ### Test Registry Access Management and Image Access Management
 
@@ -312,7 +312,7 @@ that matches your verified domain must sign in using your SSO connection. Make
 sure the Identity provider groups associated with your SSO connection cover all
 the developer groups that you want to have access to the Docker subscription.
 
-For instructions on how to enforce SSO, see [Enforce SSO](/manuals/enterprise/security/single-sign-on/connect.md).
+For instructions on how to enforce SSO, see [Enforce SSO](/manuals/security/authentication/single-sign-on/connect.md).
 
 ### Deploy configuration settings and enforce sign-in to users
 
@@ -325,6 +325,6 @@ for Docker.
 
 To continue optimizing your Docker environment:
 
-- Review your [organization's usage data](/manuals/admin/insights.md) to track adoption
+- Review your [organization's usage data](/manuals/accounts/organization/insights.md) to track adoption
 - Monitor [Docker Scout findings](/manuals/scout/explore/analysis.md) for security insights
-- Explore [additional security features](/manuals/enterprise/security/_index.md) to enhance your configuration
+- Explore [additional security features](/manuals/enterprise/security/hardened-desktop/_index.md) to enhance your configuration

content/guides/admin-user-management.md

@@ -46,7 +46,7 @@ With the right configurations, you can ensure your developers have easy access t
 
 Before setting up roles and permissions, it's important to have a clear understanding of who in your organization requires Docker access. Focus on gathering a comprehensive view of active users, their roles within projects, and how they interact with Docker resources. This process can be supported by tools like device management software or manual assessments. Encourage all users to update their Docker accounts to use organizational email addresses, ensuring seamless integration with your subscription.
 
-For steps on how you can do this, see [step 1 of onboarding your organization](/manuals/admin/organization/setup/onboard.md).
+For steps on how you can do this, see [step 1 of onboarding your organization](/manuals/accounts/organization/setup/onboard.md).
 
 ### Assign roles strategically
 
@@ -58,7 +58,7 @@ Docker's predefined roles offer flexibility for various organizational needs. As
 - Editor: Partial administrative access to the organization. Editors can create, edit, and delete repositories. They can also edit an existing team's access permissions.
 - Owner: Full organization administrative access. Owners can manage organization repositories, teams, members, settings, and billing.
 
-For more information, see [Roles and permissions](/manuals/enterprise/security/roles-and-permissions.md).
+For more information, see [Roles and permissions](/manuals/security/roles-and-permissions.md).
 
 #### Enhance with teams
 
@@ -68,7 +68,7 @@ Teams in Docker provide a structured way to manage member access and they provid
 - Assign permissions at the team level rather than individually. For instance, a development team might have "Read & Write" access to certain repositories, while a QA team has "Read-only" access.
 - As teams grow or responsibilities shift, you can easily update permissions or add new members, maintaining consistency without reconfiguring individual settings.
 
-For more information, see [Create and manage a team](/manuals/admin/organization/manage/manage-a-team.md).
+For more information, see [Create and manage a team](/manuals/accounts/organization/manage/manage-a-team.md).
 
 #### Example scenarios
 
@@ -89,7 +89,7 @@ This page guides you through onboarding owners and members, and using tools like
 
 When you create a Docker organization, you automatically become its sole owner. While optional, adding additional owners can significantly ease the process of onboarding and managing your organization by distributing administrative responsibilities. It also ensures continuity and prevents blockers if the primary owner is unavailable.
 
-For detailed information on owners, see [Roles and permissions](/manuals/enterprise/security/roles-and-permissions.md).
+For detailed information on owners, see [Roles and permissions](/manuals/security/roles-and-permissions.md).
 
 ### Invite members and assign roles
 
@@ -103,7 +103,7 @@ Members are granted controlled access to resources and enjoy enhanced organizati
 - Access to enhanced features: Members benefit from organization-wide perks, such as increased pull limits and access to premium Docker features.
 - Security control: Apply and enforce security settings at an organizational level, reducing risks associated with unmanaged accounts.
 
-For detailed information, see [Manage organization members](/manuals/admin/organization/manage/members.md).
+For detailed information, see [Manage organization members](/manuals/accounts/organization/manage/members.md).
 
 ### Future-proof user management
 
@@ -119,11 +119,11 @@ SSO:
 - Reduces password-related vulnerabilities.
 - Simplifies onboarding as it works seamlessly with SCIM and group mapping for automated provisioning.
 
-For more information, see the [SSO documentation](/manuals/enterprise/security/single-sign-on/_index.md).
+For more information, see the [SSO documentation](/manuals/security/authentication/single-sign-on/_index.md).
 
 #### Automate onboarding with SCIM and JIT provisioning
 
-Streamline user provisioning and role management with [SCIM](/manuals/enterprise/security/provisioning/scim/_index.md) and [Just-in-Time (JIT) provisioning](/manuals/enterprise/security/provisioning/just-in-time.md).
+Streamline user provisioning and role management with [SCIM](/manuals/security/provisioning/scim/_index.md) and [Just-in-Time (JIT) provisioning](/manuals/security/provisioning/just-in-time.md).
 
 With SCIM you can:
 
@@ -145,7 +145,7 @@ It also:
 - Ensures consistent access control policies.
 - Help you scale permissions as teams grow or change.
 
-For more information on how it works, see [Group mapping](/manuals/enterprise/security/provisioning/scim/group-mapping.md).
+For more information on how it works, see [Group mapping](/manuals/security/provisioning/scim/group-mapping.md).
 
 ## Monitoring and insights
 
@@ -168,7 +168,7 @@ Activity logs are available for Docker Team or Docker Business plans, with data
 - Team collaboration review: Logs show which team members pushed updates to a critical repository, ensuring accountability during a development sprint.
 - Billing adjustments: Track who added or removed subscription seats to maintain budgetary control and compliance.
 
-For more information, see [Activity logs](/manuals/admin/activity-logs.md).
+For more information, see [Activity logs](/manuals/accounts/organization/activity-logs.md).
 
 ### Insights
 
@@ -186,13 +186,13 @@ Insights provide data-driven views of Docker usage to improve team productivity
 - Build efficiency: Track average build times and success rates to pinpoint bottlenecks in development processes.
 - Container utilization: Analyze container activity across departments to ensure proper resource distribution and cost efficiency.
 
-For more information, see [Insights](/manuals/admin/insights.md).
+For more information, see [Insights](/manuals/accounts/organization/insights.md).
 
 ### Next steps
 
 Now that you've mastered user and access management in Docker, you can:
 
-- Review your [activity logs](/manuals/admin/activity-logs.md) regularly to maintain security awareness
-- Check your [Insights dashboard](/manuals/admin/insights.md) to identify opportunities for optimization
-- Explore [advanced security features](/manuals/enterprise/security/_index.md) to further enhance your Docker environment
+- Review your [activity logs](/manuals/accounts/organization/activity-logs.md) regularly to maintain security awareness
+- Check your [Insights dashboard](/manuals/accounts/organization/insights.md) to identify opportunities for optimization
+- Explore [advanced security features](/manuals/enterprise/security/hardened-desktop/_index.md) to further enhance your Docker environment
 - Share best practices with your team to ensure consistent adoption of security policies

content/guides/genai-claude-code-mcp.md

@@ -71,7 +71,7 @@ Make sure you have:
 1. Select the **Docker Hub**MCP server
 1. Add the MCP server, then open the **Configuration** tab
 1. Enter your Docker Hub username
-1. [Create a read-only personal access token](/security/access-tokens/#create-a-personal-access-token) and enter your access token under **Secrets**
+1. [Create a read-only personal access token](/security/access-tokens/personal-access-tokens/#create-a-personal-access-token) and enter your access token under **Secrets**
 1. Save the configuration
 
 ![Docker Hub](images/genai-claude-code-mcp-catalog-docker-hub.avif "Docker Hub")

content/guides/gha.md

@@ -52,7 +52,7 @@ that, you must authenticate with your Docker credentials (username and access
 token) as part of the GitHub Actions workflow.
 
 For instructions on how to create a Docker access token, see
-[Create and manage access tokens](/manuals/security/access-tokens.md).
+[Create and manage access tokens](/manuals/security/access-tokens/personal-access-tokens.md).
 
 Once you have your Docker credentials ready, add the credentials to your GitHub
 repository so you can use them in GitHub Actions:

content/manuals/_index.md

@@ -12,7 +12,7 @@ params:
       - AI and agents
       - Application development
       - Supply chain security
-      - Platform
+      - Accounts and admin
       - Enterprise
   notoc: true
   ai-and-agents:
@@ -79,31 +79,31 @@ params:
     icon: /icons/Scout.svg
     link: /scout/
   platform:
-  - title: Administration
-    description: Centralized observability for companies and organizations.
-    icon: shield-check
-    link: /admin/
-  - title: Billing
-    description: Manage billing and payment methods.
-    icon: credit-card
-    link: /billing/
   - title: Accounts
-    description: Manage your Docker account.
+    description: Manage Docker individual and organization accounts.
     icon: user-circle
     link: /accounts/
+  - title: Subscription and billing
+    description: Manage Docker subscriptions, plans, billing, and payments.
+    icon: credit-card
+    link: /subscription-billing/
   - title: Security
     description: Security guardrails for both administrators and developers.
     icon: lock-closed
     link: /security/
-  - title: Subscription
-    description: Commercial use licenses for Docker products.
-    icon: credit-card
-    link: /subscription/
+  - title: FAQs
+    description: Frequently asked questions about Docker accounts, organizations, companies, subscriptions, billing, and security.
+    icon: question-mark-circle
+    link: /faqs/
   enterprise:
   - title: Deploy Docker Desktop
     description: Deploy Docker Desktop at scale within your company
     icon: arrow-down-tray
     link: /enterprise/enterprise-deployment/
+  - title: Hardened Docker Desktop
+    description: Security features that strengthen developer environments.
+    icon: shield-check
+    link: /enterprise/security/hardened-desktop/
 ---
 
 This section contains user guides on how to install, set up, configure, and use
@@ -127,10 +127,9 @@ Security guardrails and image analysis for your software supply chain.
 
 {{< grid items=supply-chain-security >}}
 
-## Platform
+## Accounts and admin
 
-Documentation related to the Docker platform, such as administration and
-subscription management.
+Manage Docker accounts, administration, subscriptions, billing, and security.
 
 {{< grid items=platform >}}
 

content/manuals/accounts/_index.md

@@ -1,63 +1,28 @@
 ---
-title: Docker accounts
+title: Accounts
 description: >
-  Learn what a Docker account is, how Docker IDs, emails, and sign-in methods
-  relate, and how individual accounts connect to organizations
-keywords: accounts, docker ID, username, email, Google, GitHub, sign-in,
-  authentication, account management, docker account, individual account,
-  organization account, account types, Docker Hub, SSO, deactivate account
+  Manage Docker individual accounts and organization administration, including
+  members, teams, and companies.
+keywords: accounts, admin, Docker ID, organization, company, Docker Home,
+  account management
 weight: 10
 params:
   sidebar:
-    group: Platform
+    group: Accounts and admin
 grid:
-  - title: Create an account
-    description: Get started with Docker and create an account.
-    icon: finger-print
-    link: /accounts/create-account/
-  - title: Manage account
-    description: Learn how to manage the settings for your account.
-    icon: cog
-    link: /accounts/manage-account/
-  - title: Personal access tokens
-    description: Learn how to create and manage access tokens for your account.
-    icon: lock-closed
-    link: /security/access-tokens/
-  - title: Set up two-factor authentication
-    description: Add an extra layer of authentication to your Docker account.
-    link: /security/2fa/
-    icon: device-phone-mobile
-  - title: Organization overview
-    description: Learn how to create and manage Docker organizations.
+  - title: Docker individual accounts
+    description: Create and manage your Docker ID, email, and sign-in methods.
+    icon: user-circle
+    link: /accounts/individual/
+  - title: Organization accounts
+    description: Manage organizations, companies, members, and teams.
     icon: building-storefront
-    link: /admin/organization/
-  - title: Account FAQs
-    description: Explore frequently asked questions about Docker accounts.
-    icon: question-mark-circle
-    link: /accounts/general-faqs/
+    link: /accounts/organization/
 ---
 
-A Docker account is how Docker identifies you. Use it to access products like
-Docker Hub and Docker Desktop, manage settings, and join organizations.
-
-Docker has two primary account types: individual and organization. You create
-and administer organizations with your individual account. For organization
-accounts, see [Organizations](/manuals/admin/organization/_index.md). For
-organizations and companies, see [Administration](/manuals/admin/_index.md).
-
-## Docker ID, email, and sign-in
-
-When you create an account, you choose a Docker ID and a sign-in method.
-Docker also ties a verified email to the account.
-
-- Docker account: Associates your plans, Hub repositories, and account
-  settings.
-- Docker ID: A unique username that identifies you.
-- Email: How Docker contacts you for notifications and security-related
-  communications.
-- Sign-in method: Email and password,
-  [single sign-on (SSO)](/manuals/enterprise/security/single-sign-on/_index.md),
-  Google, or GitHub.
+A Docker account identifies you and lets you access Docker products. Use an
+individual account for your Docker ID and personal settings. Use an
+organization account to manage members, teams, and company-wide settings.
 
 ## Next steps