diff --git a/doc.zih.tu-dresden.de/docs/access.md b/doc.zih.tu-dresden.de/docs/access/access.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/access.md
rename to doc.zih.tu-dresden.de/docs/access/access.md
diff --git a/doc.zih.tu-dresden.de/docs/data_management/.gitkeep b/doc.zih.tu-dresden.de/docs/data_lifecycle/.gitkeep
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/data_management/.gitkeep
rename to doc.zih.tu-dresden.de/docs/data_lifecycle/.gitkeep
diff --git a/doc.zih.tu-dresden.de/docs/data_management/BeeGFS.md b/doc.zih.tu-dresden.de/docs/data_lifecycle/BeeGFS.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/data_management/BeeGFS.md
rename to doc.zih.tu-dresden.de/docs/data_lifecycle/BeeGFS.md
diff --git a/doc.zih.tu-dresden.de/docs/data_management/DataManagement.md b/doc.zih.tu-dresden.de/docs/data_lifecycle/DataManagement.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/data_management/DataManagement.md
rename to doc.zih.tu-dresden.de/docs/data_lifecycle/DataManagement.md
diff --git a/doc.zih.tu-dresden.de/docs/data_management/FileSystems.md b/doc.zih.tu-dresden.de/docs/data_lifecycle/FileSystems.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/data_management/FileSystems.md
rename to doc.zih.tu-dresden.de/docs/data_lifecycle/FileSystems.md
diff --git a/doc.zih.tu-dresden.de/docs/data_management/HPCStorageConcept2019.md b/doc.zih.tu-dresden.de/docs/data_lifecycle/HPCStorageConcept2019.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/data_management/HPCStorageConcept2019.md
rename to doc.zih.tu-dresden.de/docs/data_lifecycle/HPCStorageConcept2019.md
diff --git a/doc.zih.tu-dresden.de/docs/data_management/IntermediateArchive.md b/doc.zih.tu-dresden.de/docs/data_lifecycle/IntermediateArchive.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/data_management/IntermediateArchive.md
rename to doc.zih.tu-dresden.de/docs/data_lifecycle/IntermediateArchive.md
diff --git a/doc.zih.tu-dresden.de/docs/data_management/PreservationResearchData.md b/doc.zih.tu-dresden.de/docs/data_lifecycle/PreservationResearchData.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/data_management/PreservationResearchData.md
rename to doc.zih.tu-dresden.de/docs/data_lifecycle/PreservationResearchData.md
diff --git a/doc.zih.tu-dresden.de/docs/data_management/WarmArchive.md b/doc.zih.tu-dresden.de/docs/data_lifecycle/WarmArchive.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/data_management/WarmArchive.md
rename to doc.zih.tu-dresden.de/docs/data_lifecycle/WarmArchive.md
diff --git a/doc.zih.tu-dresden.de/docs/data_management/Workspaces.md b/doc.zih.tu-dresden.de/docs/data_lifecycle/Workspaces.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/data_management/Workspaces.md
rename to doc.zih.tu-dresden.de/docs/data_lifecycle/Workspaces.md
diff --git a/doc.zih.tu-dresden.de/docs/data_management/experiments.md b/doc.zih.tu-dresden.de/docs/data_lifecycle/experiments.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/data_management/experiments.md
rename to doc.zih.tu-dresden.de/docs/data_lifecycle/experiments.md
diff --git a/doc.zih.tu-dresden.de/docs/archive/AnnouncementOfQuotas.md b/doc.zih.tu-dresden.de/docs/data_lifecycle/quotas.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/archive/AnnouncementOfQuotas.md
rename to doc.zih.tu-dresden.de/docs/data_lifecycle/quotas.md
diff --git a/doc.zih.tu-dresden.de/docs/data_moving/DataMover.md b/doc.zih.tu-dresden.de/docs/data_transfer/DataMover.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/data_moving/DataMover.md
rename to doc.zih.tu-dresden.de/docs/data_transfer/DataMover.md
diff --git a/doc.zih.tu-dresden.de/docs/data_moving/ExportNodes.md b/doc.zih.tu-dresden.de/docs/data_transfer/ExportNodes.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/data_moving/ExportNodes.md
rename to doc.zih.tu-dresden.de/docs/data_transfer/ExportNodes.md
diff --git a/doc.zih.tu-dresden.de/docs/data_moving/data_moving.md b/doc.zih.tu-dresden.de/docs/data_transfer/data_moving.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/data_moving/data_moving.md
rename to doc.zih.tu-dresden.de/docs/data_transfer/data_moving.md
diff --git a/doc.zih.tu-dresden.de/docs/use_of_hardware/AlphaCentauri.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/AlphaCentauri.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/use_of_hardware/AlphaCentauri.md
rename to doc.zih.tu-dresden.de/docs/jobs_and_resources/AlphaCentauri.md
diff --git a/doc.zih.tu-dresden.de/docs/use_of_hardware/BatchSystems.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/BatchSystems.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/use_of_hardware/BatchSystems.md
rename to doc.zih.tu-dresden.de/docs/jobs_and_resources/BatchSystems.md
diff --git a/doc.zih.tu-dresden.de/docs/jobs/BindingAndDistributionOfTasks.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/BindingAndDistributionOfTasks.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/jobs/BindingAndDistributionOfTasks.md
rename to doc.zih.tu-dresden.de/docs/jobs_and_resources/BindingAndDistributionOfTasks.md
diff --git a/doc.zih.tu-dresden.de/docs/use_of_hardware/CheckpointRestart.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/CheckpointRestart.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/use_of_hardware/CheckpointRestart.md
rename to doc.zih.tu-dresden.de/docs/jobs_and_resources/CheckpointRestart.md
diff --git a/doc.zih.tu-dresden.de/docs/jobs/HPCDA.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/HPCDA.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/jobs/HPCDA.md
rename to doc.zih.tu-dresden.de/docs/jobs_and_resources/HPCDA.md
diff --git a/doc.zih.tu-dresden.de/docs/use_of_hardware/HardwareTaurus.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/HardwareTaurus.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/use_of_hardware/HardwareTaurus.md
rename to doc.zih.tu-dresden.de/docs/jobs_and_resources/HardwareTaurus.md
diff --git a/doc.zih.tu-dresden.de/docs/use_of_hardware/NvmeStorage.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/NvmeStorage.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/use_of_hardware/NvmeStorage.md
rename to doc.zih.tu-dresden.de/docs/jobs_and_resources/NvmeStorage.md
diff --git a/doc.zih.tu-dresden.de/docs/use_of_hardware/Power9.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/Power9.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/use_of_hardware/Power9.md
rename to doc.zih.tu-dresden.de/docs/jobs_and_resources/Power9.md
diff --git a/doc.zih.tu-dresden.de/docs/use_of_hardware/RomeNodes.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/RomeNodes.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/use_of_hardware/RomeNodes.md
rename to doc.zih.tu-dresden.de/docs/jobs_and_resources/RomeNodes.md
diff --git a/doc.zih.tu-dresden.de/docs/use_of_hardware/SDFlex.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/SDFlex.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/use_of_hardware/SDFlex.md
rename to doc.zih.tu-dresden.de/docs/jobs_and_resources/SDFlex.md
diff --git a/doc.zih.tu-dresden.de/docs/jobs/Slurm.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/Slurm.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/jobs/Slurm.md
rename to doc.zih.tu-dresden.de/docs/jobs_and_resources/Slurm.md
diff --git a/doc.zih.tu-dresden.de/docs/jobs/SlurmExamples.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/SlurmExamples.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/jobs/SlurmExamples.md
rename to doc.zih.tu-dresden.de/docs/jobs_and_resources/SlurmExamples.md
diff --git a/doc.zih.tu-dresden.de/docs/jobs/SystemTaurus.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/SystemTaurus.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/jobs/SystemTaurus.md
rename to doc.zih.tu-dresden.de/docs/jobs_and_resources/SystemTaurus.md
diff --git a/doc.zih.tu-dresden.de/docs/jobs/index.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/index.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/jobs/index.md
rename to doc.zih.tu-dresden.de/docs/jobs_and_resources/index.md
diff --git a/doc.zih.tu-dresden.de/docs/use_of_hardware.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/use_of_hardware.md
similarity index 100%
rename from doc.zih.tu-dresden.de/docs/use_of_hardware.md
rename to doc.zih.tu-dresden.de/docs/jobs_and_resources/use_of_hardware.md
diff --git a/doc.zih.tu-dresden.de/docs/use_of_hardware/.gitkeep b/doc.zih.tu-dresden.de/docs/use_of_hardware/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/doc.zih.tu-dresden.de/mkdocs.yml b/doc.zih.tu-dresden.de/mkdocs.yml
index cacb32caba8bb1d1da3a6333289f63d494c2f128..a56260fb4072e7b3f5ac309c6a4fe3b9bb477800 100644
--- a/doc.zih.tu-dresden.de/mkdocs.yml
+++ b/doc.zih.tu-dresden.de/mkdocs.yml
@@ -8,16 +8,16 @@ nav:
     - Project Request Form: application/ProjectRequestForm.md
     - Project Management: application/ProjectManagement.md
   - Access to the Cluster:
