diff --git a/docs/_config.yml b/docs/_config.yml
index 506bd2542..f269d8695 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -136,16 +136,6 @@ sidebar:
           url: /plugins-directory/
         - title: Plugin Recipes
           url: /plugin-recipes/
-        - title: Slots and Plugins
-          url: /slots-and-plugins/
-        - title: Plugins API
-          url: /plugins-api/
-    - title: Tutorials
-      children:
-        - title: Creating a Basic Plugin
-          url: /building-basic-plugin/
-        - title: Customizing Plugins with Coral UI
-          url: /customizing-plugins-coral-ui/
     - title: API
       children:
         - title: GraphQL Overview
@@ -154,6 +144,16 @@ sidebar:
           url: /api/graphql/
         - title: Server Plugin API
           url: /api/server/
+        - title: Client Plugin API
+          url: /api/client/
+        - title: Plugin Slots API
+          url: /api/slots/
+    - title: Tutorials
+      children:
+        - title: Creating a Basic Plugin
+          url: /building-basic-plugin/
+        - title: Customizing Plugins with Coral UI
+          url: /customizing-plugins-coral-ui/
     - title: Migrating
       children:
         - title: Migrating to v4.0.0
diff --git a/docs/source/04-07-plugins-api.md b/docs/source/api/client.md
similarity index 98%
rename from docs/source/04-07-plugins-api.md
rename to docs/source/api/client.md
index 2f12fccf5..fd0ec42fc 100644
--- a/docs/source/04-07-plugins-api.md
+++ b/docs/source/api/client.md
@@ -1,7 +1,10 @@
 ---
-title: Plugins API
-permalink: /plugins-api/
+title: Client Plugin API
+permalink: /api/client/
+toc: true
+class: configuration
 ---
+
 We created a set of utilities to make it easier to create and add functionality to plugins.
 Feel free to check all the utilities here:  `talk/plugin-api`.
 
diff --git a/docs/source/api/server.md b/docs/source/api/server.md
index 614c7b2ed..821b4b24f 100644
--- a/docs/source/api/server.md
+++ b/docs/source/api/server.md
@@ -524,4 +524,4 @@ module.exports = {
   }
 };
 
-```
\ No newline at end of file
+```
diff --git a/docs/source/04-06-slots-and-plugins.md b/docs/source/api/slots.md
similarity index 98%
rename from docs/source/04-06-slots-and-plugins.md
rename to docs/source/api/slots.md
index 907c85862..4ac47a516 100644
--- a/docs/source/04-06-slots-and-plugins.md
+++ b/docs/source/api/slots.md
@@ -1,6 +1,8 @@
 ---
-title: Slots and Plugins
-permalink: /slots-and-plugins/
+title: Plugin Slots API
+permalink: /api/slots/
+toc: true
+class: configuration
 ---
 
 Plugins make use of **"slots"** in order to change Talk's interface.