diff --git a/_layouts/frontpage.html b/_layouts/frontpage.html
index 2475a9df0ce9fe12a8a6efa5699aed7b6cd7bf3e..645fe82c330c8167a147c32d1456f3c4e1c24c22 100644
--- a/_layouts/frontpage.html
+++ b/_layouts/frontpage.html
@@ -97,14 +97,14 @@
                     <div class="info-col">
                         
                         <div class="info-box">
-                            <a href="{% link mission/publications.md %}" class="btn btn-outline-primary">
+                            <a href="{% link organisation/publications.md %}" class="btn btn-outline-primary">
                                 <h3><i class="fas fa-atom" aria-hidden="true"></i>&nbsp; Publications</h3>
                             </a>
                             <p>See here for publications, including conference contributions and software publications from HIFIS.</p>
                         </div>
 
                         <div class="info-box">
-                            <a href="{% link mission/documentation.md %}" class="btn btn-outline-primary">
+                            <a href="{% link organisation/documentation.md %}" class="btn btn-outline-primary">
                                 <h3><i class="fas fa-atom" aria-hidden="true"></i>&nbsp; Documentation</h3>
                             </a>
                             <p>See here for HIFIS Technical and Administrative Documentation, Policies and Internal Repositories.
@@ -112,7 +112,7 @@
                         </div>
 
                         <div class="info-box">
-                            <a href="{% link mission/index.html %}" class="btn btn-outline-primary">
+                            <a href="{% link organisation/index.html %}" class="btn btn-outline-primary">
                                 <h3><i class="fas fa-atom" aria-hidden="true"></i>&nbsp; Team and Organisation</h3>
                             </a>
                             <p>See here for insight into the organization of HIFIS, the HIFIS team and governance.</p>
diff --git a/faq.md b/faq.md
index 3e92898cacc281071728dfaa652d1a4e5dcaf674..59c447a7729ad15efda26e4f3f23c39c72aaafee 100644
--- a/faq.md
+++ b/faq.md
@@ -18,7 +18,7 @@ excerpt:
         secure and easy-to-use collaborative environment with efficiently accessible ICT services from anywhere. HIFIS
         will also support the development of research software with a high level of quality, visibility and
         sustainability.</p>
-    <p> Documentation, Full Proposal texts and Publications <a href="{% link mission/publications.md %}">can be found here</a>.
+    <p> Documentation, Full Proposal texts and Publications <a href="{% link organisation/publications.md %}">can be found here</a>.
     </p>
 </div>
 
diff --git a/mission/.gitkeep b/organisation/.gitkeep
similarity index 100%
rename from mission/.gitkeep
rename to organisation/.gitkeep
diff --git a/mission/cluster-backbone.md b/organisation/cluster-backbone.md
similarity index 98%
rename from mission/cluster-backbone.md
rename to organisation/cluster-backbone.md
index 24d17d40d0d2e0c1bd253e41b72eb042abc24017..e92e8d098d6234bfd0477e8eecdb59a3b1fc2fa3 100644
--- a/mission/cluster-backbone.md
+++ b/organisation/cluster-backbone.md
@@ -8,6 +8,7 @@ redirect_from:
   - services/backbone/index_eng.html
   - services/backbone/index_ger.html
   - services/backbone
+  - mission/cluster-backbone.html
 
 ---
 
diff --git a/mission/cluster-cloud.md b/organisation/cluster-cloud.md
similarity index 99%
rename from mission/cluster-cloud.md
rename to organisation/cluster-cloud.md
index fc390706347ac2cdc0839cabd8ce3114ff335b1e..b816936927ec92dbd7ab73731785a617872e9a17 100644
--- a/mission/cluster-cloud.md
+++ b/organisation/cluster-cloud.md
@@ -8,6 +8,7 @@ redirect_from:
   - services/cloud/index_eng.html
   - services/cloud/index_ger.html
   - services/cloud
+  - mission/cluster-cloud.html
 
 ---
 
diff --git a/mission/cluster-software.md b/organisation/cluster-software.md
similarity index 98%
rename from mission/cluster-software.md
rename to organisation/cluster-software.md
index f4e8b89ea8f6ebce406c1aff9f2a22bab3bc322b..fa94c0cb6a667b6deb189334cc7626e784373f01 100644
--- a/mission/cluster-software.md
+++ b/organisation/cluster-software.md
@@ -8,6 +8,7 @@ redirect_from:
   - services/software/index_eng.html
   - services/software/index_ger.html
   - services/software
+  - mission/cluster-software.html  
 
 ---
 ## Detailed information
