diff --git a/docs.it4i/anselm-cluster-documentation/capacity-computing.md b/docs.it4i/anselm/capacity-computing.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/capacity-computing.md
rename to docs.it4i/anselm/capacity-computing.md
diff --git a/docs.it4i/anselm-cluster-documentation/capacity.zip b/docs.it4i/anselm/capacity.zip
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/capacity.zip
rename to docs.it4i/anselm/capacity.zip
diff --git a/docs.it4i/anselm-cluster-documentation/compute-nodes.md b/docs.it4i/anselm/compute-nodes.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/compute-nodes.md
rename to docs.it4i/anselm/compute-nodes.md
diff --git a/docs.it4i/anselm-cluster-documentation/environment-and-modules.md b/docs.it4i/anselm/environment-and-modules.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/environment-and-modules.md
rename to docs.it4i/anselm/environment-and-modules.md
diff --git a/docs.it4i/anselm-cluster-documentation/hardware-overview.md b/docs.it4i/anselm/hardware-overview.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/hardware-overview.md
rename to docs.it4i/anselm/hardware-overview.md
diff --git a/docs.it4i/anselm-cluster-documentation/introduction.md b/docs.it4i/anselm/introduction.md
similarity index 81%
rename from docs.it4i/anselm-cluster-documentation/introduction.md
rename to docs.it4i/anselm/introduction.md
index 73e8631574b0f2200b2efe6db084a6c0073e4d07..1f0b7e64af02521bc0e060618df10311292d507d 100644
--- a/docs.it4i/anselm-cluster-documentation/introduction.md
+++ b/docs.it4i/anselm/introduction.md
@@ -8,4 +8,4 @@ User data shared file-system (HOME, 320 TB) and job data shared file-system (SCR
 
 The PBS Professional workload manager provides [computing resources allocations and job execution](resources-allocation-policy/).
 
-Read more on how to [apply for resources](../get-started-with-it4innovations/applying-for-resources/), [obtain login credentials,](../get-started-with-it4innovations/obtaining-login-credentials/obtaining-login-credentials/) and [access the cluster](shell-and-data-access/).
+Read more on how to [apply for resources](../general/applying-for-resources/), [obtain login credentials,](../general/obtaining-login-credentials/obtaining-login-credentials/) and [access the cluster](shell-and-data-access/).
diff --git a/docs.it4i/anselm-cluster-documentation/job-priority.md b/docs.it4i/anselm/job-priority.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/job-priority.md
rename to docs.it4i/anselm/job-priority.md
diff --git a/docs.it4i/anselm-cluster-documentation/job-submission-and-execution.md b/docs.it4i/anselm/job-submission-and-execution.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/job-submission-and-execution.md
rename to docs.it4i/anselm/job-submission-and-execution.md
diff --git a/docs.it4i/anselm-cluster-documentation/network.md b/docs.it4i/anselm/network.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/network.md
rename to docs.it4i/anselm/network.md
diff --git a/docs.it4i/anselm-cluster-documentation/prace.md b/docs.it4i/anselm/prace.md
similarity index 98%
rename from docs.it4i/anselm-cluster-documentation/prace.md
rename to docs.it4i/anselm/prace.md
index 5d05165ec8b73bd14227b7b8802a32901b5bcbe4..c4d3bce0f399ff78168f86fc8fb0c5f3e0a95999 100644
--- a/docs.it4i/anselm-cluster-documentation/prace.md
+++ b/docs.it4i/anselm/prace.md
@@ -2,7 +2,7 @@
 
 ## Intro
 
-PRACE users coming to Anselm as to TIER-1 system offered through the DECI calls are in general treated as standard users and so most of the general documentation applies to them as well. This section shows the main differences for quicker orientation, but often uses references to the original documentation. PRACE users who don't undergo the full procedure (including signing the IT4I AuP on top of the PRACE AuP) will not have a password and thus access to some services intended for regular users. This can lower their comfort, but otherwise they should be able to use the TIER-1 system as intended. Please see the [Obtaining Login Credentials section](../get-started-with-it4innovations/obtaining-login-credentials/obtaining-login-credentials/), if the same level of access is required.
+PRACE users coming to Anselm as to TIER-1 system offered through the DECI calls are in general treated as standard users and so most of the general documentation applies to them as well. This section shows the main differences for quicker orientation, but often uses references to the original documentation. PRACE users who don't undergo the full procedure (including signing the IT4I AuP on top of the PRACE AuP) will not have a password and thus access to some services intended for regular users. This can lower their comfort, but otherwise they should be able to use the TIER-1 system as intended. Please see the [Obtaining Login Credentials section](../general/obtaining-login-credentials/obtaining-login-credentials/), if the same level of access is required.
 
 All general [PRACE User Documentation](http://www.prace-ri.eu/user-documentation/) should be read before continuing reading the local documentation here.
 
diff --git a/docs.it4i/anselm-cluster-documentation/remote-visualization.md b/docs.it4i/anselm/remote-visualization.md
similarity index 98%
rename from docs.it4i/anselm-cluster-documentation/remote-visualization.md
rename to docs.it4i/anselm/remote-visualization.md
index 171c8e003216d4a6d3efe573e7bd9ef15d88070d..7b0149fce735ac31592baa6f232cf3be2ffc5a54 100644
--- a/docs.it4i/anselm-cluster-documentation/remote-visualization.md
+++ b/docs.it4i/anselm/remote-visualization.md
@@ -99,7 +99,7 @@ $ ssh login2.anselm.it4i.cz -L 5901:localhost:5901
 
 x-window-system/
 If you use Windows and Putty, please refer to port forwarding setup in the documentation:
-[x-window-and-vnc#section-12](../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/)
+[x-window-and-vnc#section-12](../general/accessing-the-clusters/graphical-user-interface/x-window-system/)
 
 #### 7. If You Don't Have Turbo VNC Installed on Your Workstation
 
diff --git a/docs.it4i/anselm-cluster-documentation/resource-allocation-and-job-execution.md b/docs.it4i/anselm/resource-allocation-and-job-execution.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/resource-allocation-and-job-execution.md
rename to docs.it4i/anselm/resource-allocation-and-job-execution.md
diff --git a/docs.it4i/anselm-cluster-documentation/resources-allocation-policy.md b/docs.it4i/anselm/resources-allocation-policy.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/resources-allocation-policy.md
rename to docs.it4i/anselm/resources-allocation-policy.md
diff --git a/docs.it4i/anselm-cluster-documentation/shell-and-data-access.md b/docs.it4i/anselm/shell-and-data-access.md
similarity index 87%
rename from docs.it4i/anselm-cluster-documentation/shell-and-data-access.md
rename to docs.it4i/anselm/shell-and-data-access.md
index 0256b6990d59cbf43a654d3d1a10019beb969db6..260945ed1b896b1740a98f5de44a5e2caa9910e3 100644
--- a/docs.it4i/anselm-cluster-documentation/shell-and-data-access.md
+++ b/docs.it4i/anselm/shell-and-data-access.md
@@ -10,7 +10,7 @@ The Anselm cluster is accessed by SSH protocol via login nodes login1 and login2
 | login1.anselm.it4i.cz | 22   | ssh      | login1                                       |
 | login2.anselm.it4i.cz | 22   | ssh      | login2                                       |
 
-The authentication is by the [private key](../get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/ssh-keys/)
+The authentication is by the [private key](../general/accessing-the-clusters/shell-access-and-data-transfer/ssh-keys/)
 
 !!! note
     Please verify SSH fingerprints during the first logon. They are identical on all login nodes:
@@ -32,7 +32,7 @@ If you see warning message "UNPROTECTED PRIVATE KEY FILE!", use this command to
 local $ chmod 600 /path/to/id_rsa
 ```
 
-On **Windows**, use [PuTTY ssh client](../get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/putty.md).
+On **Windows**, use [PuTTY ssh client](../general/accessing-the-clusters/shell-access-and-data-transfer/putty.md).
 
 After logging in, you will see the command prompt:
 
@@ -67,7 +67,7 @@ Data in and out of the system may be transferred by the [scp](http://en.wikipedi
 | login2.anselm.it4i.cz | 22   | scp, sftp |
 | dm1.anselm.it4i.cz    | 22   | scp, sftp |
 
-The authentication is by the [private key](../get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/ssh-keys/)
+The authentication is by the [private key](../general/accessing-the-clusters/shell-access-and-data-transfer/ssh-keys/)
 
 !!! note
     Data transfer rates up to **160MB/s** can be achieved with scp or sftp.
@@ -198,9 +198,9 @@ Now, configure the applications proxy settings to **localhost:6000**. Use port f
 
 ## Graphical User Interface
 
-* The [X Window system](../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/) is a principal way to get GUI access to the clusters.
-* The [Virtual Network Computing](../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/vnc/) is a graphical [desktop sharing](http://en.wikipedia.org/wiki/Desktop_sharing) system that uses the [Remote Frame Buffer protocol](http://en.wikipedia.org/wiki/RFB_protocol) to remotely control another [computer](http://en.wikipedia.org/wiki/Computer).
+* The [X Window system](../general/accessing-the-clusters/graphical-user-interface/x-window-system/) is a principal way to get GUI access to the clusters.
+* The [Virtual Network Computing](../general/accessing-the-clusters/graphical-user-interface/vnc/) is a graphical [desktop sharing](http://en.wikipedia.org/wiki/Desktop_sharing) system that uses the [Remote Frame Buffer protocol](http://en.wikipedia.org/wiki/RFB_protocol) to remotely control another [computer](http://en.wikipedia.org/wiki/Computer).
 
 ## VPN Access
 
-* Access to IT4Innovations internal resources via [VPN](../get-started-with-it4innovations/accessing-the-clusters/vpn-access/).
+* Access to IT4Innovations internal resources via [VPN](../general/accessing-the-clusters/vpn-access/).
diff --git a/docs.it4i/anselm-cluster-documentation/software/ansys/ansys-cfx.md b/docs.it4i/anselm/software/ansys/ansys-cfx.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/ansys/ansys-cfx.md
rename to docs.it4i/anselm/software/ansys/ansys-cfx.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/ansys/ansys-fluent.md b/docs.it4i/anselm/software/ansys/ansys-fluent.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/ansys/ansys-fluent.md
rename to docs.it4i/anselm/software/ansys/ansys-fluent.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/ansys/ansys-ls-dyna.md b/docs.it4i/anselm/software/ansys/ansys-ls-dyna.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/ansys/ansys-ls-dyna.md
rename to docs.it4i/anselm/software/ansys/ansys-ls-dyna.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/ansys/ansys-mechanical-apdl.md b/docs.it4i/anselm/software/ansys/ansys-mechanical-apdl.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/ansys/ansys-mechanical-apdl.md
rename to docs.it4i/anselm/software/ansys/ansys-mechanical-apdl.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/ansys/ansys.md b/docs.it4i/anselm/software/ansys/ansys.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/ansys/ansys.md
rename to docs.it4i/anselm/software/ansys/ansys.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/ansys/ls-dyna.md b/docs.it4i/anselm/software/ansys/ls-dyna.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/ansys/ls-dyna.md
rename to docs.it4i/anselm/software/ansys/ls-dyna.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/chemistry/molpro.md b/docs.it4i/anselm/software/chemistry/molpro.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/chemistry/molpro.md
rename to docs.it4i/anselm/software/chemistry/molpro.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/chemistry/nwchem.md b/docs.it4i/anselm/software/chemistry/nwchem.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/chemistry/nwchem.md
rename to docs.it4i/anselm/software/chemistry/nwchem.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/compilers.md b/docs.it4i/anselm/software/compilers.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/compilers.md
rename to docs.it4i/anselm/software/compilers.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/comsol-multiphysics.md b/docs.it4i/anselm/software/comsol-multiphysics.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/comsol-multiphysics.md
rename to docs.it4i/anselm/software/comsol-multiphysics.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/debuggers/allinea-ddt.md b/docs.it4i/anselm/software/debuggers/allinea-ddt.md
similarity index 97%
rename from docs.it4i/anselm-cluster-documentation/software/debuggers/allinea-ddt.md
rename to docs.it4i/anselm/software/debuggers/allinea-ddt.md
index 07d41915d3fa3e202a151abae32023c81c8cc125..6c1c664fb22163d3f9eadd023486494870f2a0a9 100644
--- a/docs.it4i/anselm-cluster-documentation/software/debuggers/allinea-ddt.md
+++ b/docs.it4i/anselm/software/debuggers/allinea-ddt.md
@@ -59,7 +59,7 @@ Be sure to log in with an X window forwarding enabled. This could mean using the
     $ ssh -X username@anselm.it4i.cz
 ```
 
-Other options is to access login node using VNC. Please see the detailed information on how to [use graphic user interface on Anselm](/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/)
+Other options is to access login node using VNC. Please see the detailed information on how to [use graphic user interface on Anselm](/general/accessing-the-clusters/graphical-user-interface/x-window-system/)
 
 From the login node an interactive session **with X windows forwarding** (-X option) can be started by following command:
 
diff --git a/docs.it4i/anselm-cluster-documentation/software/debuggers/allinea-performance-reports.md b/docs.it4i/anselm/software/debuggers/allinea-performance-reports.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/debuggers/allinea-performance-reports.md
rename to docs.it4i/anselm/software/debuggers/allinea-performance-reports.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/debuggers/cube.md b/docs.it4i/anselm/software/debuggers/cube.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/debuggers/cube.md
rename to docs.it4i/anselm/software/debuggers/cube.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/debuggers/debuggers.md b/docs.it4i/anselm/software/debuggers/debuggers.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/debuggers/debuggers.md
rename to docs.it4i/anselm/software/debuggers/debuggers.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/debuggers/intel-performance-counter-monitor.md b/docs.it4i/anselm/software/debuggers/intel-performance-counter-monitor.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/debuggers/intel-performance-counter-monitor.md
rename to docs.it4i/anselm/software/debuggers/intel-performance-counter-monitor.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/debuggers/intel-vtune-amplifier.md b/docs.it4i/anselm/software/debuggers/intel-vtune-amplifier.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/debuggers/intel-vtune-amplifier.md
rename to docs.it4i/anselm/software/debuggers/intel-vtune-amplifier.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/debuggers/papi.md b/docs.it4i/anselm/software/debuggers/papi.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/debuggers/papi.md
rename to docs.it4i/anselm/software/debuggers/papi.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/debuggers/scalasca.md b/docs.it4i/anselm/software/debuggers/scalasca.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/debuggers/scalasca.md
rename to docs.it4i/anselm/software/debuggers/scalasca.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/debuggers/score-p.md b/docs.it4i/anselm/software/debuggers/score-p.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/debuggers/score-p.md
rename to docs.it4i/anselm/software/debuggers/score-p.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/debuggers/total-view.md b/docs.it4i/anselm/software/debuggers/total-view.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/debuggers/total-view.md
rename to docs.it4i/anselm/software/debuggers/total-view.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/debuggers/valgrind.md b/docs.it4i/anselm/software/debuggers/valgrind.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/debuggers/valgrind.md
rename to docs.it4i/anselm/software/debuggers/valgrind.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/debuggers/vampir.md b/docs.it4i/anselm/software/debuggers/vampir.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/debuggers/vampir.md
rename to docs.it4i/anselm/software/debuggers/vampir.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/gpi2.md b/docs.it4i/anselm/software/gpi2.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/gpi2.md
rename to docs.it4i/anselm/software/gpi2.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/intel-suite/intel-compilers.md b/docs.it4i/anselm/software/intel-suite/intel-compilers.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/intel-suite/intel-compilers.md
rename to docs.it4i/anselm/software/intel-suite/intel-compilers.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/intel-suite/intel-debugger.md b/docs.it4i/anselm/software/intel-suite/intel-debugger.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/intel-suite/intel-debugger.md
rename to docs.it4i/anselm/software/intel-suite/intel-debugger.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/intel-suite/intel-integrated-performance-primitives.md b/docs.it4i/anselm/software/intel-suite/intel-integrated-performance-primitives.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/intel-suite/intel-integrated-performance-primitives.md
rename to docs.it4i/anselm/software/intel-suite/intel-integrated-performance-primitives.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/intel-suite/intel-mkl.md b/docs.it4i/anselm/software/intel-suite/intel-mkl.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/intel-suite/intel-mkl.md
rename to docs.it4i/anselm/software/intel-suite/intel-mkl.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/intel-suite/intel-tbb.md b/docs.it4i/anselm/software/intel-suite/intel-tbb.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/intel-suite/intel-tbb.md
rename to docs.it4i/anselm/software/intel-suite/intel-tbb.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/intel-suite/introduction.md b/docs.it4i/anselm/software/intel-suite/introduction.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/intel-suite/introduction.md
rename to docs.it4i/anselm/software/intel-suite/introduction.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/intel-xeon-phi.md b/docs.it4i/anselm/software/intel-xeon-phi.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/intel-xeon-phi.md
rename to docs.it4i/anselm/software/intel-xeon-phi.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/isv_licenses.md b/docs.it4i/anselm/software/isv_licenses.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/isv_licenses.md
rename to docs.it4i/anselm/software/isv_licenses.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/java.md b/docs.it4i/anselm/software/java.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/java.md
rename to docs.it4i/anselm/software/java.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/kvirtualization.md b/docs.it4i/anselm/software/kvirtualization.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/kvirtualization.md
rename to docs.it4i/anselm/software/kvirtualization.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/mpi/Running_OpenMPI.md b/docs.it4i/anselm/software/mpi/Running_OpenMPI.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/mpi/Running_OpenMPI.md
rename to docs.it4i/anselm/software/mpi/Running_OpenMPI.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/mpi/mpi.md b/docs.it4i/anselm/software/mpi/mpi.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/mpi/mpi.md
rename to docs.it4i/anselm/software/mpi/mpi.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/mpi/mpi4py-mpi-for-python.md b/docs.it4i/anselm/software/mpi/mpi4py-mpi-for-python.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/mpi/mpi4py-mpi-for-python.md
rename to docs.it4i/anselm/software/mpi/mpi4py-mpi-for-python.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/mpi/running-mpich2.md b/docs.it4i/anselm/software/mpi/running-mpich2.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/mpi/running-mpich2.md
rename to docs.it4i/anselm/software/mpi/running-mpich2.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/numerical-languages/introduction.md b/docs.it4i/anselm/software/numerical-languages/introduction.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/numerical-languages/introduction.md
rename to docs.it4i/anselm/software/numerical-languages/introduction.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/numerical-languages/matlab.md b/docs.it4i/anselm/software/numerical-languages/matlab.md
similarity index 95%
rename from docs.it4i/anselm-cluster-documentation/software/numerical-languages/matlab.md
rename to docs.it4i/anselm/software/numerical-languages/matlab.md
index 10126cc5d864f5d00a8319c88dedd9ee402f226f..d7c3d907452ca38deea8f07235170ead3114c1eb 100644
--- a/docs.it4i/anselm-cluster-documentation/software/numerical-languages/matlab.md
+++ b/docs.it4i/anselm/software/numerical-languages/matlab.md
@@ -21,9 +21,9 @@ By default the EDU variant is marked as default. If you need other version or va
 
 If you need to use the Matlab GUI to prepare your Matlab programs, you can use Matlab directly on the login nodes. But for all computations use Matlab on the compute nodes via PBS Pro scheduler.
 
-If you require the Matlab GUI, please follow the general information about [running graphical applications](../../../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/).
+If you require the Matlab GUI, please follow the general information about [running graphical applications](../../../general/accessing-the-clusters/graphical-user-interface/x-window-system/).
 
-Matlab GUI is quite slow using the X forwarding built in the PBS (qsub -X), so using X11 display redirection either via SSH or directly by xauth (please see the "GUI Applications on Compute Nodes over VNC" part [here](../../../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/x-window-system/)) is recommended.
+Matlab GUI is quite slow using the X forwarding built in the PBS (qsub -X), so using X11 display redirection either via SSH or directly by xauth (please see the "GUI Applications on Compute Nodes over VNC" part [here](../../../general/accessing-the-clusters/graphical-user-interface/x-window-system/x-window-system/)) is recommended.
 
 To run Matlab with GUI, use
 
@@ -69,7 +69,7 @@ With the new mode, MATLAB itself launches the workers via PBS, so you can either
 
 ### Parallel Matlab Interactive Session
 
-Following example shows how to start interactive session with support for Matlab GUI. For more information about GUI based applications on Anselm see [this page](../../../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/x-window-system/).
+Following example shows how to start interactive session with support for Matlab GUI. For more information about GUI based applications on Anselm see [this page](../../../general/accessing-the-clusters/graphical-user-interface/x-window-system/x-window-system/).
 
 ```bash
     $ xhost +
diff --git a/docs.it4i/anselm-cluster-documentation/software/numerical-languages/matlab_1314.md b/docs.it4i/anselm/software/numerical-languages/matlab_1314.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/numerical-languages/matlab_1314.md
rename to docs.it4i/anselm/software/numerical-languages/matlab_1314.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/numerical-languages/octave.md b/docs.it4i/anselm/software/numerical-languages/octave.md
similarity index 97%
rename from docs.it4i/anselm-cluster-documentation/software/numerical-languages/octave.md
rename to docs.it4i/anselm/software/numerical-languages/octave.md
index eb82371f76c7b6a7ea59e3b83fbec4a3dd36a083..7624f95e5ee9092be169638cafe611a9d0c91508 100644
--- a/docs.it4i/anselm-cluster-documentation/software/numerical-languages/octave.md
+++ b/docs.it4i/anselm/software/numerical-languages/octave.md
@@ -48,7 +48,7 @@ To run octave in batch mode, write an octave script, then write a bash jobscript
     exit
 ```
 
-This script may be submitted directly to the PBS workload manager via the qsub command.  The inputs are in octcode.m file, outputs in output.out file. See the single node jobscript example in the [Job execution section](http://support.it4i.cz/docs/anselm-cluster-documentation/resource-allocation-and-job-execution).
+This script may be submitted directly to the PBS workload manager via the qsub command.  The inputs are in octcode.m file, outputs in output.out file. See the single node jobscript example in the [Job execution section](http://support.it4i.cz/docs/anselm/resource-allocation-and-job-execution).
 
 The octave c compiler mkoctfile calls the GNU gcc 4.8.1 for compiling native c code. This is very useful for running native c subroutines in octave environment.
 
diff --git a/docs.it4i/anselm-cluster-documentation/software/numerical-languages/r.md b/docs.it4i/anselm/software/numerical-languages/r.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/numerical-languages/r.md
rename to docs.it4i/anselm/software/numerical-languages/r.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/numerical-libraries/fftw.md b/docs.it4i/anselm/software/numerical-libraries/fftw.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/numerical-libraries/fftw.md
rename to docs.it4i/anselm/software/numerical-libraries/fftw.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/numerical-libraries/gsl.md b/docs.it4i/anselm/software/numerical-libraries/gsl.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/numerical-libraries/gsl.md
rename to docs.it4i/anselm/software/numerical-libraries/gsl.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/numerical-libraries/hdf5.md b/docs.it4i/anselm/software/numerical-libraries/hdf5.md
similarity index 97%
rename from docs.it4i/anselm-cluster-documentation/software/numerical-libraries/hdf5.md
rename to docs.it4i/anselm/software/numerical-libraries/hdf5.md
index 35ffe1775963e9580d860914e3d1f0c50343d8cb..026531c21168b58a27bd0857e602cc46ffddb76d 100644
--- a/docs.it4i/anselm-cluster-documentation/software/numerical-libraries/hdf5.md
+++ b/docs.it4i/anselm/software/numerical-libraries/hdf5.md
@@ -84,6 +84,6 @@ Load modules and compile:
     $ mpicc hdf5test.c -o hdf5test.x -Wl,-rpath=$LIBRARY_PATH $HDF5_INC $HDF5_SHLIB
 ```
 
-Run the example as [Intel MPI program](../anselm-cluster-documentation/software/mpi/running-mpich2/).
+Run the example as [Intel MPI program](../anselm/software/mpi/running-mpich2/).
 
 For further information, please see the website: <http://www.hdfgroup.org/HDF5/>
diff --git a/docs.it4i/anselm-cluster-documentation/software/numerical-libraries/intel-numerical-libraries.md b/docs.it4i/anselm/software/numerical-libraries/intel-numerical-libraries.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/numerical-libraries/intel-numerical-libraries.md
rename to docs.it4i/anselm/software/numerical-libraries/intel-numerical-libraries.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/numerical-libraries/magma-for-intel-xeon-phi.md b/docs.it4i/anselm/software/numerical-libraries/magma-for-intel-xeon-phi.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/numerical-libraries/magma-for-intel-xeon-phi.md
rename to docs.it4i/anselm/software/numerical-libraries/magma-for-intel-xeon-phi.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/numerical-libraries/petsc.md b/docs.it4i/anselm/software/numerical-libraries/petsc.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/numerical-libraries/petsc.md
rename to docs.it4i/anselm/software/numerical-libraries/petsc.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/numerical-libraries/trilinos.md b/docs.it4i/anselm/software/numerical-libraries/trilinos.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/numerical-libraries/trilinos.md
rename to docs.it4i/anselm/software/numerical-libraries/trilinos.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/nvidia-cuda.md b/docs.it4i/anselm/software/nvidia-cuda.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/nvidia-cuda.md
rename to docs.it4i/anselm/software/nvidia-cuda.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/omics-master/diagnostic-component-team.md b/docs.it4i/anselm/software/omics-master/diagnostic-component-team.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/omics-master/diagnostic-component-team.md
rename to docs.it4i/anselm/software/omics-master/diagnostic-component-team.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/omics-master/overview.md b/docs.it4i/anselm/software/omics-master/overview.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/omics-master/overview.md
rename to docs.it4i/anselm/software/omics-master/overview.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/omics-master/priorization-component-bierapp.md b/docs.it4i/anselm/software/omics-master/priorization-component-bierapp.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/omics-master/priorization-component-bierapp.md
rename to docs.it4i/anselm/software/omics-master/priorization-component-bierapp.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/openfoam.md b/docs.it4i/anselm/software/openfoam.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/openfoam.md
rename to docs.it4i/anselm/software/openfoam.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/operating-system.md b/docs.it4i/anselm/software/operating-system.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/operating-system.md
rename to docs.it4i/anselm/software/operating-system.md
diff --git a/docs.it4i/anselm-cluster-documentation/software/paraview.md b/docs.it4i/anselm/software/paraview.md
similarity index 100%
rename from docs.it4i/anselm-cluster-documentation/software/paraview.md
rename to docs.it4i/anselm/software/paraview.md
diff --git a/docs.it4i/anselm-cluster-documentation/storage.md b/docs.it4i/anselm/storage.md
similarity index 99%
rename from docs.it4i/anselm-cluster-documentation/storage.md
rename to docs.it4i/anselm/storage.md
index 13d24491aa0a3ae29d4bafa9ccfae9a98efe4c6e..ad082c0d8486efa67428bae1a327527990fc64f2 100644
--- a/docs.it4i/anselm-cluster-documentation/storage.md
+++ b/docs.it4i/anselm/storage.md
@@ -107,7 +107,7 @@ The HOME filesystem is mounted in directory /home. Users home directories /home/
 
 The HOME filesystem should not be used to archive data of past Projects or other unrelated data.
 
-The files on HOME filesystem will not be deleted until end of the [users lifecycle](../get-started-with-it4innovations/obtaining-login-credentials/obtaining-login-credentials/).
+The files on HOME filesystem will not be deleted until end of the [users lifecycle](../general/obtaining-login-credentials/obtaining-login-credentials/).
 
 The filesystem is backed up, such that it can be restored in case of catasthropic failure resulting in significant data loss. This backup however is not intended to restore old versions of user data or to restore (accidentaly) deleted files.
 
diff --git a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/graphical-user-interface.md b/docs.it4i/general/accessing-the-clusters/graphical-user-interface/graphical-user-interface.md
similarity index 100%
rename from docs.it4i/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/graphical-user-interface.md
rename to docs.it4i/general/accessing-the-clusters/graphical-user-interface/graphical-user-interface.md
diff --git a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/vnc.md b/docs.it4i/general/accessing-the-clusters/graphical-user-interface/vnc.md
similarity index 96%
rename from docs.it4i/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/vnc.md
rename to docs.it4i/general/accessing-the-clusters/graphical-user-interface/vnc.md
index ae60d1e99674ebc8970023c5cd128536c60fa2bc..e516ab59cad1774c000f5c894975745fa7bb8a87 100644
--- a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/vnc.md
+++ b/docs.it4i/general/accessing-the-clusters/graphical-user-interface/vnc.md
@@ -198,7 +198,7 @@ Allow incoming X11 graphics from the compute nodes at the login node:
 $ xhost +
 ```
 
-Get an interactive session on a compute node (for more detailed info [look here](../../../anselm-cluster-documentation/resource-allocation-and-job-execution/job-submission-and-execution/)). Use the **-v DISPLAY** option to propagate the DISPLAY on the compute node. In this example, we want a complete node (24 cores in this example) from the production queue:
+Get an interactive session on a compute node (for more detailed info [look here](../../../anselm/resource-allocation-and-job-execution/job-submission-and-execution/)). Use the **-v DISPLAY** option to propagate the DISPLAY on the compute node. In this example, we want a complete node (24 cores in this example) from the production queue:
 
 ```bash
 $ qsub -I -v DISPLAY=$(uname -n):$(echo $DISPLAY | cut -d ':' -f 2) -A PROJECT_ID -q qprod -l select=1:ncpus=24
diff --git a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system.md b/docs.it4i/general/accessing-the-clusters/graphical-user-interface/x-window-system.md
similarity index 100%
rename from docs.it4i/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system.md
rename to docs.it4i/general/accessing-the-clusters/graphical-user-interface/x-window-system.md
diff --git a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/introduction.md b/docs.it4i/general/accessing-the-clusters/introduction.md
similarity index 91%
rename from docs.it4i/get-started-with-it4innovations/accessing-the-clusters/introduction.md
rename to docs.it4i/general/accessing-the-clusters/introduction.md
index 75aca80cb0cbffea7d3d22a883e7ee14ae2d8cae..5ca0d7689130ec6d00649f4ba692e8e8a2742647 100644
--- a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/introduction.md
+++ b/docs.it4i/general/accessing-the-clusters/introduction.md
@@ -3,7 +3,7 @@
 The IT4Innovations clusters are accessed by SSH protocol via login nodes.
 
 !!! note
-    Read more on [Accessing the Salomon Cluster](../../salomon/shell-and-data-access.md) or [Accessing the Anselm Cluster](../../anselm-cluster-documentation/shell-and-data-access.md) pages.
+    Read more on [Accessing the Salomon Cluster](../../salomon/shell-and-data-access.md) or [Accessing the Anselm Cluster](../../anselm/shell-and-data-access.md) pages.
 
 ## PuTTY
 
diff --git a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/putty.md b/docs.it4i/general/accessing-the-clusters/shell-access-and-data-transfer/putty.md
similarity index 100%
rename from docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/putty.md
rename to docs.it4i/general/accessing-the-clusters/shell-access-and-data-transfer/putty.md
diff --git a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/ssh-keys.md b/docs.it4i/general/accessing-the-clusters/shell-access-and-data-transfer/ssh-keys.md
similarity index 100%
rename from docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/ssh-keys.md
rename to docs.it4i/general/accessing-the-clusters/shell-access-and-data-transfer/ssh-keys.md
diff --git a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/vpn-connection-fail-in-win-8.1.md b/docs.it4i/general/accessing-the-clusters/shell-access-and-data-transfer/vpn-connection-fail-in-win-8.1.md
similarity index 100%
rename from docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/vpn-connection-fail-in-win-8.1.md
rename to docs.it4i/general/accessing-the-clusters/shell-access-and-data-transfer/vpn-connection-fail-in-win-8.1.md
diff --git a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/vpn-access.md b/docs.it4i/general/accessing-the-clusters/vpn-access.md
similarity index 100%
rename from docs.it4i/get-started-with-it4innovations/accessing-the-clusters/vpn-access.md
rename to docs.it4i/general/accessing-the-clusters/vpn-access.md
diff --git a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/vpn1-access.md b/docs.it4i/general/accessing-the-clusters/vpn1-access.md
similarity index 96%
rename from docs.it4i/get-started-with-it4innovations/accessing-the-clusters/vpn1-access.md
rename to docs.it4i/general/accessing-the-clusters/vpn1-access.md
index bbfdb211a5b4e1ffa1725fbb7772cbbdc30106ad..b7cacfd2425b18c51abe54e82912854c1967c07d 100644
--- a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/vpn1-access.md
+++ b/docs.it4i/general/accessing-the-clusters/vpn1-access.md
@@ -5,7 +5,7 @@
 !!! note
     **Failed to initialize connection subsystem Win 8.1 - 02-10-15 MS patch**
 
-Workaround can be found at [vpn-connection-fail-in-win-8.1](../../get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/vpn-connection-fail-in-win-8.1.html)
+Workaround can be found at [vpn-connection-fail-in-win-8.1](../../general/accessing-the-clusters/shell-access-and-data-transfer/vpn-connection-fail-in-win-8.1.html)
 
 For using resources and licenses which are located at IT4Innovations local network, it is necessary to VPN connect to this network. We use Cisco AnyConnect Secure Mobility Client, which is supported on the following operating systems:
 
diff --git a/docs.it4i/get-started-with-it4innovations/applying-for-resources.md b/docs.it4i/general/applying-for-resources.md
similarity index 100%
rename from docs.it4i/get-started-with-it4innovations/applying-for-resources.md
rename to docs.it4i/general/applying-for-resources.md
diff --git a/docs.it4i/get-started-with-it4innovations/obtaining-login-credentials/certificates-faq.md b/docs.it4i/general/obtaining-login-credentials/certificates-faq.md
similarity index 100%
rename from docs.it4i/get-started-with-it4innovations/obtaining-login-credentials/certificates-faq.md
rename to docs.it4i/general/obtaining-login-credentials/certificates-faq.md
diff --git a/docs.it4i/get-started-with-it4innovations/obtaining-login-credentials/obtaining-login-credentials.md b/docs.it4i/general/obtaining-login-credentials/obtaining-login-credentials.md
similarity index 100%
rename from docs.it4i/get-started-with-it4innovations/obtaining-login-credentials/obtaining-login-credentials.md
rename to docs.it4i/general/obtaining-login-credentials/obtaining-login-credentials.md
diff --git a/docs.it4i/index.md b/docs.it4i/index.md
index 86072355734e682af540708c3808a33c01d9d40f..7e97161c12a16c0a8bec4540a77760cebf122063 100644
--- a/docs.it4i/index.md
+++ b/docs.it4i/index.md
@@ -1,6 +1,6 @@
 # Documentation
 
-Welcome to IT4Innovations documentation pages. The IT4Innovations national supercomputing center operates supercomputers [Salomon](/salomon/introduction/) and [Anselm](/anselm-cluster-documentation/introduction/). The supercomputers are [available](get-started-with-it4innovations/applying-for-resources/) to academic community within the Czech Republic and Europe and industrial community worldwide. The purpose of these pages is to provide a comprehensive documentation on hardware, software and usage of the computers.
+Welcome to IT4Innovations documentation pages. The IT4Innovations national supercomputing center operates supercomputers [Salomon](/salomon/introduction/) and [Anselm](/anselm/introduction/). The supercomputers are [available](general/applying-for-resources/) to academic community within the Czech Republic and Europe and industrial community worldwide. The purpose of these pages is to provide a comprehensive documentation on hardware, software and usage of the computers.
 
 ## How to Read the Documentation
 
diff --git a/docs.it4i/salomon/prace.md b/docs.it4i/salomon/prace.md
index 86749dfb438d7e15f4821b923b8997febee99013..f1990d29251e00f4389ba5d23f399777a86ed726 100644
--- a/docs.it4i/salomon/prace.md
+++ b/docs.it4i/salomon/prace.md
@@ -2,7 +2,7 @@
 
 ## Intro
 
-PRACE users coming to Salomon as to TIER-1 system offered through the DECI calls are in general treated as standard users and so most of the general documentation applies to them as well. This section shows the main differences for quicker orientation, but often uses references to the original documentation. PRACE users who don't undergo the full procedure (including signing the IT4I AuP on top of the PRACE AuP) will not have a password and thus access to some services intended for regular users. This can lower their comfort, but otherwise they should be able to use the TIER-1 system as intended. Please see the [Obtaining Login Credentials section](../get-started-with-it4innovations/obtaining-login-credentials/obtaining-login-credentials/), if the same level of access is required.
+PRACE users coming to Salomon as to TIER-1 system offered through the DECI calls are in general treated as standard users and so most of the general documentation applies to them as well. This section shows the main differences for quicker orientation, but often uses references to the original documentation. PRACE users who don't undergo the full procedure (including signing the IT4I AuP on top of the PRACE AuP) will not have a password and thus access to some services intended for regular users. This can lower their comfort, but otherwise they should be able to use the TIER-1 system as intended. Please see the [Obtaining Login Credentials section](../general/obtaining-login-credentials/obtaining-login-credentials/), if the same level of access is required.
 
 All general [PRACE User Documentation](http://www.prace-ri.eu/user-documentation/) should be read before continuing reading the local documentation here.
 
@@ -16,7 +16,7 @@ Information about the local services are provided in the [introduction of genera
 
 In general PRACE users already have a PRACE account setup through their HOMESITE (institution from their country) as a result of rewarded PRACE project proposal. This includes signed PRACE AuP, generated and registered certificates, etc.
 
-If there's a special need a PRACE user can get a standard (local) account at IT4Innovations. To get an account on the Salomon cluster, the user needs to obtain the login credentials. The procedure is the same as for general users of the cluster, so please see the corresponding [section of the general documentation here](../get-started-with-it4innovations/obtaining-login-credentials/obtaining-login-credentials/).
+If there's a special need a PRACE user can get a standard (local) account at IT4Innovations. To get an account on the Salomon cluster, the user needs to obtain the login credentials. The procedure is the same as for general users of the cluster, so please see the corresponding [section of the general documentation here](../general/obtaining-login-credentials/obtaining-login-credentials/).
 
 ## Accessing the Cluster
 
@@ -107,9 +107,9 @@ implementation on Salomon supports also SCP, so for small files transfer gsiscp
 
 ### Access to X11 Applications (VNC)
 
-If the user needs to run X11 based graphical application and does not have a X11 server, the applications can be run using VNC service. If the user is using regular SSH based access, please see the [section in general documentation](../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/).
+If the user needs to run X11 based graphical application and does not have a X11 server, the applications can be run using VNC service. If the user is using regular SSH based access, please see the [section in general documentation](../general/accessing-the-clusters/graphical-user-interface/x-window-system/).
 
-If the user uses GSI SSH based access, then the procedure is similar to the SSH based access ([look here](../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/)), only the port forwarding must be done using GSI SSH:
+If the user uses GSI SSH based access, then the procedure is similar to the SSH based access ([look here](../general/accessing-the-clusters/graphical-user-interface/x-window-system/)), only the port forwarding must be done using GSI SSH:
 
 ```bash
     $ gsissh -p 2222 salomon.it4i.cz -L 5961:localhost:5961
diff --git a/docs.it4i/salomon/shell-and-data-access.md b/docs.it4i/salomon/shell-and-data-access.md
index 93b68abaaf23e38eeff31e220f66a39d22456a8b..8c0012f110667a08217b18f117bec54f6f7e9dda 100644
--- a/docs.it4i/salomon/shell-and-data-access.md
+++ b/docs.it4i/salomon/shell-and-data-access.md
@@ -15,7 +15,7 @@ The Salomon cluster is accessed by SSH protocol via login nodes login1, login2,
 | login1.salomon.it4i.cz | 22   | ssh      | login1                                |
 | login1.salomon.it4i.cz | 22   | ssh      | login1                                |
 
-The authentication is by the [private key](../get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/ssh-keys/)
+The authentication is by the [private key](../general/accessing-the-clusters/shell-access-and-data-transfer/ssh-keys/)
 
 !!! note
     Please verify SSH fingerprints during the first logon. They are identical on all login nodes:
@@ -36,7 +36,7 @@ If you see warning message "UNPROTECTED PRIVATE KEY FILE!", use this command to
 local $ chmod 600 /path/to/id_rsa
 ```
 
-On **Windows**, use [PuTTY ssh client](../get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/putty.md).
+On **Windows**, use [PuTTY ssh client](../general/accessing-the-clusters/shell-access-and-data-transfer/putty.md).
 
 After logging in, you will see the command prompt:
 
@@ -71,7 +71,7 @@ Data in and out of the system may be transferred by the [scp](http://en.wikipedi
 | login3.salomon.it4i.cz | 22   | scp, sftp |
 | login4.salomon.it4i.cz | 22   | scp, sftp |
 
-The authentication is by the [private key](../get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/ssh-keys/)
+The authentication is by the [private key](../general/accessing-the-clusters/shell-access-and-data-transfer/ssh-keys/)
 
 On linux or Mac, use scp or sftp client to transfer the data to Salomon:
 
@@ -191,9 +191,9 @@ Now, configure the applications proxy settings to **localhost:6000**. Use port f
 
 ## Graphical User Interface
 
-* The [X Window system](../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/) is a principal way to get GUI access to the clusters.
-* The [Virtual Network Computing](../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/vnc/) is a graphical [desktop sharing](http://en.wikipedia.org/wiki/Desktop_sharing) system that uses the [Remote Frame Buffer protocol](http://en.wikipedia.org/wiki/RFB_protocol) to remotely control another [computer](http://en.wikipedia.org/wiki/Computer).
+* The [X Window system](../general/accessing-the-clusters/graphical-user-interface/x-window-system/) is a principal way to get GUI access to the clusters.
+* The [Virtual Network Computing](../general/accessing-the-clusters/graphical-user-interface/vnc/) is a graphical [desktop sharing](http://en.wikipedia.org/wiki/Desktop_sharing) system that uses the [Remote Frame Buffer protocol](http://en.wikipedia.org/wiki/RFB_protocol) to remotely control another [computer](http://en.wikipedia.org/wiki/Computer).
 
 ## VPN Access
 
-* Access to IT4Innovations internal resources via [VPN](../get-started-with-it4innovations/accessing-the-clusters/vpn-access/).
+* Access to IT4Innovations internal resources via [VPN](../general/accessing-the-clusters/vpn-access/).
diff --git a/docs.it4i/salomon/software/compilers.md b/docs.it4i/salomon/software/compilers.md
index 2c5b545c6ed7e7a85041ba18c7467d5530609803..8e62965ff71b3afbd4e178c5019a0101597401b5 100644
--- a/docs.it4i/salomon/software/compilers.md
+++ b/docs.it4i/salomon/software/compilers.md
@@ -190,4 +190,4 @@ For information how to use Java (runtime and/or compiler), please read the [Java
 
 ## NVIDIA CUDA
 
-For information how to work with NVIDIA CUDA, please read the [NVIDIA CUDA page](../../anselm-cluster-documentation/software/nvidia-cuda/).
+For information how to work with NVIDIA CUDA, please read the [NVIDIA CUDA page](../../anselm/software/nvidia-cuda/).
diff --git a/docs.it4i/salomon/software/comsol/comsol-multiphysics.md b/docs.it4i/salomon/software/comsol/comsol-multiphysics.md
index 6b2d725c102af9f6b08940087344b96f9d5d7633..05a6d2944b2e8db354e134c8f506f87b70f0531a 100644
--- a/docs.it4i/salomon/software/comsol/comsol-multiphysics.md
+++ b/docs.it4i/salomon/software/comsol/comsol-multiphysics.md
@@ -32,7 +32,7 @@ By default the **EDU variant** will be loaded. If user needs other version or va
 $ module avail COMSOL
 ```
 
-If user needs to prepare COMSOL jobs in the interactive mode it is recommend to use COMSOL on the compute nodes via PBS Pro scheduler. In order run the COMSOL Desktop GUI on Windows is recommended to use the [Virtual Network Computing (VNC)](../../../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/).
+If user needs to prepare COMSOL jobs in the interactive mode it is recommend to use COMSOL on the compute nodes via PBS Pro scheduler. In order run the COMSOL Desktop GUI on Windows is recommended to use the [Virtual Network Computing (VNC)](../../../general/accessing-the-clusters/graphical-user-interface/x-window-system/).
 
 ```bash
 $ xhost +
diff --git a/docs.it4i/salomon/software/debuggers/allinea-ddt.md b/docs.it4i/salomon/software/debuggers/allinea-ddt.md
index 0c8128afed0c36c58e3477d31350e3976d363cbd..41dd4c6e8266e257a425c0e7a8b54330c38ccf04 100644
--- a/docs.it4i/salomon/software/debuggers/allinea-ddt.md
+++ b/docs.it4i/salomon/software/debuggers/allinea-ddt.md
@@ -60,7 +60,7 @@ Be sure to log in with an X window forwarding enabled. This could mean using the
     $ ssh -X username@anselm.it4i.cz
 ```
 
-Other options is to access login node using VNC. Please see the detailed information on how to [use graphic user interface on Anselm](/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/)
+Other options is to access login node using VNC. Please see the detailed information on how to [use graphic user interface on Anselm](/general/accessing-the-clusters/graphical-user-interface/x-window-system/)
 
 From the login node an interactive session **with X windows forwarding** (-X option) can be started by following command:
 
diff --git a/docs.it4i/salomon/software/intel-suite/intel-debugger.md b/docs.it4i/salomon/software/intel-suite/intel-debugger.md
index c4f25ac328d0712cc9a136fd6f96c3eddc27778e..d0fef6ab7fbe2e50e8e7f8238585521bb5cb9695 100644
--- a/docs.it4i/salomon/software/intel-suite/intel-debugger.md
+++ b/docs.it4i/salomon/software/intel-suite/intel-debugger.md
@@ -4,7 +4,7 @@ IDB is no longer available since Intel Parallel Studio 2015
 
 ## Debugging Serial Applications
 
-The intel debugger version 13.0 is available, via module intel. The debugger works for applications compiled with C and C++ compiler and the ifort fortran 77/90/95 compiler. The debugger provides java GUI environment. Use [X display](../../../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/) for running the GUI.
+The intel debugger version 13.0 is available, via module intel. The debugger works for applications compiled with C and C++ compiler and the ifort fortran 77/90/95 compiler. The debugger provides java GUI environment. Use [X display](../../../general/accessing-the-clusters/graphical-user-interface/x-window-system/) for running the GUI.
 
 ```bash
     $ module load intel/2014.06
@@ -18,7 +18,7 @@ The debugger may run in text mode. To debug in text mode, use
     $ idbc
 ```
 
-To debug on the compute nodes, module intel must be loaded. The GUI on compute nodes may be accessed using the same way as in [the GUI section](../../../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/)
+To debug on the compute nodes, module intel must be loaded. The GUI on compute nodes may be accessed using the same way as in [the GUI section](../../../general/accessing-the-clusters/graphical-user-interface/x-window-system/)
 
 Example:
 
@@ -41,7 +41,7 @@ In this example, we allocate 1 full compute node, compile program myprog.c with
 
 ### Small Number of MPI Ranks
 
-For debugging small number of MPI ranks, you may execute and debug each rank in separate xterm terminal (do not forget the [X display](../../../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/)). Using Intel MPI, this may be done in following way:
+For debugging small number of MPI ranks, you may execute and debug each rank in separate xterm terminal (do not forget the [X display](../../../general/accessing-the-clusters/graphical-user-interface/x-window-system/)). Using Intel MPI, this may be done in following way:
 
 ```bash
     $ qsub -q qexp -l select=2:ncpus=24 -X -I
diff --git a/docs.it4i/salomon/software/intel-suite/intel-trace-analyzer-and-collector.md b/docs.it4i/salomon/software/intel-suite/intel-trace-analyzer-and-collector.md
index 5b52cabe9367dec1c3995369e275d2020745e3a4..5d4513d306d1b9a4bf159c71231c9677cc2b8165 100644
--- a/docs.it4i/salomon/software/intel-suite/intel-trace-analyzer-and-collector.md
+++ b/docs.it4i/salomon/software/intel-suite/intel-trace-analyzer-and-collector.md
@@ -21,7 +21,7 @@ The trace will be saved in file myapp.stf in the current directory.
 
 ## Viewing Traces
 
-To view and analyze the trace, open ITAC GUI in a [graphical environment](../../../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/):
+To view and analyze the trace, open ITAC GUI in a [graphical environment](../../../general/accessing-the-clusters/graphical-user-interface/x-window-system/):
 
 ```bash
     $ module load itac/9.1.2.024
diff --git a/docs.it4i/salomon/software/numerical-languages/matlab.md b/docs.it4i/salomon/software/numerical-languages/matlab.md
index 59bf293f253eaf189dd3bb95ac08697f7491aa08..aec28baaedbec6491cfe8ba14a7442368dbdec17 100644
--- a/docs.it4i/salomon/software/numerical-languages/matlab.md
+++ b/docs.it4i/salomon/software/numerical-languages/matlab.md
@@ -21,9 +21,9 @@ By default the EDU variant is marked as default. If you need other version or va
 
 If you need to use the Matlab GUI to prepare your Matlab programs, you can use Matlab directly on the login nodes. But for all computations use Matlab on the compute nodes via PBS Pro scheduler.
 
-If you require the Matlab GUI, please follow the general information about [running graphical applications](../../../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/).
+If you require the Matlab GUI, please follow the general information about [running graphical applications](../../../general/accessing-the-clusters/graphical-user-interface/x-window-system/).
 
-Matlab GUI is quite slow using the X forwarding built in the PBS (qsub -X), so using X11 display redirection either via SSH or directly by xauth (please see the "GUI Applications on Compute Nodes over VNC" part [here](../../../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/)) is recommended.
+Matlab GUI is quite slow using the X forwarding built in the PBS (qsub -X), so using X11 display redirection either via SSH or directly by xauth (please see the "GUI Applications on Compute Nodes over VNC" part [here](../../../general/accessing-the-clusters/graphical-user-interface/x-window-system/)) is recommended.
 
 To run Matlab with GUI, use
 
@@ -65,7 +65,7 @@ With the new mode, MATLAB itself launches the workers via PBS, so you can either
 
 ### Parallel Matlab Interactive Session
 
-Following example shows how to start interactive session with support for Matlab GUI. For more information about GUI based applications on Anselm see [this page](../../../get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system/).
+Following example shows how to start interactive session with support for Matlab GUI. For more information about GUI based applications on Anselm see [this page](../../../general/accessing-the-clusters/graphical-user-interface/x-window-system/).
 
 ```bash
     $ xhost +
@@ -247,11 +247,11 @@ This is an example of m-script using direct mode:
 
 ### Non-Interactive Session and Licenses
 
-If you want to run batch jobs with Matlab, be sure to request appropriate license features with the PBS Pro scheduler, at least the `-l __feature__matlab__MATLAB=1` for EDU variant of Matlab. More information about how to check the license features states and how to request them with PBS Pro, please [look here](../../../anselm-cluster-documentation/software/isv_licenses/).
+If you want to run batch jobs with Matlab, be sure to request appropriate license features with the PBS Pro scheduler, at least the `-l __feature__matlab__MATLAB=1` for EDU variant of Matlab. More information about how to check the license features states and how to request them with PBS Pro, please [look here](../../../anselm/software/isv_licenses/).
 
 The licensing feature of PBS is currently disabled.
 
-In case of non-interactive session please read the [following information](../../../anselm-cluster-documentation/software/isv_licenses/) on how to modify the qsub command to test for available licenses prior getting the resource allocation.
+In case of non-interactive session please read the [following information](../../../anselm/software/isv_licenses/) on how to modify the qsub command to test for available licenses prior getting the resource allocation.
 
 ### Matlab Distributed Computing Engines Start Up Time
 
diff --git a/docs.it4i/salomon/storage.md b/docs.it4i/salomon/storage.md
index c7ed3ffc3cd13bc1737a23675f319502c5fb6504..8c3e651bca8dc33cc6fcb6283d6cd9778a4fd7dd 100644
--- a/docs.it4i/salomon/storage.md
+++ b/docs.it4i/salomon/storage.md
@@ -224,7 +224,7 @@ Users home directories /home/username reside on HOME file system. Accessible cap
 
 The HOME should not be used to archive data of past Projects or other unrelated data.
 
-The files on HOME will not be deleted until end of the [users lifecycle](../get-started-with-it4innovations/obtaining-login-credentials/obtaining-login-credentials/).
+The files on HOME will not be deleted until end of the [users lifecycle](../general/obtaining-login-credentials/obtaining-login-credentials/).
 
 The workspace is backed up, such that it can be restored in case of catasthropic failure resulting in significant data loss. This backup however is not intended to restore old versions of user data or to restore (accidentaly) deleted files.
 
diff --git a/mkdocs.yml b/mkdocs.yml
index 1898d58d05f1ed4636fca7f3794cf78c3b443764..d4d50a24f90a0f63c930f72700376111592a7ce9 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -17,17 +17,17 @@ pages:
   - Home: index.md
 #  - History of Downtimes: downtimes_history.md
   - General:
-    - Applying for Resources: get-started-with-it4innovations/applying-for-resources.md
-    - Obtaining Login Credentials: get-started-with-it4innovations/obtaining-login-credentials/obtaining-login-credentials.md
-    - Certificates FAQ: get-started-with-it4innovations/obtaining-login-credentials/certificates-faq.md
+    - Applying for Resources: general/applying-for-resources.md
+    - Obtaining Login Credentials: general/obtaining-login-credentials/obtaining-login-credentials.md
+    - Certificates FAQ: general/obtaining-login-credentials/certificates-faq.md
     - Accessing the Clusters:
-      #- Introduction: get-started-with-it4innovations/accessing-the-clusters/introduction.md
-      - OpenSSH Keys (UN*X): get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/ssh-keys.md
-      - PuTTY (Windows): get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/putty.md
-      - X Window System: get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system.md
-      - VNC: get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/vnc.md
-      - VPN Access: get-started-with-it4innovations/accessing-the-clusters/vpn-access.md
-#    - VPN-Connection-Fail-in-Win-8.1: get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/vpn-connection-fail-in-win-8.1.md
+      #- Introduction: general/accessing-the-clusters/introduction.md
+      - OpenSSH Keys (UN*X): general/accessing-the-clusters/shell-access-and-data-transfer/ssh-keys.md
+      - PuTTY (Windows): general/accessing-the-clusters/shell-access-and-data-transfer/putty.md
+      - X Window System: general/accessing-the-clusters/graphical-user-interface/x-window-system.md
+      - VNC: general/accessing-the-clusters/graphical-user-interface/vnc.md
+      - VPN Access: general/accessing-the-clusters/vpn-access.md
+#    - VPN-Connection-Fail-in-Win-8.1: general/accessing-the-clusters/shell-access-and-data-transfer/vpn-connection-fail-in-win-8.1.md
   - Salomon Cluster:
     - Introduction: salomon/introduction.md
     - Hardware Overview: salomon/hardware-overview.md
@@ -46,20 +46,20 @@ pages:
     - Storage: salomon/storage.md
     - PRACE User Support: salomon/prace.md
   - Anselm Cluster:
-    - Introduction: anselm-cluster-documentation/introduction.md
-    - Hardware Overview: anselm-cluster-documentation/hardware-overview.md
-    - Accessing the Cluster: anselm-cluster-documentation/shell-and-data-access.md
-    - Environment and Modules: anselm-cluster-documentation/environment-and-modules.md
+    - Introduction: anselm/introduction.md
+    - Hardware Overview: anselm/hardware-overview.md
+    - Accessing the Cluster: anselm/shell-and-data-access.md
+    - Environment and Modules: anselm/environment-and-modules.md
     - Resource Allocation and Job Execution:
-      - Resource Allocation Policy: anselm-cluster-documentation/resources-allocation-policy.md
-      - Job Priority: anselm-cluster-documentation/job-priority.md
-      - Job Submission and Execution: anselm-cluster-documentation/job-submission-and-execution.md
-      - Capacity Computing: anselm-cluster-documentation/capacity-computing.md
-    - Compute Nodes: anselm-cluster-documentation/compute-nodes.md
-    - Storage: anselm-cluster-documentation/storage.md
-    - Network: anselm-cluster-documentation/network.md
-    - Remote Visualization: anselm-cluster-documentation/remote-visualization.md
-    - PRACE User Support: anselm-cluster-documentation/prace.md
+      - Resource Allocation Policy: anselm/resources-allocation-policy.md
+      - Job Priority: anselm/job-priority.md
+      - Job Submission and Execution: anselm/job-submission-and-execution.md
+      - Capacity Computing: anselm/capacity-computing.md
+    - Compute Nodes: anselm/compute-nodes.md
+    - Storage: anselm/storage.md
+    - Network: anselm/network.md
+    - Remote Visualization: anselm/remote-visualization.md
+    - PRACE User Support: anselm/prace.md
   - 'Software':
     - Lmod Environment: software/lmod.md
     - Modules Matrix: modules-matrix.md
@@ -120,72 +120,72 @@ pages:
     - Anselm Software:
       - Available Modules: modules-anselm.md
       - 'ANSYS':
-        - Introduction: anselm-cluster-documentation/software/ansys/ansys.md
-        - ANSYS CFX: anselm-cluster-documentation/software/ansys/ansys-cfx.md
-        - ANSYS Fluent: anselm-cluster-documentation/software/ansys/ansys-fluent.md
-        - ANSYS LS-DYNA: anselm-cluster-documentation/software/ansys/ansys-ls-dyna.md
-        - ANSYS MAPDL: anselm-cluster-documentation/software/ansys/ansys-mechanical-apdl.md
-        - LS-DYNA: anselm-cluster-documentation/software/ansys/ls-dyna.md
+        - Introduction: anselm/software/ansys/ansys.md
+        - ANSYS CFX: anselm/software/ansys/ansys-cfx.md
+        - ANSYS Fluent: anselm/software/ansys/ansys-fluent.md
+        - ANSYS LS-DYNA: anselm/software/ansys/ansys-ls-dyna.md
+        - ANSYS MAPDL: anselm/software/ansys/ansys-mechanical-apdl.md
+        - LS-DYNA: anselm/software/ansys/ls-dyna.md
       - 'Bioinformatics':
         - Bioinformatics Applications: software/bioinformatics.md
       - 'Debuggers':
-        - Allinea Forge (DDT,MAP): anselm-cluster-documentation/software/debuggers/allinea-ddt.md
-        - Allinea Performance Reports: anselm-cluster-documentation/software/debuggers/allinea-performance-reports.md
-        - CUBE: anselm-cluster-documentation/software/debuggers/cube.md
-        - Intel Performance Counter Monitor: anselm-cluster-documentation/software/debuggers/intel-performance-counter-monitor.md
-        - Intel VTune Amplifier: anselm-cluster-documentation/software/debuggers/intel-vtune-amplifier.md
-        - PAPI: anselm-cluster-documentation/software/debuggers/papi.md
-        - Scalasca: anselm-cluster-documentation/software/debuggers/scalasca.md
-        - Score-P: anselm-cluster-documentation/software/debuggers/score-p.md
-        - Total View: anselm-cluster-documentation/software/debuggers/total-view.md
-        - VNC: anselm-cluster-documentation/software/debuggers/debuggers.md
-        - Valgrind: anselm-cluster-documentation/software/debuggers/valgrind.md
-        - Vampir: anselm-cluster-documentation/software/debuggers/vampir.md
+        - Allinea Forge (DDT,MAP): anselm/software/debuggers/allinea-ddt.md
+        - Allinea Performance Reports: anselm/software/debuggers/allinea-performance-reports.md
+        - CUBE: anselm/software/debuggers/cube.md
+        - Intel Performance Counter Monitor: anselm/software/debuggers/intel-performance-counter-monitor.md
+        - Intel VTune Amplifier: anselm/software/debuggers/intel-vtune-amplifier.md
+        - PAPI: anselm/software/debuggers/papi.md
+        - Scalasca: anselm/software/debuggers/scalasca.md
+        - Score-P: anselm/software/debuggers/score-p.md
+        - Total View: anselm/software/debuggers/total-view.md
+        - VNC: anselm/software/debuggers/debuggers.md
+        - Valgrind: anselm/software/debuggers/valgrind.md
+        - Vampir: anselm/software/debuggers/vampir.md
       - 'Chemistry':
-        - Molpro: anselm-cluster-documentation/software/chemistry/molpro.md
-        - NWChem: anselm-cluster-documentation/software/chemistry/nwchem.md
+        - Molpro: anselm/software/chemistry/molpro.md
+        - NWChem: anselm/software/chemistry/nwchem.md
         - ORCA: software/orca.md
-      - COMSOL: anselm-cluster-documentation/software/comsol-multiphysics.md
-      - Compilers: anselm-cluster-documentation/software/compilers.md
-      - GPI-2: anselm-cluster-documentation/software/gpi2.md
+      - COMSOL: anselm/software/comsol-multiphysics.md
+      - Compilers: anselm/software/compilers.md
+      - GPI-2: anselm/software/gpi2.md
       - 'Intel Suite':
-        - Introduction: anselm-cluster-documentation/software/intel-suite/introduction.md
-        - Intel Compilers: anselm-cluster-documentation/software/intel-suite/intel-compilers.md
-        - Intel Debugger: anselm-cluster-documentation/software/intel-suite/intel-debugger.md
-        - Intel IPP: anselm-cluster-documentation/software/intel-suite/intel-integrated-performance-primitives.md
-        - Intel MKL: anselm-cluster-documentation/software/intel-suite/intel-mkl.md
-        - Intel TBB: anselm-cluster-documentation/software/intel-suite/intel-tbb.md
-      - Intel Xeon Phi: anselm-cluster-documentation/software/intel-xeon-phi.md
-      - ISV Licenses: anselm-cluster-documentation/software/isv_licenses.md
-      - Java: anselm-cluster-documentation/software/java.md
+        - Introduction: anselm/software/intel-suite/introduction.md
+        - Intel Compilers: anselm/software/intel-suite/intel-compilers.md
+        - Intel Debugger: anselm/software/intel-suite/intel-debugger.md
+        - Intel IPP: anselm/software/intel-suite/intel-integrated-performance-primitives.md
+        - Intel MKL: anselm/software/intel-suite/intel-mkl.md
+        - Intel TBB: anselm/software/intel-suite/intel-tbb.md
+      - Intel Xeon Phi: anselm/software/intel-xeon-phi.md
+      - ISV Licenses: anselm/software/isv_licenses.md
+      - Java: anselm/software/java.md
       - 'MPI':
-        - Introduction: anselm-cluster-documentation/software/mpi/mpi.md
-        - MPI4Py (MPI for Python): anselm-cluster-documentation/software/mpi/mpi4py-mpi-for-python.md
-        - Running Open MPI: anselm-cluster-documentation/software/mpi/Running_OpenMPI.md
-        - Running MPICH2: anselm-cluster-documentation/software/mpi/running-mpich2.md
+        - Introduction: anselm/software/mpi/mpi.md
+        - MPI4Py (MPI for Python): anselm/software/mpi/mpi4py-mpi-for-python.md
+        - Running Open MPI: anselm/software/mpi/Running_OpenMPI.md
+        - Running MPICH2: anselm/software/mpi/running-mpich2.md
       - 'Numerical Languages':
-        - Introduction: anselm-cluster-documentation/software/numerical-languages/introduction.md
-        - Matlab 2013-2014: anselm-cluster-documentation/software/numerical-languages/matlab_1314.md
-        - Matlab: anselm-cluster-documentation/software/numerical-languages/matlab.md
-        - Octave: anselm-cluster-documentation/software/numerical-languages/octave.md
-        - R: anselm-cluster-documentation/software/numerical-languages/r.md
+        - Introduction: anselm/software/numerical-languages/introduction.md
+        - Matlab 2013-2014: anselm/software/numerical-languages/matlab_1314.md
+        - Matlab: anselm/software/numerical-languages/matlab.md
+        - Octave: anselm/software/numerical-languages/octave.md
+        - R: anselm/software/numerical-languages/r.md
       - 'Numerical Libraries':
-        - FFTW: anselm-cluster-documentation/software/numerical-libraries/fftw.md
-        - GSL: anselm-cluster-documentation/software/numerical-libraries/gsl.md
-        - HDF5: anselm-cluster-documentation/software/numerical-libraries/hdf5.md
-        - Intel Numerical Libraries: anselm-cluster-documentation/software/numerical-libraries/intel-numerical-libraries.md
-        - MAGMA for Intel Xeon Phi: anselm-cluster-documentation/software/numerical-libraries/magma-for-intel-xeon-phi.md
-        - PETSc: anselm-cluster-documentation/software/numerical-libraries/petsc.md
-        - Trilinos: anselm-cluster-documentation/software/numerical-libraries/trilinos.md
-      - NVIDIA CUDA: anselm-cluster-documentation/software/nvidia-cuda.md
+        - FFTW: anselm/software/numerical-libraries/fftw.md
+        - GSL: anselm/software/numerical-libraries/gsl.md
+        - HDF5: anselm/software/numerical-libraries/hdf5.md
+        - Intel Numerical Libraries: anselm/software/numerical-libraries/intel-numerical-libraries.md
+        - MAGMA for Intel Xeon Phi: anselm/software/numerical-libraries/magma-for-intel-xeon-phi.md
+        - PETSc: anselm/software/numerical-libraries/petsc.md
+        - Trilinos: anselm/software/numerical-libraries/trilinos.md
+      - NVIDIA CUDA: anselm/software/nvidia-cuda.md
       - 'Omics Master':
-        - Diagnostic Component (TEAM): anselm-cluster-documentation/software/omics-master/diagnostic-component-team.md
-        - Priorization Component (BiERApp): anselm-cluster-documentation/software/omics-master/priorization-component-bierapp.md
-        - Overview: anselm-cluster-documentation/software/omics-master/overview.md
-      - OpenFOAM: anselm-cluster-documentation/software/openfoam.md
-      - Operating System: anselm-cluster-documentation/software/operating-system.md
-      - ParaView: anselm-cluster-documentation/software/paraview.md
-      - Virtualization: anselm-cluster-documentation/software/kvirtualization.md
+        - Diagnostic Component (TEAM): anselm/software/omics-master/diagnostic-component-team.md
+        - Priorization Component (BiERApp): anselm/software/omics-master/priorization-component-bierapp.md
+        - Overview: anselm/software/omics-master/overview.md
+      - OpenFOAM: anselm/software/openfoam.md
+      - Operating System: anselm/software/operating-system.md
+      - ParaView: anselm/software/paraview.md
+      - Virtualization: anselm/software/kvirtualization.md
 #  - Modules Matrix: modules-matrix.md
   - PBS Pro Documentation: pbspro.md
 #  - Testing: