diff --git a/in/_toctree/administration/index.rst b/in/_toctree/administration/index.rst
deleted file mode 100644
index 6fdda68..0000000
--- a/in/_toctree/administration/index.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-Administration
-==============
-
-.. toctree::
-
-   security
-   servers
-   system
-   containerization
diff --git a/in/_toctree/administration/security.rst b/in/_toctree/administration/security.rst
deleted file mode 100644
index bf4276d..0000000
--- a/in/_toctree/administration/security.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-########
-Security
-########
-
-.. toctree::
-   :maxdepth: 2
-
-   /openssh-client/index
-   /openssh-server/index
-   /openssl/index
diff --git a/in/_toctree/administration/servers.rst b/in/_toctree/administration/servers.rst
deleted file mode 100644
index 25d2226..0000000
--- a/in/_toctree/administration/servers.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-#######
-Servers
-#######
-
-.. toctree::
-   :maxdepth: 2
-
-   /nginx/index
-   /apache/index
-
-   /nodejs/index
-   /tomcat/index
-   /glassfish/index
diff --git a/in/_toctree/administration/system.rst b/in/_toctree/administration/system.rst
deleted file mode 100644
index 3cebc76..0000000
--- a/in/_toctree/administration/system.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-######
-System
-######
-
-.. toctree::
-   :maxdepth: 2
-
-   /apt/index
-   /debian/index
diff --git a/in/_toctree/index.rst b/in/_toctree/index.rst
deleted file mode 100644
index 438f551..0000000
--- a/in/_toctree/index.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-.. toctree::
-
-   administration/index
diff --git a/in/index.rst b/in/index.rst
index 519634b..6135bde 100644
--- a/in/index.rst
+++ b/in/index.rst
@@ -4,9 +4,14 @@ RTFD
 .. toctree::
    :maxdepth: 2
 
+   public/containerization/index
    public/documents/index
-   public/scm/index
    public/virtualization/index
+   public/packages/index
+   public/security/index
+   public/systems/index
+   public/scm/index
+   public/web/index
 
 .. toctree::
    :maxdepth: 2
@@ -18,8 +23,6 @@ RTFD
    :maxdepth: 4
    :caption: Dispatch
 
-   _toctree/index
-
    tasks
 
    archive
diff --git a/in/_toctree/administration/containerization.rst b/in/public/containerization/index.rst
similarity index 50%
rename from in/_toctree/administration/containerization.rst
rename to in/public/containerization/index.rst
index 30d60f6..45ccf55 100644
--- a/in/_toctree/administration/containerization.rst
+++ b/in/public/containerization/index.rst
@@ -1,8 +1,7 @@
-################
 Containerization
-################
+================
 
 .. toctree::
    :maxdepth: 2
 
-   /lxc/index
+   lxc/index
diff --git a/in/lxc/container.rst b/in/public/containerization/lxc/container.rst
similarity index 100%
rename from in/lxc/container.rst
rename to in/public/containerization/lxc/container.rst
diff --git a/in/lxc/host.rst b/in/public/containerization/lxc/host.rst
similarity index 100%
rename from in/lxc/host.rst
rename to in/public/containerization/lxc/host.rst
diff --git a/in/lxc/index.rst b/in/public/containerization/lxc/index.rst
similarity index 90%
rename from in/lxc/index.rst
rename to in/public/containerization/lxc/index.rst
index eae0717..289e999 100644
--- a/in/lxc/index.rst
+++ b/in/public/containerization/lxc/index.rst
@@ -25,3 +25,5 @@ Promiscuous Mode    Accept
 MAC Address Changes Accept
 Forged Transmits    Accept
 =================== ======
+
+.. todo:: same problem with VirtualBox network
diff --git a/in/apt/configure.rst b/in/public/packages/apt/configure.rst
similarity index 100%
rename from in/apt/configure.rst
rename to in/public/packages/apt/configure.rst
diff --git a/in/apt/index.rst b/in/public/packages/apt/index.rst
similarity index 84%
rename from in/apt/index.rst
rename to in/public/packages/apt/index.rst
index 8474a92..540fb7f 100644
--- a/in/apt/index.rst
+++ b/in/public/packages/apt/index.rst
@@ -1,6 +1,5 @@
-###
 APT
-###
+===
 
 .. toctree::
 
diff --git a/in/apt/upgrade.rst b/in/public/packages/apt/upgrade.rst
similarity index 100%
rename from in/apt/upgrade.rst
rename to in/public/packages/apt/upgrade.rst
diff --git a/in/public/packages/index.rst b/in/public/packages/index.rst
new file mode 100644
index 0000000..54d6346
--- /dev/null
+++ b/in/public/packages/index.rst
@@ -0,0 +1,7 @@
+Packages
+========
+
+.. toctree::
+   :maxdepth: 2
+
+   apt/index
diff --git a/in/public/security/index.rst b/in/public/security/index.rst
new file mode 100644
index 0000000..9503d28
--- /dev/null
+++ b/in/public/security/index.rst
@@ -0,0 +1,9 @@
+Security
+========
+
+.. toctree::
+   :maxdepth: 2
+
+   openssh-client/index
+   openssh-server/index
+   openssl/index
diff --git a/in/openssh-client/index.rst b/in/public/security/openssh-client/index.rst
similarity index 82%
rename from in/openssh-client/index.rst
rename to in/public/security/openssh-client/index.rst
index a6425f0..eead5ba 100644
--- a/in/openssh-client/index.rst
+++ b/in/public/security/openssh-client/index.rst
@@ -8,9 +8,7 @@ Configure
 
 * /etc/ssh/ssh_config
 
