diff --git a/docs/harbor-doc-reorg/_index.md b/docs/harbor-doc-reorg/_index.md
index 43fdb15b0..161f06f57 100644
--- a/docs/harbor-doc-reorg/_index.md
+++ b/docs/harbor-doc-reorg/_index.md
@@ -13,18 +13,26 @@ This section describes how to install Harbor and perform the required initial co
   - [Run the Installer Script](install_config/installation/run_installer_script.md)
   - [Troubleshooting Harbor Installation
 ](install_config/installation/troubleshoot_installation.md)
+
+  You can also use Helm to install Harbor on a Kubernetes cluster, to make it highly available. For information about installing Harbor with Helm on a Kubernetes cluster, see the [Harbor High Availability Guide](https://github.com/goharbor/harbor-helm/blob/master/docs/High%20Availability.md) in the https://github.com/goharbor/harbor-helm repository.
 - [Configuring Harbor](install_config/configuration/_index.md)
   - [Reconfigure Harbor and Manage the Harbor Lifecycle](install_config/configuration/reconfigure_manage_lifecycle.md)
   - [Configure HTTPS Access to Harbor](install_config/configuration/configure_https.md)
+  - [Customize the Harbor Token Service](install_config/configuration/customize_token_service.md)
   - [Access Harbor Logs](install_config/configuration/access_logs.md)
 
+
 ## Harbor Administration
 
-This section describes how to use, upgrade, and maintain Harbor after deployment. These day 2 operations are performed by the Harbor Administrator.
+This section describes how to use and maintain Harbor after deployment. These day 2 operations are performed by the Harbor Administrator.
 
-- [](administration/)
-- [](administration/)
-- [](administration/)
+- [Managing Users](administration/managing_users/_index.md)
+  - [Harbor Role Based Access Control (RBAC)](administration/managing_users/configure_rbac.md)
+  - [Configure Harbor User Settings at the Command Line](administration/managing_users/configure_user_settings_cli.md)
+  - [Manage Roles by LDAP Group](administration/managing_users/manage_role_by_ldap_group.md)
+- [Upgrading Harbor](administration/upgrade/_index.md)
+  - [Upgrade Harbor and Migrate Data](administration/upgrade/upgrade_migrate_data.md)
+  - [Roll Back an Upgrade](administration/upgrade/roll_back_upgrade.md)
 
 ## Working with Harbor Projects
 
diff --git a/docs/harbor-doc-reorg/administration/_index.md b/docs/harbor-doc-reorg/administration/_index.md
new file mode 100644
index 000000000..e10953349
--- /dev/null
+++ b/docs/harbor-doc-reorg/administration/_index.md
@@ -0,0 +1,4 @@
+# Harbor Administration
+
+- [Managing Users](managing_users/_index.md)
+- [Upgrading Harbor](upgrade/_index.md)
\ No newline at end of file
diff --git a/docs/harbor-doc-reorg/install_config/configuration/administrator_options.md b/docs/harbor-doc-reorg/administration/administrator_options.md
similarity index 100%
rename from docs/harbor-doc-reorg/install_config/configuration/administrator_options.md
rename to docs/harbor-doc-reorg/administration/administrator_options.md
diff --git a/docs/harbor-doc-reorg/install_config/configuration/garbage_collection.md b/docs/harbor-doc-reorg/administration/garbage_collection.md
similarity index 100%
rename from docs/harbor-doc-reorg/install_config/configuration/garbage_collection.md
rename to docs/harbor-doc-reorg/administration/garbage_collection.md
diff --git a/docs/harbor-doc-reorg/install_config/configuration/import_vulnerability_data.md b/docs/harbor-doc-reorg/administration/import_vulnerability_data.md
similarity index 100%
rename from docs/harbor-doc-reorg/install_config/configuration/import_vulnerability_data.md
rename to docs/harbor-doc-reorg/administration/import_vulnerability_data.md
diff --git a/docs/harbor-doc-reorg/administration/managing_users/_index.md b/docs/harbor-doc-reorg/administration/managing_users/_index.md
new file mode 100644
index 000000000..47c6fff68
--- /dev/null
+++ b/docs/harbor-doc-reorg/administration/managing_users/_index.md
@@ -0,0 +1,5 @@
+# Managing Users
+
+- [Harbor Role Based Access Control (RBAC)](configure_rbac.md)
+- [Configure Harbor User Settings at the Command Line](configure_user_settings_cli.md)
+- [Manage Roles by LDAP Group](manage_role_by_ldap_group.md)
diff --git a/docs/harbor-doc-reorg/install_config/user_management/configure_rbac.md b/docs/harbor-doc-reorg/administration/managing_users/configure_rbac.md
similarity index 99%
rename from docs/harbor-doc-reorg/install_config/user_management/configure_rbac.md
rename to docs/harbor-doc-reorg/administration/managing_users/configure_rbac.md
index 9769f4672..8ecfc8c75 100644
--- a/docs/harbor-doc-reorg/install_config/user_management/configure_rbac.md
+++ b/docs/harbor-doc-reorg/administration/managing_users/configure_rbac.md
@@ -1,4 +1,4 @@
-# Role Based Access Control (RBAC)  
+# Harbor Role Based Access Control (RBAC)  
 
 ![rbac](../img/rbac.png)
 
diff --git a/docs/harbor-doc-reorg/install_config/user_management/configure_user_settings.md b/docs/harbor-doc-reorg/administration/managing_users/configure_user_settings_cli.md
similarity index 99%
rename from docs/harbor-doc-reorg/install_config/user_management/configure_user_settings.md
rename to docs/harbor-doc-reorg/administration/managing_users/configure_user_settings_cli.md
index 4894ee9ff..5a3334c01 100644
--- a/docs/harbor-doc-reorg/install_config/user_management/configure_user_settings.md
+++ b/docs/harbor-doc-reorg/administration/managing_users/configure_user_settings_cli.md
@@ -1,4 +1,4 @@
-# Config Harbor user settings by command line
+# Configure Harbor User Settings at the Command Line
 
 After release 1.8.0, all user settings are separated from system settings, it can not be configured in config file anymore. Users need to configure it with admin privileges in web console or via HTTP request.
 
diff --git a/docs/harbor-doc-reorg/install_config/user_management/manage_role_by_ldap_group.md b/docs/harbor-doc-reorg/administration/managing_users/manage_roles_by_ldap_group.md
similarity index 99%
rename from docs/harbor-doc-reorg/install_config/user_management/manage_role_by_ldap_group.md
rename to docs/harbor-doc-reorg/administration/managing_users/manage_roles_by_ldap_group.md
index 51e62e6b0..1ce8b5471 100644
--- a/docs/harbor-doc-reorg/install_config/user_management/manage_role_by_ldap_group.md
+++ b/docs/harbor-doc-reorg/administration/managing_users/manage_roles_by_ldap_group.md
@@ -1,4 +1,4 @@
-## Introduction
+# Manage Roles by LDAP Group
 
 This guide provides instructions to manage roles by LDAP/AD group. You can import an LDAP/AD group to Harbor and assign project roles to it. All LDAP/AD users in this LDAP/AD group have assigned roles.
 
diff --git a/docs/harbor-doc-reorg/install_config/configuration/setting_project_quotas.md b/docs/harbor-doc-reorg/administration/setting_project_quotas.md
similarity index 100%
rename from docs/harbor-doc-reorg/install_config/configuration/setting_project_quotas.md
rename to docs/harbor-doc-reorg/administration/setting_project_quotas.md
diff --git a/docs/harbor-doc-reorg/administration/upgrade/_index.md b/docs/harbor-doc-reorg/administration/upgrade/_index.md
new file mode 100644
index 000000000..39e5914e7
--- /dev/null
+++ b/docs/harbor-doc-reorg/administration/upgrade/_index.md
@@ -0,0 +1,4 @@
+# Upgrading Harbor
+
+- [Upgrade Harbor and Migrate Data](upgrade_migrate_data.md)
+- [Roll Back an Upgrade](roll_back_upgrade.md)
diff --git a/docs/harbor-doc-reorg/administration/upgrade/roll_back_upgrade.md b/docs/harbor-doc-reorg/administration/upgrade/roll_back_upgrade.md
new file mode 100644
index 000000000..e9bac1a86
--- /dev/null
+++ b/docs/harbor-doc-reorg/administration/upgrade/roll_back_upgrade.md
@@ -0,0 +1,34 @@
+# Roll Back an Upgrade
+
+If, for any reason, you want to roll back to the previous version of Harbor, perform the following steps:
+
+1. Stop and remove the current Harbor service if it is still running.
+
+    ```sh
+    cd harbor
+    docker-compose down
+    ```
+
+2. Remove current Harbor instance.
+
+    ```sh
+    rm -rf harbor
+    ```
+
+3. Restore the older version package of Harbor.
+
+    ```sh
+    mv /my_backup_dir/harbor harbor
+    ```
+
+4. Restore database, copy the data files from backup directory to you data volume, by default `/data/database`.
+
+5. Restart Harbor service using the previous configuration.  
+   If previous version of Harbor was installed by a release build:
+
+    ```sh
+    cd harbor
+    ./install.sh
+    ```
+
+**NOTE**: While you can roll back an upgrade to the state before you started the upgrade, Harbor does not support downgrades.
diff --git a/docs/harbor-doc-reorg/install_config/upgrade/migration_guide.md b/docs/harbor-doc-reorg/administration/upgrade/upgrade_migrate_data.md
similarity index 81%
rename from docs/harbor-doc-reorg/install_config/upgrade/migration_guide.md
rename to docs/harbor-doc-reorg/administration/upgrade/upgrade_migrate_data.md
index 747db652d..1b0868080 100644
--- a/docs/harbor-doc-reorg/install_config/upgrade/migration_guide.md
+++ b/docs/harbor-doc-reorg/administration/upgrade/upgrade_migrate_data.md
@@ -1,4 +1,4 @@
-# Harbor Upgrade and Migration Guide
+# Upgrade Harbor and Migrate Data
 
 This guide covers upgrade and migration to version 1.9.0. This guide only covers migration from v1.7.x and later to the current version. If you are upgrading from an earlier version, refer to the migration guide in the `release-1.7.0` branch to upgrade to v1.7.x first, then follow this guide to perform the migration to this version.
 
@@ -14,7 +14,7 @@ Since the migration might alter the database schema and the settings of `harbor.
 - With the introduction of storage and artifact quotas in version 1.9.0, migration from 1.7.x and 1.8.x might take a few minutes. This is because the `core` walks through all blobs in the registry and populates the database with information about the layers and artifacts in projects.
 - With the introduction of storage and artifact quotas in version 1.9.0, replication between version 1.9.0 and a previous version of Harbor does not work. You must upgrade all Harbor nodes to 1.9.0 if you have configured replication between them.
 
-## Upgrading Harbor and Migrating Data
+## Procedure
 
 1. Log in to the host that Harbor runs on, stop and remove existing Harbor instance if it is still running:
 
@@ -61,39 +61,4 @@ Since the migration might alter the database schema and the settings of `harbor.
 
     **NOTE:** The schema upgrade and data migration of the database is performed by core when Harbor starts, if the migration fails, please check the log of core to debug.
 
-6. Under the directory `./harbor`, run the `./install.sh` script to install the new Harbor instance. If you choose to install Harbor with components such as Notary, Clair, and chartmuseum, refer to [Installation & Configuration Guide](../docs/installation_guide.md) for more information.
-
-## Roll Back from an Upgrade
-
-If, for any reason, you want to roll back to the previous version of Harbor, perform the following steps:
-
-1. Stop and remove the current Harbor service if it is still running.
-
-    ```sh
-    cd harbor
-    docker-compose down
-    ```
-
-2. Remove current Harbor instance.
-
-    ```sh
-    rm -rf harbor
-    ```
-
-3. Restore the older version package of Harbor.
-
-    ```sh
-    mv /my_backup_dir/harbor harbor
-    ```
-
-4. Restore database, copy the data files from backup directory to you data volume, by default `/data/database`.
-
-5. Restart Harbor service using the previous configuration.  
-   If previous version of Harbor was installed by a release build:
-
-    ```sh
-    cd harbor
-    ./install.sh
-    ```
-
-**NOTE**: While you can roll back an upgrade to the state before you started the upgrade, Harbor does not support downgrades.
+6. Under the directory `./harbor`, run the `./install.sh` script to install the new Harbor instance. If you choose to install Harbor with components such as Notary, Clair, and chartmuseum, refer to [Installation & Configuration Guide](../docs/installation_guide.md) for more information.
\ No newline at end of file
diff --git a/docs/harbor-doc-reorg/install_config/configuration/vulnerability_scanning_clair.md b/docs/harbor-doc-reorg/administration/vulnerability_scanning_clair.md
similarity index 100%
rename from docs/harbor-doc-reorg/install_config/configuration/vulnerability_scanning_clair.md
rename to docs/harbor-doc-reorg/administration/vulnerability_scanning_clair.md
diff --git a/docs/harbor-doc-reorg/img/360.png b/docs/harbor-doc-reorg/img/360.png
new file mode 100644
index 000000000..bb8feab6b
Binary files /dev/null and b/docs/harbor-doc-reorg/img/360.png differ
diff --git a/docs/harbor-doc-reorg/img/UserMaDai.jpg b/docs/harbor-doc-reorg/img/UserMaDai.jpg
new file mode 100644
index 000000000..a14661946
Binary files /dev/null and b/docs/harbor-doc-reorg/img/UserMaDai.jpg differ
diff --git a/docs/harbor-doc-reorg/img/Yanrong.jpg b/docs/harbor-doc-reorg/img/Yanrong.jpg
new file mode 100644
index 000000000..3a4d892d4
Binary files /dev/null and b/docs/harbor-doc-reorg/img/Yanrong.jpg differ
diff --git a/docs/harbor-doc-reorg/img/add_labels_to_images.png b/docs/harbor-doc-reorg/img/add_labels_to_images.png
new file mode 100644
index 000000000..d74c6112a
Binary files /dev/null and b/docs/harbor-doc-reorg/img/add_labels_to_images.png differ
diff --git a/docs/harbor-doc-reorg/img/add_member.png b/docs/harbor-doc-reorg/img/add_member.png
new file mode 100644
index 000000000..85d578f26
Binary files /dev/null and b/docs/harbor-doc-reorg/img/add_member.png differ
diff --git a/docs/harbor-doc-reorg/img/api_explorer_btn.png b/docs/harbor-doc-reorg/img/api_explorer_btn.png
new file mode 100644
index 000000000..bf41bb24b
Binary files /dev/null and b/docs/harbor-doc-reorg/img/api_explorer_btn.png differ
diff --git a/docs/harbor-doc-reorg/img/authorize.png b/docs/harbor-doc-reorg/img/authorize.png
new file mode 100644
index 000000000..22c1c0d99
Binary files /dev/null and b/docs/harbor-doc-reorg/img/authorize.png differ
diff --git a/docs/harbor-doc-reorg/img/axatp.png b/docs/harbor-doc-reorg/img/axatp.png
new file mode 100644
index 000000000..2401c56c8
Binary files /dev/null and b/docs/harbor-doc-reorg/img/axatp.png differ
diff --git a/docs/harbor-doc-reorg/img/bar_chart.png b/docs/harbor-doc-reorg/img/bar_chart.png
new file mode 100644
index 000000000..e701dd06b
Binary files /dev/null and b/docs/harbor-doc-reorg/img/bar_chart.png differ
diff --git a/docs/harbor-doc-reorg/img/beegoLogo.png b/docs/harbor-doc-reorg/img/beegoLogo.png
new file mode 100644
index 000000000..ada97519d
Binary files /dev/null and b/docs/harbor-doc-reorg/img/beegoLogo.png differ
diff --git a/docs/harbor-doc-reorg/img/bell-outline-badged.svg b/docs/harbor-doc-reorg/img/bell-outline-badged.svg
new file mode 100644
index 000000000..a8b0a96d0
--- /dev/null
+++ b/docs/harbor-doc-reorg/img/bell-outline-badged.svg
@@ -0,0 +1,5 @@
+<svg version="1.1" width="36" height="36"  viewBox="0 0 36 36" preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>bell-outline-badged</title>
+    <path class="clr-i-outline--badged clr-i-outline-path-1--badged" d="M18,34.28A2.67,2.67,0,0,0,20.58,32H15.32A2.67,2.67,0,0,0,18,34.28Z"></path><path class="clr-i-outline--badged clr-i-outline-path-2--badged" d="M32.51,27.83A14.4,14.4,0,0,1,30,24.9a12.63,12.63,0,0,1-1.35-4.81V15.15a10.92,10.92,0,0,0-.16-1.79,7.44,7.44,0,0,1-2.24-.84,8.89,8.89,0,0,1,.4,2.64v4.94a14.24,14.24,0,0,0,1.65,5.85,16.17,16.17,0,0,0,2.44,3H5.13a16.17,16.17,0,0,0,2.44-3,14.24,14.24,0,0,0,1.65-5.85V15.15A8.8,8.8,0,0,1,18,6.31a8.61,8.61,0,0,1,4.76,1.44A7.49,7.49,0,0,1,22.5,6c0-.21,0-.42,0-.63a10.58,10.58,0,0,0-3.32-1V3.11a1.33,1.33,0,1,0-2.67,0V4.42A10.81,10.81,0,0,0,7.21,15.15v4.94A12.63,12.63,0,0,1,5.86,24.9a14.4,14.4,0,0,1-2.47,2.93,1,1,0,0,0-.34.75v1.36a1,1,0,0,0,1,1h27.8a1,1,0,0,0,1-1V28.58A1,1,0,0,0,32.51,27.83Z"></path><circle class="clr-i-outline--badged clr-i-outline-path-1--badged clr-i-badge" cx="30" cy="6" r="5"></circle>
+    <rect x="0" y="0" width="36" height="36" fill-opacity="0"/>
+</svg>
\ No newline at end of file
diff --git a/docs/harbor-doc-reorg/img/beyondsoft.png b/docs/harbor-doc-reorg/img/beyondsoft.png
new file mode 100644
index 000000000..49867c396
Binary files /dev/null and b/docs/harbor-doc-reorg/img/beyondsoft.png differ
diff --git a/docs/harbor-doc-reorg/img/bingocloud.png b/docs/harbor-doc-reorg/img/bingocloud.png
new file mode 100644
index 000000000..d1fac9f19
Binary files /dev/null and b/docs/harbor-doc-reorg/img/bingocloud.png differ
diff --git a/docs/harbor-doc-reorg/img/bocoit.png b/docs/harbor-doc-reorg/img/bocoit.png
new file mode 100644
index 000000000..7560b646f
Binary files /dev/null and b/docs/harbor-doc-reorg/img/bocoit.png differ
diff --git a/docs/harbor-doc-reorg/img/boer.png b/docs/harbor-doc-reorg/img/boer.png
new file mode 100644
index 000000000..af54d40f6
Binary files /dev/null and b/docs/harbor-doc-reorg/img/boer.png differ
diff --git a/docs/harbor-doc-reorg/img/browse_project.png b/docs/harbor-doc-reorg/img/browse_project.png
new file mode 100644
index 000000000..a9683f767
Binary files /dev/null and b/docs/harbor-doc-reorg/img/browse_project.png differ
diff --git a/docs/harbor-doc-reorg/img/browse_project_repositories.png b/docs/harbor-doc-reorg/img/browse_project_repositories.png
new file mode 100644
index 000000000..13746d70c
Binary files /dev/null and b/docs/harbor-doc-reorg/img/browse_project_repositories.png differ
diff --git a/docs/harbor-doc-reorg/img/build_history.png b/docs/harbor-doc-reorg/img/build_history.png
new file mode 100644
index 000000000..0c634f29b
Binary files /dev/null and b/docs/harbor-doc-reorg/img/build_history.png differ
diff --git a/docs/harbor-doc-reorg/img/caicloud.png b/docs/harbor-doc-reorg/img/caicloud.png
new file mode 100644
index 000000000..37e26c0ec
Binary files /dev/null and b/docs/harbor-doc-reorg/img/caicloud.png differ
diff --git a/docs/harbor-doc-reorg/img/chartrepo/add_labesl_to_chart_versions.png b/docs/harbor-doc-reorg/img/chartrepo/add_labesl_to_chart_versions.png
new file mode 100644
index 000000000..3a43127d7
Binary files /dev/null and b/docs/harbor-doc-reorg/img/chartrepo/add_labesl_to_chart_versions.png differ
diff --git a/docs/harbor-doc-reorg/img/chartrepo/chart_dependencies.png b/docs/harbor-doc-reorg/img/chartrepo/chart_dependencies.png
new file mode 100644
index 000000000..bc19cd0b8
Binary files /dev/null and b/docs/harbor-doc-reorg/img/chartrepo/chart_dependencies.png differ
diff --git a/docs/harbor-doc-reorg/img/chartrepo/chart_details.png b/docs/harbor-doc-reorg/img/chartrepo/chart_details.png
new file mode 100644
index 000000000..e642feb51
Binary files /dev/null and b/docs/harbor-doc-reorg/img/chartrepo/chart_details.png differ
diff --git a/docs/harbor-doc-reorg/img/chartrepo/chart_values.png b/docs/harbor-doc-reorg/img/chartrepo/chart_values.png
new file mode 100644
index 000000000..26e7b379b
Binary files /dev/null and b/docs/harbor-doc-reorg/img/chartrepo/chart_values.png differ
diff --git a/docs/harbor-doc-reorg/img/chartrepo/filter_chart_versions_by_label.png b/docs/harbor-doc-reorg/img/chartrepo/filter_chart_versions_by_label.png
new file mode 100644
index 000000000..1bfc46505
Binary files /dev/null and b/docs/harbor-doc-reorg/img/chartrepo/filter_chart_versions_by_label.png differ
diff --git a/docs/harbor-doc-reorg/img/chartrepo/list_chart_versions.png b/docs/harbor-doc-reorg/img/chartrepo/list_chart_versions.png
new file mode 100644
index 000000000..ed06fcf33
Binary files /dev/null and b/docs/harbor-doc-reorg/img/chartrepo/list_chart_versions.png differ
diff --git a/docs/harbor-doc-reorg/img/chartrepo/list_charts.png b/docs/harbor-doc-reorg/img/chartrepo/list_charts.png
new file mode 100644
index 000000000..92bbdbc02
Binary files /dev/null and b/docs/harbor-doc-reorg/img/chartrepo/list_charts.png differ
diff --git a/docs/harbor-doc-reorg/img/chartrepo/upload_charts.png b/docs/harbor-doc-reorg/img/chartrepo/upload_charts.png
new file mode 100644
index 000000000..9f040d87a
Binary files /dev/null and b/docs/harbor-doc-reorg/img/chartrepo/upload_charts.png differ
diff --git a/docs/harbor-doc-reorg/img/china-mobile.png b/docs/harbor-doc-reorg/img/china-mobile.png
new file mode 100644
index 000000000..98e3589da
Binary files /dev/null and b/docs/harbor-doc-reorg/img/china-mobile.png differ
diff --git a/docs/harbor-doc-reorg/img/clair_not_ready.png b/docs/harbor-doc-reorg/img/clair_not_ready.png
new file mode 100644
index 000000000..c8a978856
Binary files /dev/null and b/docs/harbor-doc-reorg/img/clair_not_ready.png differ
diff --git a/docs/harbor-doc-reorg/img/clair_not_ready2.png b/docs/harbor-doc-reorg/img/clair_not_ready2.png
new file mode 100644
index 000000000..0fa425941
Binary files /dev/null and b/docs/harbor-doc-reorg/img/clair_not_ready2.png differ
diff --git a/docs/harbor-doc-reorg/img/clair_ready.png b/docs/harbor-doc-reorg/img/clair_ready.png
new file mode 100644
index 000000000..9d6d97f4d
Binary files /dev/null and b/docs/harbor-doc-reorg/img/clair_ready.png differ
diff --git a/docs/harbor-doc-reorg/img/cloudchef.png b/docs/harbor-doc-reorg/img/cloudchef.png
new file mode 100644
index 000000000..2a5cd00c4
Binary files /dev/null and b/docs/harbor-doc-reorg/img/cloudchef.png differ
diff --git a/docs/harbor-doc-reorg/img/cloudstar.png b/docs/harbor-doc-reorg/img/cloudstar.png
new file mode 100644
index 000000000..fe0a58904
Binary files /dev/null and b/docs/harbor-doc-reorg/img/cloudstar.png differ
diff --git a/docs/harbor-doc-reorg/img/content_trust.png b/docs/harbor-doc-reorg/img/content_trust.png
new file mode 100644
index 000000000..55d716ad6
Binary files /dev/null and b/docs/harbor-doc-reorg/img/content_trust.png differ
diff --git a/docs/harbor-doc-reorg/img/create_project.png b/docs/harbor-doc-reorg/img/create_project.png
new file mode 100644
index 000000000..827ba957b
Binary files /dev/null and b/docs/harbor-doc-reorg/img/create_project.png differ
diff --git a/docs/harbor-doc-reorg/img/create_rule.png b/docs/harbor-doc-reorg/img/create_rule.png
new file mode 100644
index 000000000..e8f02bb81
Binary files /dev/null and b/docs/harbor-doc-reorg/img/create_rule.png differ
diff --git a/docs/harbor-doc-reorg/img/cve-whitelist1.png b/docs/harbor-doc-reorg/img/cve-whitelist1.png
new file mode 100644
index 000000000..f345c4e88
Binary files /dev/null and b/docs/harbor-doc-reorg/img/cve-whitelist1.png differ
diff --git a/docs/harbor-doc-reorg/img/cve-whitelist2.png b/docs/harbor-doc-reorg/img/cve-whitelist2.png
new file mode 100644
index 000000000..905768294
Binary files /dev/null and b/docs/harbor-doc-reorg/img/cve-whitelist2.png differ
diff --git a/docs/harbor-doc-reorg/img/cve-whitelist3.png b/docs/harbor-doc-reorg/img/cve-whitelist3.png
new file mode 100644
index 000000000..524db9387
Binary files /dev/null and b/docs/harbor-doc-reorg/img/cve-whitelist3.png differ
diff --git a/docs/harbor-doc-reorg/img/cve-whitelist4.png b/docs/harbor-doc-reorg/img/cve-whitelist4.png
new file mode 100644
index 000000000..972e84c98
Binary files /dev/null and b/docs/harbor-doc-reorg/img/cve-whitelist4.png differ
diff --git a/docs/harbor-doc-reorg/img/cve-whitelist5.png b/docs/harbor-doc-reorg/img/cve-whitelist5.png
new file mode 100644
index 000000000..d9bc6c929
Binary files /dev/null and b/docs/harbor-doc-reorg/img/cve-whitelist5.png differ
diff --git a/docs/harbor-doc-reorg/img/cve-whitelist6.png b/docs/harbor-doc-reorg/img/cve-whitelist6.png
new file mode 100644
index 000000000..1bbc149a8
Binary files /dev/null and b/docs/harbor-doc-reorg/img/cve-whitelist6.png differ
diff --git a/docs/harbor-doc-reorg/img/dataman.png b/docs/harbor-doc-reorg/img/dataman.png
new file mode 100644
index 000000000..914a3a549
Binary files /dev/null and b/docs/harbor-doc-reorg/img/dataman.png differ
diff --git a/docs/harbor-doc-reorg/img/datayes.png b/docs/harbor-doc-reorg/img/datayes.png
new file mode 100644
index 000000000..707aacfe5
Binary files /dev/null and b/docs/harbor-doc-reorg/img/datayes.png differ
diff --git a/docs/harbor-doc-reorg/img/delete_rule.png b/docs/harbor-doc-reorg/img/delete_rule.png
new file mode 100644
index 000000000..f71e05ace
Binary files /dev/null and b/docs/harbor-doc-reorg/img/delete_rule.png differ
diff --git a/docs/harbor-doc-reorg/img/demos/content_trust.png b/docs/harbor-doc-reorg/img/demos/content_trust.png
new file mode 100644
index 000000000..45da0e65f
Binary files /dev/null and b/docs/harbor-doc-reorg/img/demos/content_trust.png differ
diff --git a/docs/harbor-doc-reorg/img/demos/image_replication.png b/docs/harbor-doc-reorg/img/demos/image_replication.png
new file mode 100644
index 000000000..35f5bfe13
Binary files /dev/null and b/docs/harbor-doc-reorg/img/demos/image_replication.png differ
diff --git a/docs/harbor-doc-reorg/img/demos/rbac.png b/docs/harbor-doc-reorg/img/demos/rbac.png
new file mode 100644
index 000000000..48c1dff2e
Binary files /dev/null and b/docs/harbor-doc-reorg/img/demos/rbac.png differ
diff --git a/docs/harbor-doc-reorg/img/demos/vul_scan.png b/docs/harbor-doc-reorg/img/demos/vul_scan.png
new file mode 100644
index 000000000..0e84b1c28
Binary files /dev/null and b/docs/harbor-doc-reorg/img/demos/vul_scan.png differ
diff --git a/docs/harbor-doc-reorg/img/dianrong.png b/docs/harbor-doc-reorg/img/dianrong.png
new file mode 100644
index 000000000..a7a8cd85c
Binary files /dev/null and b/docs/harbor-doc-reorg/img/dianrong.png differ
diff --git a/docs/harbor-doc-reorg/img/download_harbor_certs.png b/docs/harbor-doc-reorg/img/download_harbor_certs.png
new file mode 100644
index 000000000..22d89b9c7
Binary files /dev/null and b/docs/harbor-doc-reorg/img/download_harbor_certs.png differ
diff --git a/docs/harbor-doc-reorg/img/edit_description.png b/docs/harbor-doc-reorg/img/edit_description.png
new file mode 100644
index 000000000..bf27994a9
Binary files /dev/null and b/docs/harbor-doc-reorg/img/edit_description.png differ
diff --git a/docs/harbor-doc-reorg/img/filter_images_by_label.png b/docs/harbor-doc-reorg/img/filter_images_by_label.png
new file mode 100644
index 000000000..556505ed5
Binary files /dev/null and b/docs/harbor-doc-reorg/img/filter_images_by_label.png differ
diff --git a/docs/harbor-doc-reorg/img/gc_details.png b/docs/harbor-doc-reorg/img/gc_details.png
new file mode 100644
index 000000000..d1c31e007
Binary files /dev/null and b/docs/harbor-doc-reorg/img/gc_details.png differ
diff --git a/docs/harbor-doc-reorg/img/gc_history.png b/docs/harbor-doc-reorg/img/gc_history.png
new file mode 100644
index 000000000..cfb2e9e12
Binary files /dev/null and b/docs/harbor-doc-reorg/img/gc_history.png differ
diff --git a/docs/harbor-doc-reorg/img/gc_now.png b/docs/harbor-doc-reorg/img/gc_now.png
new file mode 100644
index 000000000..4c046e23f
Binary files /dev/null and b/docs/harbor-doc-reorg/img/gc_now.png differ
diff --git a/docs/harbor-doc-reorg/img/gc_now2.png b/docs/harbor-doc-reorg/img/gc_now2.png
new file mode 100644
index 000000000..b507cb94e
Binary files /dev/null and b/docs/harbor-doc-reorg/img/gc_now2.png differ
diff --git a/docs/harbor-doc-reorg/img/gc_policy.png b/docs/harbor-doc-reorg/img/gc_policy.png
new file mode 100644
index 000000000..cfb2e9e12
Binary files /dev/null and b/docs/harbor-doc-reorg/img/gc_policy.png differ
diff --git a/docs/harbor-doc-reorg/img/group/ldap_group_addgroup.png b/docs/harbor-doc-reorg/img/group/ldap_group_addgroup.png
new file mode 100644
index 000000000..3c5f27487
Binary files /dev/null and b/docs/harbor-doc-reorg/img/group/ldap_group_addgroup.png differ
diff --git a/docs/harbor-doc-reorg/img/group/ldap_group_addgroup_dialog.png b/docs/harbor-doc-reorg/img/group/ldap_group_addgroup_dialog.png
new file mode 100644
index 000000000..fe552dad4
Binary files /dev/null and b/docs/harbor-doc-reorg/img/group/ldap_group_addgroup_dialog.png differ
diff --git a/docs/harbor-doc-reorg/img/group/ldap_group_config.png b/docs/harbor-doc-reorg/img/group/ldap_group_config.png
new file mode 100644
index 000000000..89bdd6623
Binary files /dev/null and b/docs/harbor-doc-reorg/img/group/ldap_group_config.png differ
diff --git a/docs/harbor-doc-reorg/img/ha/Architecture.png b/docs/harbor-doc-reorg/img/ha/Architecture.png
new file mode 100644
index 000000000..8e4e3f184
Binary files /dev/null and b/docs/harbor-doc-reorg/img/ha/Architecture.png differ
diff --git a/docs/harbor-doc-reorg/img/ha/LabInstallation.png b/docs/harbor-doc-reorg/img/ha/LabInstallation.png
new file mode 100644
index 000000000..16c200849
Binary files /dev/null and b/docs/harbor-doc-reorg/img/ha/LabInstallation.png differ
diff --git a/docs/harbor-doc-reorg/img/harbor-arch.png b/docs/harbor-doc-reorg/img/harbor-arch.png
new file mode 100644
index 000000000..4e19dd272
Binary files /dev/null and b/docs/harbor-doc-reorg/img/harbor-arch.png differ
diff --git a/docs/harbor-doc-reorg/img/harbor_logo.png b/docs/harbor-doc-reorg/img/harbor_logo.png
new file mode 100644
index 000000000..57408660e
Binary files /dev/null and b/docs/harbor-doc-reorg/img/harbor_logo.png differ
diff --git a/docs/harbor-doc-reorg/img/hydsoft.png b/docs/harbor-doc-reorg/img/hydsoft.png
new file mode 100644
index 000000000..0a694fa67
Binary files /dev/null and b/docs/harbor-doc-reorg/img/hydsoft.png differ
diff --git a/docs/harbor-doc-reorg/img/ifre.png b/docs/harbor-doc-reorg/img/ifre.png
new file mode 100644
index 000000000..de0d4cbea
Binary files /dev/null and b/docs/harbor-doc-reorg/img/ifre.png differ
diff --git a/docs/harbor-doc-reorg/img/jd.png b/docs/harbor-doc-reorg/img/jd.png
new file mode 100644
index 000000000..d21d155e0
Binary files /dev/null and b/docs/harbor-doc-reorg/img/jd.png differ
diff --git a/docs/harbor-doc-reorg/img/jobservice/js-arch.png b/docs/harbor-doc-reorg/img/jobservice/js-arch.png
new file mode 100644
index 000000000..e56259118
Binary files /dev/null and b/docs/harbor-doc-reorg/img/jobservice/js-arch.png differ
diff --git a/docs/harbor-doc-reorg/img/jobservice/js-deploy.png b/docs/harbor-doc-reorg/img/jobservice/js-deploy.png
new file mode 100644
index 000000000..9602a5473
Binary files /dev/null and b/docs/harbor-doc-reorg/img/jobservice/js-deploy.png differ
diff --git a/docs/harbor-doc-reorg/img/ldap_auth.png b/docs/harbor-doc-reorg/img/ldap_auth.png
new file mode 100644
index 000000000..fb4a1a845
Binary files /dev/null and b/docs/harbor-doc-reorg/img/ldap_auth.png differ
diff --git a/docs/harbor-doc-reorg/img/list_stop_executions.png b/docs/harbor-doc-reorg/img/list_stop_executions.png
new file mode 100644
index 000000000..6ef1200e0
Binary files /dev/null and b/docs/harbor-doc-reorg/img/list_stop_executions.png differ
diff --git a/docs/harbor-doc-reorg/img/list_tasks.png b/docs/harbor-doc-reorg/img/list_tasks.png
new file mode 100644
index 000000000..3efc09042
Binary files /dev/null and b/docs/harbor-doc-reorg/img/list_tasks.png differ
diff --git a/docs/harbor-doc-reorg/img/log_search_advanced.png b/docs/harbor-doc-reorg/img/log_search_advanced.png
new file mode 100644
index 000000000..ddc76f1cc
Binary files /dev/null and b/docs/harbor-doc-reorg/img/log_search_advanced.png differ
diff --git a/docs/harbor-doc-reorg/img/log_viewer.png b/docs/harbor-doc-reorg/img/log_viewer.png
new file mode 100644
index 000000000..91ec502c3
Binary files /dev/null and b/docs/harbor-doc-reorg/img/log_viewer.png differ
diff --git a/docs/harbor-doc-reorg/img/manage_global_level_labels.png b/docs/harbor-doc-reorg/img/manage_global_level_labels.png
new file mode 100644
index 000000000..4c8fa87ba
Binary files /dev/null and b/docs/harbor-doc-reorg/img/manage_global_level_labels.png differ
diff --git a/docs/harbor-doc-reorg/img/manage_project_level_labels.png b/docs/harbor-doc-reorg/img/manage_project_level_labels.png
new file mode 100644
index 000000000..94b8ec63e
Binary files /dev/null and b/docs/harbor-doc-reorg/img/manage_project_level_labels.png differ
diff --git a/docs/harbor-doc-reorg/img/manage_registry.png b/docs/harbor-doc-reorg/img/manage_registry.png
new file mode 100644
index 000000000..cc369b003
Binary files /dev/null and b/docs/harbor-doc-reorg/img/manage_registry.png differ
diff --git a/docs/harbor-doc-reorg/img/manage_replication.png b/docs/harbor-doc-reorg/img/manage_replication.png
new file mode 100644
index 000000000..918708941
Binary files /dev/null and b/docs/harbor-doc-reorg/img/manage_replication.png differ
diff --git a/docs/harbor-doc-reorg/img/new_add_member.png b/docs/harbor-doc-reorg/img/new_add_member.png
new file mode 100644
index 000000000..c28463692
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_add_member.png differ
diff --git a/docs/harbor-doc-reorg/img/new_auth.png b/docs/harbor-doc-reorg/img/new_auth.png
new file mode 100644
index 000000000..76bcf438e
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_auth.png differ
diff --git a/docs/harbor-doc-reorg/img/new_browse_project.png b/docs/harbor-doc-reorg/img/new_browse_project.png
new file mode 100644
index 000000000..71d55866b
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_browse_project.png differ
diff --git a/docs/harbor-doc-reorg/img/new_config_email.png b/docs/harbor-doc-reorg/img/new_config_email.png
new file mode 100644
index 000000000..35237912c
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_config_email.png differ
diff --git a/docs/harbor-doc-reorg/img/new_config_token.png b/docs/harbor-doc-reorg/img/new_config_token.png
new file mode 100644
index 000000000..f8e2343bc
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_config_token.png differ
diff --git a/docs/harbor-doc-reorg/img/new_create_policy.png b/docs/harbor-doc-reorg/img/new_create_policy.png
new file mode 100644
index 000000000..28c0f5479
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_create_policy.png differ
diff --git a/docs/harbor-doc-reorg/img/new_create_project.png b/docs/harbor-doc-reorg/img/new_create_project.png
new file mode 100644
index 000000000..352d5f556
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_create_project.png differ
diff --git a/docs/harbor-doc-reorg/img/new_create_rule.png b/docs/harbor-doc-reorg/img/new_create_rule.png
new file mode 100644
index 000000000..125d26c5f
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_create_rule.png differ
diff --git a/docs/harbor-doc-reorg/img/new_delete_repo.png b/docs/harbor-doc-reorg/img/new_delete_repo.png
new file mode 100644
index 000000000..05450b8e4
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_delete_repo.png differ
diff --git a/docs/harbor-doc-reorg/img/new_delete_repository.png b/docs/harbor-doc-reorg/img/new_delete_repository.png
new file mode 100644
index 000000000..a9d2a9228
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_delete_repository.png differ
diff --git a/docs/harbor-doc-reorg/img/new_delete_tag.png b/docs/harbor-doc-reorg/img/new_delete_tag.png
new file mode 100644
index 000000000..ac4d6dc60
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_delete_tag.png differ
diff --git a/docs/harbor-doc-reorg/img/new_manage_destination.png b/docs/harbor-doc-reorg/img/new_manage_destination.png
new file mode 100644
index 000000000..4846dbf42
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_manage_destination.png differ
diff --git a/docs/harbor-doc-reorg/img/new_manage_endpoint.png b/docs/harbor-doc-reorg/img/new_manage_endpoint.png
new file mode 100644
index 000000000..d344e6d31
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_manage_endpoint.png differ
diff --git a/docs/harbor-doc-reorg/img/new_manage_replication.png b/docs/harbor-doc-reorg/img/new_manage_replication.png
new file mode 100644
index 000000000..fd782bb46
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_manage_replication.png differ
diff --git a/docs/harbor-doc-reorg/img/new_policy_list.png b/docs/harbor-doc-reorg/img/new_policy_list.png
new file mode 100644
index 000000000..c8979d938
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_policy_list.png differ
diff --git a/docs/harbor-doc-reorg/img/new_proj_create.png b/docs/harbor-doc-reorg/img/new_proj_create.png
new file mode 100644
index 000000000..fbe3f72ab
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_proj_create.png differ
diff --git a/docs/harbor-doc-reorg/img/new_project_log.png b/docs/harbor-doc-reorg/img/new_project_log.png
new file mode 100644
index 000000000..11a41a84b
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_project_log.png differ
diff --git a/docs/harbor-doc-reorg/img/new_remote_cert.png b/docs/harbor-doc-reorg/img/new_remote_cert.png
new file mode 100644
index 000000000..c475b6a80
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_remote_cert.png differ
diff --git a/docs/harbor-doc-reorg/img/new_remove_update_member.png b/docs/harbor-doc-reorg/img/new_remove_update_member.png
new file mode 100644
index 000000000..f7a599ed2
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_remove_update_member.png differ
diff --git a/docs/harbor-doc-reorg/img/new_rule_list.png b/docs/harbor-doc-reorg/img/new_rule_list.png
new file mode 100644
index 000000000..b734eec46
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_rule_list.png differ
diff --git a/docs/harbor-doc-reorg/img/new_search.png b/docs/harbor-doc-reorg/img/new_search.png
new file mode 100644
index 000000000..b5d362fa4
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_search.png differ
diff --git a/docs/harbor-doc-reorg/img/new_self_reg.png b/docs/harbor-doc-reorg/img/new_self_reg.png
new file mode 100644
index 000000000..36e38107e
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_self_reg.png differ
diff --git a/docs/harbor-doc-reorg/img/new_set_admin_remove_user.png b/docs/harbor-doc-reorg/img/new_set_admin_remove_user.png
new file mode 100644
index 000000000..8b5c2c35c
Binary files /dev/null and b/docs/harbor-doc-reorg/img/new_set_admin_remove_user.png differ
diff --git a/docs/harbor-doc-reorg/img/oidc_auth_setting.png b/docs/harbor-doc-reorg/img/oidc_auth_setting.png
new file mode 100644
index 000000000..1e4eb54b0
Binary files /dev/null and b/docs/harbor-doc-reorg/img/oidc_auth_setting.png differ
diff --git a/docs/harbor-doc-reorg/img/oidc_login.png b/docs/harbor-doc-reorg/img/oidc_login.png
new file mode 100644
index 000000000..1bf77656a
Binary files /dev/null and b/docs/harbor-doc-reorg/img/oidc_login.png differ
diff --git a/docs/harbor-doc-reorg/img/oidc_onboard_dlg.png b/docs/harbor-doc-reorg/img/oidc_onboard_dlg.png
new file mode 100644
index 000000000..6537ec0ae
Binary files /dev/null and b/docs/harbor-doc-reorg/img/oidc_onboard_dlg.png differ
diff --git a/docs/harbor-doc-reorg/img/openedutainment.png b/docs/harbor-doc-reorg/img/openedutainment.png
new file mode 100644
index 000000000..45def4daa
Binary files /dev/null and b/docs/harbor-doc-reorg/img/openedutainment.png differ
diff --git a/docs/harbor-doc-reorg/img/pivotal.png b/docs/harbor-doc-reorg/img/pivotal.png
new file mode 100644
index 000000000..7b5a47ec0
Binary files /dev/null and b/docs/harbor-doc-reorg/img/pivotal.png differ
diff --git a/docs/harbor-doc-reorg/img/profile_dlg.png b/docs/harbor-doc-reorg/img/profile_dlg.png
new file mode 100644
index 000000000..dc4408907
Binary files /dev/null and b/docs/harbor-doc-reorg/img/profile_dlg.png differ
diff --git a/docs/harbor-doc-reorg/img/project-quota1.png b/docs/harbor-doc-reorg/img/project-quota1.png
new file mode 100644
index 000000000..d0a9903dc
Binary files /dev/null and b/docs/harbor-doc-reorg/img/project-quota1.png differ
diff --git a/docs/harbor-doc-reorg/img/project-quota2.png b/docs/harbor-doc-reorg/img/project-quota2.png
new file mode 100644
index 000000000..af89b7f4f
Binary files /dev/null and b/docs/harbor-doc-reorg/img/project-quota2.png differ
diff --git a/docs/harbor-doc-reorg/img/project-quota3.png b/docs/harbor-doc-reorg/img/project-quota3.png
new file mode 100644
index 000000000..d9a6cafd3
Binary files /dev/null and b/docs/harbor-doc-reorg/img/project-quota3.png differ
diff --git a/docs/harbor-doc-reorg/img/project-quota4.png b/docs/harbor-doc-reorg/img/project-quota4.png
new file mode 100644
index 000000000..44abc5c7d
Binary files /dev/null and b/docs/harbor-doc-reorg/img/project-quota4.png differ
diff --git a/docs/harbor-doc-reorg/img/project-quota5.png b/docs/harbor-doc-reorg/img/project-quota5.png
new file mode 100644
index 000000000..598cc42c2
Binary files /dev/null and b/docs/harbor-doc-reorg/img/project-quota5.png differ
diff --git a/docs/harbor-doc-reorg/img/project_configuration.png b/docs/harbor-doc-reorg/img/project_configuration.png
new file mode 100644
index 000000000..c4e5d572e
Binary files /dev/null and b/docs/harbor-doc-reorg/img/project_configuration.png differ
diff --git a/docs/harbor-doc-reorg/img/project_log.png b/docs/harbor-doc-reorg/img/project_log.png
new file mode 100644
index 000000000..8e559fd83
Binary files /dev/null and b/docs/harbor-doc-reorg/img/project_log.png differ
diff --git a/docs/harbor-doc-reorg/img/rancher.png b/docs/harbor-doc-reorg/img/rancher.png
new file mode 100644
index 000000000..99d095776
Binary files /dev/null and b/docs/harbor-doc-reorg/img/rancher.png differ
diff --git a/docs/harbor-doc-reorg/img/rbac.png b/docs/harbor-doc-reorg/img/rbac.png
new file mode 100644
index 000000000..17b1c080c
Binary files /dev/null and b/docs/harbor-doc-reorg/img/rbac.png differ
diff --git a/docs/harbor-doc-reorg/img/read_only.png b/docs/harbor-doc-reorg/img/read_only.png
new file mode 100644
index 000000000..ce48fec29
Binary files /dev/null and b/docs/harbor-doc-reorg/img/read_only.png differ
diff --git a/docs/harbor-doc-reorg/img/read_only_enable.png b/docs/harbor-doc-reorg/img/read_only_enable.png
new file mode 100644
index 000000000..29ad806d1
Binary files /dev/null and b/docs/harbor-doc-reorg/img/read_only_enable.png differ
diff --git a/docs/harbor-doc-reorg/img/read_ony_enable.png b/docs/harbor-doc-reorg/img/read_ony_enable.png
new file mode 100644
index 000000000..9e7c88a40
Binary files /dev/null and b/docs/harbor-doc-reorg/img/read_ony_enable.png differ
diff --git a/docs/harbor-doc-reorg/img/remove_update_member.png b/docs/harbor-doc-reorg/img/remove_update_member.png
new file mode 100644
index 000000000..a3375a6e4
Binary files /dev/null and b/docs/harbor-doc-reorg/img/remove_update_member.png differ
diff --git a/docs/harbor-doc-reorg/img/renderedSwagger.png b/docs/harbor-doc-reorg/img/renderedSwagger.png
new file mode 100644
index 000000000..d61cf140f
Binary files /dev/null and b/docs/harbor-doc-reorg/img/renderedSwagger.png differ
diff --git a/docs/harbor-doc-reorg/img/replication-endpoint1.png b/docs/harbor-doc-reorg/img/replication-endpoint1.png
new file mode 100644
index 000000000..5219658a3
Binary files /dev/null and b/docs/harbor-doc-reorg/img/replication-endpoint1.png differ
diff --git a/docs/harbor-doc-reorg/img/replication-endpoint2.png b/docs/harbor-doc-reorg/img/replication-endpoint2.png
new file mode 100644
index 000000000..55458d59a
Binary files /dev/null and b/docs/harbor-doc-reorg/img/replication-endpoint2.png differ
diff --git a/docs/harbor-doc-reorg/img/retag_image.png b/docs/harbor-doc-reorg/img/retag_image.png
new file mode 100644
index 000000000..08c705f46
Binary files /dev/null and b/docs/harbor-doc-reorg/img/retag_image.png differ
diff --git a/docs/harbor-doc-reorg/img/robotaccount/add_robot_account.png b/docs/harbor-doc-reorg/img/robotaccount/add_robot_account.png
new file mode 100644
index 000000000..316f94bc6
Binary files /dev/null and b/docs/harbor-doc-reorg/img/robotaccount/add_robot_account.png differ
diff --git a/docs/harbor-doc-reorg/img/robotaccount/add_robot_account_2.png b/docs/harbor-doc-reorg/img/robotaccount/add_robot_account_2.png
new file mode 100644
index 000000000..951046edf
Binary files /dev/null and b/docs/harbor-doc-reorg/img/robotaccount/add_robot_account_2.png differ
diff --git a/docs/harbor-doc-reorg/img/robotaccount/copy_robot_account_token.png b/docs/harbor-doc-reorg/img/robotaccount/copy_robot_account_token.png
new file mode 100644
index 000000000..b7c4bdf04
Binary files /dev/null and b/docs/harbor-doc-reorg/img/robotaccount/copy_robot_account_token.png differ
diff --git a/docs/harbor-doc-reorg/img/robotaccount/disable_delete_robot_account.png b/docs/harbor-doc-reorg/img/robotaccount/disable_delete_robot_account.png
new file mode 100644
index 000000000..d387a6559
Binary files /dev/null and b/docs/harbor-doc-reorg/img/robotaccount/disable_delete_robot_account.png differ
diff --git a/docs/harbor-doc-reorg/img/robotaccount/set_robot_account_token_duration.png b/docs/harbor-doc-reorg/img/robotaccount/set_robot_account_token_duration.png
new file mode 100644
index 000000000..e82c15fd1
Binary files /dev/null and b/docs/harbor-doc-reorg/img/robotaccount/set_robot_account_token_duration.png differ
diff --git a/docs/harbor-doc-reorg/img/rule_under_project_view.png b/docs/harbor-doc-reorg/img/rule_under_project_view.png
new file mode 100644
index 000000000..e626ced07
Binary files /dev/null and b/docs/harbor-doc-reorg/img/rule_under_project_view.png differ
diff --git a/docs/harbor-doc-reorg/img/scan_all.png b/docs/harbor-doc-reorg/img/scan_all.png
new file mode 100644
index 000000000..270324961
Binary files /dev/null and b/docs/harbor-doc-reorg/img/scan_all.png differ
diff --git a/docs/harbor-doc-reorg/img/scan_all2.png b/docs/harbor-doc-reorg/img/scan_all2.png
new file mode 100644
index 000000000..2dd35912d
Binary files /dev/null and b/docs/harbor-doc-reorg/img/scan_all2.png differ
diff --git a/docs/harbor-doc-reorg/img/scan_image.png b/docs/harbor-doc-reorg/img/scan_image.png
new file mode 100644
index 000000000..32b91cbed
Binary files /dev/null and b/docs/harbor-doc-reorg/img/scan_image.png differ
diff --git a/docs/harbor-doc-reorg/img/scan_policy.png b/docs/harbor-doc-reorg/img/scan_policy.png
new file mode 100644
index 000000000..39ef71086
Binary files /dev/null and b/docs/harbor-doc-reorg/img/scan_policy.png differ
diff --git a/docs/harbor-doc-reorg/img/search.png b/docs/harbor-doc-reorg/img/search.png
new file mode 100644
index 000000000..98ac16991
Binary files /dev/null and b/docs/harbor-doc-reorg/img/search.png differ
diff --git a/docs/harbor-doc-reorg/img/set_admin_remove_user.png b/docs/harbor-doc-reorg/img/set_admin_remove_user.png
new file mode 100644
index 000000000..c8f752d15
Binary files /dev/null and b/docs/harbor-doc-reorg/img/set_admin_remove_user.png differ
diff --git a/docs/harbor-doc-reorg/img/slamtec.png b/docs/harbor-doc-reorg/img/slamtec.png
new file mode 100644
index 000000000..df3a46427
Binary files /dev/null and b/docs/harbor-doc-reorg/img/slamtec.png differ
diff --git a/docs/harbor-doc-reorg/img/slamteclogo.png b/docs/harbor-doc-reorg/img/slamteclogo.png
new file mode 100644
index 000000000..4ed39f5cf
Binary files /dev/null and b/docs/harbor-doc-reorg/img/slamteclogo.png differ
diff --git a/docs/harbor-doc-reorg/img/start_replicate.png b/docs/harbor-doc-reorg/img/start_replicate.png
new file mode 100644
index 000000000..bc0ec3e4a
Binary files /dev/null and b/docs/harbor-doc-reorg/img/start_replicate.png differ
diff --git a/docs/harbor-doc-reorg/img/summary_tooltip.png b/docs/harbor-doc-reorg/img/summary_tooltip.png
new file mode 100644
index 000000000..7601efb80
Binary files /dev/null and b/docs/harbor-doc-reorg/img/summary_tooltip.png differ
diff --git a/docs/harbor-doc-reorg/img/swaggerEditor.png b/docs/harbor-doc-reorg/img/swaggerEditor.png
new file mode 100644
index 000000000..e08f991ee
Binary files /dev/null and b/docs/harbor-doc-reorg/img/swaggerEditor.png differ
diff --git a/docs/harbor-doc-reorg/img/tag-retention1.png b/docs/harbor-doc-reorg/img/tag-retention1.png
new file mode 100644
index 000000000..9990d7a30
Binary files /dev/null and b/docs/harbor-doc-reorg/img/tag-retention1.png differ
diff --git a/docs/harbor-doc-reorg/img/tag-retention2.png b/docs/harbor-doc-reorg/img/tag-retention2.png
new file mode 100644
index 000000000..99368b576
Binary files /dev/null and b/docs/harbor-doc-reorg/img/tag-retention2.png differ
diff --git a/docs/harbor-doc-reorg/img/tag-retention3.png b/docs/harbor-doc-reorg/img/tag-retention3.png
new file mode 100644
index 000000000..7cd798d79
Binary files /dev/null and b/docs/harbor-doc-reorg/img/tag-retention3.png differ
diff --git a/docs/harbor-doc-reorg/img/tag-retention4.png b/docs/harbor-doc-reorg/img/tag-retention4.png
new file mode 100644
index 000000000..6f02f89ba
Binary files /dev/null and b/docs/harbor-doc-reorg/img/tag-retention4.png differ
diff --git a/docs/harbor-doc-reorg/img/tag-retention5.png b/docs/harbor-doc-reorg/img/tag-retention5.png
new file mode 100644
index 000000000..0b3f6f491
Binary files /dev/null and b/docs/harbor-doc-reorg/img/tag-retention5.png differ
diff --git a/docs/harbor-doc-reorg/img/tag_detail.png b/docs/harbor-doc-reorg/img/tag_detail.png
new file mode 100644
index 000000000..c9466d836
Binary files /dev/null and b/docs/harbor-doc-reorg/img/tag_detail.png differ
diff --git a/docs/harbor-doc-reorg/img/talkingdata.png b/docs/harbor-doc-reorg/img/talkingdata.png
new file mode 100644
index 000000000..c0b69622b
Binary files /dev/null and b/docs/harbor-doc-reorg/img/talkingdata.png differ
diff --git a/docs/harbor-doc-reorg/img/tenxcloud.png b/docs/harbor-doc-reorg/img/tenxcloud.png
new file mode 100644
index 000000000..8db40928b
Binary files /dev/null and b/docs/harbor-doc-reorg/img/tenxcloud.png differ
diff --git a/docs/harbor-doc-reorg/img/trendmicro.png b/docs/harbor-doc-reorg/img/trendmicro.png
new file mode 100644
index 000000000..589254d29
Binary files /dev/null and b/docs/harbor-doc-reorg/img/trendmicro.png differ
diff --git a/docs/harbor-doc-reorg/img/user_profile.png b/docs/harbor-doc-reorg/img/user_profile.png
new file mode 100644
index 000000000..38abeb5ab
Binary files /dev/null and b/docs/harbor-doc-reorg/img/user_profile.png differ
diff --git a/docs/harbor-doc-reorg/img/video.png b/docs/harbor-doc-reorg/img/video.png
new file mode 100644
index 000000000..d766cdb34
Binary files /dev/null and b/docs/harbor-doc-reorg/img/video.png differ
diff --git a/docs/harbor-doc-reorg/img/wangyi.png b/docs/harbor-doc-reorg/img/wangyi.png
new file mode 100644
index 000000000..13aad21b2
Binary files /dev/null and b/docs/harbor-doc-reorg/img/wangyi.png differ
diff --git a/docs/harbor-doc-reorg/img/webhooks1.png b/docs/harbor-doc-reorg/img/webhooks1.png
new file mode 100644
index 000000000..28bd516f7
Binary files /dev/null and b/docs/harbor-doc-reorg/img/webhooks1.png differ
diff --git a/docs/harbor-doc-reorg/img/webhooks2.png b/docs/harbor-doc-reorg/img/webhooks2.png
new file mode 100644
index 000000000..7c2498995
Binary files /dev/null and b/docs/harbor-doc-reorg/img/webhooks2.png differ
diff --git a/docs/harbor-doc-reorg/img/webhooks3.png b/docs/harbor-doc-reorg/img/webhooks3.png
new file mode 100644
index 000000000..76d0472cb
Binary files /dev/null and b/docs/harbor-doc-reorg/img/webhooks3.png differ
diff --git a/docs/harbor-doc-reorg/img/webhooks4.png b/docs/harbor-doc-reorg/img/webhooks4.png
new file mode 100644
index 000000000..790dab3ec
Binary files /dev/null and b/docs/harbor-doc-reorg/img/webhooks4.png differ
diff --git a/docs/harbor-doc-reorg/img/wise2c.png b/docs/harbor-doc-reorg/img/wise2c.png
new file mode 100644
index 000000000..eca8db2cb
Binary files /dev/null and b/docs/harbor-doc-reorg/img/wise2c.png differ
diff --git a/docs/harbor-doc-reorg/img/workflow.png b/docs/harbor-doc-reorg/img/workflow.png
new file mode 100644
index 000000000..851332536
Binary files /dev/null and b/docs/harbor-doc-reorg/img/workflow.png differ
diff --git a/docs/harbor-doc-reorg/install_config/_index.md b/docs/harbor-doc-reorg/install_config/_index.md
index 5ee72de89..be066910d 100644
--- a/docs/harbor-doc-reorg/install_config/_index.md
+++ b/docs/harbor-doc-reorg/install_config/_index.md
@@ -2,5 +2,5 @@
 
 This document describes how to install Harbor, and how to perform initial configuration.
 
-- [Installing Harbor](install_config/installation/_index.md)
-- [Configuring Harbor](install_config/configuration/_index.md)
\ No newline at end of file
+- [Installing Harbor](installation/_index.md)
+- [Configuring Harbor](configuration/_index.md)
\ No newline at end of file
diff --git a/docs/harbor-doc-reorg/install_config/configuration/_index.md b/docs/harbor-doc-reorg/install_config/configuration/_index.md
index 7bc335e61..1db5dcf9b 100644
--- a/docs/harbor-doc-reorg/install_config/configuration/_index.md
+++ b/docs/harbor-doc-reorg/install_config/configuration/_index.md
@@ -4,4 +4,5 @@ After you have deployed Harbor, you can perform certain post-deployment configur
 
 - [Reconfigure Harbor and Manage the Harbor Lifecycle](reconfigure_manage_lifecycle.md)
 - [Configure HTTPS Access to Harbor](configure_https.md)
+- [Customize the Harbor Token Service](customize_token_service.md)
 - [Access Harbor Logs](access_logs.md)
diff --git a/docs/harbor-doc-reorg/install_config/configuration/customize_token_service.md b/docs/harbor-doc-reorg/install_config/configuration/customize_token_service.md
index 6d3400bc9..6afa5e127 100644
--- a/docs/harbor-doc-reorg/install_config/configuration/customize_token_service.md
+++ b/docs/harbor-doc-reorg/install_config/configuration/customize_token_service.md
@@ -1,4 +1,4 @@
-# Customize Harbor token service with your key and certificate
+# Customize the Harbor Token Service
 
 Harbor requires Docker client to access the Harbor registry with a token. The procedure to generate a token is like [Docker Registry v2 authentication](https://github.com/docker/distribution/blob/master/docs/spec/auth/token.md). Firstly, you should make a request to the token service for a token. The token is signed by the private key. After that, you make a new request with the token to the Harbor registry, Harbor registry will verify the token with the public key in the rootcert bundle. Then Harbor registry will authorize the Docker client to push/pull images.
 
diff --git a/docs/harbor-doc-reorg/install_config/upgrade/upgradetest.md b/docs/harbor-doc-reorg/install_config/upgrade/upgradetest.md
deleted file mode 100644
index 5a6e0175b..000000000
--- a/docs/harbor-doc-reorg/install_config/upgrade/upgradetest.md
+++ /dev/null
@@ -1,44 +0,0 @@
-This guide is for Harbor upgrade test  
-=======
-
-# Before upgrade
-
-## Prepare data  
-1. Add user usera userb userc userd usere, set usera userb as system admin.  
-2. Create project projecta projectc as private, create projectb as public.  
-3. Add usera as projecta's admin, userc as developer, and userd as guest. Do the same to projectb and projectc.  
-4. Login harbor as usera, push an unsigned image into projecta, then push a signed image to projecta. 
-5. Login harbor as userc, push an unsigned image into projecta, then push a signed image to projeca.
-6. Login harbor as userd, push each image one time.   
-7. Repeat 4 5 6 to projectb and projectc.
-8. Add one endpoint to harbor.  
-9. Add an immediate replication rule to projeca, a schedule rule to projectb, a manual rule to projectc, trigger each rule one time.  
-10. Add 5 system label syslabel1 to syslabel5 and tag syslabel1 and syslabel2 to all unsigned image.    
-11. In each project add 5 project label projlabela to projlabele, add projlabela projlabelb and projlabelc to signed image. 
-12. Trigger one scan all job to scan all images.(For clair enabled instance)  
-13. Update project publicly, content trust, severity and scanning settings.
-14. Update Harbor email, token expire read only and scan settings.  
-15. Update repository info.   
-**NOTE**: Create user step is not needed if auth mode is LDAP.  
-
-# Upgrade
-
-## Follow the upgrade guide  
-1. Run db migrator image to backup database.
-2. Run db migrator image to migrate database.
-3. Install new version harbor.
-
-# After upgrade  
-  
-1. Confirm users are exist and available(No need for VIC and LDAP Mode).  
-2. Confirm users have the correct role.  
-3. Confirm labels are existing and labeled correct.(No need for VIC)  
-4. Confirm notary signature correct.  
-5. Confirm endpoint exist.  
-6. Confirm replication rule exist and works well.  
-7. Confirm project level settings(publicly, content trust, scan) same as before.  
-8. Confirm system level settings(email token expire scan) same as before.  
-9. Confirm scan result the same as before upgrade.  
-10. Confirm access log the same as before upgrade.  
-11. Confirm repository info the same as before.  
-12. Confirm other image metadata(e.g. author, size) the same as before.