diff --git a/mission/documentation.md b/organisation/documentation.md
similarity index 100%
rename from mission/documentation.md
rename to organisation/documentation.md
diff --git a/mission/incubator.md b/organisation/incubator.md
similarity index 100%
rename from mission/incubator.md
rename to organisation/incubator.md
diff --git a/mission/index.html b/organisation/index.html
similarity index 81%
rename from mission/index.html
rename to organisation/index.html
index 9f9830c72f3bf70c407042293f3c3d94127b8df2..a09388748a6fcea05967813cf5e74640f346b667 100644
--- a/mission/index.html
+++ b/organisation/index.html
@@ -1,11 +1,14 @@
 ---
-title: HIFIS Mission
+title: HIFIS Structure, Governance
 title_image: default
 layout: default
 additional_css:
   - services/consulting-help-images.css
+redirect_from:
+  - mission/index.html
+  - mission
 excerpt:
-  Overview of HIFIS Motivation, Structure and Governance.
+  Overview of HIFIS Structure and Governance.
 ---
 
 
@@ -16,7 +19,7 @@ excerpt:
     <div>
         <h1 id="Structure">HIFIS Structure</h1>
         <p>
-            HIFIS is embedded in the context of the <a href="{% link mission/incubator.md %}">Helmholtz Information
+            HIFIS is embedded in the context of the <a href="{% link organisation/incubator.md %}">Helmholtz Information
                 &amp; Data Science
                 Incubator</a>.
              11 out of 18 Helmholtz centres are members of the HIFIS platform.
@@ -25,17 +28,17 @@ excerpt:
             For an extensive list of Helmholtz and international partners, see our
             <a href="{% link partners.md %}"><strong>partners page</strong></a>.
         </p>            
-        <h4 id="internal-structure">HIFIS Competence Clusters</h3>
+        <h4 id="competence-clusters">HIFIS Competence Clusters</h3>
         <p>HIFIS works in three Competence Clusters which are distributed throughout different
             Helmholtz research centers:</p>
         <ul>
-            <li><a href="{% link mission/cluster-cloud.md %}">Cloud Services</a>: Federated platform for proven first
+            <li><a href="{% link organisation/cluster-cloud.md %}">Cloud Services</a>: Federated platform for proven first
                 class cloud services;
                 led by <a href="https://www.helmholtz-berlin.de/">HZB</a>.</li>
-            <li><a href="{% link mission/cluster-backbone.md %}">Backbone Services</a>: High-performance trusted
+            <li><a href="{% link organisation/cluster-backbone.md %}">Backbone Services</a>: High-performance trusted
                 network infrastructure with
                 unified basic services; led by <a href="https://www.desy.de/">DESY</a>.</li>
-            <li><a href="{% link mission/cluster-software.md %}">Software Services</a>: Platform, training and support
+            <li><a href="{% link organisation/cluster-software.md %}">Software Services</a>: Platform, training and support
                 for high-quality,
                 sustainable software development, led by <a href="https://www.hzdr.de/">HZDR</a>.</li>
         </ul>
@@ -68,13 +71,13 @@ excerpt:
             According to the specifications of the directors of the Helmholtz Association the Helmholtz ICT Federation
             Board establishes the annual plan for HIFIS and reports about the implemented achievements to the Helmholtz
             Incubator, with the Helmholtz Incubator reporting to the general assembly.
-            <a href="{% link mission/members-fedboard.md %}">See here for a full list of members.</a></p>
+            <a href="{% link organisation/members-fedboard.md %}">See here for a full list of members.</a></p>
 
         <h3 id="scientific-advisory-board-sab">Scientific Advisory Board (SAB)</h3>
         <p>Further, the Assembly of Members of the Helmholtz Association has installed the Scientific Advisory Board
             (SAB). A total of 20 renowned international scientists contribute to HIFIS’s progress by their advice as SAB
             members.
-            <a href="{% link mission/members-sab.md %}">See here for a full list of SAB members.</a></p>
+            <a href="{% link organisation/members-sab.md %}">See here for a full list of SAB members.</a></p>
     </div>
 </div>
 <div class="image-attrib">Images by Katerina Limpitsouni via <a href="https://undraw.co/">undraw.co</a></div>
diff --git a/mission/members-fedboard.md b/organisation/members-fedboard.md
similarity index 100%
rename from mission/members-fedboard.md
rename to organisation/members-fedboard.md
diff --git a/mission/members-sab.md b/organisation/members-sab.md
similarity index 100%
rename from mission/members-sab.md
rename to organisation/members-sab.md
diff --git a/mission/publications.md b/organisation/publications.md
similarity index 100%
rename from mission/publications.md
rename to organisation/publications.md