diff --git a/404.html b/404.html
index 1aa40c4..66d5534 100644
--- a/404.html
+++ b/404.html
@@ -81,31 +81,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="/learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="/infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="/tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="/infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="/tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="/infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="/tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="/infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="/tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="/infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="/tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="/infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="/tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="/infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="/tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="/infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="/tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="/infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="/tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="/infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="/tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="/infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="/tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/community/code-of-conduct/index.html b/community/code-of-conduct/index.html
index 034ca57..64592c6 100644
--- a/community/code-of-conduct/index.html
+++ b/community/code-of-conduct/index.html
@@ -128,31 +128,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/community/community-networking-toolkit/index.html b/community/community-networking-toolkit/index.html
index b18047c..04d8ab2 100644
--- a/community/community-networking-toolkit/index.html
+++ b/community/community-networking-toolkit/index.html
@@ -98,31 +98,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/community/join/index.html b/community/join/index.html
index f473f7b..29f708c 100644
--- a/community/join/index.html
+++ b/community/join/index.html
@@ -104,31 +104,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/community/mission-vision-values/index.html b/community/mission-vision-values/index.html
index 659f0de..62af0e9 100644
--- a/community/mission-vision-values/index.html
+++ b/community/mission-vision-values/index.html
@@ -96,31 +96,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/community/partners/index.html b/community/partners/index.html
index 8eb967b..e4d8c70 100644
--- a/community/partners/index.html
+++ b/community/partners/index.html
@@ -90,31 +90,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/community/space/index.html b/community/space/index.html
index 0ac68bb..ffe6605 100644
--- a/community/space/index.html
+++ b/community/space/index.html
@@ -92,31 +92,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/community/teams/index.html b/community/teams/index.html
index 6a1422c..9ee41a5 100644
--- a/community/teams/index.html
+++ b/community/teams/index.html
@@ -88,31 +88,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/community/tech-help/index.html b/community/tech-help/index.html
index 7cf01e1..d5ff627 100644
--- a/community/tech-help/index.html
+++ b/community/tech-help/index.html
@@ -104,31 +104,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/contribute/contribute/index.html b/contribute/contribute/index.html
index 9fb2285..5d6501e 100644
--- a/contribute/contribute/index.html
+++ b/contribute/contribute/index.html
@@ -88,31 +88,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -212,7 +212,7 @@ <h2 id="deployment">Deployment</h2>
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
-        <a href="../../infrastructure/librenms/backup/" class="btn btn-neutral float-left" title="Backing Up"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../../tutorials/librenms/backup/" class="btn btn-neutral float-left" title="Backing Up"><span class="icon icon-circle-arrow-left"></span> Previous</a>
     </div>
 
   <hr/>
@@ -235,7 +235,7 @@ <h2 id="deployment">Deployment</h2>
   <span class="rst-current-version" data-toggle="rst-current-version">
     
     
-      <span><a href="../../infrastructure/librenms/backup/" style="color: #fcfcfc">&laquo; Previous</a></span>
+      <span><a href="../../tutorials/librenms/backup/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
   </span>
diff --git a/faq/about/index.html b/faq/about/index.html
index 3955aaf..7e7f462 100644
--- a/faq/about/index.html
+++ b/faq/about/index.html
@@ -90,31 +90,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/faq/connection/index.html b/faq/connection/index.html
index 3a892e5..1deae0c 100644
--- a/faq/connection/index.html
+++ b/faq/connection/index.html
@@ -96,31 +96,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/faq/help/index.html b/faq/help/index.html
index 3b31812..a289376 100644
--- a/faq/help/index.html
+++ b/faq/help/index.html
@@ -92,31 +92,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/faq/how/index.html b/faq/how/index.html
index 93c4599..0cdc68f 100644
--- a/faq/how/index.html
+++ b/faq/how/index.html
@@ -90,31 +90,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/faq/site/index.html b/faq/site/index.html
index 7c75fce..22de2e1 100644
--- a/faq/site/index.html
+++ b/faq/site/index.html
@@ -90,31 +90,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/faq/what/index.html b/faq/what/index.html
index 86548a1..9e01eaf 100644
--- a/faq/what/index.html
+++ b/faq/what/index.html
@@ -90,31 +90,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/faq/why/index.html b/faq/why/index.html
index 8d67f17..1d362b5 100644
--- a/faq/why/index.html
+++ b/faq/why/index.html
@@ -90,31 +90,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/index.html b/index.html
index 9ba37ea..79352f0 100644
--- a/index.html
+++ b/index.html
@@ -94,31 +94,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -214,5 +214,5 @@ <h2 id="whats-here">What's here?</h2>
 
 <!--
 MkDocs version : 1.6.0
-Build Date UTC : 2024-08-21 19:49:47.131461+00:00
+Build Date UTC : 2024-08-22 03:56:11.145353+00:00
 -->
