diff --git a/docs/docs/developers/testing.md b/docs/docs/developers/testing.md
index 7ab0a9c40..1071a7562 100644
--- a/docs/docs/developers/testing.md
+++ b/docs/docs/developers/testing.md
@@ -30,7 +30,7 @@
 
 - Set M365 Credentials environment variables
 
-    > You can find more information on how to get these values in [configuration docs](/configuration/m365_access).
+    > You can find more information on how to get these values in our [M365 docs](/setup/m365_access).
 
     ```bash
     export AZURE_CLIENT_ID=<id>
diff --git a/docs/docs/intro.md b/docs/docs/intro.md
index f33e592d9..ed9e27a20 100644
--- a/docs/docs/intro.md
+++ b/docs/docs/intro.md
@@ -12,5 +12,5 @@ beyond M365, will expand based on the interest and needs of the community.
 
 ## Getting started
 
-Follow the instructions in the [Running Corso](/running) and [Initial Configuration](/configuration/concepts) sections to
-setup Corso and get it ready for first use. You can then go through the [Tutorial](/tutorial) section to see it in action.
+Follow the instructions in the [Initial Setup](/setup/concepts) section to setup Corso and get it ready for first use.
+You can then go through the [Tutorial](/tutorial) section to see it in action.
diff --git a/docs/docs/configuration/concepts.md b/docs/docs/setup/concepts.md
similarity index 94%
rename from docs/docs/configuration/concepts.md
rename to docs/docs/setup/concepts.md
index 5bb55432c..ff4bb2dd2 100644
--- a/docs/docs/configuration/concepts.md
+++ b/docs/docs/setup/concepts.md
@@ -21,7 +21,7 @@ application to connect to your *M365 tenant* and transfer data during backup and
 ## Corso concepts {#corso-concepts}
 
 * **Repository** refers to the storage location where Corso securely and efficiently stores encrypted *backups* of your
-*M365 Services* data. See [Repositories](/configuration/repos) for more information.
+*M365 Services* data. See [Repositories](/setup/repos) for more information.
 
 * **Backup** is a copy of your *M365 Services* data to be used for restores in case of deletion, loss, or corruption of the
 original data. Corso performs backups incrementally, and each backup only captures data that has changed between backup iterations.
diff --git a/docs/docs/running.md b/docs/docs/setup/configuration.md
similarity index 97%
rename from docs/docs/running.md
rename to docs/docs/setup/configuration.md
index 2ad9557a6..b79b3c2b5 100644
--- a/docs/docs/running.md
+++ b/docs/docs/setup/configuration.md
@@ -1,4 +1,4 @@
-# Running Corso
+# Configuring Corso
 
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
@@ -15,7 +15,7 @@ Two things are needed to run Corso:
 
 Three distinct pieces of configuration are required by Corso:
 
-* S3 object storage configuration to store backups. See [AWS Credentials Setup](/configuration/repos##s3-creds-setup) for
+* S3 object storage configuration to store backups. See [AWS Credentials Setup](/setup/repos##s3-creds-setup) for
 alternate ways to pass AWS credentials.
   * `AWS_ACCESS_KEY_ID`: Access key for an IAM user or role for accessing an S3 bucket
   * `AWS_SECRET_ACCESS_KEY`: Secret key associated with the access key
diff --git a/docs/docs/configuration/m365_access.md b/docs/docs/setup/m365_access.md
similarity index 100%
rename from docs/docs/configuration/m365_access.md
rename to docs/docs/setup/m365_access.md
diff --git a/docs/docs/configuration/repos.md b/docs/docs/setup/repos.md
similarity index 99%
rename from docs/docs/configuration/repos.md
rename to docs/docs/setup/repos.md
index ae24466fd..a63e0ede7 100644
--- a/docs/docs/configuration/repos.md
+++ b/docs/docs/setup/repos.md
@@ -2,7 +2,7 @@
 description: "Configure backup repository"
 ---
 
-# Repositories
+# Corso repositories
 
 A Corso [repository](concepts#corso-concepts) stores encrypted copies of your backup data. Repositories are
 supported on the following object storage systems:
diff --git a/docs/docs/tutorial.md b/docs/docs/tutorial.md
index af2d35c36..9f655a056 100644
--- a/docs/docs/tutorial.md
+++ b/docs/docs/tutorial.md
@@ -5,8 +5,8 @@ In this tutorial you will perform your first backup followed by a restore.
 ## Prerequisites
 
 * Install Docker
-* Configure connection to your M365 Tenant (see [M365 Access](/configuration/m365_access))
-* Initialize a Corso backup repository (see [Repositories](/configuration/repos))
+* Configure connection to your M365 Tenant (see [M365 Access](/setup/m365_access))
+* Initialize a Corso backup repository (see [Repositories](/setup/repos))
 
 ## Your first backup
 
diff --git a/docs/sidebars.js b/docs/sidebars.js
index 8d87cc457..de4a6fbe2 100644
--- a/docs/sidebars.js
+++ b/docs/sidebars.js
@@ -16,12 +16,11 @@ const sidebars = {
   // By default, Docusaurus generates a sidebar from the docs folder structure
   docsSidebar: [
     'intro',
-    'running',
     'tutorial',
     {
       type: 'category',
-      label: 'Initial configuration',
-      items: ['configuration/concepts', 'configuration/m365_access', 'configuration/repos'],
+      label: 'Initial setup',
+      items: ['setup/concepts', 'setup/m365_access', 'setup/repos', 'setup/configuration'],
     },
     {
       type: 'category',