diff --git a/features/frameworks/mbed-coap/.gitattributes b/connectivity/libraries/mbed-coap/.gitattributes
similarity index 100%
rename from features/frameworks/mbed-coap/.gitattributes
rename to connectivity/libraries/mbed-coap/.gitattributes
diff --git a/features/frameworks/mbed-coap/.gitignore b/connectivity/libraries/mbed-coap/.gitignore
similarity index 100%
rename from features/frameworks/mbed-coap/.gitignore
rename to connectivity/libraries/mbed-coap/.gitignore
diff --git a/features/frameworks/mbed-coap/.mbedignore b/connectivity/libraries/mbed-coap/.mbedignore
similarity index 100%
rename from features/frameworks/mbed-coap/.mbedignore
rename to connectivity/libraries/mbed-coap/.mbedignore
diff --git a/features/frameworks/mbed-coap/.settings/language.settings.xml b/connectivity/libraries/mbed-coap/.settings/language.settings.xml
similarity index 100%
rename from features/frameworks/mbed-coap/.settings/language.settings.xml
rename to connectivity/libraries/mbed-coap/.settings/language.settings.xml
diff --git a/features/frameworks/mbed-coap/.settings/org.eclipse.cdt.core.prefs b/connectivity/libraries/mbed-coap/.settings/org.eclipse.cdt.core.prefs
similarity index 100%
rename from features/frameworks/mbed-coap/.settings/org.eclipse.cdt.core.prefs
rename to connectivity/libraries/mbed-coap/.settings/org.eclipse.cdt.core.prefs
diff --git a/features/frameworks/mbed-coap/CHANGELOG.md b/connectivity/libraries/mbed-coap/CHANGELOG.md
similarity index 100%
rename from features/frameworks/mbed-coap/CHANGELOG.md
rename to connectivity/libraries/mbed-coap/CHANGELOG.md
diff --git a/features/frameworks/mbed-coap/LICENSE b/connectivity/libraries/mbed-coap/LICENSE
similarity index 100%
rename from features/frameworks/mbed-coap/LICENSE
rename to connectivity/libraries/mbed-coap/LICENSE
diff --git a/features/frameworks/mbed-coap/Makefile b/connectivity/libraries/mbed-coap/Makefile
similarity index 100%
rename from features/frameworks/mbed-coap/Makefile
rename to connectivity/libraries/mbed-coap/Makefile
diff --git a/features/frameworks/mbed-coap/Makefile.test b/connectivity/libraries/mbed-coap/Makefile.test
similarity index 100%
rename from features/frameworks/mbed-coap/Makefile.test
rename to connectivity/libraries/mbed-coap/Makefile.test
diff --git a/features/frameworks/mbed-coap/README.md b/connectivity/libraries/mbed-coap/README.md
similarity index 100%
rename from features/frameworks/mbed-coap/README.md
rename to connectivity/libraries/mbed-coap/README.md
diff --git a/features/frameworks/mbed-coap/README.txt b/connectivity/libraries/mbed-coap/README.txt
similarity index 100%
rename from features/frameworks/mbed-coap/README.txt
rename to connectivity/libraries/mbed-coap/README.txt
diff --git a/features/frameworks/mbed-coap/apache-2.0.txt b/connectivity/libraries/mbed-coap/apache-2.0.txt
similarity index 100%
rename from features/frameworks/mbed-coap/apache-2.0.txt
rename to connectivity/libraries/mbed-coap/apache-2.0.txt
diff --git a/features/frameworks/mbed-coap/doxygen/libcoap_doxy b/connectivity/libraries/mbed-coap/doxygen/libcoap_doxy
similarity index 100%
rename from features/frameworks/mbed-coap/doxygen/libcoap_doxy
rename to connectivity/libraries/mbed-coap/doxygen/libcoap_doxy
diff --git a/features/frameworks/mbed-coap/junit_xsl.xslt b/connectivity/libraries/mbed-coap/junit_xsl.xslt
similarity index 100%
rename from features/frameworks/mbed-coap/junit_xsl.xslt
rename to connectivity/libraries/mbed-coap/junit_xsl.xslt
diff --git a/features/frameworks/mbed-coap/mbed-coap/sn_coap_header.h b/connectivity/libraries/mbed-coap/mbed-coap/sn_coap_header.h
similarity index 100%
rename from features/frameworks/mbed-coap/mbed-coap/sn_coap_header.h
rename to connectivity/libraries/mbed-coap/mbed-coap/sn_coap_header.h
diff --git a/features/frameworks/mbed-coap/mbed-coap/sn_coap_protocol.h b/connectivity/libraries/mbed-coap/mbed-coap/sn_coap_protocol.h
similarity index 100%
rename from features/frameworks/mbed-coap/mbed-coap/sn_coap_protocol.h
rename to connectivity/libraries/mbed-coap/mbed-coap/sn_coap_protocol.h
diff --git a/features/frameworks/mbed-coap/mbed-coap/sn_config.h b/connectivity/libraries/mbed-coap/mbed-coap/sn_config.h
similarity index 100%
rename from features/frameworks/mbed-coap/mbed-coap/sn_config.h
rename to connectivity/libraries/mbed-coap/mbed-coap/sn_config.h
diff --git a/features/frameworks/mbed-coap/mbed_lib.json b/connectivity/libraries/mbed-coap/mbed_lib.json
similarity index 100%
rename from features/frameworks/mbed-coap/mbed_lib.json
rename to connectivity/libraries/mbed-coap/mbed_lib.json
diff --git a/features/frameworks/mbed-coap/run_unit_tests.sh b/connectivity/libraries/mbed-coap/run_unit_tests.sh
similarity index 100%
rename from features/frameworks/mbed-coap/run_unit_tests.sh
rename to connectivity/libraries/mbed-coap/run_unit_tests.sh
diff --git a/features/frameworks/mbed-coap/run_unit_tests_with_valgrind.sh b/connectivity/libraries/mbed-coap/run_unit_tests_with_valgrind.sh
similarity index 100%
rename from features/frameworks/mbed-coap/run_unit_tests_with_valgrind.sh
rename to connectivity/libraries/mbed-coap/run_unit_tests_with_valgrind.sh
diff --git a/features/frameworks/mbed-coap/source/include/sn_coap_header_internal.h b/connectivity/libraries/mbed-coap/source/include/sn_coap_header_internal.h
similarity index 100%
rename from features/frameworks/mbed-coap/source/include/sn_coap_header_internal.h
rename to connectivity/libraries/mbed-coap/source/include/sn_coap_header_internal.h
diff --git a/features/frameworks/mbed-coap/source/include/sn_coap_protocol_internal.h b/connectivity/libraries/mbed-coap/source/include/sn_coap_protocol_internal.h
similarity index 100%
rename from features/frameworks/mbed-coap/source/include/sn_coap_protocol_internal.h
rename to connectivity/libraries/mbed-coap/source/include/sn_coap_protocol_internal.h
diff --git a/features/frameworks/mbed-coap/source/sn_coap_builder.c b/connectivity/libraries/mbed-coap/source/sn_coap_builder.c
similarity index 100%
rename from features/frameworks/mbed-coap/source/sn_coap_builder.c
rename to connectivity/libraries/mbed-coap/source/sn_coap_builder.c
diff --git a/features/frameworks/mbed-coap/source/sn_coap_header_check.c b/connectivity/libraries/mbed-coap/source/sn_coap_header_check.c
similarity index 100%
rename from features/frameworks/mbed-coap/source/sn_coap_header_check.c
rename to connectivity/libraries/mbed-coap/source/sn_coap_header_check.c
diff --git a/features/frameworks/mbed-coap/source/sn_coap_parser.c b/connectivity/libraries/mbed-coap/source/sn_coap_parser.c
similarity index 100%
rename from features/frameworks/mbed-coap/source/sn_coap_parser.c
rename to connectivity/libraries/mbed-coap/source/sn_coap_parser.c
diff --git a/features/frameworks/mbed-coap/source/sn_coap_protocol.c b/connectivity/libraries/mbed-coap/source/sn_coap_protocol.c
similarity index 100%
rename from features/frameworks/mbed-coap/source/sn_coap_protocol.c
rename to connectivity/libraries/mbed-coap/source/sn_coap_protocol.c
diff --git a/features/frameworks/mbed-coap/xsl_script.sh b/connectivity/libraries/mbed-coap/xsl_script.sh
similarity index 100%
rename from features/frameworks/mbed-coap/xsl_script.sh
rename to connectivity/libraries/mbed-coap/xsl_script.sh