diff --git a/mkdocs.yml b/mkdocs.yml
index 0ecb5bc13832d17d1e14c8c8dabefb6efea1d897..e8e94f1a163f4b83207335bf43226d121de38dd5 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -71,7 +71,7 @@ extra:
 nav:
   - Overview:
     - Introduction: index.md
-    - OpenSlice deployment examples: under_construction.md
+    - OpenSlice deployment examples: OpenSlice_deployment_examples.md
   - Getting Started:
     - Deployment: 
       - Introduction: deployment.md
@@ -79,61 +79,64 @@ nav:
       - Kubernetes: deploymentK8s.md
     - Configuration:
       - Introduction: config_intro.md
-      - Role/Keycloak management: under_construction.md
+      - Role/Keycloak management: role_keycloak_management.md
       - NFV Orchestrator Configuration: nfvoconfig.md
       - Consuming Services From External OSS: ./architecture/consumingServicesFromExternalPartners.md
   - NaaS:
-    - Introduction: under_construction.md
+    - Introduction: ./naas/introduction.md
     - Services:
-      - Service Specification: under_construction.md
-      - Service Catalogs: under_construction.md
-      - Service Inventory: under_construction.md
-      - GSMA GST to TMF Service: under_construction.md      
+      - Service Specification: ./naas/service_spec.md
+      - Service Catalogs: ./naas/service_catalog.md
+      - Service Inventory: ./naas/service_inventory.md
+      - GSMA GST to TMF Service: ./naas/gst_to_tmf.md      
     - Resources:
-      - Resources Specification: under_construction.md
-      - Resources Catalogs: under_construction.md
-      - Resources Inventory: under_construction.md
+      - Resources Specification: ./naas/resource_spec.md
+      - Resources Catalogs:  ./naas/resource_catalog.md
+      - Resources Inventory:  ./naas/resource_inventory.md
     - Service orchestration:
-      - Introduction: under_construction.md
-      - Service Lifecycle management: under_construction.md
-      - LCM Rules Introduction: under_construction.md      
+      - Introduction: ./naas/so_intro.md
+      - Service Lifecycle management: ./naas/lcm.md
+      - LCM Rules Introduction: ./naas/lcm_rules_intro.md      
       - From Service order to services/resources: 
-        - Exposing Kubernetes services: under_construction.md
-        - Exposing NFV Services: under_construction.md
-    - Supported TMFORUM exposed APIs: under_construction.md
+        - Exposing Kubernetes services: ./naas/so_servicespec_to_services_kubernetes.md
+        - Exposing NFV Services: ./naas/so_servicespec_to_services_nfv.md
+    - Supported TMFORUM exposed APIs: ./naas/exposed_apis.md
   - Service design:
-    - Introduction: service_design_intro.md
+    - Introduction: ./service_design/intro.md
     - Support for Kubernetes:
-      - Introduction: under_construction.md
-      - Exposing Kubernetes Resources: ExposingKubernetesResources.md
-      - Design Helm aaService: under_construction.md
-      - Exposing CRDs_aaS_Example_Calculator: ExposingCRDs_aaS_Example_Calculator.md
-      - HELM Installation aaS Jenkins Example: HELM_Installation_aaS_Jenkins_Example.md
-    - NFV Catalogs: nfvcatalogs.md
-    - Design NFV Services: under_construction.md
+      - Introduction: ./service_design/kubernetes/intro.md
+      - Exposing Kubernetes Resources: ./service_design/kubernetes/ExposingKubernetesResources.md
+      - Design Helm aaService: ./service_design/kubernetes/design_helmaas.md
+    - Support for NFV:
+      - Design NFV Services: ./service_design/nfv/design_nfv_services.md  
+      - NFV Catalogs: ./service_design/nfv/nfvcatalogs.md
     - LCM Rules:
-      - Introduction: under_construction.md
-      - Specification: under_construction.md
-      - Typical Examples: under_construction.md
-    - Service Specification Examples: under_construction.md
+      - Introduction: ./service_design/lcmrules/intro.md
+      - Specification: ./service_design/lcmrules/specification.md
+      - Typical Examples: ./service_design/lcmrules/examples.md
+    - Service Specification Examples: 
+      - Open5GS (NFV approach): ./service_design/examples/open5gs_nfv.md
+      - Open5GS (Kubernetes approach): ./service_design/examples/open5gs_kubernetes.md
+      - Exposing CRDs_aaS_Example_Calculator: ./service_design/examples/ExposingCRDs_aaS_Example_Calculator.md
+      - HELM Installation aaS Jenkins Example: ./service_design/examples/HELM_Installation_aaS_Jenkins_Example.md
   - Service Ordering:
-    - Ordering Services from catalogs: under_construction.md
+    - Ordering Services from catalogs: ./service_ordering/ordering_services.md
   - Testing services:
-    - Testing Specification: under_construction.md
-    - Testing Catalogs: under_construction.md
-    - Testing Inventory: under_construction.md
+    - Testing Specification: ./testing_services/test_spec.md
+    - Testing Catalogs: ./testing_services/test_catalogs.md
+    - Testing Inventory: ./testing_services/test_inventory.md
   - Service as a Product:
-    - Product Specification: under_construction.md
-    - Product Catalogs: under_construction.md
-    - Product Inventory: under_construction.md
+    - Product Specification: ./product_model/product_spec.md
+    - Product Catalogs: ./product_model/product_catalogs.md
+    - Product Inventory: ./product_model/product_inventory.md
   - Assurance services:
-    - Introduction: under_construction.md
-    - Alarms and Actions: alarms_actions.md
+    - Introduction: ./assurance_services/intro.md
+    - Alarms and Actions: ./assurance_services/alarms_actions.md
   - Design & Architecture:
       - Architecture: ./architecture/architecture.md
       - Cloud native support: 
-        - Introduction: under_construction.md
-        - CRIDGE for Developers: CRIDGEforDevelopers.md
+        - Introduction: ./architecture/CRIDGE_cloud_native_intro.md
+        - CRIDGE for Developers: ./architecture/CRIDGEforDevelopers.md
       - Message bus: ./architecture/messagebus.md
       - OSOM: ./architecture/osom.md
       - Authentication: ./architecture/oauth.md