diff --git a/docs/design-documents/features/connectivity/EMAC.png b/connectivity/docs/EMAC.png
similarity index 100%
rename from docs/design-documents/features/connectivity/EMAC.png
rename to connectivity/docs/EMAC.png
diff --git a/docs/design-documents/features/connectivity/EmacInterface.png b/connectivity/docs/EmacInterface.png
similarity index 100%
rename from docs/design-documents/features/connectivity/EmacInterface.png
rename to connectivity/docs/EmacInterface.png
diff --git a/docs/design-documents/features/connectivity/EmacInterface_simple.png b/connectivity/docs/EmacInterface_simple.png
similarity index 100%
rename from docs/design-documents/features/connectivity/EmacInterface_simple.png
rename to connectivity/docs/EmacInterface_simple.png
diff --git a/docs/design-documents/features/connectivity/L3IP.png b/connectivity/docs/L3IP.png
similarity index 100%
rename from docs/design-documents/features/connectivity/L3IP.png
rename to connectivity/docs/L3IP.png
diff --git a/docs/design-documents/features/connectivity/L3IPInterface.png b/connectivity/docs/L3IPInterface.png
similarity index 100%
rename from docs/design-documents/features/connectivity/L3IPInterface.png
rename to connectivity/docs/L3IPInterface.png
diff --git a/docs/design-documents/features/connectivity/Multihoming - Design document.md b/connectivity/docs/Multihoming - Design document.md
similarity index 100%
rename from docs/design-documents/features/connectivity/Multihoming - Design document.md
rename to connectivity/docs/Multihoming - Design document.md
diff --git a/docs/design-documents/features/connectivity/TLSSocket - Design document.md b/connectivity/docs/TLSSocket - Design document.md
similarity index 100%
rename from docs/design-documents/features/connectivity/TLSSocket - Design document.md
rename to connectivity/docs/TLSSocket - Design document.md
diff --git a/docs/design-documents/features/connectivity/class_diagram.png b/connectivity/docs/class_diagram.png
similarity index 100%
rename from docs/design-documents/features/connectivity/class_diagram.png
rename to connectivity/docs/class_diagram.png
diff --git a/docs/design-documents/features/connectivity/components.png b/connectivity/docs/components.png
similarity index 100%
rename from docs/design-documents/features/connectivity/components.png
rename to connectivity/docs/components.png
diff --git a/docs/design-documents/features/connectivity/hi_level.png b/connectivity/docs/hi_level.png
similarity index 100%
rename from docs/design-documents/features/connectivity/hi_level.png
rename to connectivity/docs/hi_level.png
diff --git a/docs/design-documents/features/connectivity/incoming_emac.png b/connectivity/docs/incoming_emac.png
similarity index 100%
rename from docs/design-documents/features/connectivity/incoming_emac.png
rename to connectivity/docs/incoming_emac.png
diff --git a/docs/design-documents/features/connectivity/incoming_ppp.png b/connectivity/docs/incoming_ppp.png
similarity index 100%
rename from docs/design-documents/features/connectivity/incoming_ppp.png
rename to connectivity/docs/incoming_ppp.png
diff --git a/docs/design-documents/features/connectivity/lwip_changes_new.png b/connectivity/docs/lwip_changes_new.png
similarity index 100%
rename from docs/design-documents/features/connectivity/lwip_changes_new.png
rename to connectivity/docs/lwip_changes_new.png
diff --git a/docs/design-documents/features/connectivity/lwip_changes_old.png b/connectivity/docs/lwip_changes_old.png
similarity index 100%
rename from docs/design-documents/features/connectivity/lwip_changes_old.png
rename to connectivity/docs/lwip_changes_old.png
diff --git a/docs/design-documents/features/connectivity/lwip_class.png b/connectivity/docs/lwip_class.png
similarity index 100%
rename from docs/design-documents/features/connectivity/lwip_class.png
rename to connectivity/docs/lwip_class.png
diff --git a/docs/design-documents/features/connectivity/lwip_simply.png b/connectivity/docs/lwip_simply.png
similarity index 100%
rename from docs/design-documents/features/connectivity/lwip_simply.png
rename to connectivity/docs/lwip_simply.png
diff --git a/docs/design-documents/statistics/network_stats.md b/connectivity/docs/network_stats.md
similarity index 100%
rename from docs/design-documents/statistics/network_stats.md
rename to connectivity/docs/network_stats.md
diff --git a/docs/design-documents/features/connectivity/outgoing_eth.png b/connectivity/docs/outgoing_eth.png
similarity index 100%
rename from docs/design-documents/features/connectivity/outgoing_eth.png
rename to connectivity/docs/outgoing_eth.png
diff --git a/docs/design-documents/features/connectivity/outgoing_ppp.png b/connectivity/docs/outgoing_ppp.png
similarity index 100%
rename from docs/design-documents/features/connectivity/outgoing_ppp.png
rename to connectivity/docs/outgoing_ppp.png
diff --git a/docs/design-documents/nfc/interop_test_rig.png b/connectivity/nfc/docs/interop_test_rig.png
similarity index 100%
rename from docs/design-documents/nfc/interop_test_rig.png
rename to connectivity/nfc/docs/interop_test_rig.png
diff --git a/docs/design-documents/nfc/nfc_design.md b/connectivity/nfc/docs/nfc_design.md
similarity index 100%
rename from docs/design-documents/nfc/nfc_design.md
rename to connectivity/nfc/docs/nfc_design.md
diff --git a/docs/design-documents/nfc/phase_1_architecture.png b/connectivity/nfc/docs/phase_1_architecture.png
similarity index 100%
rename from docs/design-documents/nfc/phase_1_architecture.png
rename to connectivity/nfc/docs/phase_1_architecture.png
diff --git a/docs/design-documents/nfc/phase_2_architecture.png b/connectivity/nfc/docs/phase_2_architecture.png
similarity index 100%
rename from docs/design-documents/nfc/phase_2_architecture.png
rename to connectivity/nfc/docs/phase_2_architecture.png
diff --git a/docs/design-documents/nfc/uml_diagram_controller.png b/connectivity/nfc/docs/uml_diagram_controller.png
similarity index 100%
rename from docs/design-documents/nfc/uml_diagram_controller.png
rename to connectivity/nfc/docs/uml_diagram_controller.png
diff --git a/docs/design-documents/nfc/uml_diagram_controller.txt b/connectivity/nfc/docs/uml_diagram_controller.txt
similarity index 100%
rename from docs/design-documents/nfc/uml_diagram_controller.txt
rename to connectivity/nfc/docs/uml_diagram_controller.txt
diff --git a/docs/design-documents/nfc/uml_diagram_endpoints.png b/connectivity/nfc/docs/uml_diagram_endpoints.png
similarity index 100%
rename from docs/design-documents/nfc/uml_diagram_endpoints.png
rename to connectivity/nfc/docs/uml_diagram_endpoints.png
diff --git a/docs/design-documents/nfc/uml_diagram_endpoints.txt b/connectivity/nfc/docs/uml_diagram_endpoints.txt
similarity index 100%
rename from docs/design-documents/nfc/uml_diagram_endpoints.txt
rename to connectivity/nfc/docs/uml_diagram_endpoints.txt
diff --git a/docs/design-documents/nfc/uml_diagram_ndef_common_parsers.png b/connectivity/nfc/docs/uml_diagram_ndef_common_parsers.png
similarity index 100%
rename from docs/design-documents/nfc/uml_diagram_ndef_common_parsers.png
rename to connectivity/nfc/docs/uml_diagram_ndef_common_parsers.png
diff --git a/docs/design-documents/nfc/uml_diagram_ndef_common_parsers.txt b/connectivity/nfc/docs/uml_diagram_ndef_common_parsers.txt
similarity index 100%
rename from docs/design-documents/nfc/uml_diagram_ndef_common_parsers.txt
rename to connectivity/nfc/docs/uml_diagram_ndef_common_parsers.txt
diff --git a/docs/design-documents/nfc/uml_diagram_ndef_message_builder_diagram.png b/connectivity/nfc/docs/uml_diagram_ndef_message_builder_diagram.png
similarity index 100%
rename from docs/design-documents/nfc/uml_diagram_ndef_message_builder_diagram.png
rename to connectivity/nfc/docs/uml_diagram_ndef_message_builder_diagram.png
diff --git a/docs/design-documents/nfc/uml_diagram_ndef_message_builder_diagram.txt b/connectivity/nfc/docs/uml_diagram_ndef_message_builder_diagram.txt
similarity index 100%
rename from docs/design-documents/nfc/uml_diagram_ndef_message_builder_diagram.txt
rename to connectivity/nfc/docs/uml_diagram_ndef_message_builder_diagram.txt
diff --git a/docs/design-documents/nfc/uml_diagram_ndef_message_parser.png b/connectivity/nfc/docs/uml_diagram_ndef_message_parser.png
similarity index 100%
rename from docs/design-documents/nfc/uml_diagram_ndef_message_parser.png
rename to connectivity/nfc/docs/uml_diagram_ndef_message_parser.png
diff --git a/docs/design-documents/nfc/uml_diagram_ndef_message_parser.txt b/connectivity/nfc/docs/uml_diagram_ndef_message_parser.txt
similarity index 100%
rename from docs/design-documents/nfc/uml_diagram_ndef_message_parser.txt
rename to connectivity/nfc/docs/uml_diagram_ndef_message_parser.txt
diff --git a/docs/design-documents/nfc/uml_diagram_ndef_record_parser.png b/connectivity/nfc/docs/uml_diagram_ndef_record_parser.png
similarity index 100%
rename from docs/design-documents/nfc/uml_diagram_ndef_record_parser.png
rename to connectivity/nfc/docs/uml_diagram_ndef_record_parser.png
diff --git a/docs/design-documents/nfc/uml_diagram_ndef_record_parser.txt b/connectivity/nfc/docs/uml_diagram_ndef_record_parser.txt
similarity index 100%
rename from docs/design-documents/nfc/uml_diagram_ndef_record_parser.txt
rename to connectivity/nfc/docs/uml_diagram_ndef_record_parser.txt
diff --git a/docs/design-documents/nfc/uml_diagram_ndef_simple_parser.png b/connectivity/nfc/docs/uml_diagram_ndef_simple_parser.png
similarity index 100%
rename from docs/design-documents/nfc/uml_diagram_ndef_simple_parser.png
rename to connectivity/nfc/docs/uml_diagram_ndef_simple_parser.png
diff --git a/docs/design-documents/nfc/uml_diagram_ndef_simple_parser.txt b/connectivity/nfc/docs/uml_diagram_ndef_simple_parser.txt
similarity index 100%
rename from docs/design-documents/nfc/uml_diagram_ndef_simple_parser.txt
rename to connectivity/nfc/docs/uml_diagram_ndef_simple_parser.txt
diff --git a/docs/design-documents/features/connectivity/README.md b/docs/design-documents/features/connectivity/README.md
deleted file mode 100644
index 69d438c36c..0000000000
--- a/docs/design-documents/features/connectivity/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Design Documents - Connectivity