diff --git a/docs/documentation/analysis.md b/docs/documentation/analysis.md
index e8e36639cddda22ef6240aad0cc4be9593eb3d67..a8d39664dd53595db7e32a19003a7d9162a74936 100644
--- a/docs/documentation/analysis.md
+++ b/docs/documentation/analysis.md
@@ -22,7 +22,7 @@ lift mach numbers.
 
 |Module Version|Language|License|Documentation|
 |:---:|:---:|:---:|---|
-|2.1.0|:simple-cplusplus: |GPLv3|[Link](aerodynamic_analysis/content/index.md)|
+|2.1.0|:simple-cplusplus: |GPLv3|[Link](aircraft-design/aerodynamic_analysis/doc/content/index.md)|
 
 ---
 
@@ -39,7 +39,7 @@ For the user, possible changes in the module run configuration can be made in th
 
 |Module Version|Language|License|Documentation|
 |:---:|:---:|:---:|---|
-|2.1.0|:simple-cplusplus: |GPLv3|[Link](mission_analysis/content/index.md)|
+|2.1.0|:simple-cplusplus: |GPLv3|[Link](aircraft-design/mission_analysis/doc/content/index.md)|
 
 ---
 
@@ -50,7 +50,7 @@ The `weight_and_balance_analysis` module calculates sub-masses and total masses
 
 |Module Version|Language|License|Documentation|
 |:---:|:---:|:---:|---|
-|2.1.0|:simple-cplusplus: |GPLv3|[Link](weight_and_balance_analysis/content/index.md)|
+|2.1.0|:simple-cplusplus: |GPLv3|[Link](aircraft-design/weight_and_balance_analysis/doc/content/index.md)|
 
 ---
 
@@ -67,7 +67,7 @@ The parameters comprised in this XML file can have different attributes as e.g.
 
 |Module Version|Language|License|Documentation|
 |:---:|:---:|:---:|---|
-|2.1.0|:simple-cplusplus: |GPLv3|[Link](ecological_assessment/content/index.md)|
+|2.1.0|:simple-cplusplus: |GPLv3|[Link](aircraft-design/ecological_assessment/doc/content/index.md)|
 
 ---
 
@@ -78,7 +78,7 @@ The module `calculatePerformance` is used to evaluate the mission performance of
 
 |Module Version|Language|License|Documentation|
 |:---:|:---:|:---:|---|
-|2.1.0|:simple-cplusplus:| GPLv3 |[Link](performance_assessment/content/index.md)|
+|2.1.0|:simple-cplusplus:| GPLv3 |[Link](aircraft-design/performance_assessment/doc/content/index.md)|
 
 ---
 
@@ -94,6 +94,6 @@ Direct costs include all expenses incurred in operating and financing the aircra
 
 |Module Version|Language|License|Documentation|
 |:---:|:---:|:---:|---|
-|2.1.0|:simple-python: |GPLv3|[Link](cost_estimation/content/index.md)|
+|2.1.0|:simple-python: |GPLv3|[Link](aircraft-design/cost_estimation/doc/content/index.md)|
 
 ---
diff --git a/docs/documentation/sizing.md b/docs/documentation/sizing.md
index 395679341c83b3e9fc9a2e014ad4c307a7da0cb9..0a1bf7358943967291824837fd13b98f944e6076 100644
--- a/docs/documentation/sizing.md
+++ b/docs/documentation/sizing.md
@@ -37,7 +37,7 @@ The parameters comprised in this file can have different attributes as e.g. Desc
 
 |Module Version|Language|License|Documentation|
 |:---:|:---:|:---:|---|
-|2.1.0|:simple-cplusplus: |GPLv3|[Link](create_mission_xml/content/index.md)|
+|2.1.0|:simple-cplusplus: |GPLv3|[Link](aircraft-design/create_mission_xml/doc/content/index.md)|
 
 ---
 
@@ -48,7 +48,7 @@ The **fuselage_design** module calculates characteristic parameters and generate
 
 |Module Version|Language|License|Documentation|
 |:---:|:---:|:---:|---|
-|2.1.0|:simple-cplusplus: |GPLv3|[Link](fuselage_design/content/index.md)|
+|2.1.0|:simple-cplusplus: |GPLv3|[Link](aircraft-design/fuselage_design/doc/content/index.md)|
 
 ---
 
@@ -59,7 +59,7 @@ The **wing_design** module calculates characteristic parameter of the aircraft m
 
 |Module Version|Language|License|Documentation|
 |:---:|:---:|:---:|---|