-    - Overview: access.md
+    - Overview: access/access.md
     - Desktop Visualization: access/DesktopCloudVisualization.md
     - Web VNC: access/WebVNC.md
     - Login: access/Login.md
     - Security Restrictions: access/SecurityRestrictions.md
     - SSH with Putty: access/SSHMitPutty.md
   - Transfer of Data:
-    - Overview: data_moving/data_moving.md
-    - Data Mover: data_moving/DataMover.md
-    - Export Nodes: data_moving/ExportNodes.md
+    - Overview: data_transfer/data_moving.md
+    - Data Mover: data_transfer/DataMover.md
+    - Export Nodes: data_transfer/ExportNodes.md
   - Environment and Software:
     - Overview: software/Overview.md
     - Environment:
@@ -71,33 +71,33 @@ nav:
       - Vampir: software/Vampir.md
       - Mathematics: software/Mathematics.md
   - Data Lifecycle Management:
-    - Overview: data_management/DataManagement.md
-    - Announcement of Quotas: data_management/AnnouncementOfQuotas.md
-    - Workspaces: data_management/Workspaces.md
-    - BeeGFS: data_management/BeeGFS.md
-    - Intermediate Archive: data_management/IntermediateArchive.md
-    - Filesystems: data_management/FileSystems.md
-    - Warm Archive: data_management/WarmArchive.md
-    - HPC Storage Concept 2019: data_management/HPCStorageConcept2019.md
-    - Preservation of Research Data: data_management/PreservationResearchData.md
-    - Structuring Experiments: experiments.md
+    - Overview: data_lifecycle/DataManagement.md
+    - Quotas: data_lifecycle/quotas.md
+    - Workspaces: data_lifecycle/Workspaces.md
+    - BeeGFS: data_lifecycle/BeeGFS.md
+    - Intermediate Archive: data_lifecycle/IntermediateArchive.md
+    - Filesystems: data_lifecycle/FileSystems.md
+    - Warm Archive: data_lifecycle/WarmArchive.md
+    - HPC Storage Concept 2019: data_lifecycle/HPCStorageConcept2019.md
+    - Preservation of Research Data: data_lifecycle/PreservationResearchData.md
+    - Structuring Experiments: data_lifecycle/experiments.md
   - Jobs and Resources:
