diff --git a/doc.zih.tu-dresden.de/docs/data_management/ProjectManagement.md b/doc.zih.tu-dresden.de/docs/application/ProjectManagement.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/data_management/ProjectManagement.md
rename to doc.zih.tu-dresden.de/docs/application/ProjectManagement.md
diff --git a/doc.zih.tu-dresden.de/docs/jobs/SystemTaurus.md b/doc.zih.tu-dresden.de/docs/jobs/SystemTaurus.md
index 33c809ac2b13d456439117999bf1018aac361e66..8e45c2994b2890e355794a7d9039e99363b13547 100644
--- a/doc.zih.tu-dresden.de/docs/jobs/SystemTaurus.md
+++ b/doc.zih.tu-dresden.de/docs/jobs/SystemTaurus.md
@@ -2,8 +2,8 @@
 
 ## Information about the Hardware
 
-[Detailed information on the current HPC hardware can be found
-here.](../use_of_hardware/HardwareTaurus.md)
+Detailed information on the current HPC hardware can be found
+[here.](../use_of_hardware/HardwareTaurus.md)
 
 ## Applying for Access to the System
 
@@ -52,7 +52,7 @@ You can find an list of fingerprints [here](../access/Login.md#SSH_access).
 
 You have to explicitly load a compiler module and an MPI module on
 Taurus. Eg. with `module load GCC OpenMPI`. ( [read more about
-Modules](../data_management/RuntimeEnvironment.md), **todo link** (read more about
+Modules](../software/RuntimeEnvironment.md), **todo link** (read more about
 Compilers)(Compendium.Compilers))
 
 Use the wrapper commands like e.g. `mpicc` (`mpiicc` for intel),
diff --git a/doc.zih.tu-dresden.de/docs/data_management/Applications.md b/doc.zih.tu-dresden.de/docs/software/Applications.md
similarity index 91%
rename from doc.zih.tu-dresden.de/docs/data_management/Applications.md
rename to doc.zih.tu-dresden.de/docs/software/Applications.md
index cd347f856423ab9fcef56aad10c0011654e2da44..bdf776633769b01628a953d71d607bcb3d03f363 100644
--- a/doc.zih.tu-dresden.de/docs/data_management/Applications.md
+++ b/doc.zih.tu-dresden.de/docs/software/Applications.md
@@ -5,12 +5,12 @@ descriptions are taken from the vendor's web site or from
 Wikipedia.org.)
 
 Before running an application you normally have to load a
