diff --git a/source/containerization.rst b/source/_toctree/administration/containerization.rst
similarity index 85%
rename from source/containerization.rst
rename to source/_toctree/administration/containerization.rst
index cc8ef02..30d60f6 100644
--- a/source/containerization.rst
+++ b/source/_toctree/administration/containerization.rst
@@ -5,4 +5,4 @@ Containerization
 .. toctree::
    :maxdepth: 2
 
-   lxc/index
+   /lxc/index
diff --git a/source/_toctree/administration/index.rst b/source/_toctree/administration/index.rst
index 0c052de..6fdda68 100644
--- a/source/_toctree/administration/index.rst
+++ b/source/_toctree/administration/index.rst
@@ -2,3 +2,8 @@ Administration
 ==============
 
 .. toctree::
+
+   security
+   servers
+   system
+   containerization
diff --git a/source/_toctree/administration/security.rst b/source/_toctree/administration/security.rst
new file mode 100644
index 0000000..bf4276d
--- /dev/null
+++ b/source/_toctree/administration/security.rst
@@ -0,0 +1,10 @@
+########
+Security
+########
+
+.. toctree::
+   :maxdepth: 2
+
+   /openssh-client/index
+   /openssh-server/index
+   /openssl/index
diff --git a/source/_toctree/administration/servers.rst b/source/_toctree/administration/servers.rst
new file mode 100644
index 0000000..25d2226
--- /dev/null
+++ b/source/_toctree/administration/servers.rst
@@ -0,0 +1,13 @@
+#######
+Servers
+#######
+
+.. toctree::
+   :maxdepth: 2
+
+   /nginx/index
+   /apache/index
+
+   /nodejs/index
+   /tomcat/index
+   /glassfish/index
diff --git a/source/system.rst b/source/_toctree/administration/system.rst
similarity index 62%
rename from source/system.rst
rename to source/_toctree/administration/system.rst
index d7ad38c..3cebc76 100644
--- a/source/system.rst
+++ b/source/_toctree/administration/system.rst
@@ -5,5 +5,5 @@ System
 .. toctree::
    :maxdepth: 2
 
-   apt/index
-   debian/index
+   /apt/index
+   /debian/index
diff --git a/source/applications.rst b/source/applications.rst
deleted file mode 100644
index c8884a9..0000000
--- a/source/applications.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-############
-Applications
-############
-
-.. toctree::
-   :maxdepth: 2
-
-   nodejs/index
-   tomcat/index
-   glassfish/index
diff --git a/source/index.rst b/source/index.rst
index 99f9e0b..dc36ac2 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -7,7 +7,6 @@
    _toctree/index
 
 .. toctree::
-   :caption: Pro
    :maxdepth: 3
    :numbered: 2
 
@@ -17,20 +16,10 @@
    script
    network
    data
-   web
    code
-   applications
-   security
-   system
    boot
-   containerization
    virtualization
 
-.. toctree::
-   :caption: Home
-   :maxdepth: 3
-   :numbered: 2
-
    desktop
    media
    privacy
diff --git a/source/security.rst b/source/security.rst
deleted file mode 100644
index b53d51c..0000000
--- a/source/security.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-########
-Security
-########
-
-.. toctree::
-   :maxdepth: 2
-
-   openssh-client/index
-   openssh-server/index
-   openssl/index
diff --git a/source/web.rst b/source/web.rst
deleted file mode 100644
index 6140b0a..0000000
--- a/source/web.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-###
-Web
-###
-
-.. toctree::
-   :maxdepth: 2
-
-   nginx/index
-   apache/index