diff --git a/docs/guides/extension_points.rst b/docs/guides/concepts/extension_points.rst
similarity index 100%
rename from docs/guides/extension_points.rst
rename to docs/guides/concepts/extension_points.rst
diff --git a/docs/guides/frontend/bootstrap.rst b/docs/guides/concepts/frontend/bootstrap.rst
similarity index 100%
rename from docs/guides/frontend/bootstrap.rst
rename to docs/guides/concepts/frontend/bootstrap.rst
diff --git a/docs/guides/frontend/javascript.rst b/docs/guides/concepts/frontend/javascript.rst
similarity index 100%
rename from docs/guides/frontend/javascript.rst
rename to docs/guides/concepts/frontend/javascript.rst
diff --git a/docs/guides/frontend/static_assets.rst b/docs/guides/concepts/frontend/static_assets.rst
similarity index 100%
rename from docs/guides/frontend/static_assets.rst
rename to docs/guides/concepts/frontend/static_assets.rst
diff --git a/docs/guides/frontend/styling.rst b/docs/guides/concepts/frontend/styling.rst
similarity index 100%
rename from docs/guides/frontend/styling.rst
rename to docs/guides/concepts/frontend/styling.rst
diff --git a/docs/guides/guides.rst b/docs/guides/concepts/index.rst
similarity index 80%
rename from docs/guides/guides.rst
rename to docs/guides/concepts/index.rst
index 5eb3aa5e27..01f9250379 100644
--- a/docs/guides/guides.rst
+++ b/docs/guides/concepts/index.rst
@@ -1,5 +1,5 @@
-Guides
-******
+Concepts and Guides
+###################
 
 .. toctree::
     :maxdepth: 2
diff --git a/docs/guides/testing/test_pyramid.png b/docs/guides/concepts/testing/test_pyramid.png
similarity index 100%
rename from docs/guides/testing/test_pyramid.png
rename to docs/guides/concepts/testing/test_pyramid.png
diff --git a/docs/guides/testing/testing.rst b/docs/guides/concepts/testing/testing.rst
similarity index 100%
rename from docs/guides/testing/testing.rst
rename to docs/guides/concepts/testing/testing.rst
diff --git a/docs/guides/index.rst b/docs/guides/index.rst
index d8e83e8b82..59d4934146 100644
--- a/docs/guides/index.rst
+++ b/docs/guides/index.rst
@@ -61,10 +61,28 @@ locations.
          :outline:
          :expand:
 
+   .. grid-item-card:: Concepts
+      :class-card: sd-shadow-md sd-p-2
+      :class-footer: sd-border-0
+
+      * :doc:`concepts/extension_points`
+      * :doc:`concepts/testing/testing`
+      * :doc:`concepts/frontend/javascript`
+      +++
+      .. button-ref:: concepts/index
+         :color: primary
+         :outline:
+         :expand:
+
 
 Change History
 **************
 
+* Jun 30, 2023
+
+  * Added API, Feature Toggle and Settings docs.
+  * Re-organized how the docs are laid out.
+
 * December, 2020: Added documentation about new protocols for writing celery tasks.
 
 * April, 2019: API and repository-specific documentation builds resumed.