diff --git a/twiki2md/root/WebHome/Access.md b/doc.zih.tu-dresden.de/docs/application/Access.md
similarity index 100%
rename from twiki2md/root/WebHome/Access.md
rename to doc.zih.tu-dresden.de/docs/application/Access.md
diff --git a/twiki2md/root/AnnouncementOfQuotas.md b/doc.zih.tu-dresden.de/docs/data_management/AnnouncementOfQuotas.md
similarity index 100%
rename from twiki2md/root/AnnouncementOfQuotas.md
rename to doc.zih.tu-dresden.de/docs/data_management/AnnouncementOfQuotas.md
diff --git a/twiki2md/root/WebHome/Applications.md b/doc.zih.tu-dresden.de/docs/data_management/Applications.md
similarity index 100%
rename from twiki2md/root/WebHome/Applications.md
rename to doc.zih.tu-dresden.de/docs/data_management/Applications.md
diff --git a/twiki2md/root/Cloud/BeeGFS.md b/doc.zih.tu-dresden.de/docs/data_management/BeeGFS.md
similarity index 100%
rename from twiki2md/root/Cloud/BeeGFS.md
rename to doc.zih.tu-dresden.de/docs/data_management/BeeGFS.md
diff --git a/twiki2md/root/WebCreateNewTopic/ProjectManagement.md b/doc.zih.tu-dresden.de/docs/data_management/ProjectManagement.md
similarity index 100%
rename from twiki2md/root/WebCreateNewTopic/ProjectManagement.md
rename to doc.zih.tu-dresden.de/docs/data_management/ProjectManagement.md
diff --git a/twiki2md/root/DataManagement/DataMover.md b/doc.zih.tu-dresden.de/docs/data_moving/DataMover.md
similarity index 100%
rename from twiki2md/root/DataManagement/DataMover.md
rename to doc.zih.tu-dresden.de/docs/data_moving/DataMover.md
diff --git a/twiki2md/root/DataManagement/ExportNodes.md b/doc.zih.tu-dresden.de/docs/data_moving/ExportNodes.md
similarity index 100%
rename from twiki2md/root/DataManagement/ExportNodes.md
rename to doc.zih.tu-dresden.de/docs/data_moving/ExportNodes.md
diff --git a/twiki2md/root/Slurm/BindingAndDistributionOfTasks.md b/doc.zih.tu-dresden.de/docs/jobs/BindingAndDistributionOfTasks.md
similarity index 100%
rename from twiki2md/root/Slurm/BindingAndDistributionOfTasks.md
rename to doc.zih.tu-dresden.de/docs/jobs/BindingAndDistributionOfTasks.md
diff --git a/twiki2md/root/Access/ProjectRequestForm.md b/doc.zih.tu-dresden.de/docs/req_resources/ProjectRequestForm.md
similarity index 100%
rename from twiki2md/root/Access/ProjectRequestForm.md
rename to doc.zih.tu-dresden.de/docs/req_resources/ProjectRequestForm.md
diff --git a/twiki2md/root/Applications/DeepLearning.md b/doc.zih.tu-dresden.de/docs/software/DeepLearning.md
similarity index 100%
rename from twiki2md/root/Applications/DeepLearning.md
rename to doc.zih.tu-dresden.de/docs/software/DeepLearning.md
diff --git a/twiki2md/root/WebHome/JupyterHub.md b/doc.zih.tu-dresden.de/docs/software/JupyterHub.md
similarity index 100%
rename from twiki2md/root/WebHome/JupyterHub.md
rename to doc.zih.tu-dresden.de/docs/software/JupyterHub.md
diff --git a/twiki2md/root/JupyterHub/JupyterHubForTeaching.md b/doc.zih.tu-dresden.de/docs/software/JupyterHubForTeaching.md
similarity index 100%
rename from twiki2md/root/JupyterHub/JupyterHubForTeaching.md
rename to doc.zih.tu-dresden.de/docs/software/JupyterHubForTeaching.md
diff --git a/doc.zih.tu-dresden.de/docs/software/overview.md b/doc.zih.tu-dresden.de/docs/software/overview.md
index db945921f7123eb342edc2d9c7bf0fb8be6ef834..4a158ce73121e53d072fbdd00773d656b2fdfc16 100644
--- a/doc.zih.tu-dresden.de/docs/software/overview.md
+++ b/doc.zih.tu-dresden.de/docs/software/overview.md
@@ -33,5 +33,5 @@ Some tasks require using containers. It can be done on Taurus by [Singularity]**
 could be found in the [following chapter]**todo link**.
 
 Useful links: [Libraries]**todo link**, [Deep Learning]**todo link**, [Jupyter Hub]**todo link**,