-::
-
-  TODO
+.. todo:: lines
 
 **********
 Create key
@@ -21,3 +19,5 @@ Create key
 .. code:: shell
 
   ssh-keygen -b 4096
+
+.. todo:: other arguments
diff --git a/in/openssh-server/index.rst b/in/public/security/openssh-server/index.rst
similarity index 98%
rename from in/openssh-server/index.rst
rename to in/public/security/openssh-server/index.rst
index af4c650..b9b0bd4 100644
--- a/in/openssh-server/index.rst
+++ b/in/public/security/openssh-server/index.rst
@@ -73,6 +73,4 @@ types: rsa/ed25519/…?
 
 * authorized_keys
 
-::
-
-  TODO
+.. todo:: about
diff --git a/in/openssl/index.rst b/in/public/security/openssl/index.rst
similarity index 100%
rename from in/openssl/index.rst
rename to in/public/security/openssl/index.rst
diff --git a/in/debian/index.rst b/in/public/systems/debian/index.rst
similarity index 100%
rename from in/debian/index.rst
rename to in/public/systems/debian/index.rst
diff --git a/in/debian/mirror.rst b/in/public/systems/debian/mirror.rst
similarity index 100%
rename from in/debian/mirror.rst
rename to in/public/systems/debian/mirror.rst
diff --git a/in/debian/packages.rst b/in/public/systems/debian/packages.rst
similarity index 100%
rename from in/debian/packages.rst
rename to in/public/systems/debian/packages.rst
diff --git a/in/debian/repositories.rst b/in/public/systems/debian/repositories.rst
similarity index 100%
rename from in/debian/repositories.rst
rename to in/public/systems/debian/repositories.rst
diff --git a/in/debian/system.rst b/in/public/systems/debian/system.rst
similarity index 100%
rename from in/debian/system.rst
rename to in/public/systems/debian/system.rst
diff --git a/in/public/systems/index.rst b/in/public/systems/index.rst
new file mode 100644
index 0000000..7163056
--- /dev/null
+++ b/in/public/systems/index.rst
@@ -0,0 +1,7 @@
+Systems
+=======
+
+.. toctree::
+   :maxdepth: 2
+
+   debian/index
diff --git a/in/apache/index.rst b/in/public/web/apache/index.rst
similarity index 100%
rename from in/apache/index.rst
rename to in/public/web/apache/index.rst
diff --git a/in/glassfish/certify.rst b/in/public/web/glassfish/certify.rst
similarity index 100%
rename from in/glassfish/certify.rst
rename to in/public/web/glassfish/certify.rst
diff --git a/in/glassfish/configure.rst b/in/public/web/glassfish/configure.rst
similarity index 100%
rename from in/glassfish/configure.rst
rename to in/public/web/glassfish/configure.rst
diff --git a/in/glassfish/deploy.rst b/in/public/web/glassfish/deploy.rst
similarity index 100%
rename from in/glassfish/deploy.rst
rename to in/public/web/glassfish/deploy.rst
diff --git a/in/glassfish/index.rst b/in/public/web/glassfish/index.rst
similarity index 100%
rename from in/glassfish/index.rst
rename to in/public/web/glassfish/index.rst
diff --git a/in/public/web/index.rst b/in/public/web/index.rst
new file mode 100644
index 0000000..6c8622c
--- /dev/null
+++ b/in/public/web/index.rst
@@ -0,0 +1,12 @@
+Web
+===
+
+.. toctree::
+   :maxdepth: 2
+
+   nginx/index
+   apache/index
+
+   nodejs/index
+   tomcat/index
+   glassfish/index
diff --git a/in/nginx/configure.rst b/in/public/web/nginx/configure.rst
similarity index 100%
rename from in/nginx/configure.rst
rename to in/public/web/nginx/configure.rst
diff --git a/in/nginx/index.rst b/in/public/web/nginx/index.rst
similarity index 100%
rename from in/nginx/index.rst
rename to in/public/web/nginx/index.rst
diff --git a/in/nginx/serve.rst b/in/public/web/nginx/serve.rst
similarity index 100%
rename from in/nginx/serve.rst
rename to in/public/web/nginx/serve.rst
diff --git a/in/nodejs/index.rst b/in/public/web/nodejs/index.rst
similarity index 100%
rename from in/nodejs/index.rst
rename to in/public/web/nodejs/index.rst
diff --git a/in/tomcat/certify.rst b/in/public/web/tomcat/certify.rst
similarity index 100%
rename from in/tomcat/certify.rst
rename to in/public/web/tomcat/certify.rst
diff --git a/in/tomcat/configure.rst b/in/public/web/tomcat/configure.rst
similarity index 100%
rename from in/tomcat/configure.rst
rename to in/public/web/tomcat/configure.rst
diff --git a/in/tomcat/deploy.rst b/in/public/web/tomcat/deploy.rst
similarity index 100%
rename from in/tomcat/deploy.rst
rename to in/public/web/tomcat/deploy.rst
diff --git a/in/tomcat/index.rst b/in/public/web/tomcat/index.rst
similarity index 100%
rename from in/tomcat/index.rst
rename to in/public/web/tomcat/index.rst