diff --git a/infrastructure/epc-setup/index.html b/infrastructure/epc-setup/index.html
index fb835ed..e2a51d8 100644
--- a/infrastructure/epc-setup/index.html
+++ b/infrastructure/epc-setup/index.html
@@ -88,33 +88,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul class="current">
-                  <li class="toctree-l1"><a class="reference internal" href="../hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1 current"><a class="reference internal current" href="#">Step 1. LTE Core Network Setup</a>
-    <ul class="current">
-    </ul>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -155,8 +153,8 @@ <h1 id="step-1-colteepc-lte-core-network-setup">Step 1: CoLTE/EPC (LTE Core Netw
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
-        <a href="../librenms-setup/" class="btn btn-neutral float-left" title="Network Monitoring 2. LibreNMS Agent Configuration"><span class="icon icon-circle-arrow-left"></span> Previous</a>
-        <a href="../sas-setup/" class="btn btn-neutral float-right" title="Step 2. eNodeB and SAS Setup">Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="../../faq/why/" class="btn btn-neutral float-left" title="Why have a Community Network?"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../hardware/" class="btn btn-neutral float-right" title="Hardware Overview">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
   <hr/>
@@ -179,10 +177,10 @@ <h1 id="step-1-colteepc-lte-core-network-setup">Step 1: CoLTE/EPC (LTE Core Netw
   <span class="rst-current-version" data-toggle="rst-current-version">
     
     
-      <span><a href="../librenms-setup/" style="color: #fcfcfc">&laquo; Previous</a></span>
+      <span><a href="../../faq/why/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
-      <span><a href="../sas-setup/" style="color: #fcfcfc">Next &raquo;</a></span>
+      <span><a href="../hardware/" style="color: #fcfcfc">Next &raquo;</a></span>
     
   </span>
 </div>
diff --git a/infrastructure/hardware/index.html b/infrastructure/hardware/index.html
index 61519a5..a4513f0 100644
--- a/infrastructure/hardware/index.html
+++ b/infrastructure/hardware/index.html
@@ -88,33 +88,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul class="current">
-                  <li class="toctree-l1 current"><a class="reference internal current" href="#">Hardware Overview</a>
-    <ul class="current">
-    </ul>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -195,8 +193,8 @@ <h3 id="cbrs-compatible-unlocked-smartphone">CBRS-Compatible Unlocked Smartphone
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
-        <a href="../../learn/networking/" class="btn btn-neutral float-left" title="Networking"><span class="icon icon-circle-arrow-left"></span> Previous</a>
-        <a href="../software/" class="btn btn-neutral float-right" title="Software Overview">Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="../epc-setup/" class="btn btn-neutral float-left" title="Step 1. LTE Core Network Setup"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../librenms-manager-setup/" class="btn btn-neutral float-right" title="Network Monitoring 1. LibreNMS Network Manager Configuration">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
   <hr/>
@@ -219,10 +217,10 @@ <h3 id="cbrs-compatible-unlocked-smartphone">CBRS-Compatible Unlocked Smartphone
   <span class="rst-current-version" data-toggle="rst-current-version">
     
     
-      <span><a href="../../learn/networking/" style="color: #fcfcfc">&laquo; Previous</a></span>
+      <span><a href="../epc-setup/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
-      <span><a href="../software/" style="color: #fcfcfc">Next &raquo;</a></span>
+      <span><a href="../librenms-manager-setup/" style="color: #fcfcfc">Next &raquo;</a></span>
     
   </span>
 </div>
diff --git a/infrastructure/librenms-manager-setup/index.html b/infrastructure/librenms-manager-setup/index.html
index 7fe38f2..30e14b9 100644
--- a/infrastructure/librenms-manager-setup/index.html
+++ b/infrastructure/librenms-manager-setup/index.html
@@ -88,39 +88,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul class="current">
-                  <li class="toctree-l1"><a class="reference internal" href="../hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1 current"><a class="reference internal current" href="#">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
-    <ul class="current">
-    <li class="toctree-l2"><a class="reference internal" href="#librenms-manager-installation">LibreNMS Manager Installation:</a>
-    </li>
-    <li class="toctree-l2"><a class="reference internal" href="#network-specific-configuration">Network-Specific Configuration:</a>
-    </li>
-    <li class="toctree-l2"><a class="reference internal" href="#adding-baicells-os-configuration-to-librenms">Adding Baicells OS configuration to LibreNMS</a>
-    </li>
-    </ul>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -296,7 +288,7 @@ <h2 id="adding-baicells-os-configuration-to-librenms">Adding Baicells OS configu
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
-        <a href="../peering/" class="btn btn-neutral float-left" title="Public ASN Peering"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../hardware/" class="btn btn-neutral float-left" title="Hardware Overview"><span class="icon icon-circle-arrow-left"></span> Previous</a>
         <a href="../librenms-setup/" class="btn btn-neutral float-right" title="Network Monitoring 2. LibreNMS Agent Configuration">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
@@ -320,7 +312,7 @@ <h2 id="adding-baicells-os-configuration-to-librenms">Adding Baicells OS configu
   <span class="rst-current-version" data-toggle="rst-current-version">
     
     
-      <span><a href="../peering/" style="color: #fcfcfc">&laquo; Previous</a></span>
+      <span><a href="../hardware/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
       <span><a href="../librenms-setup/" style="color: #fcfcfc">Next &raquo;</a></span>
diff --git a/infrastructure/librenms-setup/index.html b/infrastructure/librenms-setup/index.html
index 1389c80..35db780 100644
--- a/infrastructure/librenms-setup/index.html
+++ b/infrastructure/librenms-setup/index.html
@@ -88,43 +88,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul class="current">
-                  <li class="toctree-l1"><a class="reference internal" href="../hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1 current"><a class="reference internal current" href="#">Network Monitoring 2. LibreNMS Agent Configuration</a>
-    <ul class="current">
-    <li class="toctree-l2"><a class="reference internal" href="#adding-a-new-node-to-librenms">Adding a New Node to LibreNMS</a>
-    </li>
-    <li class="toctree-l2"><a class="reference internal" href="#epc-snmp-configuration">ePC SNMP Configuration</a>
-    </li>
-    <li class="toctree-l2"><a class="reference internal" href="#baicells-snmp-configuration">Baicells SNMP configuration</a>
-    </li>
-    <li class="toctree-l2"><a class="reference internal" href="#adding-the-node-to-librenms">Adding the Node to LibreNMS</a>
-    </li>
-    <li class="toctree-l2"><a class="reference internal" href="#other-helpful-notes">Other helpful notes:</a>
-    </li>
-    </ul>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -291,7 +279,7 @@ <h2 id="other-helpful-notes">Other helpful notes:</h2>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
         <a href="../librenms-manager-setup/" class="btn btn-neutral float-left" title="Network Monitoring 1. LibreNMS Network Manager Configuration"><span class="icon icon-circle-arrow-left"></span> Previous</a>
-        <a href="../epc-setup/" class="btn btn-neutral float-right" title="Step 1. LTE Core Network Setup">Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="../peering/" class="btn btn-neutral float-right" title="Public ASN Peering">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
   <hr/>
@@ -317,7 +305,7 @@ <h2 id="other-helpful-notes">Other helpful notes:</h2>
       <span><a href="../librenms-manager-setup/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
-      <span><a href="../epc-setup/" style="color: #fcfcfc">Next &raquo;</a></span>
+      <span><a href="../peering/" style="color: #fcfcfc">Next &raquo;</a></span>
     
   </span>
 </div>
diff --git a/infrastructure/librenms/backup/index.html b/infrastructure/librenms/backup/index.html
index 4d23cf2..094409f 100644
--- a/infrastructure/librenms/backup/index.html
+++ b/infrastructure/librenms/backup/index.html
@@ -88,33 +88,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul class="current">
-                  <li class="toctree-l1"><a class="reference internal" href="../../hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
-                  <li class="toctree-l1 current"><a class="reference internal current" >Librenms</a>
-    <ul class="current">
-                <li class="toctree-l2"><a class="reference internal" href="../deploy/">Deploying</a>
+                  <li class="toctree-l1"><a class="reference internal" >Librenms</a>
+    <ul>
+                <li class="toctree-l2"><a class="reference internal" href="../../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2 current"><a class="reference internal current" href="#">Backing Up</a>
-    <ul class="current">
-    </ul>
+                <li class="toctree-l2"><a class="reference internal" href="../../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -155,8 +153,8 @@ <h1 id="backing-up">Backing Up</h1>
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
-        <a href="../upgrade/" class="btn btn-neutral float-left" title="Upgrading"><span class="icon icon-circle-arrow-left"></span> Previous</a>
-        <a href="../../../contribute/contribute/" class="btn btn-neutral float-right" title="Contribute to SCN Docs">Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="../../software/" class="btn btn-neutral float-left" title="Software Overview"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../deploy/" class="btn btn-neutral float-right" title="Deploying">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
   <hr/>
@@ -179,10 +177,10 @@ <h1 id="backing-up">Backing Up</h1>
   <span class="rst-current-version" data-toggle="rst-current-version">
     
     
-      <span><a href="../upgrade/" style="color: #fcfcfc">&laquo; Previous</a></span>
+      <span><a href="../../software/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
-      <span><a href="../../../contribute/contribute/" style="color: #fcfcfc">Next &raquo;</a></span>
+      <span><a href="../deploy/" style="color: #fcfcfc">Next &raquo;</a></span>
     
   </span>
 </div>
diff --git a/infrastructure/librenms/deploy/index.html b/infrastructure/librenms/deploy/index.html
index e160de8..4ec1f8a 100644
--- a/infrastructure/librenms/deploy/index.html
+++ b/infrastructure/librenms/deploy/index.html
@@ -88,37 +88,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul class="current">
-                  <li class="toctree-l1"><a class="reference internal" href="../../hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
-                  <li class="toctree-l1 current"><a class="reference internal current" >Librenms</a>
-    <ul class="current">
-                <li class="toctree-l2 current"><a class="reference internal current" href="#">Deploying</a>
-    <ul class="current">
-    <li class="toctree-l3"><a class="reference internal" href="#software-requirements">Software requirements</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#steps">Steps</a>
-    </li>
-    </ul>
+                  <li class="toctree-l1"><a class="reference internal" >Librenms</a>
+    <ul>
+                <li class="toctree-l2"><a class="reference internal" href="../../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -180,7 +174,7 @@ <h2 id="steps">Steps</h2>
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
-        <a href="../../proxmox-vaultwarden-deployment/" class="btn btn-neutral float-left" title="Proxmox Deployment Guide - Vaultwarden"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../backup/" class="btn btn-neutral float-left" title="Backing Up"><span class="icon icon-circle-arrow-left"></span> Previous</a>
         <a href="../upgrade/" class="btn btn-neutral float-right" title="Upgrading">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
@@ -204,7 +198,7 @@ <h2 id="steps">Steps</h2>
   <span class="rst-current-version" data-toggle="rst-current-version">
     
     
-      <span><a href="../../proxmox-vaultwarden-deployment/" style="color: #fcfcfc">&laquo; Previous</a></span>
+      <span><a href="../backup/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
       <span><a href="../upgrade/" style="color: #fcfcfc">Next &raquo;</a></span>
diff --git a/infrastructure/librenms/upgrade/index.html b/infrastructure/librenms/upgrade/index.html
index b175ef2..b3805d7 100644
--- a/infrastructure/librenms/upgrade/index.html
+++ b/infrastructure/librenms/upgrade/index.html
@@ -88,37 +88,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul class="current">
-                  <li class="toctree-l1"><a class="reference internal" href="../../hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
-                  <li class="toctree-l1 current"><a class="reference internal current" >Librenms</a>
-    <ul class="current">
-                <li class="toctree-l2"><a class="reference internal" href="../deploy/">Deploying</a>
+                  <li class="toctree-l1"><a class="reference internal" >Librenms</a>
+    <ul>
+                <li class="toctree-l2"><a class="reference internal" href="../../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2 current"><a class="reference internal current" href="#">Upgrading</a>
-    <ul class="current">
-    <li class="toctree-l3"><a class="reference internal" href="#os">OS</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#service">Service</a>
-    </li>
-    </ul>
+                <li class="toctree-l2"><a class="reference internal" href="../../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -177,7 +171,7 @@ <h2 id="service">Service</h2>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
         <a href="../deploy/" class="btn btn-neutral float-left" title="Deploying"><span class="icon icon-circle-arrow-left"></span> Previous</a>
-        <a href="../backup/" class="btn btn-neutral float-right" title="Backing Up">Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="../../../learn/cable-crimping/" class="btn btn-neutral float-right" title="Crimping Ethernet Cables">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
   <hr/>
@@ -203,7 +197,7 @@ <h2 id="service">Service</h2>
       <span><a href="../deploy/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
-      <span><a href="../backup/" style="color: #fcfcfc">Next &raquo;</a></span>
+      <span><a href="../../../learn/cable-crimping/" style="color: #fcfcfc">Next &raquo;</a></span>
     
   </span>
 </div>
diff --git a/infrastructure/peering/index.html b/infrastructure/peering/index.html
index 07b6f39..9dd61a2 100644
--- a/infrastructure/peering/index.html
+++ b/infrastructure/peering/index.html
@@ -88,47 +88,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul class="current">
-                  <li class="toctree-l1"><a class="reference internal" href="../hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1 current"><a class="reference internal current" href="#">Public ASN Peering</a>
-    <ul class="current">
-    <li class="toctree-l2"><a class="reference internal" href="#local-connectivity-lab-operates-as54429">Local Connectivity Lab operates AS54429</a>
-    </li>
-    <li class="toctree-l2"><a class="reference internal" href="#our-peering-policy-is-yes">Our peering Policy is Yes</a>
-        <ul>
-    <li class="toctree-l3"><a class="reference internal" href="#peering-policy">Peering Policy</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#locations">Locations</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#exchanges">Exchanges</a>
-    </li>
-        </ul>
-    </li>
-    <li class="toctree-l2"><a class="reference internal" href="#peering-data">Peering Data</a>
-    </li>
-    </ul>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -225,8 +209,8 @@ <h2 id="peering-data">Peering Data</h2>
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
-        <a href="../software/" class="btn btn-neutral float-left" title="Software Overview"><span class="icon icon-circle-arrow-left"></span> Previous</a>
-        <a href="../librenms-manager-setup/" class="btn btn-neutral float-right" title="Network Monitoring 1. LibreNMS Network Manager Configuration">Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="../librenms-setup/" class="btn btn-neutral float-left" title="Network Monitoring 2. LibreNMS Agent Configuration"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../proxmox-vaultwarden-deployment/" class="btn btn-neutral float-right" title="Proxmox Deployment Guide - Vaultwarden">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
   <hr/>
@@ -249,10 +233,10 @@ <h2 id="peering-data">Peering Data</h2>
   <span class="rst-current-version" data-toggle="rst-current-version">
     
     
-      <span><a href="../software/" style="color: #fcfcfc">&laquo; Previous</a></span>
+      <span><a href="../librenms-setup/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
-      <span><a href="../librenms-manager-setup/" style="color: #fcfcfc">Next &raquo;</a></span>
+      <span><a href="../proxmox-vaultwarden-deployment/" style="color: #fcfcfc">Next &raquo;</a></span>
     
   </span>
 </div>
diff --git a/infrastructure/proxmox-vaultwarden-deployment/index.html b/infrastructure/proxmox-vaultwarden-deployment/index.html
index fb38767..450d08f 100644
--- a/infrastructure/proxmox-vaultwarden-deployment/index.html
+++ b/infrastructure/proxmox-vaultwarden-deployment/index.html
@@ -88,33 +88,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul class="current">
-                  <li class="toctree-l1"><a class="reference internal" href="../hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1 current"><a class="reference internal current" href="#">Proxmox Deployment Guide - Vaultwarden</a>
-    <ul class="current">
-    </ul>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -366,8 +364,8 @@ <h2 id="section-13-using-the-backup">Section 13: Using the Backup</h2>
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
-        <a href="../sas-setup/" class="btn btn-neutral float-left" title="Step 2. eNodeB and SAS Setup"><span class="icon icon-circle-arrow-left"></span> Previous</a>
-        <a href="../librenms/deploy/" class="btn btn-neutral float-right" title="Deploying">Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="../peering/" class="btn btn-neutral float-left" title="Public ASN Peering"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../sas-setup/" class="btn btn-neutral float-right" title="Step 2. eNodeB and SAS Setup">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
   <hr/>
@@ -390,10 +388,10 @@ <h2 id="section-13-using-the-backup">Section 13: Using the Backup</h2>
   <span class="rst-current-version" data-toggle="rst-current-version">
     
     
-      <span><a href="../sas-setup/" style="color: #fcfcfc">&laquo; Previous</a></span>
+      <span><a href="../peering/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
-      <span><a href="../librenms/deploy/" style="color: #fcfcfc">Next &raquo;</a></span>
+      <span><a href="../sas-setup/" style="color: #fcfcfc">Next &raquo;</a></span>
     
   </span>
 </div>
diff --git a/infrastructure/sas-setup/index.html b/infrastructure/sas-setup/index.html
index a10567f..99f34d6 100644
--- a/infrastructure/sas-setup/index.html
+++ b/infrastructure/sas-setup/index.html
@@ -88,105 +88,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul class="current">
-                  <li class="toctree-l1"><a class="reference internal" href="../hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1 current"><a class="reference internal current" href="#">Step 2. eNodeB and SAS Setup</a>
-    <ul class="current">
-    <li class="toctree-l2"><a class="reference internal" href="#introduction">Introduction</a>
-    </li>
-    <li class="toctree-l2"><a class="reference internal" href="#i-get-set-up-with-a-spectrum-access-system-sas">I. Get set up with a Spectrum Access System (SAS)</a>
-        <ul>
-    <li class="toctree-l3"><a class="reference internal" href="#a-why-get-set-up-with-a-sas">A. Why get set up with a SAS?</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#b-cpi-license">B. CPI License</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#c-sas-pricing-agreements">C. SAS Pricing Agreements</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#d-sas-registration">D. SAS Registration</a>
-    </li>
-        </ul>
-    </li>
-    <li class="toctree-l2"><a class="reference internal" href="#ii-register-device-in-sas-portal">II. Register device in SAS portal</a>
-        <ul>
-    <li class="toctree-l3"><a class="reference internal" href="#a-once-you-have-an-account-on-an-sas-service-register-your-devices-on-their-portal-or-dashboard">A. Once you have an account on an SAS service, register your devices on their portal or dashboard.</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#b-our-setup">B. Our Setup</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#c-example-configuration">C. Example Configuration</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#d-cpi-signature">D. CPI Signature</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#e-status-tab">E. Status Tab</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#f-other-helpful-links">F. Other helpful links</a>
-    </li>
-        </ul>
-    </li>
-    <li class="toctree-l2"><a class="reference internal" href="#iii-steps-in-baicells-cloud-interface">III. Steps in Baicells Cloud interface</a>
-        <ul>
-    <li class="toctree-l3"><a class="reference internal" href="#a-make-a-baicells-omc-account">A. Make a Baicells OMC account.</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#b-take-note-of-the-cloudkey">B. Take note of the CloudKey</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#c-set-your-sas-service-provider">C. Set your SAS service provider.</a>
-    </li>
-        </ul>
-    </li>
-    <li class="toctree-l2"><a class="reference internal" href="#iv-steps-in-baicells-management-interface">IV. Steps in Baicells management interface</a>
-        <ul>
-    <li class="toctree-l3"><a class="reference internal" href="#a-local-management-portal">A. Local Management Portal</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#b-upgrade-firmware">B. Upgrade firmware</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#c-get-everything-connected">C. Get everything connected</a>
-        <ul>
-    <li class="toctree-l4"><a class="reference internal" href="#1-configure-internet-access-wan">1. Configure Internet Access (WAN)</a>
-    </li>
-    <li class="toctree-l4"><a class="reference internal" href="#2-check-internet-access">2. Check Internet access</a>
-    </li>
-    <li class="toctree-l4"><a class="reference internal" href="#3-reboot-as-needed">3. Reboot as needed</a>
-    </li>
-    <li class="toctree-l4"><a class="reference internal" href="#4-attach-to-baicells-omc">4. Attach to Baicells OMC</a>
-    </li>
-    <li class="toctree-l4"><a class="reference internal" href="#5-disable-ipsec">5. Disable IPsec</a>
-    </li>
-    <li class="toctree-l4"><a class="reference internal" href="#6-disable-gps-sync-when-testing-indoors">6. Disable GPS Sync when testing indoors.</a>
-    </li>
-    <li class="toctree-l4"><a class="reference internal" href="#7-change-the-mme-settings">7. Change the MME settings</a>
-    </li>
-    <li class="toctree-l4"><a class="reference internal" href="#8-enable-sas">8. Enable SAS</a>
-    </li>
-    <li class="toctree-l4"><a class="reference internal" href="#9-check-baicells-cloud-omc-to-debug-issues">9. Check Baicells CLOUD OMC to debug issues</a>
-    </li>
-        </ul>
-    </li>
-        </ul>
-    </li>
-    <li class="toctree-l2"><a class="reference internal" href="#v-how-to-change-location-antenna-properties-etc-after-deployment">V. How to change location, antenna properties, etc. after deployment</a>
-    </li>
-    </ul>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -486,8 +412,8 @@ <h2 id="v-how-to-change-location-antenna-properties-etc-after-deployment">V. How
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
-        <a href="../epc-setup/" class="btn btn-neutral float-left" title="Step 1. LTE Core Network Setup"><span class="icon icon-circle-arrow-left"></span> Previous</a>
-        <a href="../proxmox-vaultwarden-deployment/" class="btn btn-neutral float-right" title="Proxmox Deployment Guide - Vaultwarden">Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="../proxmox-vaultwarden-deployment/" class="btn btn-neutral float-left" title="Proxmox Deployment Guide - Vaultwarden"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../software/" class="btn btn-neutral float-right" title="Software Overview">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
   <hr/>
@@ -510,10 +436,10 @@ <h2 id="v-how-to-change-location-antenna-properties-etc-after-deployment">V. How
   <span class="rst-current-version" data-toggle="rst-current-version">
     
     
-      <span><a href="../epc-setup/" style="color: #fcfcfc">&laquo; Previous</a></span>
+      <span><a href="../proxmox-vaultwarden-deployment/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
-      <span><a href="../proxmox-vaultwarden-deployment/" style="color: #fcfcfc">Next &raquo;</a></span>
+      <span><a href="../software/" style="color: #fcfcfc">Next &raquo;</a></span>
     
   </span>
 </div>
diff --git a/infrastructure/software/index.html b/infrastructure/software/index.html
index 0ac8a48..73a518e 100644
--- a/infrastructure/software/index.html
+++ b/infrastructure/software/index.html
@@ -88,69 +88,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul class="current">
-                  <li class="toctree-l1"><a class="reference internal" href="../hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1 current"><a class="reference internal current" href="#">Software Overview</a>
-    <ul class="current">
-    <li class="toctree-l2"><a class="reference internal" href="#networking">Networking</a>
-        <ul>
-    <li class="toctree-l3"><a class="reference internal" href="#local-services">Local Services</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#evolved-packet-core-epc">Evolved Packet Core (EPC)</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#spectrum-access-system-sas">Spectrum Access System (SAS)</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#network-monitoring-and-alerting">Network Monitoring and Alerting</a>
-    </li>
-        </ul>
-    </li>
-    <li class="toctree-l2"><a class="reference internal" href="#field-measurement">Field Measurement</a>
-        <ul>
-    <li class="toctree-l3"><a class="reference internal" href="#network-performance-measurement-tool">Network Performance Measurement Tool</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#network-cell-info-lite">Network Cell Info Lite</a>
-    </li>
-        </ul>
-    </li>
-    <li class="toctree-l2"><a class="reference internal" href="#site-planning">Site Planning</a>
-        <ul>
-    <li class="toctree-l3"><a class="reference internal" href="#google-earth">Google Earth</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#ubiquiti-line-of-sight">Ubiquiti Line of Sight</a>
-    </li>
-        </ul>
-    </li>
-    <li class="toctree-l2"><a class="reference internal" href="#other-resources">Other resources</a>
-        <ul>
-    <li class="toctree-l3"><a class="reference internal" href="#facebook-isp-toolbox-line-of-sight">Facebook ISP Toolbox Line of Sight</a>
-    </li>
-    <li class="toctree-l3"><a class="reference internal" href="#facebook-isp-toolbox-market-evaluator">Facebook ISP Toolbox Market Evaluator</a>
-    </li>
-        </ul>
-    </li>
-    </ul>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -221,8 +183,8 @@ <h3 id="facebook-isp-toolbox-market-evaluator">Facebook ISP Toolbox Market Evalu
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
-        <a href="../hardware/" class="btn btn-neutral float-left" title="Hardware Overview"><span class="icon icon-circle-arrow-left"></span> Previous</a>
-        <a href="../peering/" class="btn btn-neutral float-right" title="Public ASN Peering">Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="../sas-setup/" class="btn btn-neutral float-left" title="Step 2. eNodeB and SAS Setup"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../librenms/backup/" class="btn btn-neutral float-right" title="Backing Up">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
   <hr/>
@@ -245,10 +207,10 @@ <h3 id="facebook-isp-toolbox-market-evaluator">Facebook ISP Toolbox Market Evalu
   <span class="rst-current-version" data-toggle="rst-current-version">
     
     
-      <span><a href="../hardware/" style="color: #fcfcfc">&laquo; Previous</a></span>
+      <span><a href="../sas-setup/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
-      <span><a href="../peering/" style="color: #fcfcfc">Next &raquo;</a></span>
+      <span><a href="../librenms/backup/" style="color: #fcfcfc">Next &raquo;</a></span>
     
   </span>
 </div>
diff --git a/learn/cable-crimping/index.html b/learn/cable-crimping/index.html
index c3b0475..18b90d5 100644
--- a/learn/cable-crimping/index.html
+++ b/learn/cable-crimping/index.html
@@ -144,31 +144,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/learn/lte-networks/index.html b/learn/lte-networks/index.html
index 473e697..90cfc90 100644
--- a/learn/lte-networks/index.html
+++ b/learn/lte-networks/index.html
@@ -94,31 +94,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/learn/networking/index.html b/learn/networking/index.html
index b0a8c6b..34b3dca 100644
--- a/learn/networking/index.html
+++ b/learn/networking/index.html
@@ -90,31 +90,31 @@
     </ul>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -157,7 +157,7 @@ <h1 id="learn-about-computer-networks">Learn about Computer Networks</h1>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
         <a href="../lte-networks/" class="btn btn-neutral float-left" title="LTE Networks"><span class="icon icon-circle-arrow-left"></span> Previous</a>
-        <a href="../../infrastructure/hardware/" class="btn btn-neutral float-right" title="Hardware Overview">Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="../../tutorials/hardware/" class="btn btn-neutral float-right" title="Hardware Overview">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
   <hr/>
@@ -183,7 +183,7 @@ <h1 id="learn-about-computer-networks">Learn about Computer Networks</h1>
       <span><a href="../lte-networks/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
-      <span><a href="../../infrastructure/hardware/" style="color: #fcfcfc">Next &raquo;</a></span>
+      <span><a href="../../tutorials/hardware/" style="color: #fcfcfc">Next &raquo;</a></span>
     
   </span>
 </div>
diff --git a/learn/wireless-communication/index.html b/learn/wireless-communication/index.html
index 1d401ba..cd9cc46 100644
--- a/learn/wireless-communication/index.html
+++ b/learn/wireless-communication/index.html
@@ -154,31 +154,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="../networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../../tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/search.html b/search.html
index a05ba26..570537e 100644
--- a/search.html
+++ b/search.html
@@ -81,31 +81,31 @@
                   <li class="toctree-l1"><a class="reference internal" href="./learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
               <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="./infrastructure/hardware/">Hardware Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="./tutorials/hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="./infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="./tutorials/software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="./infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="./tutorials/peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="./infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="./tutorials/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="./infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="./tutorials/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="./infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="./tutorials/epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="./infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="./tutorials/enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="./infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="./tutorials/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="./infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="./tutorials/librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="./infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="./tutorials/librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="./infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="./tutorials/librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
diff --git a/sitemap.xml.gz b/sitemap.xml.gz
index 4520748..9e15723 100644
Binary files a/sitemap.xml.gz and b/sitemap.xml.gz differ
diff --git a/tutorials/enb-setup/index.html b/tutorials/enb-setup/index.html
index 2200b24..883e8fd 100644
--- a/tutorials/enb-setup/index.html
+++ b/tutorials/enb-setup/index.html
@@ -88,31 +88,105 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul class="current">
+                  <li class="toctree-l1"><a class="reference internal" href="../hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1 current"><a class="reference internal current" href="#">Step 2. eNodeB and SAS Setup</a>
+    <ul class="current">
+    <li class="toctree-l2"><a class="reference internal" href="#introduction">Introduction</a>
+    </li>
+    <li class="toctree-l2"><a class="reference internal" href="#i-get-set-up-with-a-spectrum-access-system-sas">I. Get set up with a Spectrum Access System (SAS)</a>
+        <ul>
+    <li class="toctree-l3"><a class="reference internal" href="#a-why-get-set-up-with-a-sas">A. Why get set up with a SAS?</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#b-cpi-license">B. CPI License</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#c-sas-pricing-agreements">C. SAS Pricing Agreements</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#d-sas-registration">D. SAS Registration</a>
+    </li>
+        </ul>
+    </li>
+    <li class="toctree-l2"><a class="reference internal" href="#ii-register-device-in-sas-portal">II. Register device in SAS portal</a>
+        <ul>
+    <li class="toctree-l3"><a class="reference internal" href="#a-once-you-have-an-account-on-an-sas-service-register-your-devices-on-their-portal-or-dashboard">A. Once you have an account on an SAS service, register your devices on their portal or dashboard.</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#b-our-setup">B. Our Setup</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#c-example-configuration">C. Example Configuration</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#d-cpi-signature">D. CPI Signature</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#e-status-tab">E. Status Tab</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#f-other-helpful-links">F. Other helpful links</a>
+    </li>
+        </ul>
+    </li>
+    <li class="toctree-l2"><a class="reference internal" href="#iii-steps-in-baicells-cloud-interface">III. Steps in Baicells Cloud interface</a>
+        <ul>
+    <li class="toctree-l3"><a class="reference internal" href="#a-make-a-baicells-omc-account">A. Make a Baicells OMC account.</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#b-take-note-of-the-cloudkey">B. Take note of the CloudKey</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#c-set-your-sas-service-provider">C. Set your SAS service provider.</a>
+    </li>
+        </ul>
+    </li>
+    <li class="toctree-l2"><a class="reference internal" href="#iv-steps-in-baicells-management-interface">IV. Steps in Baicells management interface</a>
+        <ul>
+    <li class="toctree-l3"><a class="reference internal" href="#a-local-management-portal">A. Local Management Portal</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#b-upgrade-firmware">B. Upgrade firmware</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#c-get-everything-connected">C. Get everything connected</a>
+        <ul>
+    <li class="toctree-l4"><a class="reference internal" href="#1-configure-internet-access-wan">1. Configure Internet Access (WAN)</a>
+    </li>
+    <li class="toctree-l4"><a class="reference internal" href="#2-check-internet-access">2. Check Internet access</a>
+    </li>
+    <li class="toctree-l4"><a class="reference internal" href="#3-reboot-as-needed">3. Reboot as needed</a>
+    </li>
+    <li class="toctree-l4"><a class="reference internal" href="#4-attach-to-baicells-omc">4. Attach to Baicells OMC</a>
+    </li>
+    <li class="toctree-l4"><a class="reference internal" href="#5-disable-ipsec">5. Disable IPsec</a>
+    </li>
+    <li class="toctree-l4"><a class="reference internal" href="#6-disable-gps-sync-when-testing-indoors">6. Disable GPS Sync when testing indoors.</a>
+    </li>
+    <li class="toctree-l4"><a class="reference internal" href="#7-change-the-mme-settings">7. Change the MME settings</a>
+    </li>
+    <li class="toctree-l4"><a class="reference internal" href="#8-enable-sas">8. Enable SAS</a>
+    </li>
+    <li class="toctree-l4"><a class="reference internal" href="#9-check-baicells-cloud-omc-to-debug-issues">9. Check Baicells CLOUD OMC to debug issues</a>
+    </li>
+        </ul>
+    </li>
+        </ul>
+    </li>
+    <li class="toctree-l2"><a class="reference internal" href="#v-how-to-change-location-antenna-properties-etc-after-deployment">V. How to change location, antenna properties, etc. after deployment</a>
+    </li>
+    </ul>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -412,8 +486,8 @@ <h2 id="v-how-to-change-location-antenna-properties-etc-after-deployment">V. How
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
-        <a href="../../learn/wireless-communication/" class="btn btn-neutral float-left" title="Wireless Communication"><span class="icon icon-circle-arrow-left"></span> Previous</a>
-        <a href="../epc-setup/" class="btn btn-neutral float-right" title="Step 1. LTE Core Network Setup">Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="../epc-setup/" class="btn btn-neutral float-left" title="Step 1. LTE Core Network Setup"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../proxmox-vaultwarden-deployment/" class="btn btn-neutral float-right" title="Proxmox Deployment Guide - Vaultwarden">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
   <hr/>
@@ -436,10 +510,10 @@ <h2 id="v-how-to-change-location-antenna-properties-etc-after-deployment">V. How
   <span class="rst-current-version" data-toggle="rst-current-version">
     
     
-      <span><a href="../../learn/wireless-communication/" style="color: #fcfcfc">&laquo; Previous</a></span>
+      <span><a href="../epc-setup/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
-      <span><a href="../epc-setup/" style="color: #fcfcfc">Next &raquo;</a></span>
+      <span><a href="../proxmox-vaultwarden-deployment/" style="color: #fcfcfc">Next &raquo;</a></span>
     
   </span>
 </div>
diff --git a/tutorials/epc-setup/index.html b/tutorials/epc-setup/index.html
index e3add29..a664f30 100644
--- a/tutorials/epc-setup/index.html
+++ b/tutorials/epc-setup/index.html
@@ -88,31 +88,33 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul class="current">
+                  <li class="toctree-l1"><a class="reference internal" href="../hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1 current"><a class="reference internal current" href="#">Step 1. LTE Core Network Setup</a>
+    <ul class="current">
+    </ul>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -153,8 +155,8 @@ <h1 id="step-1-colteepc-lte-core-network-setup">Step 1: CoLTE/EPC (LTE Core Netw
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
-        <a href="../enb-setup/" class="btn btn-neutral float-left" title="Step 2. eNodeB and SAS Setup"><span class="icon icon-circle-arrow-left"></span> Previous</a>
-        <a href="../hardware/" class="btn btn-neutral float-right" title="Hardware Overview">Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="../librenms-setup/" class="btn btn-neutral float-left" title="Network Monitoring 2. LibreNMS Agent Configuration"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../enb-setup/" class="btn btn-neutral float-right" title="Step 2. eNodeB and SAS Setup">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
   <hr/>
@@ -177,10 +179,10 @@ <h1 id="step-1-colteepc-lte-core-network-setup">Step 1: CoLTE/EPC (LTE Core Netw
   <span class="rst-current-version" data-toggle="rst-current-version">
     
     
-      <span><a href="../enb-setup/" style="color: #fcfcfc">&laquo; Previous</a></span>
+      <span><a href="../librenms-setup/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
-      <span><a href="../hardware/" style="color: #fcfcfc">Next &raquo;</a></span>
+      <span><a href="../enb-setup/" style="color: #fcfcfc">Next &raquo;</a></span>
     
   </span>
 </div>
diff --git a/tutorials/hardware/index.html b/tutorials/hardware/index.html
index fc37dff..d80aeba 100644
--- a/tutorials/hardware/index.html
+++ b/tutorials/hardware/index.html
@@ -88,31 +88,33 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul class="current">
+                  <li class="toctree-l1 current"><a class="reference internal current" href="#">Hardware Overview</a>
+    <ul class="current">
+    </ul>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -193,8 +195,8 @@ <h3 id="cbrs-compatible-unlocked-smartphone">CBRS-Compatible Unlocked Smartphone
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
-        <a href="../epc-setup/" class="btn btn-neutral float-left" title="Step 1. LTE Core Network Setup"><span class="icon icon-circle-arrow-left"></span> Previous</a>
-        <a href="../librenms-manager-setup/" class="btn btn-neutral float-right" title="Network Monitoring 1. LibreNMS Network Manager Configuration">Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="../../learn/networking/" class="btn btn-neutral float-left" title="Networking"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../software/" class="btn btn-neutral float-right" title="Software Overview">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
   <hr/>
@@ -217,10 +219,10 @@ <h3 id="cbrs-compatible-unlocked-smartphone">CBRS-Compatible Unlocked Smartphone
   <span class="rst-current-version" data-toggle="rst-current-version">
     
     
-      <span><a href="../epc-setup/" style="color: #fcfcfc">&laquo; Previous</a></span>
+      <span><a href="../../learn/networking/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
-      <span><a href="../librenms-manager-setup/" style="color: #fcfcfc">Next &raquo;</a></span>
+      <span><a href="../software/" style="color: #fcfcfc">Next &raquo;</a></span>
     
   </span>
 </div>
diff --git a/tutorials/librenms-manager-setup/index.html b/tutorials/librenms-manager-setup/index.html
index 181cae8..8a2a4af 100644
--- a/tutorials/librenms-manager-setup/index.html
+++ b/tutorials/librenms-manager-setup/index.html
@@ -88,31 +88,39 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul class="current">
+                  <li class="toctree-l1"><a class="reference internal" href="../hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1 current"><a class="reference internal current" href="#">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+    <ul class="current">
+    <li class="toctree-l2"><a class="reference internal" href="#librenms-manager-installation">LibreNMS Manager Installation:</a>
+    </li>
+    <li class="toctree-l2"><a class="reference internal" href="#network-specific-configuration">Network-Specific Configuration:</a>
+    </li>
+    <li class="toctree-l2"><a class="reference internal" href="#adding-baicells-os-configuration-to-librenms">Adding Baicells OS configuration to LibreNMS</a>
+    </li>
+    </ul>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -288,7 +296,7 @@ <h2 id="adding-baicells-os-configuration-to-librenms">Adding Baicells OS configu
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
-        <a href="../hardware/" class="btn btn-neutral float-left" title="Hardware Overview"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../peering/" class="btn btn-neutral float-left" title="Public ASN Peering"><span class="icon icon-circle-arrow-left"></span> Previous</a>
         <a href="../librenms-setup/" class="btn btn-neutral float-right" title="Network Monitoring 2. LibreNMS Agent Configuration">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
@@ -312,7 +320,7 @@ <h2 id="adding-baicells-os-configuration-to-librenms">Adding Baicells OS configu
   <span class="rst-current-version" data-toggle="rst-current-version">
     
     
-      <span><a href="../hardware/" style="color: #fcfcfc">&laquo; Previous</a></span>
+      <span><a href="../peering/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
       <span><a href="../librenms-setup/" style="color: #fcfcfc">Next &raquo;</a></span>
diff --git a/tutorials/librenms-setup/index.html b/tutorials/librenms-setup/index.html
index 5f5f632..88000ba 100644
--- a/tutorials/librenms-setup/index.html
+++ b/tutorials/librenms-setup/index.html
@@ -88,31 +88,43 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul class="current">
+                  <li class="toctree-l1"><a class="reference internal" href="../hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1 current"><a class="reference internal current" href="#">Network Monitoring 2. LibreNMS Agent Configuration</a>
+    <ul class="current">
+    <li class="toctree-l2"><a class="reference internal" href="#adding-a-new-node-to-librenms">Adding a New Node to LibreNMS</a>
+    </li>
+    <li class="toctree-l2"><a class="reference internal" href="#epc-snmp-configuration">EPC SNMP Configuration</a>
+    </li>
+    <li class="toctree-l2"><a class="reference internal" href="#baicells-snmp-configuration">Baicells SNMP configuration</a>
+    </li>
+    <li class="toctree-l2"><a class="reference internal" href="#adding-the-node-to-librenms">Adding the Node to LibreNMS</a>
+    </li>
+    <li class="toctree-l2"><a class="reference internal" href="#other-helpful-notes">Other helpful notes:</a>
+    </li>
+    </ul>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -279,7 +291,7 @@ <h2 id="other-helpful-notes">Other helpful notes:</h2>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
         <a href="../librenms-manager-setup/" class="btn btn-neutral float-left" title="Network Monitoring 1. LibreNMS Network Manager Configuration"><span class="icon icon-circle-arrow-left"></span> Previous</a>
-        <a href="../peering/" class="btn btn-neutral float-right" title="Public ASN Peering">Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="../epc-setup/" class="btn btn-neutral float-right" title="Step 1. LTE Core Network Setup">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
   <hr/>
@@ -305,7 +317,7 @@ <h2 id="other-helpful-notes">Other helpful notes:</h2>
       <span><a href="../librenms-manager-setup/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
-      <span><a href="../peering/" style="color: #fcfcfc">Next &raquo;</a></span>
+      <span><a href="../epc-setup/" style="color: #fcfcfc">Next &raquo;</a></span>
     
   </span>
 </div>
diff --git a/tutorials/librenms/backup/index.html b/tutorials/librenms/backup/index.html
index 9e8562d..d5ea43f 100644
--- a/tutorials/librenms/backup/index.html
+++ b/tutorials/librenms/backup/index.html
@@ -88,31 +88,33 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul class="current">
+                  <li class="toctree-l1"><a class="reference internal" href="../../hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" >Librenms</a>
-    <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../../infrastructure/librenms/deploy/">Deploying</a>
+                  <li class="toctree-l1 current"><a class="reference internal current" >Librenms</a>
+    <ul class="current">
+                <li class="toctree-l2"><a class="reference internal" href="../deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2 current"><a class="reference internal current" href="#">Backing Up</a>
+    <ul class="current">
+    </ul>
                 </li>
     </ul>
                   </li>
@@ -153,8 +155,8 @@ <h1 id="backing-up">Backing Up</h1>
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
-        <a href="../../software/" class="btn btn-neutral float-left" title="Software Overview"><span class="icon icon-circle-arrow-left"></span> Previous</a>
-        <a href="../deploy/" class="btn btn-neutral float-right" title="Deploying">Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="../upgrade/" class="btn btn-neutral float-left" title="Upgrading"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../../../contribute/contribute/" class="btn btn-neutral float-right" title="Contribute to SCN Docs">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
   <hr/>
@@ -177,10 +179,10 @@ <h1 id="backing-up">Backing Up</h1>
   <span class="rst-current-version" data-toggle="rst-current-version">
     
     
-      <span><a href="../../software/" style="color: #fcfcfc">&laquo; Previous</a></span>
+      <span><a href="../upgrade/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
-      <span><a href="../deploy/" style="color: #fcfcfc">Next &raquo;</a></span>
+      <span><a href="../../../contribute/contribute/" style="color: #fcfcfc">Next &raquo;</a></span>
     
   </span>
 </div>
diff --git a/tutorials/librenms/deploy/index.html b/tutorials/librenms/deploy/index.html
index a35ef56..2329cf7 100644
--- a/tutorials/librenms/deploy/index.html
+++ b/tutorials/librenms/deploy/index.html
@@ -88,31 +88,37 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul class="current">
+                  <li class="toctree-l1"><a class="reference internal" href="../../hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" >Librenms</a>
-    <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../../infrastructure/librenms/deploy/">Deploying</a>
+                  <li class="toctree-l1 current"><a class="reference internal current" >Librenms</a>
+    <ul class="current">
+                <li class="toctree-l2 current"><a class="reference internal current" href="#">Deploying</a>
+    <ul class="current">
+    <li class="toctree-l3"><a class="reference internal" href="#software-requirements">Software requirements</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#steps">Steps</a>
+    </li>
+    </ul>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -174,7 +180,7 @@ <h2 id="steps">Steps</h2>
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
-        <a href="../backup/" class="btn btn-neutral float-left" title="Backing Up"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../../proxmox-vaultwarden-deployment/" class="btn btn-neutral float-left" title="Proxmox Deployment Guide - Vaultwarden"><span class="icon icon-circle-arrow-left"></span> Previous</a>
         <a href="../upgrade/" class="btn btn-neutral float-right" title="Upgrading">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
@@ -198,7 +204,7 @@ <h2 id="steps">Steps</h2>
   <span class="rst-current-version" data-toggle="rst-current-version">
     
     
-      <span><a href="../backup/" style="color: #fcfcfc">&laquo; Previous</a></span>
+      <span><a href="../../proxmox-vaultwarden-deployment/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
       <span><a href="../upgrade/" style="color: #fcfcfc">Next &raquo;</a></span>
diff --git a/tutorials/librenms/upgrade/index.html b/tutorials/librenms/upgrade/index.html
index f2be63b..4514b94 100644
--- a/tutorials/librenms/upgrade/index.html
+++ b/tutorials/librenms/upgrade/index.html
@@ -88,31 +88,37 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul class="current">
+                  <li class="toctree-l1"><a class="reference internal" href="../../hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" >Librenms</a>
-    <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../../infrastructure/librenms/deploy/">Deploying</a>
+                  <li class="toctree-l1 current"><a class="reference internal current" >Librenms</a>
+    <ul class="current">
+                <li class="toctree-l2"><a class="reference internal" href="../deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2 current"><a class="reference internal current" href="#">Upgrading</a>
+    <ul class="current">
+    <li class="toctree-l3"><a class="reference internal" href="#os">OS</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#service">Service</a>
+    </li>
+    </ul>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -171,6 +177,7 @@ <h2 id="service">Service</h2>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
         <a href="../deploy/" class="btn btn-neutral float-left" title="Deploying"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../backup/" class="btn btn-neutral float-right" title="Backing Up">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
   <hr/>
@@ -196,6 +203,8 @@ <h2 id="service">Service</h2>
       <span><a href="../deploy/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
+      <span><a href="../backup/" style="color: #fcfcfc">Next &raquo;</a></span>
+    
   </span>
 </div>
     <script src="../../../js/jquery-3.6.0.min.js"></script>
diff --git a/tutorials/peering/index.html b/tutorials/peering/index.html
index 82f2ba3..c4f8e03 100644
--- a/tutorials/peering/index.html
+++ b/tutorials/peering/index.html
@@ -88,31 +88,47 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul class="current">
+                  <li class="toctree-l1"><a class="reference internal" href="../hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1 current"><a class="reference internal current" href="#">Public ASN Peering</a>
+    <ul class="current">
+    <li class="toctree-l2"><a class="reference internal" href="#local-connectivity-lab-operates-as54429">Local Connectivity Lab operates AS54429</a>
+    </li>
+    <li class="toctree-l2"><a class="reference internal" href="#our-peering-policy-is-yes">Our peering Policy is Yes</a>
+        <ul>
+    <li class="toctree-l3"><a class="reference internal" href="#peering-policy">Peering Policy</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#locations">Locations</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#exchanges">Exchanges</a>
+    </li>
+        </ul>
+    </li>
+    <li class="toctree-l2"><a class="reference internal" href="#peering-data">Peering Data</a>
+    </li>
+    </ul>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -209,8 +225,8 @@ <h2 id="peering-data">Peering Data</h2>
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
-        <a href="../librenms-setup/" class="btn btn-neutral float-left" title="Network Monitoring 2. LibreNMS Agent Configuration"><span class="icon icon-circle-arrow-left"></span> Previous</a>
-        <a href="../proxmox-vaultwarden-deployment/" class="btn btn-neutral float-right" title="Proxmox Deployment Guide - Vaultwarden">Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="../software/" class="btn btn-neutral float-left" title="Software Overview"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../librenms-manager-setup/" class="btn btn-neutral float-right" title="Network Monitoring 1. LibreNMS Network Manager Configuration">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
   <hr/>
@@ -233,10 +249,10 @@ <h2 id="peering-data">Peering Data</h2>
   <span class="rst-current-version" data-toggle="rst-current-version">
     
     
-      <span><a href="../librenms-setup/" style="color: #fcfcfc">&laquo; Previous</a></span>
+      <span><a href="../software/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
-      <span><a href="../proxmox-vaultwarden-deployment/" style="color: #fcfcfc">Next &raquo;</a></span>
+      <span><a href="../librenms-manager-setup/" style="color: #fcfcfc">Next &raquo;</a></span>
     
   </span>
 </div>
diff --git a/tutorials/proxmox-vaultwarden-deployment/index.html b/tutorials/proxmox-vaultwarden-deployment/index.html
index 0c29089..568870a 100644
--- a/tutorials/proxmox-vaultwarden-deployment/index.html
+++ b/tutorials/proxmox-vaultwarden-deployment/index.html
@@ -88,31 +88,33 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul class="current">
+                  <li class="toctree-l1"><a class="reference internal" href="../hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../software/">Software Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1 current"><a class="reference internal current" href="#">Proxmox Deployment Guide - Vaultwarden</a>
+    <ul class="current">
+    </ul>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -364,8 +366,8 @@ <h2 id="section-13-using-the-backup">Section 13: Using the Backup</h2>
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
-        <a href="../peering/" class="btn btn-neutral float-left" title="Public ASN Peering"><span class="icon icon-circle-arrow-left"></span> Previous</a>
-        <a href="../software/" class="btn btn-neutral float-right" title="Software Overview">Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="../enb-setup/" class="btn btn-neutral float-left" title="Step 2. eNodeB and SAS Setup"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../librenms/deploy/" class="btn btn-neutral float-right" title="Deploying">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
   <hr/>
@@ -388,10 +390,10 @@ <h2 id="section-13-using-the-backup">Section 13: Using the Backup</h2>
   <span class="rst-current-version" data-toggle="rst-current-version">
     
     
-      <span><a href="../peering/" style="color: #fcfcfc">&laquo; Previous</a></span>
+      <span><a href="../enb-setup/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
-      <span><a href="../software/" style="color: #fcfcfc">Next &raquo;</a></span>
+      <span><a href="../librenms/deploy/" style="color: #fcfcfc">Next &raquo;</a></span>
     
   </span>
 </div>
diff --git a/tutorials/software/index.html b/tutorials/software/index.html
index 89ae3ae..f6a0c2d 100644
--- a/tutorials/software/index.html
+++ b/tutorials/software/index.html
@@ -88,31 +88,69 @@
                   <li class="toctree-l1"><a class="reference internal" href="../../learn/networking/">Networking</a>
                   </li>
               </ul>
-              <p class="caption"><span class="caption-text">Infrastructure</span></p>
-              <ul>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/hardware/">Hardware Overview</a>
+              <p class="caption"><span class="caption-text">Tutorials</span></p>
+              <ul class="current">
+                  <li class="toctree-l1"><a class="reference internal" href="../hardware/">Hardware Overview</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/software/">Software Overview</a>
+                  <li class="toctree-l1 current"><a class="reference internal current" href="#">Software Overview</a>
+    <ul class="current">
+    <li class="toctree-l2"><a class="reference internal" href="#networking">Networking</a>
+        <ul>
+    <li class="toctree-l3"><a class="reference internal" href="#local-services">Local Services</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#evolved-packet-core-epc">Evolved Packet Core (EPC)</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#spectrum-access-system-sas">Spectrum Access System (SAS)</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#network-monitoring-and-alerting">Network Monitoring and Alerting</a>
+    </li>
+        </ul>
+    </li>
+    <li class="toctree-l2"><a class="reference internal" href="#field-measurement">Field Measurement</a>
+        <ul>
+    <li class="toctree-l3"><a class="reference internal" href="#network-performance-measurement-tool">Network Performance Measurement Tool</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#network-cell-info-lite">Network Cell Info Lite</a>
+    </li>
+        </ul>
+    </li>
+    <li class="toctree-l2"><a class="reference internal" href="#site-planning">Site Planning</a>
+        <ul>
+    <li class="toctree-l3"><a class="reference internal" href="#google-earth">Google Earth</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#ubiquiti-line-of-sight">Ubiquiti Line of Sight</a>
+    </li>
+        </ul>
+    </li>
+    <li class="toctree-l2"><a class="reference internal" href="#other-resources">Other resources</a>
+        <ul>
+    <li class="toctree-l3"><a class="reference internal" href="#facebook-isp-toolbox-line-of-sight">Facebook ISP Toolbox Line of Sight</a>
+    </li>
+    <li class="toctree-l3"><a class="reference internal" href="#facebook-isp-toolbox-market-evaluator">Facebook ISP Toolbox Market Evaluator</a>
+    </li>
+        </ul>
+    </li>
+    </ul>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/peering/">Public ASN Peering</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../peering/">Public ASN Peering</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../librenms-manager-setup/">Network Monitoring 1. LibreNMS Network Manager Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../librenms-setup/">Network Monitoring 2. LibreNMS Agent Configuration</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/epc-setup/">Step 1. LTE Core Network Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../epc-setup/">Step 1. LTE Core Network Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/sas-setup/">Step 2. eNodeB and SAS Setup</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../enb-setup/">Step 2. eNodeB and SAS Setup</a>
                   </li>
-                  <li class="toctree-l1"><a class="reference internal" href="../../infrastructure/proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
+                  <li class="toctree-l1"><a class="reference internal" href="../proxmox-vaultwarden-deployment/">Proxmox Deployment Guide - Vaultwarden</a>
                   </li>
                   <li class="toctree-l1"><a class="reference internal" >Librenms</a>
     <ul>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/deploy/">Deploying</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/deploy/">Deploying</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/upgrade/">Upgrading</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/upgrade/">Upgrading</a>
                 </li>
-                <li class="toctree-l2"><a class="reference internal" href="../../infrastructure/librenms/backup/">Backing Up</a>
+                <li class="toctree-l2"><a class="reference internal" href="../librenms/backup/">Backing Up</a>
                 </li>
     </ul>
                   </li>
@@ -183,8 +221,8 @@ <h3 id="facebook-isp-toolbox-market-evaluator">Facebook ISP Toolbox Market Evalu
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
-        <a href="../proxmox-vaultwarden-deployment/" class="btn btn-neutral float-left" title="Proxmox Deployment Guide - Vaultwarden"><span class="icon icon-circle-arrow-left"></span> Previous</a>
-        <a href="../librenms/backup/" class="btn btn-neutral float-right" title="Backing Up">Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="../hardware/" class="btn btn-neutral float-left" title="Hardware Overview"><span class="icon icon-circle-arrow-left"></span> Previous</a>
+        <a href="../peering/" class="btn btn-neutral float-right" title="Public ASN Peering">Next <span class="icon icon-circle-arrow-right"></span></a>
     </div>
 
   <hr/>
@@ -207,10 +245,10 @@ <h3 id="facebook-isp-toolbox-market-evaluator">Facebook ISP Toolbox Market Evalu
   <span class="rst-current-version" data-toggle="rst-current-version">
     
     
-      <span><a href="../proxmox-vaultwarden-deployment/" style="color: #fcfcfc">&laquo; Previous</a></span>
+      <span><a href="../hardware/" style="color: #fcfcfc">&laquo; Previous</a></span>
     
     
-      <span><a href="../librenms/backup/" style="color: #fcfcfc">Next &raquo;</a></span>
+      <span><a href="../peering/" style="color: #fcfcfc">Next &raquo;</a></span>
     
   </span>
 </div>