-    - Overview: use_of_hardware.md
-    - Batch Systems: use_of_hardware/BatchSystems.md
+    - Overview: jobs_and_resources/use_of_hardware.md
+    - Batch Systems: jobs_and_resources/BatchSystems.md
     - Hardware Resources:
-      - Hardware Taurus: use_of_hardware/HardwareTaurus.md
-      - AMD Rome Nodes: use_of_hardware/RomeNodes.md
-      - IBM Power9 Nodes: use_of_hardware/Power9.md
-      - NVMe Storage: use_of_hardware/NvmeStorage.md
-      - Alpha Centauri: use_of_hardware/AlphaCentauri.md
-      - HPE Superdome Flex: use_of_hardware/SDFlex.md
-    - Checkpoint/Restart: use_of_hardware/CheckpointRestart.md
-    - Overview2: jobs/index.md
-    - Taurus: jobs/SystemTaurus.md
-    - Slurm Examples: jobs/SlurmExamples.md
-    - Slurm: jobs/Slurm.md
-    - HPC-DA: jobs/HPCDA.md
-    - Binding And Distribution Of Tasks: jobs/BindingAndDistributionOfTasks.md
+      - Hardware Taurus: jobs_and_resources/HardwareTaurus.md
+      - AMD Rome Nodes: jobs_and_resources/RomeNodes.md
+      - IBM Power9 Nodes: jobs_and_resources/Power9.md
+      - NVMe Storage: jobs_and_resources/NvmeStorage.md
+      - Alpha Centauri: jobs_and_resources/AlphaCentauri.md
+      - HPE Superdome Flex: jobs_and_resources/SDFlex.md
+    - Checkpoint/Restart: jobs_and_resources/CheckpointRestart.md
+    - Overview2: jobs_and_resources/index.md
+    - Taurus: jobs_and_resources/SystemTaurus.md
+    - Slurm Examples: jobs_and_resources/SlurmExamples.md
+    - Slurm: jobs_and_resources/Slurm.md
+    - HPC-DA: jobs_and_resources/HPCDA.md
+    - Binding And Distribution Of Tasks: jobs_and_resources/BindingAndDistributionOfTasks.md
       #    - Queue Policy: jobs/policy.md
       #    - Examples: jobs/examples/index.md
       #    - Affinity: jobs/affinity/index.md