diff --git a/books/system_administrators/Makefile b/books/sysadmins/Makefile
similarity index 100%
rename from books/system_administrators/Makefile
rename to books/sysadmins/Makefile
diff --git a/books/system_administrators/SUMMARY.md b/books/sysadmins/SUMMARY.md
similarity index 99%
rename from books/system_administrators/SUMMARY.md
rename to books/sysadmins/SUMMARY.md
index a1dfc94..aa0d1e3 100644
--- a/books/system_administrators/SUMMARY.md
+++ b/books/sysadmins/SUMMARY.md
@@ -1,4 +1,4 @@
-- [Table of Contents](system_administrators/system_administrators_book_toc.md)
+- [Introduction](system_administrators/system_administrators_book.md)
 - [Getting Started](system_administrators/getstarted/tfgrid3_getstarted.md)
   - [SSH Remote Connection](system_administrators/getstarted/ssh_guide/ssh_guide.md)
     - [SSH with OpenSSH](system_administrators/getstarted/ssh_guide/ssh_openssh.md)
diff --git a/books/system_administrators/scripts/calculate_cloud_pricing.sh b/books/sysadmins/scripts/calculate_cloud_pricing.sh
similarity index 100%
rename from books/system_administrators/scripts/calculate_cloud_pricing.sh
rename to books/sysadmins/scripts/calculate_cloud_pricing.sh
diff --git a/books/system_administrators/scripts/calculate_marketcap.sh b/books/sysadmins/scripts/calculate_marketcap.sh
similarity index 100%
rename from books/system_administrators/scripts/calculate_marketcap.sh
rename to books/sysadmins/scripts/calculate_marketcap.sh
diff --git a/books/system_administrators/scripts/generate_wallets.sh b/books/sysadmins/scripts/generate_wallets.sh
similarity index 100%
rename from books/system_administrators/scripts/generate_wallets.sh
rename to books/sysadmins/scripts/generate_wallets.sh
diff --git a/books/system_administrators/sync_production.sh b/books/sysadmins/sync_production.sh
similarity index 85%
rename from books/system_administrators/sync_production.sh
rename to books/sysadmins/sync_production.sh
index c2cee8b..db1860a 100755
--- a/books/system_administrators/sync_production.sh
+++ b/books/sysadmins/sync_production.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 set -ex
-export NAME=system_administrators
+export NAME=sysadmins
 hero mdbook -u https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/manual/heroscript/$NAME
 rsync -rv ~/hero/www/info/$NAME/ root@info.ourworld.tf:/root/hero/www/info/$NAME/