-|2.1.0|:simple-cplusplus: |GPLv3|[Link](wing_design/content/index.md)|
+|2.1.0|:simple-cplusplus: |GPLv3|[Link](aircraft-design/wing_design/doc/content/index.md)|
 
 ---
 
@@ -71,7 +71,7 @@ It takes takes the controllability as wells as the static margin of the aircraft
 
 |Module Version|Language|License|Documentation|
 |:---:|:---:|:---:|---|
-|2.1.0|:simple-cplusplus: |GPLv3|[Link](empennage_design/content/index.md)|
+|2.1.0|:simple-cplusplus: |GPLv3|[Link](aircraft-design/empennage_design/doc/content/index.md)|
 
 ---
 
@@ -82,7 +82,7 @@ It takes takes the controllability as wells as the static margin of the aircraft
 
 |Module Version|Language|License|Documentation|
 |:---:|:---:|:---:|---|
-|2.1.0|:simple-python: |GPLv3|[Link](tank_design/content/index.md)|
+|2.1.0|:simple-python: |GPLv3|[Link](aircraft-design/tank_design/doc/content/index.md)|
 
 
 ---
@@ -100,7 +100,7 @@ Also the mass properties are analyzed.
 
 |Module Version|Language|License|Documentation|
 |:---:|:---:|:---:|---|
-|3.0.0|:simple-cplusplus: |GPLv3|[Link](propulsion_design/content/index.md)|
+|3.0.0|:simple-cplusplus: |GPLv3|[Link](aircraft-design/propulsion_design/doc/content/index.md)|
 
 ---
 
@@ -111,7 +111,7 @@ The **landing_gear_design** module calculates characteristic parameters for the
 
 |Module Version|Language|License|Documentation|
 |:---:|:---:|:---:|---|
-|2.1.0|:simple-cplusplus: |GPLv3|[Link](landing_gear_design/content/index.md)|
+|2.1.0|:simple-cplusplus: |GPLv3|[Link](aircraft-design/landing_gear_design/doc/content/index.md)|
 
 ---
 
@@ -123,6 +123,6 @@ It dimensions ATA chapter systems in terms of mass and energy requirement divide
 
 |Module Version|Language|License|Documentation|
 |:---:|:---:|:---:|---|
-|2.1.0|:simple-cplusplus: |GPLv3|[Link](systems_design/content/index.md)|
+|2.1.0|:simple-cplusplus: |GPLv3|[Link](aircraft-design/systems_design/doc/content/index.md)|
 
 ---
diff --git a/mkdocs.yml b/mkdocs.yml
index 414020efa55c755b28d60562cfd28820d416dc6b..5f2c785a6ea3e76ea6c1835889eadf030b44e572 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -124,7 +124,23 @@ nav:                                      # Customizes the main navigation struc
   - Documentation:                        # Top-level item for documentation.
     - Overview: documentation/overview.md   # Overview of modules.
     - Aircraft Design:
-      - Sizing: documentation/sizing.md  # Link to aircraft sizing documentation.
+      - Sizing:  
+          - Overview: documentation/sizing.md # Link to aircraft sizing documentation.
+          - Initial Sizing: documentation/aircraft-design/initial_sizing/doc/content/index.md
+          - Create Mission XML: documentation/aircraft-design/create_mission_xml/doc/content/index.md
+          - Fuselage Design: documentation/aircraft-design/fuselage_design/doc/content/index.md
+          - Wing Design: documentation/aircraft-design/wing_design/doc/content/index.md
+          - Empennage Design: documentation/aircraft-design/empennage_design/doc/content/index.md
+          - Tank Design: documentation/aircraft-design/tank_design/doc/content/index.md
+          - Propulsion Design:
+            - Introduction: documentation/aircraft-design/propulsion_design/doc/content/index.md
+            - Getting Started: documentation/aircraft-design/propulsion_design/doc/content/getting_started.md
+            - Engineering Principles: documentation/aircraft-design/propulsion_design/doc/content/engineering_principles.md
+            - Software Architecture: documentation/aircraft-design/propulsion_design/doc/content/software_architecture.md
+            - Changelog: documentation/aircraft-design/propulsion_design/doc/content/changelog.md
+            - Additional: documentation/aircraft-design/propulsion_design/doc/content/additional.md
+          - Landing Gear Design: documentation/aircraft-design/landing_gear_design/doc/content/index.md
+          - Systems Design: documentation/aircraft-design/systems_design/doc/content/index.md
       - Analysis: documentation/analysis.md  # Link to analysis module page.
     - Libraries: documentation/libraries.md # Link to libraries overview.
     - Utilities: documentation/additional_software.md