diff --git a/_toc.yml b/_toc.yml
index 40c8a50b..72cfa735 100644
--- a/_toc.yml
+++ b/_toc.yml
@@ -56,14 +56,20 @@ chapters:
             sections:
               - file: admin-guide/configuration/monitoring/icinga2
               - file: admin-guide/configuration/monitoring/metrics_telegraf
+              - file: admin-guide/configuration/monitoring/journald
               - file: admin-guide/configuration/monitoring/syslog_forwarding
               - file: admin-guide/configuration/monitoring/central_logging_elastic
-          - file: admin-guide/configuration/packages
-          - file: admin-guide/configuration/python
-          - file: admin-guide/configuration/conda
-          - file: admin-guide/configuration/package_updates
-          - file: admin-guide/configuration/package_repositories
-          - file: admin-guide/configuration/services
+          - file: admin-guide/configuration/software
+            sections:
+              - file: admin-guide/configuration/software/packages
+              - file: admin-guide/configuration/software/services
+              - file: admin-guide/configuration/software/selinux_configuration
+              - file: admin-guide/configuration/software/package_updates
+              - file: admin-guide/configuration/software/package_repositories
+              - file: admin-guide/configuration/software/python
+              - file: admin-guide/configuration/software/conda
+              - file: admin-guide/configuration/software/labview
+              - file: admin-guide/configuration/software/citrix_vda
           - file: admin-guide/configuration/mount
           - file: admin-guide/configuration/distribute_files
           - file: admin-guide/configuration/resize_vm_disk
@@ -80,16 +86,12 @@ chapters:
           - file: admin-guide/configuration/screen_lock
           - file: admin-guide/configuration/banner_message
           - file: admin-guide/configuration/alternative_desktops
-          - file: admin-guide/configuration/journald
           - file: admin-guide/configuration/ntp_server
           - file: admin-guide/configuration/nfs_server
           - file: admin-guide/configuration/sshd_configuration
           - file: admin-guide/configuration/sftp_server
           - file: admin-guide/configuration/ssh_host_hopping
-          - file: admin-guide/configuration/citrix_vda
-          - file: admin-guide/configuration/labview
           - file: admin-guide/configuration/configuration_email
-          - file: admin-guide/configuration/selinux_configuration
 
 
       - file: admin-guide/custom_repositories
diff --git a/admin-guide/configuration/journald.md b/admin-guide/configuration/monitoring/journald.md
similarity index 100%
rename from admin-guide/configuration/journald.md
rename to admin-guide/configuration/monitoring/journald.md
diff --git a/admin-guide/configuration/citrix_vda.md b/admin-guide/configuration/software/citrix_vda.md
similarity index 100%
rename from admin-guide/configuration/citrix_vda.md
rename to admin-guide/configuration/software/citrix_vda.md
diff --git a/admin-guide/configuration/conda.md b/admin-guide/configuration/software/conda.md
similarity index 100%
rename from admin-guide/configuration/conda.md
rename to admin-guide/configuration/software/conda.md
diff --git a/admin-guide/configuration/labview.md b/admin-guide/configuration/software/labview.md
similarity index 100%
rename from admin-guide/configuration/labview.md
rename to admin-guide/configuration/software/labview.md
diff --git a/admin-guide/configuration/package_repositories.md b/admin-guide/configuration/software/package_repositories.md
similarity index 100%
rename from admin-guide/configuration/package_repositories.md
rename to admin-guide/configuration/software/package_repositories.md
diff --git a/admin-guide/configuration/package_updates.md b/admin-guide/configuration/software/package_updates.md
similarity index 100%
rename from admin-guide/configuration/package_updates.md
rename to admin-guide/configuration/software/package_updates.md
diff --git a/admin-guide/configuration/packages.md b/admin-guide/configuration/software/packages.md
similarity index 100%
rename from admin-guide/configuration/packages.md
rename to admin-guide/configuration/software/packages.md
diff --git a/admin-guide/configuration/python.md b/admin-guide/configuration/software/python.md
similarity index 100%
rename from admin-guide/configuration/python.md
rename to admin-guide/configuration/software/python.md
diff --git a/admin-guide/configuration/selinux_configuration.md b/admin-guide/configuration/software/selinux_configuration.md
similarity index 100%
rename from admin-guide/configuration/selinux_configuration.md
rename to admin-guide/configuration/software/selinux_configuration.md
diff --git a/admin-guide/configuration/services.md b/admin-guide/configuration/software/services.md
similarity index 100%
rename from admin-guide/configuration/services.md
rename to admin-guide/configuration/software/services.md