diff --git a/collections/system_administrators/system_administrators_book.md b/collections/system_administrators/system_administrators_book.md
new file mode 100644
index 0000000..5ccf13b
--- /dev/null
+++ b/collections/system_administrators/system_administrators_book.md
@@ -0,0 +1,3 @@
+# ThreeFold System Administrators Manual
+
+This manual covers all practical tutorials for system administrators working on the ThreeFold Grid.
\ No newline at end of file
diff --git a/collections/system_administrators/system_administrators_book_toc.md b/collections/system_administrators/system_administrators_book_toc.md
deleted file mode 100644
index 333106c..0000000
--- a/collections/system_administrators/system_administrators_book_toc.md
+++ /dev/null
@@ -1,93 +0,0 @@
-# ThreeFold System Administrators Manual
-
-This manual covers all practical tutorials for system administrators working on the ThreeFold Grid.
-
-<h2> Table of Contents </h2>
-
-- [Getting Started](tfgrid3_getstarted.md)
-  - [SSH Remote Connection](ssh_guide.md)
-      - [SSH with OpenSSH](ssh_openssh.md)
-      - [SSH with PuTTY](ssh_putty.md)
-      - [SSH with WSL](ssh_wsl.md)
-      - [WireGuard Access](ssh_wireguard.md)
-  - [Remote Desktop and GUI](remote_desktop_gui.md)
-      - [Cockpit: a Web-based Interface for Servers](cockpit_guide.md)
-      - [XRDP: an Open-Source Remote Desktop Protocol](xrdp_guide.md)
-      - [Apache Guacamole: a Clientless Remote Desktop Gateway](guacamole_guide.md)
-- [Planetary Network](planetarynetwork.md)
-- [TFGrid Services](tf_grid_services_readme.md)
-- [GPU](gpu_toc.md)
-  - [GPU Support](gpu.md)
-- [Terraform](terraform_toc.md)
-  - [Overview](terraform_readme.md)
-  - [Installing Terraform](terraform_install.md)
-  - [Terraform Basics](terraform_basics.md)
-  - [Full VM Deployment](terraform_full_vm.md)
-  - [GPU Support](terraform_gpu_support.md)
-  - [Resources](terraform_resources_readme.md)
-    - [Using Scheduler](terraform_scheduler.md)
-    - [Virtual Machine](terraform_vm.md)
-    - [Web Gateway](terraform_vm_gateway.md)
-    - [Kubernetes Cluster](terraform_k8s.md)
-    - [ZDB](terraform_zdb.md)
-    - [Zlogs](terraform_zlogs.md)
-    - [Quantum Safe Filesystem](terraform_qsfs.md)
-      - [QSFS on Micro VM](terraform_qsfs_on_microvm.md)
-      - [QSFS on Full VM](terraform_qsfs_on_full_vm.md)
-    - [CapRover](terraform_caprover.md)
-  - [Advanced](terraform_advanced_readme.md)
-    - [Terraform Provider](terraform_provider.md)
-    - [Terraform Provisioners](terraform_provisioners.md)
-    - [Mounts](terraform_mounts.md)
-    - [Capacity Planning](terraform_capacity_planning.md)
-    - [Updates](terraform_updates.md)
-    - [SSH Connection with Wireguard](terraform_wireguard_ssh.md)
-    - [Set a Wireguard VPN](terraform_wireguard_vpn.md)
-    - [Synced MariaDB Databases](terraform_mariadb_synced_databases.md)
-    - [Nomad](terraform_nomad.md)
-    - [Nextcloud Deployments](terraform_nextcloud_toc.md)
-      - [Nextcloud All-in-One Deployment](terraform_nextcloud_aio.md)
-      - [Nextcloud Single Deployment](terraform_nextcloud_single.md)
-      - [Nextcloud Redundant Deployment](terraform_nextcloud_redundant.md)
-      - [Nextcloud 2-Node VPN Deployment](terraform_nextcloud_vpn.md)
-- [Pulumi](pulumi_readme.md)
-  - [Introduction to Pulumi](pulumi_intro.md)
-  - [Installing Pulumi](pulumi_install.md)
-  - [Deployment Examples](pulumi_examples.md)
-  - [Deployment Details](pulumi_deployment_details.md)
-- [Mycelium](mycelium_toc.md)
-    - [Overview](overview.md)
-    - [Installation](installation.md)
-    - [Additional Information](information.md)
-    - [Message](message.md)
-    - [Packet](packet.md)
-    - [Data Packet](data_packet.md)
-    - [API YAML](api_yaml.md)
-- [Computer and IT Basics](computer_it_basics.md)
-  - [CLI and Scripts Basics](cli_scripts_basics.md)
-  - [Docker Basics](docker_basics.md)
-  - [Git and GitHub Basics](git_github_basics.md)
-  - [Firewall Basics](firewall_basics.md)
-      - [UFW Basics](ufw_basics.md)
-      - [Firewalld Basics](firewalld_basics.md)
-  - [File Transfer](file_transfer.md)
-  - [Screenshots](screenshots.md)
-- [Advanced](advanced.md)
-  - [Token Transfer Keygenerator](token_transfer_keygenerator.md)
-  - [Cancel Contracts](cancel_contracts.md)
-  - [Contract Bills Reports](contract_bill_report.md)
-  - [Listing Free Public IPs](list_public_ips.md)
-  - [Cloud Console](cloud_console.md)
-  - [Redis](grid3_redis.md)
-  - [IPFS](ipfs_toc.md)
-      - [IPFS on a Full VM](ipfs_fullvm.md)
-      - [IPFS on a Micro VM](ipfs_microvm.md)
-  - [MinIO Operator with Helm3](minio_helm3.md) 
-  - [Hummingbot](hummingbot.md)
-  - [AI & ML Workloads](ai_ml_workloads.md)
-  - [Ecommerce](ecommerce.md)
-    - [WooCommerce](woocommerce.md)
-    - [nopCommerce](nopcommerce.md)
-  - [Hummingbot](hummingbot.md)
-  - [HTTPS with Caddy](https_caddy.md)
-  - [Node Status Bot](node_status_bot.md)
\ No newline at end of file
diff --git a/heroscript/system_administrators/book_collections.md b/heroscript/sysadmins/book_collections.md
similarity index 90%
rename from heroscript/system_administrators/book_collections.md
rename to heroscript/sysadmins/book_collections.md
index dc32726..8993bfe 100644
--- a/heroscript/system_administrators/book_collections.md
+++ b/heroscript/sysadmins/book_collections.md
@@ -1,7 +1,7 @@
 ```js
 
-!!book.generate name:'system_administrators' title:'ThreeFold System Administrators Manual' printbook:false foldlevel:0
-        url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/books/system_administrators'
+!!book.generate name:'sysadmins' title:'ThreeFold System Administrators Manual' printbook:false foldlevel:0
+        url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/books/sysadmins'
 
 !!doctree.add
     url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/manual'
diff --git a/heroscript/system_administrators/context.md b/heroscript/sysadmins/context.md
similarity index 100%
rename from heroscript/system_administrators/context.md
rename to heroscript/sysadmins/context.md
diff --git a/heroscript/system_administrators/sshkey.md b/heroscript/sysadmins/sshkey.md
similarity index 100%
rename from heroscript/system_administrators/sshkey.md
rename to heroscript/sysadmins/sshkey.md