diff --git a/features/frameworks/nanostack-libservice/.gitignore b/connectivity/libraries/nanostack-libservice/.gitignore
similarity index 100%
rename from features/frameworks/nanostack-libservice/.gitignore
rename to connectivity/libraries/nanostack-libservice/.gitignore
diff --git a/features/frameworks/nanostack-libservice/.mbedignore b/connectivity/libraries/nanostack-libservice/.mbedignore
similarity index 100%
rename from features/frameworks/nanostack-libservice/.mbedignore
rename to connectivity/libraries/nanostack-libservice/.mbedignore
diff --git a/features/frameworks/nanostack-libservice/.yotta_ignore b/connectivity/libraries/nanostack-libservice/.yotta_ignore
similarity index 100%
rename from features/frameworks/nanostack-libservice/.yotta_ignore
rename to connectivity/libraries/nanostack-libservice/.yotta_ignore
diff --git a/features/frameworks/nanostack-libservice/LICENSE b/connectivity/libraries/nanostack-libservice/LICENSE
similarity index 100%
rename from features/frameworks/nanostack-libservice/LICENSE
rename to connectivity/libraries/nanostack-libservice/LICENSE
diff --git a/features/frameworks/nanostack-libservice/Makefile b/connectivity/libraries/nanostack-libservice/Makefile
similarity index 100%
rename from features/frameworks/nanostack-libservice/Makefile
rename to connectivity/libraries/nanostack-libservice/Makefile
diff --git a/features/frameworks/nanostack-libservice/README.md b/connectivity/libraries/nanostack-libservice/README.md
similarity index 100%
rename from features/frameworks/nanostack-libservice/README.md
rename to connectivity/libraries/nanostack-libservice/README.md
diff --git a/features/frameworks/nanostack-libservice/apache-2.0.txt b/connectivity/libraries/nanostack-libservice/apache-2.0.txt
similarity index 100%
rename from features/frameworks/nanostack-libservice/apache-2.0.txt
rename to connectivity/libraries/nanostack-libservice/apache-2.0.txt
diff --git a/features/frameworks/nanostack-libservice/mbed-client-libservice/common_functions.h b/connectivity/libraries/nanostack-libservice/mbed-client-libservice/common_functions.h
similarity index 100%
rename from features/frameworks/nanostack-libservice/mbed-client-libservice/common_functions.h
rename to connectivity/libraries/nanostack-libservice/mbed-client-libservice/common_functions.h
diff --git a/features/frameworks/nanostack-libservice/mbed-client-libservice/ip4string.h b/connectivity/libraries/nanostack-libservice/mbed-client-libservice/ip4string.h
similarity index 100%
rename from features/frameworks/nanostack-libservice/mbed-client-libservice/ip4string.h
rename to connectivity/libraries/nanostack-libservice/mbed-client-libservice/ip4string.h
diff --git a/features/frameworks/nanostack-libservice/mbed-client-libservice/ip6string.h b/connectivity/libraries/nanostack-libservice/mbed-client-libservice/ip6string.h
similarity index 100%
rename from features/frameworks/nanostack-libservice/mbed-client-libservice/ip6string.h
rename to connectivity/libraries/nanostack-libservice/mbed-client-libservice/ip6string.h
diff --git a/features/frameworks/nanostack-libservice/mbed-client-libservice/ip_fsc.h b/connectivity/libraries/nanostack-libservice/mbed-client-libservice/ip_fsc.h
similarity index 100%
rename from features/frameworks/nanostack-libservice/mbed-client-libservice/ip_fsc.h
rename to connectivity/libraries/nanostack-libservice/mbed-client-libservice/ip_fsc.h
diff --git a/features/frameworks/nanostack-libservice/mbed-client-libservice/ns_list.h b/connectivity/libraries/nanostack-libservice/mbed-client-libservice/ns_list.h
similarity index 100%
rename from features/frameworks/nanostack-libservice/mbed-client-libservice/ns_list.h
rename to connectivity/libraries/nanostack-libservice/mbed-client-libservice/ns_list.h
diff --git a/features/frameworks/nanostack-libservice/mbed-client-libservice/ns_nvm_helper.h b/connectivity/libraries/nanostack-libservice/mbed-client-libservice/ns_nvm_helper.h
similarity index 100%
rename from features/frameworks/nanostack-libservice/mbed-client-libservice/ns_nvm_helper.h
rename to connectivity/libraries/nanostack-libservice/mbed-client-libservice/ns_nvm_helper.h
diff --git a/features/frameworks/nanostack-libservice/mbed-client-libservice/ns_trace.h b/connectivity/libraries/nanostack-libservice/mbed-client-libservice/ns_trace.h
similarity index 100%
rename from features/frameworks/nanostack-libservice/mbed-client-libservice/ns_trace.h
rename to connectivity/libraries/nanostack-libservice/mbed-client-libservice/ns_trace.h
diff --git a/features/frameworks/nanostack-libservice/mbed-client-libservice/ns_types.h b/connectivity/libraries/nanostack-libservice/mbed-client-libservice/ns_types.h
similarity index 100%
rename from features/frameworks/nanostack-libservice/mbed-client-libservice/ns_types.h
rename to connectivity/libraries/nanostack-libservice/mbed-client-libservice/ns_types.h
diff --git a/features/frameworks/nanostack-libservice/mbed-client-libservice/nsdynmemLIB.h b/connectivity/libraries/nanostack-libservice/mbed-client-libservice/nsdynmemLIB.h
similarity index 100%
rename from features/frameworks/nanostack-libservice/mbed-client-libservice/nsdynmemLIB.h
rename to connectivity/libraries/nanostack-libservice/mbed-client-libservice/nsdynmemLIB.h
diff --git a/features/frameworks/nanostack-libservice/mbed-client-libservice/platform/arm_hal_interrupt.h b/connectivity/libraries/nanostack-libservice/mbed-client-libservice/platform/arm_hal_interrupt.h
similarity index 100%
rename from features/frameworks/nanostack-libservice/mbed-client-libservice/platform/arm_hal_interrupt.h
rename to connectivity/libraries/nanostack-libservice/mbed-client-libservice/platform/arm_hal_interrupt.h
diff --git a/features/frameworks/nanostack-libservice/mbed-client-libservice/platform/arm_hal_nvm.h b/connectivity/libraries/nanostack-libservice/mbed-client-libservice/platform/arm_hal_nvm.h
similarity index 100%
rename from features/frameworks/nanostack-libservice/mbed-client-libservice/platform/arm_hal_nvm.h
rename to connectivity/libraries/nanostack-libservice/mbed-client-libservice/platform/arm_hal_nvm.h
diff --git a/features/frameworks/nanostack-libservice/mbed_lib.json b/connectivity/libraries/nanostack-libservice/mbed_lib.json
similarity index 100%
rename from features/frameworks/nanostack-libservice/mbed_lib.json
rename to connectivity/libraries/nanostack-libservice/mbed_lib.json
diff --git a/features/frameworks/nanostack-libservice/source/IPv6_fcf_lib/ip_fsc.c b/connectivity/libraries/nanostack-libservice/source/IPv6_fcf_lib/ip_fsc.c
similarity index 100%
rename from features/frameworks/nanostack-libservice/source/IPv6_fcf_lib/ip_fsc.c
rename to connectivity/libraries/nanostack-libservice/source/IPv6_fcf_lib/ip_fsc.c
diff --git a/features/frameworks/nanostack-libservice/source/libBits/common_functions.c b/connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
similarity index 100%
rename from features/frameworks/nanostack-libservice/source/libBits/common_functions.c
rename to connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
diff --git a/features/frameworks/nanostack-libservice/source/libList/ns_list.c b/connectivity/libraries/nanostack-libservice/source/libList/ns_list.c
similarity index 100%
rename from features/frameworks/nanostack-libservice/source/libList/ns_list.c
rename to connectivity/libraries/nanostack-libservice/source/libList/ns_list.c
diff --git a/features/frameworks/nanostack-libservice/source/libTrace/scripts/fetch_groups.sh b/connectivity/libraries/nanostack-libservice/source/libTrace/scripts/fetch_groups.sh
similarity index 100%
rename from features/frameworks/nanostack-libservice/source/libTrace/scripts/fetch_groups.sh
rename to connectivity/libraries/nanostack-libservice/source/libTrace/scripts/fetch_groups.sh
diff --git a/features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c b/connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
similarity index 100%
rename from features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
rename to connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
diff --git a/features/frameworks/nanostack-libservice/source/libip4string/stoip4.c b/connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
similarity index 100%
rename from features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
rename to connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
diff --git a/features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c b/connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
similarity index 100%
rename from features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
rename to connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
diff --git a/features/frameworks/nanostack-libservice/source/libip6string/stoip6.c b/connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
similarity index 100%
rename from features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
rename to connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
diff --git a/features/frameworks/nanostack-libservice/source/nsdynmemLIB/nsdynmemLIB.c b/connectivity/libraries/nanostack-libservice/source/nsdynmemLIB/nsdynmemLIB.c
similarity index 100%
rename from features/frameworks/nanostack-libservice/source/nsdynmemLIB/nsdynmemLIB.c
rename to connectivity/libraries/nanostack-libservice/source/nsdynmemLIB/nsdynmemLIB.c
diff --git a/features/frameworks/nanostack-libservice/source/nvmHelper/ns_nvm_helper.c b/connectivity/libraries/nanostack-libservice/source/nvmHelper/ns_nvm_helper.c
similarity index 100%
rename from features/frameworks/nanostack-libservice/source/nvmHelper/ns_nvm_helper.c
rename to connectivity/libraries/nanostack-libservice/source/nvmHelper/ns_nvm_helper.c
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/.gitignore b/connectivity/libraries/nanostack-libservice/test/libService/unittest/.gitignore
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/.gitignore
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/.gitignore
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/Makefile b/connectivity/libraries/nanostack-libservice/test/libService/unittest/Makefile
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/Makefile
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/Makefile
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/MakefileWorker.mk b/connectivity/libraries/nanostack-libservice/test/libService/unittest/MakefileWorker.mk
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/MakefileWorker.mk
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/MakefileWorker.mk
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/ip6tos/Makefile b/connectivity/libraries/nanostack-libservice/test/libService/unittest/ip6tos/Makefile
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/ip6tos/Makefile
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/ip6tos/Makefile
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/ip6tos/ip6tos_test.cpp b/connectivity/libraries/nanostack-libservice/test/libService/unittest/ip6tos/ip6tos_test.cpp
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/ip6tos/ip6tos_test.cpp
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/ip6tos/ip6tos_test.cpp
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/ip6tos/main.cpp b/connectivity/libraries/nanostack-libservice/test/libService/unittest/ip6tos/main.cpp
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/ip6tos/main.cpp
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/ip6tos/main.cpp
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/makefile_defines.txt b/connectivity/libraries/nanostack-libservice/test/libService/unittest/makefile_defines.txt
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/makefile_defines.txt
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/makefile_defines.txt
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/nsdynmem/Makefile b/connectivity/libraries/nanostack-libservice/test/libService/unittest/nsdynmem/Makefile
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/nsdynmem/Makefile
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/nsdynmem/Makefile
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/nsdynmem/dynmemtest.cpp b/connectivity/libraries/nanostack-libservice/test/libService/unittest/nsdynmem/dynmemtest.cpp
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/nsdynmem/dynmemtest.cpp
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/nsdynmem/dynmemtest.cpp
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/nsdynmem/error_callback.c b/connectivity/libraries/nanostack-libservice/test/libService/unittest/nsdynmem/error_callback.c
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/nsdynmem/error_callback.c
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/nsdynmem/error_callback.c
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/nsdynmem/error_callback.h b/connectivity/libraries/nanostack-libservice/test/libService/unittest/nsdynmem/error_callback.h
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/nsdynmem/error_callback.h
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/nsdynmem/error_callback.h
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/nsdynmem/main.cpp b/connectivity/libraries/nanostack-libservice/test/libService/unittest/nsdynmem/main.cpp
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/nsdynmem/main.cpp
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/nsdynmem/main.cpp
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/nsnvmhelper/Makefile b/connectivity/libraries/nanostack-libservice/test/libService/unittest/nsnvmhelper/Makefile
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/nsnvmhelper/Makefile
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/nsnvmhelper/Makefile
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/nsnvmhelper/main.cpp b/connectivity/libraries/nanostack-libservice/test/libService/unittest/nsnvmhelper/main.cpp
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/nsnvmhelper/main.cpp
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/nsnvmhelper/main.cpp
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/nsnvmhelper/nsnvmhelpertest.cpp b/connectivity/libraries/nanostack-libservice/test/libService/unittest/nsnvmhelper/nsnvmhelpertest.cpp
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/nsnvmhelper/nsnvmhelpertest.cpp
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/nsnvmhelper/nsnvmhelpertest.cpp
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/nsnvmhelper/test_ns_nvm_helper.c b/connectivity/libraries/nanostack-libservice/test/libService/unittest/nsnvmhelper/test_ns_nvm_helper.c
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/nsnvmhelper/test_ns_nvm_helper.c
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/nsnvmhelper/test_ns_nvm_helper.c
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/nsnvmhelper/test_ns_nvm_helper.h b/connectivity/libraries/nanostack-libservice/test/libService/unittest/nsnvmhelper/test_ns_nvm_helper.h
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/nsnvmhelper/test_ns_nvm_helper.h
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/nsnvmhelper/test_ns_nvm_helper.h
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/run_tests b/connectivity/libraries/nanostack-libservice/test/libService/unittest/run_tests
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/run_tests
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/run_tests
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/stoip6/Makefile b/connectivity/libraries/nanostack-libservice/test/libService/unittest/stoip6/Makefile
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/stoip6/Makefile
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/stoip6/Makefile
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/stoip6/main.cpp b/connectivity/libraries/nanostack-libservice/test/libService/unittest/stoip6/main.cpp
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/stoip6/main.cpp
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/stoip6/main.cpp
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/stoip6/stoip6test.cpp b/connectivity/libraries/nanostack-libservice/test/libService/unittest/stoip6/stoip6test.cpp
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/stoip6/stoip6test.cpp
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/stoip6/stoip6test.cpp
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/stubs/common_functions_stub.c b/connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/common_functions_stub.c
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/stubs/common_functions_stub.c
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/common_functions_stub.c
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/stubs/ip6tos_stub.c b/connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/ip6tos_stub.c
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/stubs/ip6tos_stub.c
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/ip6tos_stub.c
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/stubs/ip6tos_stub.h b/connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/ip6tos_stub.h
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/stubs/ip6tos_stub.h
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/ip6tos_stub.h
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/stubs/ipv6_test_values.h b/connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/ipv6_test_values.h
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/stubs/ipv6_test_values.h
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/ipv6_test_values.h
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/stubs/mbed_trace_stub.c b/connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/mbed_trace_stub.c
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/stubs/mbed_trace_stub.c
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/mbed_trace_stub.c
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/stubs/ns_list_stub.c b/connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/ns_list_stub.c
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/stubs/ns_list_stub.c
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/ns_list_stub.c
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/stubs/nsdynmemLIB_stub.c b/connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/nsdynmemLIB_stub.c
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/stubs/nsdynmemLIB_stub.c
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/nsdynmemLIB_stub.c
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/stubs/nsdynmemLIB_stub.h b/connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/nsdynmemLIB_stub.h
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/stubs/nsdynmemLIB_stub.h
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/nsdynmemLIB_stub.h
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/stubs/platform_critical.c b/connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/platform_critical.c
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/stubs/platform_critical.c
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/platform_critical.c
diff --git a/features/frameworks/nanostack-libservice/test/libService/unittest/stubs/platform_nvm_stub.c b/connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/platform_nvm_stub.c
similarity index 100%
rename from features/frameworks/nanostack-libservice/test/libService/unittest/stubs/platform_nvm_stub.c
rename to connectivity/libraries/nanostack-libservice/test/libService/unittest/stubs/platform_nvm_stub.c