-[Big Data Frameworks]**todo link**, [R]**todo link**, [Applications for various fields of
+[Big Data Frameworks](useful_links/BigDataFrameworksApacheSparkApacheFlinkApacheHadoop.md), [R]**todo link**, [Applications for various fields of
 science]**todo link**
diff --git a/twiki2md/root/WebHome/BigDataFrameworksApacheSparkApacheFlinkApacheHadoop.md b/doc.zih.tu-dresden.de/docs/software/useful_links/BigDataFrameworksApacheSparkApacheFlinkApacheHadoop.md
similarity index 100%
rename from twiki2md/root/WebHome/BigDataFrameworksApacheSparkApacheFlinkApacheHadoop.md
rename to doc.zih.tu-dresden.de/docs/software/useful_links/BigDataFrameworksApacheSparkApacheFlinkApacheHadoop.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
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/twiki2md/root/Compendium.WebHome/BatchSystems.md b/doc.zih.tu-dresden.de/docs/use_of_hardware/BatchSystems.md
similarity index 100%
rename from twiki2md/root/Compendium.WebHome/BatchSystems.md
rename to doc.zih.tu-dresden.de/docs/use_of_hardware/BatchSystems.md
diff --git a/twiki2md/root/Compendium/CheckpointRestart.md b/doc.zih.tu-dresden.de/docs/use_of_hardware/CheckpointRestart.md
similarity index 100%
rename from twiki2md/root/Compendium/CheckpointRestart.md
rename to doc.zih.tu-dresden.de/docs/use_of_hardware/CheckpointRestart.md
diff --git a/twiki2md/root/SystemTaurus/HardwareTaurus.md b/doc.zih.tu-dresden.de/docs/use_of_hardware/HardwareTaurus.md
similarity index 100%
rename from twiki2md/root/SystemTaurus/HardwareTaurus.md
rename to doc.zih.tu-dresden.de/docs/use_of_hardware/HardwareTaurus.md
diff --git a/doc.zih.tu-dresden.de/mkdocs.yml b/doc.zih.tu-dresden.de/mkdocs.yml
index 0ccc12adf65b2548bf57f06e603c212e973a5f58..9df61f7bf730a6040ccdc718a6cde3f30d66e19f 100644
--- a/doc.zih.tu-dresden.de/mkdocs.yml
+++ b/doc.zih.tu-dresden.de/mkdocs.yml
@@ -1,23 +1,41 @@
 nav:
   - Home: index.md
-  - Application for HPC Login: application.md
-  - Request for Resources: req_resources.md
-  - Access to the Cluster: access.md
+  - Application for HPC Login: 
+    - Overview: application.md
+    - Access: application/Access.md
+  - Request for Resources:
+    - Overview: req_resources.md
+    - Project Request Form: req_resources/ProjectRequestForm.md
   - Available Software and Usage:
     - Overview: software/overview.md
     - Modules: software/modules.md
+    - JupyterHub: software/Jupyterhub.md
+    - JupyterHub for Teaching: software/JupyterHubForTeaching.md
     - Containers: software/containers.md
+    - Deep Learning: software/DeepLearning.md
     - FAQs: software/modules-faq.md
   - Data Management:
     - Overview: data_management/datamanagement.md
+    - Announcement of Quotas: data_management/AnnouncementOfQuotas.md
     - Workspaces: data_management/workspaces.md
-  - Data Moving: data_moving.md
-  - Use of Hardware: use_of_hardware.md
+    - Applications: data_management/Applications.md
+    - BeeGFS: data_management/BeeGFS.md
+    - Projectmanagment: data_management/ProjectManagement.md
+  - Data Moving:
+    - Overview: data_moving.md
+    - Data Mover: data_moving/DataMover.md
+    - Export Nodes: data_moving/ExportNodes.md
+  - Use of Hardware:
+    - Overview: use_of_hardware.md
+    - Batch Systems: use_of_hardware/BatchSystems.md
+    - Hardware Taurus: use_of_hardware/SystemTaurus.md
+    - Checkpoint/Restart: use_of_hardware/CheckpointRestart.md
   - Structuring Experiments: experiments.md
   - Support: support.md
   - Running Jobs:
     - Overview: jobs/index.md
     - Slurm: jobs/Slurm.md
+    - Binding And Distribution Of Tasks: jobs/BindingAndDistributionOfTasks.md
       #    - Queue Policy: jobs/policy.md
       #    - Examples: jobs/examples/index.md
       #    - Affinity: jobs/affinity/index.md