diff --git a/_data/toc.yaml b/_data/toc.yaml
index 62495b1f22..1eb5ad14bf 100644
--- a/_data/toc.yaml
+++ b/_data/toc.yaml
@@ -743,91 +743,93 @@ toc:
       title: Release Notes
   - sectiontitle: Docker Trusted Registry 2.1
     section:
-    - path: /datacenter/dtr/2.1/
+    - path: /datacenter/dtr/2.1/guides/
       title: Docker Trusted Registry overview
-    - path: /datacenter/dtr/2.1/architecture/
+    - path: /datacenter/dtr/2.1/guides/architecture/
       title: Architecture
     - sectiontitle: Installation
       section:
-      - path: /datacenter/dtr/2.1/install/system-requirements/
+      - path: /datacenter/dtr/2.1/guides/install/system-requirements/
         title: System requirements
-      - path: /datacenter/dtr/2.1/install/
+      - path: /datacenter/dtr/2.1/guides/install/
         title: Install Docker Trusted Registry
-      - path: /datacenter/dtr/2.1/install/install-offline/
+      - path: /datacenter/dtr/2.1/guides/install/install-offline/
         title: Install offline
-      - path: /datacenter/dtr/2.1/install/license/
+      - path: /datacenter/dtr/2.1/guides/install/license/
         title: License your deployment
-      - path: /datacenter/dtr/2.1/install/upgrade/
+      - path: /datacenter/dtr/2.1/guides/install/upgrade/
         title: Upgrade
-      - path: /datacenter/dtr/2.1/install/uninstall/
+      - path: /datacenter/dtr/2.1/guides/install/uninstall/
         title: Uninstall
-      - sectiontitle: docker/dtr image reference
-        section:
-        - path: /datacenter/dtr/2.1/reference/
-          title: Overview
-        - path: /datacenter/dtr/2.1/reference/backup/
-          title: backup
-        - path: /datacenter/dtr/2.1/reference/dumpcerts/
-          title: dumpcerts
-        - path: /datacenter/dtr/2.1/reference/images/
-          title: images
-        - path: /datacenter/dtr/2.1/reference/install/
-          title: install
-        - path: /datacenter/dtr/2.1/reference/join/
-          title: join
-        - path: /datacenter/dtr/2.1/reference/reconfigure/
-          title: reconfigure
-        - path: /datacenter/dtr/2.1/reference/remove/
-          title: remove
-        - path: /datacenter/dtr/2.1/reference/restore/
-          title: restore
-        - path: /datacenter/dtr/2.1/reference/upgrade/
-          title: upgrade
     - sectiontitle: Configuration
       section:
-      - path: /datacenter/dtr/2.1/configure/
+      - path: /datacenter/dtr/2.1/guides/configure/
         title: Use your own certificates
-      - path: /datacenter/dtr/2.1/configure/configure-storage/
+      - path: /datacenter/dtr/2.1/guides/configure/configure-storage/
         title: Storage configuration
     - sectiontitle: Monitor and troubleshoot
       section:
-      - path: /datacenter/dtr/2.1/monitor-troubleshoot/
+      - path: /datacenter/dtr/2.1/guides/monitor-troubleshoot/
         title: Monitor DTR
-      - path: /datacenter/dtr/2.1/monitor-troubleshoot/troubleshoot/
+      - path: /datacenter/dtr/2.1/guides/monitor-troubleshoot/troubleshoot/
         title: Troubleshoot DTR
     - sectiontitle: High-availability
       section:
-      - path: /datacenter/dtr/2.1/high-availability/
+      - path: /datacenter/dtr/2.1/guides/high-availability/
         title: Set up high availability
-      - path: /datacenter/dtr/2.1/high-availability/backups-and-disaster-recovery/
+      - path: /datacenter/dtr/2.1/guides/high-availability/backups-and-disaster-recovery/
         title: Backups and disaster recovery
     - sectiontitle: User management
       section:
-      - path: /datacenter/dtr/2.1/user-management/
+      - path: /datacenter/dtr/2.1/guides/user-management/
         title: Authentication and authorization
-      - path: /datacenter/dtr/2.1/user-management/create-and-manage-users/
+      - path: /datacenter/dtr/2.1/guides/user-management/create-and-manage-users/
         title: Create and manage users
-      - path: /datacenter/dtr/2.1/user-management/create-and-manage-orgs/
+      - path: /datacenter/dtr/2.1/guides/user-management/create-and-manage-orgs/
         title: Create and manage organizations
-      - path: /datacenter/dtr/2.1/user-management/create-and-manage-teams/
+      - path: /datacenter/dtr/2.1/guides/user-management/create-and-manage-teams/
         title: Create and manage teams
-      - path: /datacenter/dtr/2.1/user-management/permission-levels/
+      - path: /datacenter/dtr/2.1/guides/user-management/permission-levels/
         title: Permission levels
     - sectiontitle: Repositories and images
       section:
-      - path: /datacenter/dtr/2.1/repos-and-images/
+      - path: /datacenter/dtr/2.1/guides/repos-and-images/
         title: Configure your Docker Engine
-      - path: /datacenter/dtr/2.1/repos-and-images/pull-an-image/
+      - path: /datacenter/dtr/2.1/guides/repos-and-images/pull-an-image/
         title: Pull an image
-      - path: /datacenter/dtr/2.1/repos-and-images/push-an-image/
+      - path: /datacenter/dtr/2.1/guides/repos-and-images/push-an-image/
         title: Push an image
-      - path: /datacenter/dtr/2.1/repos-and-images/delete-an-image/
+      - path: /datacenter/dtr/2.1/guides/repos-and-images/delete-an-image/
         title: Delete an image
-    - path: /apidocs/v2.1.0
-      title: DTR API
-    - path: /datacenter/dtr/2.1/release-notes/
+    - sectiontitle: API and CLI reference
+      section:
+      - path: /datacenter/dtr/2.1/reference/api/
+        title: API reference
+      - sectiontitle: CLI reference
+        section:
+        - path: /datacenter/dtr/2.1/reference/cli/
+          title: Overview
+        - path: /datacenter/dtr/2.1/reference/cli/backup/
+          title: backup
+        - path: /datacenter/dtr/2.1/reference/cli/dumpcerts/
+          title: dumpcerts
+        - path: /datacenter/dtr/2.1/reference/cli/images/
+          title: images
+        - path: /datacenter/dtr/2.1/reference/cli/install/
+          title: install
+        - path: /datacenter/dtr/2.1/reference/cli/join/
+          title: join
+        - path: /datacenter/dtr/2.1/reference/cli/reconfigure/
+          title: reconfigure
+        - path: /datacenter/dtr/2.1/reference/cli/remove/
+          title: remove
+        - path: /datacenter/dtr/2.1/reference/cli/restore/
+          title: restore
+        - path: /datacenter/dtr/2.1/reference/cli/upgrade/
+          title: upgrade
+    - path: /datacenter/dtr/2.1/guides/release-notes/
       title: Release notes
-    - path: /datacenter/dtr/2.1/support/
+    - path: /datacenter/dtr/2.1/guides/support/
       title: Get support
 - sectiontitle: Docker Cloud
   section:
