diff --git a/docs/harbor-doc-reorg/_index.md b/docs/harbor-doc-reorg/_index.md
index 9b9fb85b3..ee17b6d61 100644
--- a/docs/harbor-doc-reorg/_index.md
+++ b/docs/harbor-doc-reorg/_index.md
@@ -7,6 +7,7 @@ This is the main table of contents for the Harbor documentation.
 This section describes how to install Harbor and perform the required initial configurations. These day 1 operations are performed by the Harbor Administrator.
 
 - [Installing Harbor](install_config/installation/_index.md)
+  - [Test Harbor with the Demo Server](install_config/installation/demo_server.md)
   - [Harbor Installation Prerequisites](install_config/installation/installation_prereqs.md)
   - [Download the Harbor Installer](install_config/installation/download_installer.md)
   - [Configure the Harbor YML File](install_config/installation/configure_yml_file.md)
@@ -17,8 +18,6 @@ This section describes how to install Harbor and perform the required initial co
   - [Configure HTTPS Access to Harbor](install_config/configuration/configure_https.md)
   - [Customize the Harbor Token Service](install_config/configuration/customize_token_service.md)
   - [Configure Notary Content Trust](install_config/configuration/configure_notary_content_trust.md)
-  - [Reconfigure Harbor and Manage the Harbor Lifecycle](install_config/configuration/reconfigure_manage_lifecycle.md)
-  - [Access Harbor Logs](install_config/configuration/access_logs.md)
 - [Initial Configuration in the Harbor UI](install_config/configuration/initial_config_ui.md)
   - [Configure Authentication](configure_authentication.md)
   - [Other General Settings](general_settings.md)
@@ -49,6 +48,9 @@ This section describes how to use and maintain Harbor after deployment. These da
 - [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)
+- [Manage the Harbor Instance](administration/manage_harbor/_index.md)
+  - [Reconfigure Harbor and Manage the Harbor Lifecycle](administration/manage_harbor/reconfigure_manage_lifecycle.md)
+  - [Access Harbor Logs](administration/manage_harbor/access_logs.md)
 
 ## Working with Harbor Projects
 
diff --git a/docs/harbor-doc-reorg/administration/_index.md b/docs/harbor-doc-reorg/administration/_index.md
index 6d3f1947e..e87ec7599 100644
--- a/docs/harbor-doc-reorg/administration/_index.md
+++ b/docs/harbor-doc-reorg/administration/_index.md
@@ -5,4 +5,5 @@
 - [Configuring Replication](configuring_replication/_index.md)
 - [Vulnerability Scanning with Clair](vulnerability_scanning/_index.md)
 - [Garbage Collection](garbage_collection/_index.md)
-- [Upgrading Harbor](upgrade/_index.md)
\ No newline at end of file
+- [Upgrading Harbor](upgrade/_index.md)
+- [Manage the Harbor Instance](manage_harbor/_index.md)
\ No newline at end of file
diff --git a/docs/harbor-doc-reorg/administration/manage_harbor/_index.md b/docs/harbor-doc-reorg/administration/manage_harbor/_index.md
new file mode 100644
index 000000000..851b48542
--- /dev/null
+++ b/docs/harbor-doc-reorg/administration/manage_harbor/_index.md
@@ -0,0 +1,4 @@
+# Manage the Harbor Instance
+
+- [Reconfigure Harbor and Manage the Harbor Lifecycle](reconfigure_manage_lifecycle.md)
+- [Access Harbor Logs](access_logs.md)
diff --git a/docs/harbor-doc-reorg/install_config/configuration/access_logs.md b/docs/harbor-doc-reorg/administration/manage_harbor/access_logs.md
similarity index 100%
rename from docs/harbor-doc-reorg/install_config/configuration/access_logs.md
rename to docs/harbor-doc-reorg/administration/manage_harbor/access_logs.md
diff --git a/docs/harbor-doc-reorg/install_config/configuration/reconfigure_manage_lifecycle.md b/docs/harbor-doc-reorg/administration/manage_harbor/reconfigure_manage_lifecycle.md
similarity index 100%
rename from docs/harbor-doc-reorg/install_config/configuration/reconfigure_manage_lifecycle.md
rename to docs/harbor-doc-reorg/administration/manage_harbor/reconfigure_manage_lifecycle.md
diff --git a/docs/harbor-doc-reorg/install_config/demo_server.md b/docs/harbor-doc-reorg/install_config/installation/demo_server.md
similarity index 79%
rename from docs/harbor-doc-reorg/install_config/demo_server.md
rename to docs/harbor-doc-reorg/install_config/installation/demo_server.md
index e15facdd3..d7727d7fe 100644
--- a/docs/harbor-doc-reorg/install_config/demo_server.md
+++ b/docs/harbor-doc-reorg/install_config/installation/demo_server.md
@@ -1,8 +1,9 @@
-# Demo Server Guide
+# Test Harbor with the Demo Server
 
 **Important!** 
- - Please note that this demo server is **ONLY** for your trial of Harbor functionalities. 
+ - Please note that this demo server is **ONLY** for experimenting with functionality. 
  - Please **DO NOT** upload any sensitive images to this server. 
+ - This is **NOT** a production environment and we are not responsible for any loss of data, functionality, or service.
  - We will **CLEAN AND RESET** the server every **TWO Days**.
  - You can only experience the non-admin functionalities on this server. Please follow the **[Installation Guide](installation_guide.md)** to set up a Harbor server to try more advanced features.
  - Please do not push large images(>100MB) as the server has limited storage.