diff --git a/core/aibs/index.rst b/core/aibs/index.rst
index 9f46b0cf4..cb90f8db5 100644
--- a/core/aibs/index.rst
+++ b/core/aibs/index.rst
@@ -1,7 +1,11 @@
 Add-In Boards / Cards
 =======================================
 .. toctree::
+   :caption: Add-In Boards
    :maxdepth: 2
 
-   README
+   grayskull/README
+   wormhole/README
    ack
+   warp100
+   compliance
\ No newline at end of file
diff --git a/core/index.rst b/core/index.rst
index 9e1ea090d..9a3ec9d71 100644
--- a/core/index.rst
+++ b/core/index.rst
@@ -1,20 +1,11 @@
 Tenstorrent
 ==============================
 
-.. toctree::
-   :caption: Add-in Boards
-   :maxdepth: 2
-
-   aibs/grayskull/README
-   aibs/wormhole/README
-   aibs/ack
-   aibs/warp100
-   aibs/compliance
 
 .. toctree::
-   :caption: Systems
-   :maxdepth: 2
+   :caption: Hardware
 
+   aibs/index
    systems/index
 
 .. toctree::
diff --git a/core/systems/index.rst b/core/systems/index.rst
index 856906c53..7922f4699 100644
--- a/core/systems/index.rst
+++ b/core/systems/index.rst
@@ -1,43 +1,10 @@
-.. toctree::
-   :maxdepth: 2
-
-TT-QuietBox
-=======================================
-.. toctree::
-   :maxdepth: 2
-
-   quietbox/README
-   quietbox/softwaresetup
-   quietbox/specifications
-   quietbox/support
-
-TT-LoudBox
-=======================================
-.. toctree::
-   :maxdepth: 2
-
-   t3000/README
-   t3000/softwaresetup
-   t3000/specifications
-   t3000/support
-
-T1000
-=======================================
-
-.. toctree::
-   :maxdepth: 2
-
-   t1000/README
-   t1000/softwaresetup
-   t1000/specifications
-   t1000/support
-
-T7000
+Systems
 =======================================
 .. toctree::
+   :caption: Systems
    :maxdepth: 2
-
-   t7000/README
-   t7000/softwaresetup
-   t7000/specifications
-   t7000/support
\ No newline at end of file
+   
+   quietbox/index
+   t3000/index
+   t1000/index
+   t7000/index
diff --git a/core/systems/quietbox/index.rst b/core/systems/quietbox/index.rst
new file mode 100644
index 000000000..5287138e1
--- /dev/null
+++ b/core/systems/quietbox/index.rst
@@ -0,0 +1,10 @@
+  
+TT-QuietBox
+=======================================
+.. toctree::
+   :maxdepth: 2
+
+   README
+   softwaresetup
+   specifications
+   support
diff --git a/core/systems/t1000/index.rst b/core/systems/t1000/index.rst
new file mode 100644
index 000000000..d91c02fa7
--- /dev/null
+++ b/core/systems/t1000/index.rst
@@ -0,0 +1,10 @@
+T1000
+=======================================
+
+.. toctree::
+   :maxdepth: 2
+
+   README
+   softwaresetup
+   specifications
+   support
diff --git a/core/systems/t3000/index.rst b/core/systems/t3000/index.rst
new file mode 100644
index 000000000..991a995eb
--- /dev/null
+++ b/core/systems/t3000/index.rst
@@ -0,0 +1,9 @@
+TT-LoudBox
+=======================================
+.. toctree::
+   :maxdepth: 2
+
+   README
+   softwaresetup
+   specifications
+   support
\ No newline at end of file
diff --git a/core/systems/t7000/index.rst b/core/systems/t7000/index.rst
new file mode 100644
index 000000000..06c0217eb
--- /dev/null
+++ b/core/systems/t7000/index.rst
@@ -0,0 +1,9 @@
+T7000
+=======================================
+.. toctree::
+   :maxdepth: 2
+
+   README
+   softwaresetup
+   specifications
+   support
\ No newline at end of file