diff --git a/datacenter/dtr/2.1/architecture.md b/datacenter/dtr/2.1/guides/architecture.md
similarity index 100%
rename from datacenter/dtr/2.1/architecture.md
rename to datacenter/dtr/2.1/guides/architecture.md
diff --git a/datacenter/dtr/2.1/configure/configure-storage.md b/datacenter/dtr/2.1/guides/configure/configure-storage.md
similarity index 100%
rename from datacenter/dtr/2.1/configure/configure-storage.md
rename to datacenter/dtr/2.1/guides/configure/configure-storage.md
diff --git a/datacenter/dtr/2.1/configure/index.md b/datacenter/dtr/2.1/guides/configure/index.md
similarity index 100%
rename from datacenter/dtr/2.1/configure/index.md
rename to datacenter/dtr/2.1/guides/configure/index.md
diff --git a/datacenter/dtr/2.1/high-availability/backups-and-disaster-recovery.md b/datacenter/dtr/2.1/guides/high-availability/backups-and-disaster-recovery.md
similarity index 97%
rename from datacenter/dtr/2.1/high-availability/backups-and-disaster-recovery.md
rename to datacenter/dtr/2.1/guides/high-availability/backups-and-disaster-recovery.md
index 7ce2e1476b..f7776fac52 100644
--- a/datacenter/dtr/2.1/high-availability/backups-and-disaster-recovery.md
+++ b/datacenter/dtr/2.1/guides/high-availability/backups-and-disaster-recovery.md
@@ -52,7 +52,7 @@ When creating a backup, the resulting .tar file contains sensitive information
 like private keys. You should ensure the backups are stored securely.
 
 You can check the
-[reference documentation](../reference/backup.md), for the
+[reference documentation](../../reference/cli/backup.md), for the
 backup command to learn about all the available flags.
 
 As an example, to create a backup of a DTR node, you can use:
@@ -99,7 +99,7 @@ consideration whether your DTR installation is configured to store images on
 the filesystem or using a cloud provider.
 
 You can check the
-[reference documentation](../reference/backup.md), for the
+[reference documentation](../../reference/cli/backup.md), for the
 backup command to learn about all the available flags.
 
 