-[module](../data_management/RuntimeEnvironment.md#modules). Please read the instructions given
+[module](../software/RuntimeEnvironment.md#modules). Please read the instructions given
 while loading the module, they might be more up-to-date than this
 manual.
 
 -   **TODO Link** (Complete List of Modules)(SoftwareModulesList)
--   [Using Software Modules](../data_management/RuntimeEnvironment.md#modules)
+-   [Using Software Modules](../software/RuntimeEnvironment.md#modules)
 
 <!-- -->
 
diff --git a/doc.zih.tu-dresden.de/docs/data_management/BuildingSoftware.md b/doc.zih.tu-dresden.de/docs/software/BuildingSoftware.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/data_management/BuildingSoftware.md
rename to doc.zih.tu-dresden.de/docs/software/BuildingSoftware.md
diff --git a/doc.zih.tu-dresden.de/docs/software/JupyterHub.md b/doc.zih.tu-dresden.de/docs/software/JupyterHub.md
index fb19b5fb04945d485de766abb33d8deeb60dfa37..f7b34b52250b8426e40b8c61eca4896eaf7b8d2f 100644
--- a/doc.zih.tu-dresden.de/docs/software/JupyterHub.md
+++ b/doc.zih.tu-dresden.de/docs/software/JupyterHub.md
@@ -44,7 +44,7 @@ settings. You can:
     Slurm](../jobs/Slurm.md))
 -   assign your session to a project or reservation
 -   load modules from the [LMOD module
-    system](../data_management/RuntimeEnvironment.md)
+    system](../software/RuntimeEnvironment.md)
 -   choose a different standard environment (in preparation for future
     software updates or testing additional features)
 
@@ -224,7 +224,7 @@ Here's a short list of some included software:
 
 \* generic = all partitions except ml
 
-\*\* R is loaded from the [module system](../data_management/RuntimeEnvironment.md)
+\*\* R is loaded from the [module system](../software/RuntimeEnvironment.md)
 
 ### Creating and using your own environment
 
diff --git a/doc.zih.tu-dresden.de/docs/software/Mathematics.md b/doc.zih.tu-dresden.de/docs/software/Mathematics.md
index 13e51ea31c7732b83afd18d98254e7898d49a385..45af03beb748f75abf3d79789de5622872438e02 100644
--- a/doc.zih.tu-dresden.de/docs/software/Mathematics.md
+++ b/doc.zih.tu-dresden.de/docs/software/Mathematics.md
@@ -105,7 +105,7 @@ Or use:
        module load MATLAB
 
 (then you will get the most recent Matlab version. [Refer to the modules
-section for details.](../data_management/RuntimeEnvironment.md#Modules))
+section for details.](../software/RuntimeEnvironment.md#Modules))
 
 ### matlab interactive
 
diff --git a/doc.zih.tu-dresden.de/docs/data_management/RuntimeEnvironment.md b/doc.zih.tu-dresden.de/docs/software/RuntimeEnvironment.md
similarity index 98%
rename from doc.zih.tu-dresden.de/docs/data_management/RuntimeEnvironment.md
rename to doc.zih.tu-dresden.de/docs/software/RuntimeEnvironment.md
index b5ea842cec81ba95cea4f62e4dbba36ca95112cf..3bb467308049f189dfb278eb19cd8e61dc4ba849 100644
--- a/doc.zih.tu-dresden.de/docs/data_management/RuntimeEnvironment.md
+++ b/doc.zih.tu-dresden.de/docs/software/RuntimeEnvironment.md
@@ -171,7 +171,7 @@ can load the modules with `module load` .
 
 ## Misc
 
-An automated [backup](FileSystems.md#backup-and-snapshots-of-the-file-system)
+An automated [backup](../data_management/FileSystems.md#backup-and-snapshots-of-the-file-system)
 system provides security for the HOME-directories on `Taurus` and `Venus` on a daily basis. This is
 the reason why we urge our users to store (large) temporary data (like checkpoint files) on the
 /scratch -Filesystem or at local scratch disks.
diff --git a/doc.zih.tu-dresden.de/docs/software/SCS5Software.md b/doc.zih.tu-dresden.de/docs/software/SCS5Software.md
index c813a642e3f260d419dccac4bc4efa43825ec5ef..70b86d93f7a3b73d8f10bdecb5f919f5a45e6f44 100644
--- a/doc.zih.tu-dresden.de/docs/software/SCS5Software.md
+++ b/doc.zih.tu-dresden.de/docs/software/SCS5Software.md
@@ -21,7 +21,7 @@ remove it and accept the new one after comparing its fingerprint with those list
 ## Using Software Modules
 
 Starting with SCS5, we only provide
-[Lmod](../data_management/RuntimeEnvironment.md#lmod-an-alternative-module-implementation) as the
+[Lmod](../software/RuntimeEnvironment.md#lmod-an-alternative-module-implementation) as the
 environment module tool of choice.
 
 As usual, you can get a list of the available software modules via:
diff --git a/doc.zih.tu-dresden.de/docs/software/TensorFlow.md b/doc.zih.tu-dresden.de/docs/software/TensorFlow.md
index 37506c792a34e4be078f6f314a6e859b6cf477fe..4d051c5467d749c8a31cc5232c570d443fa8ff13 100644
--- a/doc.zih.tu-dresden.de/docs/software/TensorFlow.md
+++ b/doc.zih.tu-dresden.de/docs/software/TensorFlow.md
@@ -27,7 +27,7 @@ part of the TU Dresden HPC system.
 
 There are three main options on how to work with Tensorflow on the
 HPC-DA: **1.** **Modules,** **2.** **JupyterNotebook, 3. Containers**. The best option is 
-to use [module system](../data_management/RuntimeEnvironment.md#Module_Environments) and 
+to use [module system](../software/RuntimeEnvironment.md#Module_Environments) and 
 Python virtual environment. Please see the next chapters and the [Python page](Python.md) for the
 HPC-DA system.
 
@@ -261,4 +261,4 @@ else stay with the default of modenv/scs5.
 
 Q: How to change the module environment and know more about modules?
 
-A: [Modules](../data_management/RuntimeEnvironment.md#Modules)
+A: [Modules](../software/RuntimeEnvironment.md#Modules)
diff --git a/doc.zih.tu-dresden.de/mkdocs.yml b/doc.zih.tu-dresden.de/mkdocs.yml
index 21004dc1b0d13d306eff9651265f42eed7429303..cdd18670b5d3b867b5c8087d2ebc727f377f21e1 100644
--- a/doc.zih.tu-dresden.de/mkdocs.yml
+++ b/doc.zih.tu-dresden.de/mkdocs.yml
@@ -6,6 +6,7 @@ nav:
     - Terms: application/TermsOfUse.md
     - Request for Resources: application/RequestForResources.md
     - Project Request Form: application/ProjectRequestForm.md
+    - Projectmanagment: application/ProjectManagement.md
   - Access to the Cluster:
     - Overview: access.md
     - Desktop Visualization: access/DesktopCloudVisualization.md
@@ -17,6 +18,7 @@ nav:
     - Overview: software/Overview.md
     - Environment:
       - Modules: software/Modules.md
+      - Runtime Environment: software/RuntimeEnvironment.md
       - Custom EasyBuild Modules: software/CustomEasyBuildEnvironment.md
     - JupyterHub:
       - Overview: software/JupyterHub.md
@@ -27,6 +29,7 @@ nav:
       - Singularity Example Definitions: software/SingularityExampleDefinitions.md
       - VM tools: software/VMTools.md
     - Applications:
+      - Overview: software/Applications.md
       - Bio Informatics: software/Bioinformatics.md
       - Computational Fluid Dynamics (CFD): software/CFD.md
       - NanoscaleSimulations: software/NanoscaleSimulations.md
@@ -51,6 +54,7 @@ nav:
     - Virtual Desktops: software/VirtualDesktops.md
     - Software Development and Tools:
       - Overview: software/SoftwareDevelopment.md
+      - Building Software: software/BuildingSoftware.md
       - GPU Programming: software/GPUProgramming.md
       - Compilers: software/Compilers.md
       - Debuggers: software/Debuggers.md
@@ -66,11 +70,7 @@ nav:
     - Overview: data_management/DataManagement.md
     - Announcement of Quotas: data_management/AnnouncementOfQuotas.md
     - Workspaces: data_management/Workspaces.md
-    - Applications: data_management/Applications.md
     - BeeGFS: data_management/BeeGFS.md
-    - Projectmanagment: data_management/ProjectManagement.md
-    - Runtime Environment: data_management/RuntimeEnvironment.md
-    - Building Software: data_management/BuildingSoftware.md
     - Intermediate Archive: data_management/IntermediateArchive.md
     - Filesystems: data_management/FileSystems.md
     - Warm Archive: data_management/WarmArchive.md