diff --git a/config.js b/config.js
index a2010b26..5f22b2b7 100644
--- a/config.js
+++ b/config.js
@@ -25,10 +25,6 @@ module.exports = {
       from: '/concepts/',
       to: '/concepts/introduction/'
     },
-    {
-      from: '/setup/',
-      to: '/setup/quickstart/'
-    },
     {
       from: '/tutorials/',
       to: '/tutorials/introduction/'
diff --git a/content/setup/quickstart.md b/content/setup/quickstart.md
deleted file mode 100644
index 3a715db4..00000000
--- a/content/setup/quickstart.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: Quickstart
-description: Quickly grok Ocean tools.
----
-
-Each of the following has its own quickstart to get a feel for using Ocean. Pick your favorite and follow the link to proceed.
-
-- [JavaScript driver](https://github.com/oceanprotocol/ocean.js)
-- [Python driver](https://github.com/oceanprotocol/ocean.py)
-- [React hooks](https://github.com/oceanprotocol/react)
diff --git a/content/setup/compute-to-data.md b/content/tutorials/compute-to-data.md
similarity index 100%
rename from content/setup/compute-to-data.md
rename to content/tutorials/compute-to-data.md
diff --git a/content/setup/marketplace.md b/content/tutorials/marketplace.md
similarity index 100%
rename from content/setup/marketplace.md
rename to content/tutorials/marketplace.md
diff --git a/content/tutorials/metamask-setup.md b/content/tutorials/metamask-setup.md
index e0cba5c9..46c2c2fc 100644
--- a/content/tutorials/metamask-setup.md
+++ b/content/tutorials/metamask-setup.md
@@ -1,5 +1,5 @@
 ---
-title: Set Up MetaMask
+title: Set Up MetaMask Wallet
 description: Tutorial about how to set up MetaMask for Chrome.
 ---
 
diff --git a/content/tutorials/wallets-and-ocean-tokens.md b/content/tutorials/wallets-and-ocean-tokens.md
index a2c1b9a7..74b793dc 100644
--- a/content/tutorials/wallets-and-ocean-tokens.md
+++ b/content/tutorials/wallets-and-ocean-tokens.md
@@ -1,5 +1,5 @@
 ---
-title: Use Your Wallet to Manage Ocean Tokens
+title: Use Your Wallet to Manage OCEAN Tokens
 description: How to use crypto wallet software to check your Ocean Token balance and to send Ocean Tokens to others.
 ---
 
diff --git a/data/sections.yml b/data/sections.yml
index b6fec50e..09130ece 100644
--- a/data/sections.yml
+++ b/data/sections.yml
@@ -1,13 +1,13 @@
+- title: Quickstart
+  description: Try out ocean.js, ocean.py or React drivers.
+  link: /concepts/introduction/
+  color: blue
+
 - title: Core Concepts
   description: On Ocean architecture, network deployments, and more.
   link: /concepts/introduction/
   color: purple
 
-- title: Setup Guides
-  description: On setting up a marketplace, publisher, and compute-to-data.
-  link: /setup/quickstart/
-  color: blue
-
 - title: Tutorials
   description: Build an Ocean-powered React app, and more. 
   link: /tutorials/introduction/
diff --git a/data/sidebars/setup.yml b/data/sidebars/setup.yml
index 7cca283c..1eecbe34 100644
--- a/data/sidebars/setup.yml
+++ b/data/sidebars/setup.yml
@@ -1,8 +1,3 @@
-- group: Quickstart
-  items:
-    - title: Quickly grok Ocean tools
-      link: /setup/quickstart/
-
 - group: Marketplaces
   items:
     - title: Set Up a Marketplace
diff --git a/data/sidebars/tutorials.yml b/data/sidebars/tutorials.yml
index 8df5e565..6ee7e1fc 100644
--- a/data/sidebars/tutorials.yml
+++ b/data/sidebars/tutorials.yml
@@ -5,15 +5,25 @@
 
 - group: Wallets & Ocean Protocol
   items:
-    - title: Set Up MetaMask
+    - title: Set Up MetaMask Wallet
       link: /tutorials/metamask-setup/
-    - title: Use Your Wallet to Manage Ocean Tokens
+    - title: Use Your Wallet to Manage OCEAN Tokens
       link: /tutorials/wallets-and-ocean-tokens/
     - title: Get ETH and OCEAN Tokens
       link: /tutorials/get-ether-and-ocean-tokens/
     - title: Connect to Ocean-Related Networks
       link: /tutorials/connect-to-networks/
 
+- group: Marketplaces
+  items:
+    - title: Set Up a Marketplace
+      link: /tutorials/marketplace/
+
+- group: Compute-to-Data
+  items:
+    - title: Run a Compute-to-Data Environment
+      link: /tutorials/compute-to-data/
+
 - group: Storage Setup
   items:
     - title: Set Up Azure Storage