diff --git a/datacenter/dtr/2.1/high-availability/index.md b/datacenter/dtr/2.1/guides/high-availability/index.md
similarity index 100%
rename from datacenter/dtr/2.1/high-availability/index.md
rename to datacenter/dtr/2.1/guides/high-availability/index.md
diff --git a/datacenter/dtr/2.1/images/Makefile b/datacenter/dtr/2.1/guides/images/Makefile
similarity index 100%
rename from datacenter/dtr/2.1/images/Makefile
rename to datacenter/dtr/2.1/guides/images/Makefile
diff --git a/datacenter/dtr/2.1/images/admin-logs.png b/datacenter/dtr/2.1/guides/images/admin-logs.png
similarity index 100%
rename from datacenter/dtr/2.1/images/admin-logs.png
rename to datacenter/dtr/2.1/guides/images/admin-logs.png
diff --git a/datacenter/dtr/2.1/images/admin-metrics.png b/datacenter/dtr/2.1/guides/images/admin-metrics.png
similarity index 100%
rename from datacenter/dtr/2.1/images/admin-metrics.png
rename to datacenter/dtr/2.1/guides/images/admin-metrics.png
diff --git a/datacenter/dtr/2.1/images/admin-settings-auth.png b/datacenter/dtr/2.1/guides/images/admin-settings-auth.png
similarity index 100%
rename from datacenter/dtr/2.1/images/admin-settings-auth.png
rename to datacenter/dtr/2.1/guides/images/admin-settings-auth.png
diff --git a/datacenter/dtr/2.1/images/admin-settings-authentication-basic.png b/datacenter/dtr/2.1/guides/images/admin-settings-authentication-basic.png
similarity index 100%
rename from datacenter/dtr/2.1/images/admin-settings-authentication-basic.png
rename to datacenter/dtr/2.1/guides/images/admin-settings-authentication-basic.png
diff --git a/datacenter/dtr/2.1/images/admin-settings-authentication-ldap.png b/datacenter/dtr/2.1/guides/images/admin-settings-authentication-ldap.png
similarity index 100%
rename from datacenter/dtr/2.1/images/admin-settings-authentication-ldap.png
rename to datacenter/dtr/2.1/guides/images/admin-settings-authentication-ldap.png
diff --git a/datacenter/dtr/2.1/images/admin-settings-authentication.png b/datacenter/dtr/2.1/guides/images/admin-settings-authentication.png
similarity index 100%
rename from datacenter/dtr/2.1/images/admin-settings-authentication.png
rename to datacenter/dtr/2.1/guides/images/admin-settings-authentication.png
diff --git a/datacenter/dtr/2.1/images/admin-settings-license.png b/datacenter/dtr/2.1/guides/images/admin-settings-license.png
similarity index 100%
rename from datacenter/dtr/2.1/images/admin-settings-license.png
rename to datacenter/dtr/2.1/guides/images/admin-settings-license.png
diff --git a/datacenter/dtr/2.1/images/admin-settings-license2.png b/datacenter/dtr/2.1/guides/images/admin-settings-license2.png
similarity index 100%
rename from datacenter/dtr/2.1/images/admin-settings-license2.png
rename to datacenter/dtr/2.1/guides/images/admin-settings-license2.png
diff --git a/datacenter/dtr/2.1/images/admin-settings-security.png b/datacenter/dtr/2.1/guides/images/admin-settings-security.png
similarity index 100%
rename from datacenter/dtr/2.1/images/admin-settings-security.png
rename to datacenter/dtr/2.1/guides/images/admin-settings-security.png
diff --git a/datacenter/dtr/2.1/images/admin-settings-storage-azure.png b/datacenter/dtr/2.1/guides/images/admin-settings-storage-azure.png
similarity index 100%
rename from datacenter/dtr/2.1/images/admin-settings-storage-azure.png
rename to datacenter/dtr/2.1/guides/images/admin-settings-storage-azure.png
diff --git a/datacenter/dtr/2.1/images/admin-settings-storage-s3.png b/datacenter/dtr/2.1/guides/images/admin-settings-storage-s3.png
similarity index 100%
rename from datacenter/dtr/2.1/images/admin-settings-storage-s3.png
rename to datacenter/dtr/2.1/guides/images/admin-settings-storage-s3.png
diff --git a/datacenter/dtr/2.1/images/admin-settings-storage.png b/datacenter/dtr/2.1/guides/images/admin-settings-storage.png
similarity index 100%
rename from datacenter/dtr/2.1/images/admin-settings-storage.png
rename to datacenter/dtr/2.1/guides/images/admin-settings-storage.png
diff --git a/datacenter/dtr/2.1/images/admin-settings.png b/datacenter/dtr/2.1/guides/images/admin-settings.png
similarity index 100%
rename from datacenter/dtr/2.1/images/admin-settings.png
rename to datacenter/dtr/2.1/guides/images/admin-settings.png
diff --git a/datacenter/dtr/2.1/images/architecture-1.png b/datacenter/dtr/2.1/guides/images/architecture-1.png
similarity index 100%
rename from datacenter/dtr/2.1/images/architecture-1.png
rename to datacenter/dtr/2.1/guides/images/architecture-1.png
diff --git a/datacenter/dtr/2.1/images/authentication-authorization-1.svg b/datacenter/dtr/2.1/guides/images/authentication-authorization-1.svg
similarity index 100%
rename from datacenter/dtr/2.1/images/authentication-authorization-1.svg
rename to datacenter/dtr/2.1/guides/images/authentication-authorization-1.svg
diff --git a/datacenter/dtr/2.1/images/aws-dtr-sg-rules.png b/datacenter/dtr/2.1/guides/images/aws-dtr-sg-rules.png
similarity index 100%
rename from datacenter/dtr/2.1/images/aws-dtr-sg-rules.png
rename to datacenter/dtr/2.1/guides/images/aws-dtr-sg-rules.png
diff --git a/datacenter/dtr/2.1/images/aws-engine-sg-rules.png b/datacenter/dtr/2.1/guides/images/aws-engine-sg-rules.png
similarity index 100%
rename from datacenter/dtr/2.1/images/aws-engine-sg-rules.png
rename to datacenter/dtr/2.1/guides/images/aws-engine-sg-rules.png
diff --git a/datacenter/dtr/2.1/images/aws-instance-id.png b/datacenter/dtr/2.1/guides/images/aws-instance-id.png
similarity index 100%
rename from datacenter/dtr/2.1/images/aws-instance-id.png
rename to datacenter/dtr/2.1/guides/images/aws-instance-id.png
diff --git a/datacenter/dtr/2.1/images/azure_filter.png b/datacenter/dtr/2.1/guides/images/azure_filter.png
similarity index 100%
rename from datacenter/dtr/2.1/images/azure_filter.png
rename to datacenter/dtr/2.1/guides/images/azure_filter.png
diff --git a/datacenter/dtr/2.1/images/azure_ip.png b/datacenter/dtr/2.1/guides/images/azure_ip.png
similarity index 100%
rename from datacenter/dtr/2.1/images/azure_ip.png
rename to datacenter/dtr/2.1/guides/images/azure_ip.png
diff --git a/datacenter/dtr/2.1/images/azure_portal.png b/datacenter/dtr/2.1/guides/images/azure_portal.png
similarity index 100%
rename from datacenter/dtr/2.1/images/azure_portal.png
rename to datacenter/dtr/2.1/guides/images/azure_portal.png
diff --git a/datacenter/dtr/2.1/images/basic_configuration.png b/datacenter/dtr/2.1/guides/images/basic_configuration.png
similarity index 100%
rename from datacenter/dtr/2.1/images/basic_configuration.png
rename to datacenter/dtr/2.1/guides/images/basic_configuration.png
diff --git a/datacenter/dtr/2.1/images/console-pull.png b/datacenter/dtr/2.1/guides/images/console-pull.png
similarity index 100%
rename from datacenter/dtr/2.1/images/console-pull.png
rename to datacenter/dtr/2.1/guides/images/console-pull.png
diff --git a/datacenter/dtr/2.1/images/console-push.png b/datacenter/dtr/2.1/guides/images/console-push.png
similarity index 100%
rename from datacenter/dtr/2.1/images/console-push.png
rename to datacenter/dtr/2.1/guides/images/console-push.png
diff --git a/datacenter/dtr/2.1/images/create-and-manage-orgs-1.png b/datacenter/dtr/2.1/guides/images/create-and-manage-orgs-1.png
similarity index 100%
rename from datacenter/dtr/2.1/images/create-and-manage-orgs-1.png
rename to datacenter/dtr/2.1/guides/images/create-and-manage-orgs-1.png
diff --git a/datacenter/dtr/2.1/images/create-and-manage-orgs-2.png b/datacenter/dtr/2.1/guides/images/create-and-manage-orgs-2.png
similarity index 100%
rename from datacenter/dtr/2.1/images/create-and-manage-orgs-2.png
rename to datacenter/dtr/2.1/guides/images/create-and-manage-orgs-2.png
diff --git a/datacenter/dtr/2.1/images/create-and-manage-orgs-3.png b/datacenter/dtr/2.1/guides/images/create-and-manage-orgs-3.png
similarity index 100%
rename from datacenter/dtr/2.1/images/create-and-manage-orgs-3.png
rename to datacenter/dtr/2.1/guides/images/create-and-manage-orgs-3.png
diff --git a/datacenter/dtr/2.1/images/create-and-manage-teams-1.png b/datacenter/dtr/2.1/guides/images/create-and-manage-teams-1.png
similarity index 100%
rename from datacenter/dtr/2.1/images/create-and-manage-teams-1.png
rename to datacenter/dtr/2.1/guides/images/create-and-manage-teams-1.png
diff --git a/datacenter/dtr/2.1/images/create-and-manage-teams-2.png b/datacenter/dtr/2.1/guides/images/create-and-manage-teams-2.png
similarity index 100%
rename from datacenter/dtr/2.1/images/create-and-manage-teams-2.png
rename to datacenter/dtr/2.1/guides/images/create-and-manage-teams-2.png
diff --git a/datacenter/dtr/2.1/images/create-and-manage-teams-3.png b/datacenter/dtr/2.1/guides/images/create-and-manage-teams-3.png
similarity index 100%
rename from datacenter/dtr/2.1/images/create-and-manage-teams-3.png
rename to datacenter/dtr/2.1/guides/images/create-and-manage-teams-3.png
diff --git a/datacenter/dtr/2.1/images/create-and-manage-teams-4.png b/datacenter/dtr/2.1/guides/images/create-and-manage-teams-4.png
similarity index 100%
rename from datacenter/dtr/2.1/images/create-and-manage-teams-4.png
rename to datacenter/dtr/2.1/guides/images/create-and-manage-teams-4.png
diff --git a/datacenter/dtr/2.1/images/create-and-manage-teams-5.png b/datacenter/dtr/2.1/guides/images/create-and-manage-teams-5.png
similarity index 100%
rename from datacenter/dtr/2.1/images/create-and-manage-teams-5.png
rename to datacenter/dtr/2.1/guides/images/create-and-manage-teams-5.png
diff --git a/datacenter/dtr/2.1/images/create-manage-users-1.png b/datacenter/dtr/2.1/guides/images/create-manage-users-1.png
similarity index 100%
rename from datacenter/dtr/2.1/images/create-manage-users-1.png
rename to datacenter/dtr/2.1/guides/images/create-manage-users-1.png
diff --git a/datacenter/dtr/2.1/images/create-manage-users-2.png b/datacenter/dtr/2.1/guides/images/create-manage-users-2.png
similarity index 100%
rename from datacenter/dtr/2.1/images/create-manage-users-2.png
rename to datacenter/dtr/2.1/guides/images/create-manage-users-2.png
diff --git a/datacenter/dtr/2.1/images/dashboard-settings-general.png b/datacenter/dtr/2.1/guides/images/dashboard-settings-general.png
similarity index 100%
rename from datacenter/dtr/2.1/images/dashboard-settings-general.png
rename to datacenter/dtr/2.1/guides/images/dashboard-settings-general.png
diff --git a/datacenter/dtr/2.1/images/delete-an-image-1.png b/datacenter/dtr/2.1/guides/images/delete-an-image-1.png
similarity index 100%
rename from datacenter/dtr/2.1/images/delete-an-image-1.png
rename to datacenter/dtr/2.1/guides/images/delete-an-image-1.png
diff --git a/datacenter/dtr/2.1/images/docker-hub-org-enterprise-license-CSDE-dropdown.png b/datacenter/dtr/2.1/guides/images/docker-hub-org-enterprise-license-CSDE-dropdown.png
similarity index 100%
rename from datacenter/dtr/2.1/images/docker-hub-org-enterprise-license-CSDE-dropdown.png
rename to datacenter/dtr/2.1/guides/images/docker-hub-org-enterprise-license-CSDE-dropdown.png
diff --git a/datacenter/dtr/2.1/images/docker-hub-org-enterprise-license.png b/datacenter/dtr/2.1/guides/images/docker-hub-org-enterprise-license.png
similarity index 100%
rename from datacenter/dtr/2.1/images/docker-hub-org-enterprise-license.png
rename to datacenter/dtr/2.1/guides/images/docker-hub-org-enterprise-license.png
diff --git a/datacenter/dtr/2.1/images/dtr-integration-1.png b/datacenter/dtr/2.1/guides/images/dtr-integration-1.png
similarity index 100%
rename from datacenter/dtr/2.1/images/dtr-integration-1.png
rename to datacenter/dtr/2.1/guides/images/dtr-integration-1.png
diff --git a/datacenter/dtr/2.1/images/dtr-license-download.png b/datacenter/dtr/2.1/guides/images/dtr-license-download.png
similarity index 100%
rename from datacenter/dtr/2.1/images/dtr-license-download.png
rename to datacenter/dtr/2.1/guides/images/dtr-license-download.png
diff --git a/datacenter/dtr/2.1/images/high-availability-1.png b/datacenter/dtr/2.1/guides/images/high-availability-1.png
similarity index 100%
rename from datacenter/dtr/2.1/images/high-availability-1.png
rename to datacenter/dtr/2.1/guides/images/high-availability-1.png
diff --git a/datacenter/dtr/2.1/images/high-availability-2.png b/datacenter/dtr/2.1/guides/images/high-availability-2.png
similarity index 100%
rename from datacenter/dtr/2.1/images/high-availability-2.png
rename to datacenter/dtr/2.1/guides/images/high-availability-2.png
diff --git a/datacenter/dtr/2.1/images/install-dtr-1.png b/datacenter/dtr/2.1/guides/images/install-dtr-1.png
similarity index 100%
rename from datacenter/dtr/2.1/images/install-dtr-1.png
rename to datacenter/dtr/2.1/guides/images/install-dtr-1.png
diff --git a/datacenter/dtr/2.1/images/install-dtr-2.png b/datacenter/dtr/2.1/guides/images/install-dtr-2.png
similarity index 100%
rename from datacenter/dtr/2.1/images/install-dtr-2.png
rename to datacenter/dtr/2.1/guides/images/install-dtr-2.png
diff --git a/datacenter/dtr/2.1/images/install-dtr-3.png b/datacenter/dtr/2.1/guides/images/install-dtr-3.png
similarity index 100%
rename from datacenter/dtr/2.1/images/install-dtr-3.png
rename to datacenter/dtr/2.1/guides/images/install-dtr-3.png
diff --git a/datacenter/dtr/2.1/images/install-dtr-4.png b/datacenter/dtr/2.1/guides/images/install-dtr-4.png
similarity index 100%
rename from datacenter/dtr/2.1/images/install-dtr-4.png
rename to datacenter/dtr/2.1/guides/images/install-dtr-4.png
diff --git a/datacenter/dtr/2.1/images/jenkins-plugins.png b/datacenter/dtr/2.1/guides/images/jenkins-plugins.png
similarity index 100%
rename from datacenter/dtr/2.1/images/jenkins-plugins.png
rename to datacenter/dtr/2.1/guides/images/jenkins-plugins.png
diff --git a/datacenter/dtr/2.1/images/jenkins-ui.png b/datacenter/dtr/2.1/guides/images/jenkins-ui.png
similarity index 100%
rename from datacenter/dtr/2.1/images/jenkins-ui.png
rename to datacenter/dtr/2.1/guides/images/jenkins-ui.png
diff --git a/datacenter/dtr/2.1/images/license-1.png b/datacenter/dtr/2.1/guides/images/license-1.png
similarity index 100%
rename from datacenter/dtr/2.1/images/license-1.png
rename to datacenter/dtr/2.1/guides/images/license-1.png
diff --git a/datacenter/dtr/2.1/images/license-2.png b/datacenter/dtr/2.1/guides/images/license-2.png
similarity index 100%
rename from datacenter/dtr/2.1/images/license-2.png
rename to datacenter/dtr/2.1/guides/images/license-2.png
diff --git a/datacenter/dtr/2.1/images/monitor-1.png b/datacenter/dtr/2.1/guides/images/monitor-1.png
similarity index 100%
rename from datacenter/dtr/2.1/images/monitor-1.png
rename to datacenter/dtr/2.1/guides/images/monitor-1.png
diff --git a/datacenter/dtr/2.1/images/monitor-2.png b/datacenter/dtr/2.1/guides/images/monitor-2.png
similarity index 100%
rename from datacenter/dtr/2.1/images/monitor-2.png
rename to datacenter/dtr/2.1/guides/images/monitor-2.png
diff --git a/datacenter/dtr/2.1/images/overview-1.png b/datacenter/dtr/2.1/guides/images/overview-1.png
similarity index 100%
rename from datacenter/dtr/2.1/images/overview-1.png
rename to datacenter/dtr/2.1/guides/images/overview-1.png
diff --git a/datacenter/dtr/2.1/images/overview-2.png b/datacenter/dtr/2.1/guides/images/overview-2.png
similarity index 100%
rename from datacenter/dtr/2.1/images/overview-2.png
rename to datacenter/dtr/2.1/guides/images/overview-2.png
diff --git a/datacenter/dtr/2.1/images/pull-an-image-1.png b/datacenter/dtr/2.1/guides/images/pull-an-image-1.png
similarity index 100%
rename from datacenter/dtr/2.1/images/pull-an-image-1.png
rename to datacenter/dtr/2.1/guides/images/pull-an-image-1.png
diff --git a/datacenter/dtr/2.1/images/pull-an-image-2.png b/datacenter/dtr/2.1/guides/images/pull-an-image-2.png
similarity index 100%
rename from datacenter/dtr/2.1/images/pull-an-image-2.png
rename to datacenter/dtr/2.1/guides/images/pull-an-image-2.png
diff --git a/datacenter/dtr/2.1/images/push-an-image-1.png b/datacenter/dtr/2.1/guides/images/push-an-image-1.png
similarity index 100%
rename from datacenter/dtr/2.1/images/push-an-image-1.png
rename to datacenter/dtr/2.1/guides/images/push-an-image-1.png
diff --git a/datacenter/dtr/2.1/images/push-an-image-2.png b/datacenter/dtr/2.1/guides/images/push-an-image-2.png
similarity index 100%
rename from datacenter/dtr/2.1/images/push-an-image-2.png
rename to datacenter/dtr/2.1/guides/images/push-an-image-2.png
diff --git a/datacenter/dtr/2.1/images/push-an-image-3.png b/datacenter/dtr/2.1/guides/images/push-an-image-3.png
similarity index 100%
rename from datacenter/dtr/2.1/images/push-an-image-3.png
rename to datacenter/dtr/2.1/guides/images/push-an-image-3.png
diff --git a/datacenter/dtr/2.1/images/repo.png b/datacenter/dtr/2.1/guides/images/repo.png
similarity index 100%
rename from datacenter/dtr/2.1/images/repo.png
rename to datacenter/dtr/2.1/guides/images/repo.png
diff --git a/datacenter/dtr/2.1/images/script-copy.png b/datacenter/dtr/2.1/guides/images/script-copy.png
similarity index 100%
rename from datacenter/dtr/2.1/images/script-copy.png
rename to datacenter/dtr/2.1/guides/images/script-copy.png
diff --git a/datacenter/dtr/2.1/images/use-your-certificates-1.png b/datacenter/dtr/2.1/guides/images/use-your-certificates-1.png
similarity index 100%
rename from datacenter/dtr/2.1/images/use-your-certificates-1.png
rename to datacenter/dtr/2.1/guides/images/use-your-certificates-1.png
diff --git a/datacenter/dtr/2.1/index.md b/datacenter/dtr/2.1/guides/index.md
similarity index 100%
rename from datacenter/dtr/2.1/index.md
rename to datacenter/dtr/2.1/guides/index.md
diff --git a/datacenter/dtr/2.1/install/index.md b/datacenter/dtr/2.1/guides/install/index.md
similarity index 95%
rename from datacenter/dtr/2.1/install/index.md
rename to datacenter/dtr/2.1/guides/install/index.md
index 218a04740a..dfa900dc09 100644
--- a/datacenter/dtr/2.1/install/index.md
+++ b/datacenter/dtr/2.1/guides/install/index.md
@@ -20,7 +20,7 @@ infrastructure has all the [requirements DTR needs to run](system-requirements.m
 
 Since DTR requires Docker Universal Control Plane (UCP)
 to run, you need to install UCP on all the nodes where you plan to install DTR.
-[Learn how to install UCP](/datacenter/ucp/2.0/guides/installation/install.md).
+[Learn how to install UCP](/datacenter/ucp/2.0/guides/installation/index.md).
 
 Make sure all the nodes you plan on installing DTR are being managed by UCP.
 
@@ -47,7 +47,7 @@ DTR. `--ucp-insecure-tls` tells the installer to trust the certificates used
 by UCP.
 
 The install command has other flags for customizing DTR at install time.
-Check the [reference documentation to learn more](../reference/install.md).
+Check the [reference documentation to learn more](../../reference/cli/install.md).
 
 
 ## Step 4. Check that DTR is running
@@ -126,5 +126,5 @@ replicas:
 
 ## See also
 
-* [Install DTR offline](install-dtr-offline.md)
-* [Upgrade DTR](upgrade/upgrade-major.md)
+* [Install DTR offline](install-offline.md)
+* [Upgrade DTR](upgrade.md)
diff --git a/datacenter/dtr/2.1/install/install-offline.md b/datacenter/dtr/2.1/guides/install/install-offline.md
similarity index 100%
rename from datacenter/dtr/2.1/install/install-offline.md
rename to datacenter/dtr/2.1/guides/install/install-offline.md
diff --git a/datacenter/dtr/2.1/install/license.md b/datacenter/dtr/2.1/guides/install/license.md
similarity index 100%
rename from datacenter/dtr/2.1/install/license.md
rename to datacenter/dtr/2.1/guides/install/license.md
diff --git a/datacenter/dtr/2.1/install/system-requirements.md b/datacenter/dtr/2.1/guides/install/system-requirements.md
similarity index 100%
rename from datacenter/dtr/2.1/install/system-requirements.md
rename to datacenter/dtr/2.1/guides/install/system-requirements.md
diff --git a/datacenter/dtr/2.1/install/uninstall.md b/datacenter/dtr/2.1/guides/install/uninstall.md
similarity index 96%
rename from datacenter/dtr/2.1/install/uninstall.md
rename to datacenter/dtr/2.1/guides/install/uninstall.md
index 09c48e590f..724b01c18e 100644
--- a/datacenter/dtr/2.1/install/uninstall.md
+++ b/datacenter/dtr/2.1/guides/install/uninstall.md
@@ -14,7 +14,7 @@ The remove command:
 * Deletes all DTR volumes.
 
 To see what options are available in the uninstall command, check the
-[uninstall command reference](../reference/remove.md), or run:
+[uninstall command reference](../../reference/cli/remove.md), or run:
 
 ```bash
 $ docker run -it --rm docker/dtr:2.1.0-beta3 remove --help
diff --git a/datacenter/dtr/2.1/install/upgrade.md b/datacenter/dtr/2.1/guides/install/upgrade.md
similarity index 84%
rename from datacenter/dtr/2.1/install/upgrade.md
rename to datacenter/dtr/2.1/guides/install/upgrade.md
index 304841b21e..ef11f9a8ba 100644
--- a/datacenter/dtr/2.1/install/upgrade.md
+++ b/datacenter/dtr/2.1/guides/install/upgrade.md
@@ -1,5 +1,5 @@
 ---
-title: Upgrade
+title: Upgrade DTR
 description: Learn how to upgrade your Docker Trusted Registry
 keywords:
 - docker, dtr, upgrade, install
@@ -17,7 +17,7 @@ business peak hours to ensure the impact on your business is close to none.
 ## Step 1. Upgrade DTR to 2.0
 
 Make sure you're running DTR 2.0. If that's not the case, [upgrade your
-installation to the 2.0 version](upgrade-major.md).
+installation to the 2.0 version](/datacenter/dtr/2.0/install/upgrade/upgrade-major.md).
 
 ## Step 2. Upgrade DTR
 
@@ -36,7 +36,7 @@ To upgrade DTR you use the `upgrade` command.
 
     If the node you're upgrading doesn't have access to the internet, you can
     use a machine with internet connection to
-    [pull all the DTR images](../install-offline.md).
+    [pull all the DTR images](install-offline.md).
 
 4.  Run the upgrade command.
 
@@ -50,9 +50,9 @@ To upgrade DTR you use the `upgrade` command.
 
     By default the upgrade command runs in interactive mode and prompts you for
     any necessary information. You can also check the
-    [reference documentation](../reference/index.md) for other existing flags.
+    [reference documentation](../../reference/cli/index.md) for other existing flags.
 
 ## Where to go next
 
 * [System requirements](system-requirements.md)
-* [Monitor DTR](../../monitor-troubleshoot/index.md)
+* [Monitor DTR](..//monitor-troubleshoot/index.md)
diff --git a/datacenter/dtr/2.1/monitor-troubleshoot/index.md b/datacenter/dtr/2.1/guides/monitor-troubleshoot/index.md
similarity index 100%
rename from datacenter/dtr/2.1/monitor-troubleshoot/index.md
rename to datacenter/dtr/2.1/guides/monitor-troubleshoot/index.md
diff --git a/datacenter/dtr/2.1/monitor-troubleshoot/troubleshoot.md b/datacenter/dtr/2.1/guides/monitor-troubleshoot/troubleshoot.md
similarity index 100%
rename from datacenter/dtr/2.1/monitor-troubleshoot/troubleshoot.md
rename to datacenter/dtr/2.1/guides/monitor-troubleshoot/troubleshoot.md
diff --git a/datacenter/dtr/2.1/release-notes.md b/datacenter/dtr/2.1/guides/release-notes.md
similarity index 97%
rename from datacenter/dtr/2.1/release-notes.md
rename to datacenter/dtr/2.1/guides/release-notes.md
index 0ed3ab1de5..29f4bdb7e1 100644
--- a/datacenter/dtr/2.1/release-notes.md
+++ b/datacenter/dtr/2.1/guides/release-notes.md
@@ -8,7 +8,7 @@ keywords:
 Here you can learn about new features, bug fixes, breaking changes and
 known issues for each DTR version.
 
-You can then use [the upgrade instructions](../install/upgrade.md),
+You can then use [the upgrade instructions](install/upgrade.md),
 to upgrade your installation to the latest release.
 
 ## DTR 2.1 Beta 3
diff --git a/datacenter/dtr/2.1/repos-and-images/delete-an-image.md b/datacenter/dtr/2.1/guides/repos-and-images/delete-an-image.md
similarity index 100%
rename from datacenter/dtr/2.1/repos-and-images/delete-an-image.md
rename to datacenter/dtr/2.1/guides/repos-and-images/delete-an-image.md
diff --git a/datacenter/dtr/2.1/repos-and-images/index.md b/datacenter/dtr/2.1/guides/repos-and-images/index.md
similarity index 100%
rename from datacenter/dtr/2.1/repos-and-images/index.md
rename to datacenter/dtr/2.1/guides/repos-and-images/index.md
diff --git a/datacenter/dtr/2.1/repos-and-images/pull-an-image.md b/datacenter/dtr/2.1/guides/repos-and-images/pull-an-image.md
similarity index 100%
rename from datacenter/dtr/2.1/repos-and-images/pull-an-image.md
rename to datacenter/dtr/2.1/guides/repos-and-images/pull-an-image.md
diff --git a/datacenter/dtr/2.1/repos-and-images/push-an-image.md b/datacenter/dtr/2.1/guides/repos-and-images/push-an-image.md
similarity index 100%
rename from datacenter/dtr/2.1/repos-and-images/push-an-image.md
rename to datacenter/dtr/2.1/guides/repos-and-images/push-an-image.md
diff --git a/datacenter/dtr/2.1/support.md b/datacenter/dtr/2.1/guides/support.md
similarity index 100%
rename from datacenter/dtr/2.1/support.md
rename to datacenter/dtr/2.1/guides/support.md
diff --git a/datacenter/dtr/2.1/user-management/create-and-manage-orgs.md b/datacenter/dtr/2.1/guides/user-management/create-and-manage-orgs.md
similarity index 100%
rename from datacenter/dtr/2.1/user-management/create-and-manage-orgs.md
rename to datacenter/dtr/2.1/guides/user-management/create-and-manage-orgs.md
diff --git a/datacenter/dtr/2.1/user-management/create-and-manage-teams.md b/datacenter/dtr/2.1/guides/user-management/create-and-manage-teams.md
similarity index 100%
rename from datacenter/dtr/2.1/user-management/create-and-manage-teams.md
rename to datacenter/dtr/2.1/guides/user-management/create-and-manage-teams.md
diff --git a/datacenter/dtr/2.1/user-management/create-and-manage-users.md b/datacenter/dtr/2.1/guides/user-management/create-and-manage-users.md
similarity index 100%
rename from datacenter/dtr/2.1/user-management/create-and-manage-users.md
rename to datacenter/dtr/2.1/guides/user-management/create-and-manage-users.md
diff --git a/datacenter/dtr/2.1/user-management/index.md b/datacenter/dtr/2.1/guides/user-management/index.md
similarity index 100%
rename from datacenter/dtr/2.1/user-management/index.md
rename to datacenter/dtr/2.1/guides/user-management/index.md
diff --git a/datacenter/dtr/2.1/user-management/permission-levels.md b/datacenter/dtr/2.1/guides/user-management/permission-levels.md
similarity index 100%
rename from datacenter/dtr/2.1/user-management/permission-levels.md
rename to datacenter/dtr/2.1/guides/user-management/permission-levels.md
diff --git a/apidocs/v2.1.0/css/print.css b/datacenter/dtr/2.1/reference/api/css/print.css
similarity index 100%
rename from apidocs/v2.1.0/css/print.css
rename to datacenter/dtr/2.1/reference/api/css/print.css
diff --git a/apidocs/v2.1.0/css/reset.css b/datacenter/dtr/2.1/reference/api/css/reset.css
similarity index 100%
rename from apidocs/v2.1.0/css/reset.css
rename to datacenter/dtr/2.1/reference/api/css/reset.css
diff --git a/apidocs/v2.1.0/css/screen.css b/datacenter/dtr/2.1/reference/api/css/screen.css
similarity index 100%
rename from apidocs/v2.1.0/css/screen.css
rename to datacenter/dtr/2.1/reference/api/css/screen.css
diff --git a/apidocs/v2.1.0/css/style.css b/datacenter/dtr/2.1/reference/api/css/style.css
similarity index 100%
rename from apidocs/v2.1.0/css/style.css
rename to datacenter/dtr/2.1/reference/api/css/style.css
diff --git a/apidocs/v2.1.0/css/typography.css b/datacenter/dtr/2.1/reference/api/css/typography.css
similarity index 100%
rename from apidocs/v2.1.0/css/typography.css
rename to datacenter/dtr/2.1/reference/api/css/typography.css
diff --git a/apidocs/v2.1.0/custom/custom.css b/datacenter/dtr/2.1/reference/api/custom/custom.css
similarity index 100%
rename from apidocs/v2.1.0/custom/custom.css
rename to datacenter/dtr/2.1/reference/api/custom/custom.css
diff --git a/apidocs/v2.1.0/fonts/droid-sans-v6-latin-700.eot b/datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-700.eot
similarity index 100%
rename from apidocs/v2.1.0/fonts/droid-sans-v6-latin-700.eot
rename to datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-700.eot
diff --git a/apidocs/v2.1.0/fonts/droid-sans-v6-latin-700.svg b/datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-700.svg
similarity index 100%
rename from apidocs/v2.1.0/fonts/droid-sans-v6-latin-700.svg
rename to datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-700.svg
diff --git a/apidocs/v2.1.0/fonts/droid-sans-v6-latin-700.ttf b/datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-700.ttf
similarity index 100%
rename from apidocs/v2.1.0/fonts/droid-sans-v6-latin-700.ttf
rename to datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-700.ttf
diff --git a/apidocs/v2.1.0/fonts/droid-sans-v6-latin-700.woff b/datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-700.woff
similarity index 100%
rename from apidocs/v2.1.0/fonts/droid-sans-v6-latin-700.woff
rename to datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-700.woff
diff --git a/apidocs/v2.1.0/fonts/droid-sans-v6-latin-700.woff2 b/datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-700.woff2
similarity index 100%
rename from apidocs/v2.1.0/fonts/droid-sans-v6-latin-700.woff2
rename to datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-700.woff2
diff --git a/apidocs/v2.1.0/fonts/droid-sans-v6-latin-regular.eot b/datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-regular.eot
similarity index 100%
rename from apidocs/v2.1.0/fonts/droid-sans-v6-latin-regular.eot
rename to datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-regular.eot
diff --git a/apidocs/v2.1.0/fonts/droid-sans-v6-latin-regular.svg b/datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-regular.svg
similarity index 100%
rename from apidocs/v2.1.0/fonts/droid-sans-v6-latin-regular.svg
rename to datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-regular.svg
diff --git a/apidocs/v2.1.0/fonts/droid-sans-v6-latin-regular.ttf b/datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-regular.ttf
similarity index 100%
rename from apidocs/v2.1.0/fonts/droid-sans-v6-latin-regular.ttf
rename to datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-regular.ttf
diff --git a/apidocs/v2.1.0/fonts/droid-sans-v6-latin-regular.woff b/datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-regular.woff
similarity index 100%
rename from apidocs/v2.1.0/fonts/droid-sans-v6-latin-regular.woff
rename to datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-regular.woff
diff --git a/apidocs/v2.1.0/fonts/droid-sans-v6-latin-regular.woff2 b/datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-regular.woff2
similarity index 100%
rename from apidocs/v2.1.0/fonts/droid-sans-v6-latin-regular.woff2
rename to datacenter/dtr/2.1/reference/api/fonts/droid-sans-v6-latin-regular.woff2
diff --git a/apidocs/v2.1.0/images/explorer_icons.png b/datacenter/dtr/2.1/reference/api/images/explorer_icons.png
similarity index 100%
rename from apidocs/v2.1.0/images/explorer_icons.png
rename to datacenter/dtr/2.1/reference/api/images/explorer_icons.png
diff --git a/apidocs/v2.1.0/images/favicon-16x16.png b/datacenter/dtr/2.1/reference/api/images/favicon-16x16.png
similarity index 100%
rename from apidocs/v2.1.0/images/favicon-16x16.png
rename to datacenter/dtr/2.1/reference/api/images/favicon-16x16.png
diff --git a/apidocs/v2.1.0/images/favicon-32x32.png b/datacenter/dtr/2.1/reference/api/images/favicon-32x32.png
similarity index 100%
rename from apidocs/v2.1.0/images/favicon-32x32.png
rename to datacenter/dtr/2.1/reference/api/images/favicon-32x32.png
diff --git a/apidocs/v2.1.0/images/favicon.ico b/datacenter/dtr/2.1/reference/api/images/favicon.ico
similarity index 100%
rename from apidocs/v2.1.0/images/favicon.ico
rename to datacenter/dtr/2.1/reference/api/images/favicon.ico
diff --git a/apidocs/v2.1.0/images/logo_small.png b/datacenter/dtr/2.1/reference/api/images/logo_small.png
similarity index 100%
rename from apidocs/v2.1.0/images/logo_small.png
rename to datacenter/dtr/2.1/reference/api/images/logo_small.png
diff --git a/apidocs/v2.1.0/images/pet_store_api.png b/datacenter/dtr/2.1/reference/api/images/pet_store_api.png
similarity index 100%
rename from apidocs/v2.1.0/images/pet_store_api.png
rename to datacenter/dtr/2.1/reference/api/images/pet_store_api.png
diff --git a/apidocs/v2.1.0/images/throbber.gif b/datacenter/dtr/2.1/reference/api/images/throbber.gif
similarity index 100%
rename from apidocs/v2.1.0/images/throbber.gif
rename to datacenter/dtr/2.1/reference/api/images/throbber.gif
diff --git a/apidocs/v2.1.0/images/wordnik_api.png b/datacenter/dtr/2.1/reference/api/images/wordnik_api.png
similarity index 100%
rename from apidocs/v2.1.0/images/wordnik_api.png
rename to datacenter/dtr/2.1/reference/api/images/wordnik_api.png
diff --git a/apidocs/v2.1.0/index.html b/datacenter/dtr/2.1/reference/api/index.html
similarity index 100%
rename from apidocs/v2.1.0/index.html
rename to datacenter/dtr/2.1/reference/api/index.html
diff --git a/apidocs/v2.1.0/index.md b/datacenter/dtr/2.1/reference/api/index.md
similarity index 89%
rename from apidocs/v2.1.0/index.md
rename to datacenter/dtr/2.1/reference/api/index.md
index 9b4d9d94c7..23051ed6d8 100644
--- a/apidocs/v2.1.0/index.md
+++ b/datacenter/dtr/2.1/reference/api/index.md
@@ -1,12 +1,9 @@
-+++
-type = "_default"
-title = "v2.1.0 API"
-description = "v2.1.0 API"
-keywords = ["Docker, DTR, API, v2.1.0"]
-weight = 101
-[menu.main]
-parent = "smn_dtrapi"
-+++
+---
+title: Docker Trusted Registry 2.1 API
+description: Learn how to use the Docker Trusted Registry REST API
+keywords:
+- dtr, api, reference
+---
 
 <div class="swagger-section">
 <div id="swagger-ui-container" class="swagger-ui-wrap"></div>
diff --git a/apidocs/v2.1.0/lang/en.js b/datacenter/dtr/2.1/reference/api/lang/en.js
similarity index 100%
rename from apidocs/v2.1.0/lang/en.js
rename to datacenter/dtr/2.1/reference/api/lang/en.js
diff --git a/apidocs/v2.1.0/lang/es.js b/datacenter/dtr/2.1/reference/api/lang/es.js
similarity index 100%
rename from apidocs/v2.1.0/lang/es.js
rename to datacenter/dtr/2.1/reference/api/lang/es.js
diff --git a/apidocs/v2.1.0/lang/pt.js b/datacenter/dtr/2.1/reference/api/lang/pt.js
similarity index 100%
rename from apidocs/v2.1.0/lang/pt.js
rename to datacenter/dtr/2.1/reference/api/lang/pt.js
diff --git a/apidocs/v2.1.0/lang/ru.js b/datacenter/dtr/2.1/reference/api/lang/ru.js
similarity index 100%
rename from apidocs/v2.1.0/lang/ru.js
rename to datacenter/dtr/2.1/reference/api/lang/ru.js
diff --git a/apidocs/v2.1.0/lang/tr.js b/datacenter/dtr/2.1/reference/api/lang/tr.js
similarity index 100%
rename from apidocs/v2.1.0/lang/tr.js
rename to datacenter/dtr/2.1/reference/api/lang/tr.js
diff --git a/apidocs/v2.1.0/lang/translator.js b/datacenter/dtr/2.1/reference/api/lang/translator.js
similarity index 100%
rename from apidocs/v2.1.0/lang/translator.js
rename to datacenter/dtr/2.1/reference/api/lang/translator.js
diff --git a/apidocs/v2.1.0/lib/backbone-min.js b/datacenter/dtr/2.1/reference/api/lib/backbone-min.js
similarity index 100%
rename from apidocs/v2.1.0/lib/backbone-min.js
rename to datacenter/dtr/2.1/reference/api/lib/backbone-min.js
diff --git a/apidocs/v2.1.0/lib/handlebars-2.0.0.js b/datacenter/dtr/2.1/reference/api/lib/handlebars-2.0.0.js
similarity index 100%
rename from apidocs/v2.1.0/lib/handlebars-2.0.0.js
rename to datacenter/dtr/2.1/reference/api/lib/handlebars-2.0.0.js
diff --git a/apidocs/v2.1.0/lib/highlight.7.3.pack.js b/datacenter/dtr/2.1/reference/api/lib/highlight.7.3.pack.js
similarity index 100%
rename from apidocs/v2.1.0/lib/highlight.7.3.pack.js
rename to datacenter/dtr/2.1/reference/api/lib/highlight.7.3.pack.js
diff --git a/apidocs/v2.1.0/lib/jquery-1.8.0.min.js b/datacenter/dtr/2.1/reference/api/lib/jquery-1.8.0.min.js
similarity index 100%
rename from apidocs/v2.1.0/lib/jquery-1.8.0.min.js
rename to datacenter/dtr/2.1/reference/api/lib/jquery-1.8.0.min.js
diff --git a/apidocs/v2.1.0/lib/jquery.ba-bbq.min.js b/datacenter/dtr/2.1/reference/api/lib/jquery.ba-bbq.min.js
similarity index 100%
rename from apidocs/v2.1.0/lib/jquery.ba-bbq.min.js
rename to datacenter/dtr/2.1/reference/api/lib/jquery.ba-bbq.min.js
diff --git a/apidocs/v2.1.0/lib/jquery.slideto.min.js b/datacenter/dtr/2.1/reference/api/lib/jquery.slideto.min.js
similarity index 100%
rename from apidocs/v2.1.0/lib/jquery.slideto.min.js
rename to datacenter/dtr/2.1/reference/api/lib/jquery.slideto.min.js
diff --git a/apidocs/v2.1.0/lib/jquery.wiggle.min.js b/datacenter/dtr/2.1/reference/api/lib/jquery.wiggle.min.js
similarity index 100%
rename from apidocs/v2.1.0/lib/jquery.wiggle.min.js
rename to datacenter/dtr/2.1/reference/api/lib/jquery.wiggle.min.js
diff --git a/apidocs/v2.1.0/lib/marked.js b/datacenter/dtr/2.1/reference/api/lib/marked.js
similarity index 100%
rename from apidocs/v2.1.0/lib/marked.js
rename to datacenter/dtr/2.1/reference/api/lib/marked.js
diff --git a/apidocs/v2.1.0/lib/swagger-oauth.js b/datacenter/dtr/2.1/reference/api/lib/swagger-oauth.js
similarity index 100%
rename from apidocs/v2.1.0/lib/swagger-oauth.js
rename to datacenter/dtr/2.1/reference/api/lib/swagger-oauth.js
diff --git a/apidocs/v2.1.0/lib/underscore-min.js b/datacenter/dtr/2.1/reference/api/lib/underscore-min.js
similarity index 100%
rename from apidocs/v2.1.0/lib/underscore-min.js
rename to datacenter/dtr/2.1/reference/api/lib/underscore-min.js
diff --git a/apidocs/v2.1.0/lib/underscore-min.map b/datacenter/dtr/2.1/reference/api/lib/underscore-min.map
similarity index 100%
rename from apidocs/v2.1.0/lib/underscore-min.map
rename to datacenter/dtr/2.1/reference/api/lib/underscore-min.map
diff --git a/apidocs/v2.1.0/main.js b/datacenter/dtr/2.1/reference/api/main.js
similarity index 100%
rename from apidocs/v2.1.0/main.js
rename to datacenter/dtr/2.1/reference/api/main.js
diff --git a/apidocs/v2.1.0/o2c.html b/datacenter/dtr/2.1/reference/api/o2c.html
similarity index 100%
rename from apidocs/v2.1.0/o2c.html
rename to datacenter/dtr/2.1/reference/api/o2c.html
diff --git a/apidocs/v2.1.0/swagger-fix.diff b/datacenter/dtr/2.1/reference/api/swagger-fix.diff
similarity index 100%
rename from apidocs/v2.1.0/swagger-fix.diff
rename to datacenter/dtr/2.1/reference/api/swagger-fix.diff
diff --git a/apidocs/v2.1.0/swagger-ui.js b/datacenter/dtr/2.1/reference/api/swagger-ui.js
similarity index 100%
rename from apidocs/v2.1.0/swagger-ui.js
rename to datacenter/dtr/2.1/reference/api/swagger-ui.js
diff --git a/apidocs/v2.1.0/swagger-ui.js.original b/datacenter/dtr/2.1/reference/api/swagger-ui.js.original
similarity index 100%
rename from apidocs/v2.1.0/swagger-ui.js.original
rename to datacenter/dtr/2.1/reference/api/swagger-ui.js.original
diff --git a/apidocs/v2.1.0/swagger-ui.min.js b/datacenter/dtr/2.1/reference/api/swagger-ui.min.js
similarity index 100%
rename from apidocs/v2.1.0/swagger-ui.min.js
rename to datacenter/dtr/2.1/reference/api/swagger-ui.min.js
diff --git a/apidocs/v2.1.0/swagger-ui.min.js.original b/datacenter/dtr/2.1/reference/api/swagger-ui.min.js.original
similarity index 100%
rename from apidocs/v2.1.0/swagger-ui.min.js.original
rename to datacenter/dtr/2.1/reference/api/swagger-ui.min.js.original
diff --git a/datacenter/dtr/2.1/reference/backup.md b/datacenter/dtr/2.1/reference/cli/backup.md
similarity index 100%
rename from datacenter/dtr/2.1/reference/backup.md
rename to datacenter/dtr/2.1/reference/cli/backup.md
diff --git a/datacenter/dtr/2.1/reference/dumpcerts.md b/datacenter/dtr/2.1/reference/cli/dumpcerts.md
similarity index 100%
rename from datacenter/dtr/2.1/reference/dumpcerts.md
rename to datacenter/dtr/2.1/reference/cli/dumpcerts.md
diff --git a/datacenter/dtr/2.1/reference/images.md b/datacenter/dtr/2.1/reference/cli/images.md
similarity index 100%
rename from datacenter/dtr/2.1/reference/images.md
rename to datacenter/dtr/2.1/reference/cli/images.md
diff --git a/datacenter/dtr/2.1/reference/index.md b/datacenter/dtr/2.1/reference/cli/index.md
similarity index 100%
rename from datacenter/dtr/2.1/reference/index.md
rename to datacenter/dtr/2.1/reference/cli/index.md
diff --git a/datacenter/dtr/2.1/reference/install.md b/datacenter/dtr/2.1/reference/cli/install.md
similarity index 100%
rename from datacenter/dtr/2.1/reference/install.md
rename to datacenter/dtr/2.1/reference/cli/install.md
diff --git a/datacenter/dtr/2.1/reference/join.md b/datacenter/dtr/2.1/reference/cli/join.md
similarity index 100%
rename from datacenter/dtr/2.1/reference/join.md
rename to datacenter/dtr/2.1/reference/cli/join.md
diff --git a/datacenter/dtr/2.1/reference/reconfigure.md b/datacenter/dtr/2.1/reference/cli/reconfigure.md
similarity index 100%
rename from datacenter/dtr/2.1/reference/reconfigure.md
rename to datacenter/dtr/2.1/reference/cli/reconfigure.md
diff --git a/datacenter/dtr/2.1/reference/remove.md b/datacenter/dtr/2.1/reference/cli/remove.md
similarity index 100%
rename from datacenter/dtr/2.1/reference/remove.md
rename to datacenter/dtr/2.1/reference/cli/remove.md
diff --git a/datacenter/dtr/2.1/reference/restore.md b/datacenter/dtr/2.1/reference/cli/restore.md
similarity index 100%
rename from datacenter/dtr/2.1/reference/restore.md
rename to datacenter/dtr/2.1/reference/cli/restore.md
diff --git a/datacenter/dtr/2.1/reference/upgrade.md b/datacenter/dtr/2.1/reference/cli/upgrade.md
similarity index 100%
rename from datacenter/dtr/2.1/reference/upgrade.md
rename to datacenter/dtr/2.1/reference/cli/upgrade.md