diff --git a/features/nanostack/CONTRIBUTING.md b/connectivity/nanostack/CONTRIBUTING.md
similarity index 100%
rename from features/nanostack/CONTRIBUTING.md
rename to connectivity/nanostack/CONTRIBUTING.md
diff --git a/features/nanostack/coap-service/.gitignore b/connectivity/nanostack/coap-service/.gitignore
similarity index 100%
rename from features/nanostack/coap-service/.gitignore
rename to connectivity/nanostack/coap-service/.gitignore
diff --git a/features/nanostack/coap-service/.mbedignore b/connectivity/nanostack/coap-service/.mbedignore
similarity index 100%
rename from features/nanostack/coap-service/.mbedignore
rename to connectivity/nanostack/coap-service/.mbedignore
diff --git a/features/nanostack/coap-service/LICENSE b/connectivity/nanostack/coap-service/LICENSE
similarity index 100%
rename from features/nanostack/coap-service/LICENSE
rename to connectivity/nanostack/coap-service/LICENSE
diff --git a/features/nanostack/coap-service/Makefile b/connectivity/nanostack/coap-service/Makefile
similarity index 100%
rename from features/nanostack/coap-service/Makefile
rename to connectivity/nanostack/coap-service/Makefile
diff --git a/features/nanostack/coap-service/Makefile.test b/connectivity/nanostack/coap-service/Makefile.test
similarity index 100%
rename from features/nanostack/coap-service/Makefile.test
rename to connectivity/nanostack/coap-service/Makefile.test
diff --git a/features/nanostack/coap-service/apache-2.0.txt b/connectivity/nanostack/coap-service/apache-2.0.txt
similarity index 100%
rename from features/nanostack/coap-service/apache-2.0.txt
rename to connectivity/nanostack/coap-service/apache-2.0.txt
diff --git a/features/nanostack/coap-service/coap-service/coap_service_api.h b/connectivity/nanostack/coap-service/coap-service/coap_service_api.h
similarity index 100%
rename from features/nanostack/coap-service/coap-service/coap_service_api.h
rename to connectivity/nanostack/coap-service/coap-service/coap_service_api.h
diff --git a/features/nanostack/coap-service/junit_xsl.xslt b/connectivity/nanostack/coap-service/junit_xsl.xslt
similarity index 100%
rename from features/nanostack/coap-service/junit_xsl.xslt
rename to connectivity/nanostack/coap-service/junit_xsl.xslt
diff --git a/features/nanostack/coap-service/mbed_lib.json b/connectivity/nanostack/coap-service/mbed_lib.json
similarity index 100%
rename from features/nanostack/coap-service/mbed_lib.json
rename to connectivity/nanostack/coap-service/mbed_lib.json
diff --git a/features/nanostack/coap-service/run_unit_tests.sh b/connectivity/nanostack/coap-service/run_unit_tests.sh
similarity index 100%
rename from features/nanostack/coap-service/run_unit_tests.sh
rename to connectivity/nanostack/coap-service/run_unit_tests.sh
diff --git a/features/nanostack/coap-service/source/coap_connection_handler.c b/connectivity/nanostack/coap-service/source/coap_connection_handler.c
similarity index 100%
rename from features/nanostack/coap-service/source/coap_connection_handler.c
rename to connectivity/nanostack/coap-service/source/coap_connection_handler.c
diff --git a/features/nanostack/coap-service/source/coap_message_handler.c b/connectivity/nanostack/coap-service/source/coap_message_handler.c
similarity index 100%
rename from features/nanostack/coap-service/source/coap_message_handler.c
rename to connectivity/nanostack/coap-service/source/coap_message_handler.c
diff --git a/features/nanostack/coap-service/source/coap_security_handler.c b/connectivity/nanostack/coap-service/source/coap_security_handler.c
similarity index 100%
rename from features/nanostack/coap-service/source/coap_security_handler.c
rename to connectivity/nanostack/coap-service/source/coap_security_handler.c
diff --git a/features/nanostack/coap-service/source/coap_service_api.c b/connectivity/nanostack/coap-service/source/coap_service_api.c
similarity index 100%
rename from features/nanostack/coap-service/source/coap_service_api.c
rename to connectivity/nanostack/coap-service/source/coap_service_api.c
diff --git a/features/nanostack/coap-service/source/include/coap_connection_handler.h b/connectivity/nanostack/coap-service/source/include/coap_connection_handler.h
similarity index 100%
rename from features/nanostack/coap-service/source/include/coap_connection_handler.h
rename to connectivity/nanostack/coap-service/source/include/coap_connection_handler.h
diff --git a/features/nanostack/coap-service/source/include/coap_message_handler.h b/connectivity/nanostack/coap-service/source/include/coap_message_handler.h
similarity index 100%
rename from features/nanostack/coap-service/source/include/coap_message_handler.h
rename to connectivity/nanostack/coap-service/source/include/coap_message_handler.h
diff --git a/features/nanostack/coap-service/source/include/coap_security_handler.h b/connectivity/nanostack/coap-service/source/include/coap_security_handler.h
similarity index 100%
rename from features/nanostack/coap-service/source/include/coap_security_handler.h
rename to connectivity/nanostack/coap-service/source/include/coap_security_handler.h
diff --git a/features/nanostack/coap-service/source/include/coap_service_api_internal.h b/connectivity/nanostack/coap-service/source/include/coap_service_api_internal.h
similarity index 100%
rename from features/nanostack/coap-service/source/include/coap_service_api_internal.h
rename to connectivity/nanostack/coap-service/source/include/coap_service_api_internal.h
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/Makefile b/connectivity/nanostack/coap-service/test/coap-service/unittest/Makefile
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/Makefile
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/Makefile
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/MakefileWorker.mk b/connectivity/nanostack/coap-service/test/coap-service/unittest/MakefileWorker.mk
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/MakefileWorker.mk
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/MakefileWorker.mk
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/Makefile b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/Makefile
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/Makefile
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/Makefile
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/coap_connection_handlertest.cpp b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/coap_connection_handlertest.cpp
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/coap_connection_handlertest.cpp
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/coap_connection_handlertest.cpp
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/main.cpp b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/main.cpp
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/main.cpp
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/main.cpp
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.h b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.h
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.h
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.h
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/Makefile b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/Makefile
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/Makefile
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/Makefile
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/coap_message_handlertest.cpp b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/coap_message_handlertest.cpp
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/coap_message_handlertest.cpp
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/coap_message_handlertest.cpp
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/main.cpp b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/main.cpp
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/main.cpp
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/main.cpp
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.h b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.h
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.h
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.h
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/Makefile b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/Makefile
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/Makefile
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/Makefile
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/coap_security_handlertest.cpp b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/coap_security_handlertest.cpp
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/coap_security_handlertest.cpp
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/coap_security_handlertest.cpp
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/main.cpp b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/main.cpp
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/main.cpp
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/main.cpp
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.h b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.h
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.h
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.h
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/Makefile b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_service_api/Makefile
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/Makefile
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_service_api/Makefile
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/coap_service_apitest.cpp b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_service_api/coap_service_apitest.cpp
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/coap_service_apitest.cpp
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_service_api/coap_service_apitest.cpp
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/main.cpp b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_service_api/main.cpp
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/main.cpp
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_service_api/main.cpp
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.h b/connectivity/nanostack/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.h
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.h
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.h
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/makefile_defines.txt b/connectivity/nanostack/coap-service/test/coap-service/unittest/makefile_defines.txt
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/makefile_defines.txt
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/makefile_defines.txt
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/run_tests b/connectivity/nanostack/coap-service/test/coap-service/unittest/run_tests
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/run_tests
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/run_tests
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.h b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.h
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.h
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.h
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.h b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.h
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.h
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.h
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.h b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.h
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.h
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.h
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_service_api_stub.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/coap_service_api_stub.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/coap_service_api_stub.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/coap_service_api_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/common_functions_stub.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/common_functions_stub.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/common_functions_stub.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/common_functions_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.h b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.h
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.h
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.h
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/mbed_trace_stub.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbed_trace_stub.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/mbed_trace_stub.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbed_trace_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.h b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.h
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.h
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.h
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/ns_list_stub.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/ns_list_stub.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/ns_list_stub.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/ns_list_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/ns_timer_stub.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/ns_timer_stub.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/ns_timer_stub.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/ns_timer_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/ns_timer_stub.h b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/ns_timer_stub.h
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/ns_timer_stub.h
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/ns_timer_stub.h
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.h b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.h
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.h
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.h
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/randLIB_stub.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/randLIB_stub.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/randLIB_stub.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/randLIB_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.h b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.h
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.h
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.h
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.h b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.h
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.h
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.h
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.h b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.h
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.h
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.h
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/socket_api_stub.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/socket_api_stub.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/socket_api_stub.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/socket_api_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/socket_api_stub.h b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/socket_api_stub.h
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/socket_api_stub.h
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/socket_api_stub.h
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/system_timer_stub.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/system_timer_stub.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/system_timer_stub.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/system_timer_stub.c
diff --git a/features/nanostack/coap-service/test/coap-service/unittest/stub/timeout_stub.c b/connectivity/nanostack/coap-service/test/coap-service/unittest/stub/timeout_stub.c
similarity index 100%
rename from features/nanostack/coap-service/test/coap-service/unittest/stub/timeout_stub.c
rename to connectivity/nanostack/coap-service/test/coap-service/unittest/stub/timeout_stub.c
diff --git a/features/nanostack/coap-service/xsl_script.sh b/connectivity/nanostack/coap-service/xsl_script.sh
similarity index 100%
rename from features/nanostack/coap-service/xsl_script.sh
rename to connectivity/nanostack/coap-service/xsl_script.sh
diff --git a/features/nanostack/nanostack-interface/Nanostack.h b/connectivity/nanostack/include/nanostack-interface/Nanostack.h
similarity index 100%
rename from features/nanostack/nanostack-interface/Nanostack.h
rename to connectivity/nanostack/include/nanostack-interface/Nanostack.h
diff --git a/features/nanostack/nanostack-interface/NanostackEthernetPhy.h b/connectivity/nanostack/include/nanostack-interface/NanostackEthernetPhy.h
similarity index 100%
rename from features/nanostack/nanostack-interface/NanostackEthernetPhy.h
rename to connectivity/nanostack/include/nanostack-interface/NanostackEthernetPhy.h
diff --git a/features/nanostack/nanostack-interface/NanostackInterface.h b/connectivity/nanostack/include/nanostack-interface/NanostackInterface.h
similarity index 100%
rename from features/nanostack/nanostack-interface/NanostackInterface.h
rename to connectivity/nanostack/include/nanostack-interface/NanostackInterface.h
diff --git a/features/nanostack/nanostack-interface/NanostackLockGuard.h b/connectivity/nanostack/include/nanostack-interface/NanostackLockGuard.h
similarity index 100%
rename from features/nanostack/nanostack-interface/NanostackLockGuard.h
rename to connectivity/nanostack/include/nanostack-interface/NanostackLockGuard.h
diff --git a/features/nanostack/nanostack-interface/NanostackMACPhy.h b/connectivity/nanostack/include/nanostack-interface/NanostackMACPhy.h
similarity index 100%
rename from features/nanostack/nanostack-interface/NanostackMACPhy.h
rename to connectivity/nanostack/include/nanostack-interface/NanostackMACPhy.h
diff --git a/features/nanostack/nanostack-interface/NanostackPPPPhy.h b/connectivity/nanostack/include/nanostack-interface/NanostackPPPPhy.h
similarity index 100%
rename from features/nanostack/nanostack-interface/NanostackPPPPhy.h
rename to connectivity/nanostack/include/nanostack-interface/NanostackPPPPhy.h
diff --git a/features/nanostack/nanostack-interface/NanostackPhy.h b/connectivity/nanostack/include/nanostack-interface/NanostackPhy.h
similarity index 100%
rename from features/nanostack/nanostack-interface/NanostackPhy.h
rename to connectivity/nanostack/include/nanostack-interface/NanostackPhy.h
diff --git a/features/nanostack/nanostack-interface/NanostackRfPhy.h b/connectivity/nanostack/include/nanostack-interface/NanostackRfPhy.h
similarity index 100%
rename from features/nanostack/nanostack-interface/NanostackRfPhy.h
rename to connectivity/nanostack/include/nanostack-interface/NanostackRfPhy.h
diff --git a/features/nanostack/nanostack-interface/mbed_lib.json b/connectivity/nanostack/include/nanostack-interface/mbed_lib.json
similarity index 100%
rename from features/nanostack/nanostack-interface/mbed_lib.json
rename to connectivity/nanostack/include/nanostack-interface/mbed_lib.json
diff --git a/features/nanostack/mbed-mesh-api/.gitignore b/connectivity/nanostack/mbed-mesh-api/.gitignore
similarity index 100%
rename from features/nanostack/mbed-mesh-api/.gitignore
rename to connectivity/nanostack/mbed-mesh-api/.gitignore
diff --git a/features/nanostack/mbed-mesh-api/.mbedignore b/connectivity/nanostack/mbed-mesh-api/.mbedignore
similarity index 100%
rename from features/nanostack/mbed-mesh-api/.mbedignore
rename to connectivity/nanostack/mbed-mesh-api/.mbedignore
diff --git a/features/nanostack/mbed-mesh-api/LICENSE b/connectivity/nanostack/mbed-mesh-api/LICENSE
similarity index 100%
rename from features/nanostack/mbed-mesh-api/LICENSE
rename to connectivity/nanostack/mbed-mesh-api/LICENSE
diff --git a/features/nanostack/mbed-mesh-api/apache-2.0.txt b/connectivity/nanostack/mbed-mesh-api/apache-2.0.txt
similarity index 100%
rename from features/nanostack/mbed-mesh-api/apache-2.0.txt
rename to connectivity/nanostack/mbed-mesh-api/apache-2.0.txt
diff --git a/features/nanostack/mbed-mesh-api/mbed-mesh-api/LoWPANNDInterface.h b/connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/LoWPANNDInterface.h
similarity index 100%
rename from features/nanostack/mbed-mesh-api/mbed-mesh-api/LoWPANNDInterface.h
rename to connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/LoWPANNDInterface.h
diff --git a/features/nanostack/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h b/connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h
similarity index 100%
rename from features/nanostack/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h
rename to connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h
diff --git a/features/nanostack/mbed-mesh-api/mbed-mesh-api/NanostackEthernetInterface.h b/connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/NanostackEthernetInterface.h
similarity index 100%
rename from features/nanostack/mbed-mesh-api/mbed-mesh-api/NanostackEthernetInterface.h
rename to connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/NanostackEthernetInterface.h
diff --git a/features/nanostack/mbed-mesh-api/mbed-mesh-api/NanostackPPPInterface.h b/connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/NanostackPPPInterface.h
similarity index 100%
rename from features/nanostack/mbed-mesh-api/mbed-mesh-api/NanostackPPPInterface.h
rename to connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/NanostackPPPInterface.h
diff --git a/features/nanostack/mbed-mesh-api/mbed-mesh-api/ThreadInterface.h b/connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/ThreadInterface.h
similarity index 100%
rename from features/nanostack/mbed-mesh-api/mbed-mesh-api/ThreadInterface.h
rename to connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/ThreadInterface.h
diff --git a/features/nanostack/mbed-mesh-api/mbed-mesh-api/WisunBorderRouter.h b/connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/WisunBorderRouter.h
similarity index 100%
rename from features/nanostack/mbed-mesh-api/mbed-mesh-api/WisunBorderRouter.h
rename to connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/WisunBorderRouter.h
diff --git a/features/nanostack/mbed-mesh-api/mbed-mesh-api/WisunInterface.h b/connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/WisunInterface.h
similarity index 100%
rename from features/nanostack/mbed-mesh-api/mbed-mesh-api/WisunInterface.h
rename to connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/WisunInterface.h
diff --git a/features/nanostack/mbed-mesh-api/mbed-mesh-api/mesh_interface_types.h b/connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/mesh_interface_types.h
similarity index 100%
rename from features/nanostack/mbed-mesh-api/mbed-mesh-api/mesh_interface_types.h
rename to connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/mesh_interface_types.h
diff --git a/features/nanostack/mbed-mesh-api/mbed_lib.json b/connectivity/nanostack/mbed-mesh-api/mbed_lib.json
similarity index 100%
rename from features/nanostack/mbed-mesh-api/mbed_lib.json
rename to connectivity/nanostack/mbed-mesh-api/mbed_lib.json
diff --git a/features/nanostack/mbed-mesh-api/source/CallbackHandler.cpp b/connectivity/nanostack/mbed-mesh-api/source/CallbackHandler.cpp
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/CallbackHandler.cpp
rename to connectivity/nanostack/mbed-mesh-api/source/CallbackHandler.cpp
diff --git a/features/nanostack/mbed-mesh-api/source/LoWPANNDInterface.cpp b/connectivity/nanostack/mbed-mesh-api/source/LoWPANNDInterface.cpp
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/LoWPANNDInterface.cpp
rename to connectivity/nanostack/mbed-mesh-api/source/LoWPANNDInterface.cpp
diff --git a/features/nanostack/mbed-mesh-api/source/MeshInterfaceNanostack.cpp b/connectivity/nanostack/mbed-mesh-api/source/MeshInterfaceNanostack.cpp
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/MeshInterfaceNanostack.cpp
rename to connectivity/nanostack/mbed-mesh-api/source/MeshInterfaceNanostack.cpp
diff --git a/features/nanostack/mbed-mesh-api/source/NanostackEMACInterface.cpp b/connectivity/nanostack/mbed-mesh-api/source/NanostackEMACInterface.cpp
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/NanostackEMACInterface.cpp
rename to connectivity/nanostack/mbed-mesh-api/source/NanostackEMACInterface.cpp
diff --git a/features/nanostack/mbed-mesh-api/source/NanostackEthernetInterface.cpp b/connectivity/nanostack/mbed-mesh-api/source/NanostackEthernetInterface.cpp
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/NanostackEthernetInterface.cpp
rename to connectivity/nanostack/mbed-mesh-api/source/NanostackEthernetInterface.cpp
diff --git a/features/nanostack/mbed-mesh-api/source/NanostackMemoryManager.cpp b/connectivity/nanostack/mbed-mesh-api/source/NanostackMemoryManager.cpp
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/NanostackMemoryManager.cpp
rename to connectivity/nanostack/mbed-mesh-api/source/NanostackMemoryManager.cpp
diff --git a/features/nanostack/mbed-mesh-api/source/NanostackPPPInterface.cpp b/connectivity/nanostack/mbed-mesh-api/source/NanostackPPPInterface.cpp
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/NanostackPPPInterface.cpp
rename to connectivity/nanostack/mbed-mesh-api/source/NanostackPPPInterface.cpp
diff --git a/features/nanostack/mbed-mesh-api/source/ThreadInterface.cpp b/connectivity/nanostack/mbed-mesh-api/source/ThreadInterface.cpp
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/ThreadInterface.cpp
rename to connectivity/nanostack/mbed-mesh-api/source/ThreadInterface.cpp
diff --git a/features/nanostack/mbed-mesh-api/source/WisunBorderRouter.cpp b/connectivity/nanostack/mbed-mesh-api/source/WisunBorderRouter.cpp
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/WisunBorderRouter.cpp
rename to connectivity/nanostack/mbed-mesh-api/source/WisunBorderRouter.cpp
diff --git a/features/nanostack/mbed-mesh-api/source/WisunInterface.cpp b/connectivity/nanostack/mbed-mesh-api/source/WisunInterface.cpp
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/WisunInterface.cpp
rename to connectivity/nanostack/mbed-mesh-api/source/WisunInterface.cpp
diff --git a/features/nanostack/mbed-mesh-api/source/ethernet_tasklet.c b/connectivity/nanostack/mbed-mesh-api/source/ethernet_tasklet.c
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/ethernet_tasklet.c
rename to connectivity/nanostack/mbed-mesh-api/source/ethernet_tasklet.c
diff --git a/features/nanostack/mbed-mesh-api/source/include/NanostackMemoryManager.h b/connectivity/nanostack/mbed-mesh-api/source/include/NanostackMemoryManager.h
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/include/NanostackMemoryManager.h
rename to connectivity/nanostack/mbed-mesh-api/source/include/NanostackMemoryManager.h
diff --git a/features/nanostack/mbed-mesh-api/source/include/callback_handler.h b/connectivity/nanostack/mbed-mesh-api/source/include/callback_handler.h
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/include/callback_handler.h
rename to connectivity/nanostack/mbed-mesh-api/source/include/callback_handler.h
diff --git a/features/nanostack/mbed-mesh-api/source/include/enet_tasklet.h b/connectivity/nanostack/mbed-mesh-api/source/include/enet_tasklet.h
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/include/enet_tasklet.h
rename to connectivity/nanostack/mbed-mesh-api/source/include/enet_tasklet.h
diff --git a/features/nanostack/mbed-mesh-api/source/include/mesh_system.h b/connectivity/nanostack/mbed-mesh-api/source/include/mesh_system.h
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/include/mesh_system.h
rename to connectivity/nanostack/mbed-mesh-api/source/include/mesh_system.h
diff --git a/features/nanostack/mbed-mesh-api/source/include/nd_tasklet.h b/connectivity/nanostack/mbed-mesh-api/source/include/nd_tasklet.h
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/include/nd_tasklet.h
rename to connectivity/nanostack/mbed-mesh-api/source/include/nd_tasklet.h
diff --git a/features/nanostack/mbed-mesh-api/source/include/thread_tasklet.h b/connectivity/nanostack/mbed-mesh-api/source/include/thread_tasklet.h
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/include/thread_tasklet.h
rename to connectivity/nanostack/mbed-mesh-api/source/include/thread_tasklet.h
diff --git a/features/nanostack/mbed-mesh-api/source/include/wisun_tasklet.h b/connectivity/nanostack/mbed-mesh-api/source/include/wisun_tasklet.h
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/include/wisun_tasklet.h
rename to connectivity/nanostack/mbed-mesh-api/source/include/wisun_tasklet.h
diff --git a/features/nanostack/mbed-mesh-api/source/mesh_system.c b/connectivity/nanostack/mbed-mesh-api/source/mesh_system.c
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/mesh_system.c
rename to connectivity/nanostack/mbed-mesh-api/source/mesh_system.c
diff --git a/features/nanostack/mbed-mesh-api/source/nd_tasklet.c b/connectivity/nanostack/mbed-mesh-api/source/nd_tasklet.c
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/nd_tasklet.c
rename to connectivity/nanostack/mbed-mesh-api/source/nd_tasklet.c
diff --git a/features/nanostack/mbed-mesh-api/source/thread_tasklet.c b/connectivity/nanostack/mbed-mesh-api/source/thread_tasklet.c
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/thread_tasklet.c
rename to connectivity/nanostack/mbed-mesh-api/source/thread_tasklet.c
diff --git a/features/nanostack/mbed-mesh-api/source/wisun_tasklet.c b/connectivity/nanostack/mbed-mesh-api/source/wisun_tasklet.c
similarity index 100%
rename from features/nanostack/mbed-mesh-api/source/wisun_tasklet.c
rename to connectivity/nanostack/mbed-mesh-api/source/wisun_tasklet.c
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/.gitattributes b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/.gitattributes
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/.gitattributes
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/.gitattributes
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/.mbedignore b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/.mbedignore
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/.mbedignore
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/.mbedignore
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/README.md b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/README.md
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/README.md
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/README.md
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_fhss_timer.cpp b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_fhss_timer.cpp
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_fhss_timer.cpp
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_fhss_timer.cpp
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_interrupt.c b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_interrupt.c
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_interrupt.c
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_interrupt.c
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_interrupt_private.h b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_interrupt_private.h
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_interrupt_private.h
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_interrupt_private.h
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_random.c b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_random.c
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_random.c
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_random.c
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_timer.cpp b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_timer.cpp
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_timer.cpp
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_timer.cpp
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/mbed_lib.json b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/mbed_lib.json
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/mbed_lib.json
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/mbed_lib.json
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop.c b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop.c
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop.c
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop.c
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop.h b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop.h
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop.h
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop.h
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop_mbed.cpp b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop_mbed.cpp
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop_mbed.cpp
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop_mbed.cpp
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop_mutex.c b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop_mutex.c
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop_mutex.c
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop_mutex.c
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop_mutex.h b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop_mutex.h
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop_mutex.h
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_event_loop_mutex.h
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_file_system_api.cpp b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_file_system_api.cpp
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_file_system_api.cpp
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_file_system_api.cpp
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_file_system_api.h b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_file_system_api.h
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_file_system_api.h
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_file_system_api.h
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_hal_init.c b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_hal_init.c
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_hal_init.c
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_hal_init.c
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_hal_init.h b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_hal_init.h
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_hal_init.h
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/ns_hal_init.h
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/nvm/README.md b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/nvm/README.md
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/nvm/README.md
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/nvm/README.md
diff --git a/features/nanostack/nanostack-hal-mbed-cmsis-rtos/nvm/nvm_ram.c b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/nvm/nvm_ram.c
similarity index 100%
rename from features/nanostack/nanostack-hal-mbed-cmsis-rtos/nvm/nvm_ram.c
rename to connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/nvm/nvm_ram.c
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/.gitignore b/connectivity/nanostack/sal-stack-nanostack-eventloop/.gitignore
similarity index 100%
rename from features/nanostack/sal-stack-nanostack-eventloop/.gitignore
rename to connectivity/nanostack/sal-stack-nanostack-eventloop/.gitignore
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/LICENSE b/connectivity/nanostack/sal-stack-nanostack-eventloop/LICENSE
similarity index 100%
rename from features/nanostack/sal-stack-nanostack-eventloop/LICENSE
rename to connectivity/nanostack/sal-stack-nanostack-eventloop/LICENSE
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/Makefile b/connectivity/nanostack/sal-stack-nanostack-eventloop/Makefile
similarity index 100%
rename from features/nanostack/sal-stack-nanostack-eventloop/Makefile
rename to connectivity/nanostack/sal-stack-nanostack-eventloop/Makefile
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/apache-2.0.txt b/connectivity/nanostack/sal-stack-nanostack-eventloop/apache-2.0.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack-eventloop/apache-2.0.txt
rename to connectivity/nanostack/sal-stack-nanostack-eventloop/apache-2.0.txt
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/mbed_lib.json b/connectivity/nanostack/sal-stack-nanostack-eventloop/mbed_lib.json
similarity index 100%
rename from features/nanostack/sal-stack-nanostack-eventloop/mbed_lib.json
rename to connectivity/nanostack/sal-stack-nanostack-eventloop/mbed_lib.json
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_callback_timer.h b/connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_callback_timer.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_callback_timer.h
rename to connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_callback_timer.h
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_event.h b/connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_event.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_event.h
rename to connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_event.h
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_event_timer.h b/connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_event_timer.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_event_timer.h
rename to connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_event_timer.h
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_scheduler.h b/connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_scheduler.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_scheduler.h
rename to connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_scheduler.h
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/platform/arm_hal_timer.h b/connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/platform/arm_hal_timer.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/platform/arm_hal_timer.h
rename to connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/platform/arm_hal_timer.h
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/platform/eventloop_config.h b/connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/platform/eventloop_config.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/platform/eventloop_config.h
rename to connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/platform/eventloop_config.h
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/source/event.c b/connectivity/nanostack/sal-stack-nanostack-eventloop/source/event.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack-eventloop/source/event.c
rename to connectivity/nanostack/sal-stack-nanostack-eventloop/source/event.c
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/source/event.h b/connectivity/nanostack/sal-stack-nanostack-eventloop/source/event.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack-eventloop/source/event.h
rename to connectivity/nanostack/sal-stack-nanostack-eventloop/source/event.h
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/source/ns_timeout.c b/connectivity/nanostack/sal-stack-nanostack-eventloop/source/ns_timeout.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack-eventloop/source/ns_timeout.c
rename to connectivity/nanostack/sal-stack-nanostack-eventloop/source/ns_timeout.c
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/source/ns_timer.c b/connectivity/nanostack/sal-stack-nanostack-eventloop/source/ns_timer.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack-eventloop/source/ns_timer.c
rename to connectivity/nanostack/sal-stack-nanostack-eventloop/source/ns_timer.c
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/source/ns_timer.h b/connectivity/nanostack/sal-stack-nanostack-eventloop/source/ns_timer.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack-eventloop/source/ns_timer.h
rename to connectivity/nanostack/sal-stack-nanostack-eventloop/source/ns_timer.h
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/source/system_timer.c b/connectivity/nanostack/sal-stack-nanostack-eventloop/source/system_timer.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack-eventloop/source/system_timer.c
rename to connectivity/nanostack/sal-stack-nanostack-eventloop/source/system_timer.c
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/source/timer_sys.h b/connectivity/nanostack/sal-stack-nanostack-eventloop/source/timer_sys.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack-eventloop/source/timer_sys.h
rename to connectivity/nanostack/sal-stack-nanostack-eventloop/source/timer_sys.h
diff --git a/features/nanostack/sal-stack-nanostack/.gitattributes b/connectivity/nanostack/sal-stack-nanostack/.gitattributes
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/.gitattributes
rename to connectivity/nanostack/sal-stack-nanostack/.gitattributes
diff --git a/features/nanostack/sal-stack-nanostack/.gitignore b/connectivity/nanostack/sal-stack-nanostack/.gitignore
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/.gitignore
rename to connectivity/nanostack/sal-stack-nanostack/.gitignore
diff --git a/features/nanostack/sal-stack-nanostack/.mbedignore b/connectivity/nanostack/sal-stack-nanostack/.mbedignore
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/.mbedignore
rename to connectivity/nanostack/sal-stack-nanostack/.mbedignore
diff --git a/features/nanostack/sal-stack-nanostack/DOXYGEN_FRONTPAGE.md b/connectivity/nanostack/sal-stack-nanostack/DOXYGEN_FRONTPAGE.md
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/DOXYGEN_FRONTPAGE.md
rename to connectivity/nanostack/sal-stack-nanostack/DOXYGEN_FRONTPAGE.md
diff --git a/features/nanostack/sal-stack-nanostack/Doxyfile b/connectivity/nanostack/sal-stack-nanostack/Doxyfile
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/Doxyfile
rename to connectivity/nanostack/sal-stack-nanostack/Doxyfile
diff --git a/features/nanostack/sal-stack-nanostack/LICENSE-Apache-2.0 b/connectivity/nanostack/sal-stack-nanostack/LICENSE-Apache-2.0
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/LICENSE-Apache-2.0
rename to connectivity/nanostack/sal-stack-nanostack/LICENSE-Apache-2.0
diff --git a/features/nanostack/sal-stack-nanostack/LICENSE-BSD-3-Clause b/connectivity/nanostack/sal-stack-nanostack/LICENSE-BSD-3-Clause
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/LICENSE-BSD-3-Clause
rename to connectivity/nanostack/sal-stack-nanostack/LICENSE-BSD-3-Clause
diff --git a/features/nanostack/sal-stack-nanostack/Makefile b/connectivity/nanostack/sal-stack-nanostack/Makefile
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/Makefile
rename to connectivity/nanostack/sal-stack-nanostack/Makefile
diff --git a/features/nanostack/sal-stack-nanostack/NOTICE b/connectivity/nanostack/sal-stack-nanostack/NOTICE
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/NOTICE
rename to connectivity/nanostack/sal-stack-nanostack/NOTICE
diff --git a/features/nanostack/sal-stack-nanostack/README.md b/connectivity/nanostack/sal-stack-nanostack/README.md
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/README.md
rename to connectivity/nanostack/sal-stack-nanostack/README.md
diff --git a/features/nanostack/sal-stack-nanostack/doxygen/mainpage.dox b/connectivity/nanostack/sal-stack-nanostack/doxygen/mainpage.dox
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/doxygen/mainpage.dox
rename to connectivity/nanostack/sal-stack-nanostack/doxygen/mainpage.dox
diff --git a/features/nanostack/sal-stack-nanostack/include_dirs.mk b/connectivity/nanostack/sal-stack-nanostack/include_dirs.mk
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/include_dirs.mk
rename to connectivity/nanostack/sal-stack-nanostack/include_dirs.mk
diff --git a/features/nanostack/sal-stack-nanostack/mbed_lib.json b/connectivity/nanostack/sal-stack-nanostack/mbed_lib.json
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/mbed_lib.json
rename to connectivity/nanostack/sal-stack-nanostack/mbed_lib.json
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/cca_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/cca_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/cca_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/cca_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/ccmLIB.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/ccmLIB.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/ccmLIB.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/ccmLIB.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/dhcp_service_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/dhcp_service_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/dhcp_service_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/dhcp_service_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/ethernet_mac_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/ethernet_mac_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/ethernet_mac_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/ethernet_mac_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/fhss_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/fhss_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/fhss_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/fhss_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/fhss_config.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/fhss_config.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/fhss_config.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/fhss_config.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/fhss_test_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/fhss_test_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/fhss_test_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/fhss_test_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/fhss_ws_extension.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/fhss_ws_extension.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/fhss_ws_extension.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/fhss_ws_extension.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/mac_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/mac_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/mac_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/mac_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/mac_common_defines.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/mac_common_defines.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/mac_common_defines.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/mac_common_defines.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/mac_filter_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/mac_filter_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/mac_filter_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/mac_filter_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/mac_mcps.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/mac_mcps.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/mac_mcps.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/mac_mcps.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/mlme.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/mlme.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/mlme.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/mlme.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/multicast_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/multicast_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/multicast_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/multicast_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/net_6lowpan_parameter_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/net_6lowpan_parameter_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/net_6lowpan_parameter_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/net_6lowpan_parameter_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/net_address_extension.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/net_address_extension.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/net_address_extension.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/net_address_extension.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/net_fhss.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/net_fhss.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/net_fhss.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/net_fhss.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/net_interface.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/net_interface.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/net_interface.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/net_interface.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/net_ipv6_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/net_ipv6_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/net_ipv6_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/net_ipv6_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/net_load_balance_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/net_load_balance_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/net_load_balance_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/net_load_balance_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/net_mle_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/net_mle_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/net_mle_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/net_mle_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/net_nvm_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/net_nvm_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/net_nvm_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/net_nvm_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/net_nwk_scan.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/net_nwk_scan.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/net_nwk_scan.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/net_nwk_scan.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/net_pana_parameters_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/net_pana_parameters_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/net_pana_parameters_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/net_pana_parameters_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/net_polling_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/net_polling_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/net_polling_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/net_polling_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/net_rpl.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/net_rpl.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/net_rpl.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/net_rpl.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/net_sleep.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/net_sleep.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/net_sleep.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/net_sleep.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/net_test_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/net_test_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/net_test_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/net_test_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/net_thread_test.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/net_thread_test.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/net_thread_test.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/net_thread_test.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/net_ws_test.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/net_ws_test.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/net_ws_test.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/net_ws_test.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/ns_address.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/ns_address.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/ns_address.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/ns_address.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/ns_conf.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/ns_conf.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/ns_conf.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/ns_conf.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/ns_file_system.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/ns_file_system.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/ns_file_system.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/ns_file_system.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/ns_mdns_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/ns_mdns_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/ns_mdns_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/ns_mdns_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/ns_sha256.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/ns_sha256.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/ns_sha256.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/ns_sha256.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/ns_time_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/ns_time_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/ns_time_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/ns_time_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/ns_virtual_rf_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/ns_virtual_rf_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/ns_virtual_rf_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/ns_virtual_rf_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/nwk_stats_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/nwk_stats_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/nwk_stats_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/nwk_stats_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/platform/arm_hal_aes.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/platform/arm_hal_aes.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/platform/arm_hal_aes.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/platform/arm_hal_aes.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/platform/arm_hal_phy.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/platform/arm_hal_phy.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/platform/arm_hal_phy.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/platform/arm_hal_phy.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/platform/os_whiteboard.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/platform/os_whiteboard.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/platform/os_whiteboard.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/platform/os_whiteboard.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/platform/topo_trace.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/platform/topo_trace.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/platform/topo_trace.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/platform/topo_trace.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/serial_mac_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/serial_mac_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/serial_mac_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/serial_mac_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/shalib.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/shalib.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/shalib.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/shalib.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/socket_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/socket_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/socket_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/socket_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/sw_mac.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/sw_mac.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/sw_mac.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/sw_mac.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/thread_bbr_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/thread_bbr_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/thread_bbr_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/thread_bbr_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/thread_border_router_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/thread_border_router_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/thread_border_router_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/thread_border_router_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/thread_commissioning_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/thread_commissioning_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/thread_commissioning_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/thread_commissioning_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/thread_dhcpv6_server.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/thread_dhcpv6_server.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/thread_dhcpv6_server.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/thread_dhcpv6_server.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/thread_diagcop_lib.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/thread_diagcop_lib.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/thread_diagcop_lib.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/thread_diagcop_lib.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/thread_lowpower_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/thread_lowpower_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/thread_lowpower_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/thread_lowpower_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/thread_management_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/thread_management_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/thread_management_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/thread_management_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/thread_management_if.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/thread_management_if.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/thread_management_if.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/thread_management_if.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/thread_meshcop_lib.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/thread_meshcop_lib.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/thread_meshcop_lib.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/thread_meshcop_lib.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/thread_net_config_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/thread_net_config_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/thread_net_config_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/thread_net_config_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/whiteboard_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/whiteboard_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/whiteboard_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/whiteboard_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/ws_bbr_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/ws_bbr_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/ws_bbr_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/ws_bbr_api.h
diff --git a/features/nanostack/sal-stack-nanostack/nanostack/ws_management_api.h b/connectivity/nanostack/sal-stack-nanostack/nanostack/ws_management_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/nanostack/ws_management_api.h
rename to connectivity/nanostack/sal-stack-nanostack/nanostack/ws_management_api.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/network_lib.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/network_lib.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/network_lib.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/network_lib.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_interface.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_interface.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_interface.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_interface.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/network_lib.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/network_lib.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/network_lib.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/network_lib.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan_bootstrap.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan_bootstrap.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan_bootstrap.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan_bootstrap.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan_interface.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan_interface.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan_interface.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan_interface.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Fragmentation/cipv6_fragmenter.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Fragmentation/cipv6_fragmenter.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Fragmentation/cipv6_fragmenter.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Fragmentation/cipv6_fragmenter.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Fragmentation/cipv6_fragmenter.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Fragmentation/cipv6_fragmenter.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Fragmentation/cipv6_fragmenter.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Fragmentation/cipv6_fragmenter.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/6lowpan_iphc.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/6lowpan_iphc.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/6lowpan_iphc.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/6lowpan_iphc.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/cipv6.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/cipv6.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/cipv6.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/cipv6.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_compress.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_compress.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_compress.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_compress.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_compress.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_compress.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_compress.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_compress.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_decompress.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_decompress.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_decompress.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_decompress.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_decompress.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_decompress.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_decompress.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_decompress.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/lowpan_context.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/lowpan_context.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/lowpan_context.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/lowpan_context.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/lowpan_context.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/lowpan_context.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/lowpan_context.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/lowpan_context.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/beacon_handler.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/beacon_handler.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/beacon_handler.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/beacon_handler.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/beacon_handler.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/beacon_handler.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/beacon_handler.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/beacon_handler.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_data_poll.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_data_poll.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_data_poll.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_data_poll.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_data_poll.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_data_poll.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_data_poll.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_data_poll.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_helper.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_helper.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_helper.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_helper.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_helper.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_helper.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_helper.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_helper.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_ie_lib.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_ie_lib.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_ie_lib.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_ie_lib.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_ie_lib.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_ie_lib.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_ie_lib.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_ie_lib.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_pairwise_key.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_pairwise_key.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_pairwise_key.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_pairwise_key.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_pairwise_key.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_pairwise_key.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_pairwise_key.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_pairwise_key.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_response_handler.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_response_handler.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_response_handler.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_response_handler.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_response_handler.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_response_handler.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_response_handler.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_response_handler.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mpx_api.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mpx_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mpx_api.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mpx_api.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Mesh/mesh.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Mesh/mesh.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Mesh/mesh.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Mesh/mesh.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Mesh/mesh.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Mesh/mesh.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Mesh/mesh.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Mesh/mesh.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ND/nd_defines.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ND/nd_defines.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ND/nd_defines.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ND/nd_defines.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ND/nd_router_object.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ND/nd_router_object.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ND/nd_router_object.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ND/nd_router_object.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ND/nd_router_object.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ND/nd_router_object.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ND/nd_router_object.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ND/nd_router_object.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/NVM/nwk_nvm.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/NVM/nwk_nvm.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/NVM/nwk_nvm.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/NVM/nwk_nvm.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/NVM/nwk_nvm.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/NVM/nwk_nvm.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/NVM/nwk_nvm.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/NVM/nwk_nvm.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_api.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_api_internal.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_api_internal.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_api_internal.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_api_internal.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_commercial.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_commercial.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_commercial.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_commercial.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_commercial.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_commercial.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_commercial.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_commercial.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_beacon.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_beacon.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_beacon.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_beacon.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_beacon.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_beacon.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_beacon.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_beacon.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bootstrap.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bootstrap.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bootstrap.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bootstrap.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bootstrap.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bootstrap.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bootstrap.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bootstrap.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_border_router_api.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_border_router_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_border_router_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_border_router_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_border_router_api_internal.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_border_router_api_internal.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_border_router_api_internal.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_border_router_api_internal.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_ccm.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_ccm.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_ccm.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_ccm.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_ccm.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_ccm.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_ccm.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_ccm.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_api.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_if.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_if.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_if.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_if.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_if.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_if.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_if.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_if.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_common.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_common.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_common.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_common.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_common.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_common.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_common.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_common.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_config.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_config.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_config.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_config.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_constants.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_constants.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_constants.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_constants.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_dhcpv6_server.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_dhcpv6_server.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_dhcpv6_server.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_dhcpv6_server.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_dhcpv6_server.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_dhcpv6_server.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_dhcpv6_server.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_dhcpv6_server.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_diagnostic.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_diagnostic.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_diagnostic.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_diagnostic.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_diagnostic.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_diagnostic.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_diagnostic.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_diagnostic.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_discovery.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_discovery.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_discovery.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_discovery.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_discovery.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_discovery.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_discovery.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_discovery.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_host_bootstrap.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_host_bootstrap.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_host_bootstrap.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_host_bootstrap.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_host_bootstrap.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_host_bootstrap.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_host_bootstrap.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_host_bootstrap.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_joiner_application.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_joiner_application.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_joiner_application.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_joiner_application.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_joiner_application.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_joiner_application.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_joiner_application.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_joiner_application.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_leader_service.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_leader_service.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_leader_service.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_leader_service.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_leader_service.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_leader_service.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_leader_service.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_leader_service.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_api.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_private_api.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_private_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_private_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_private_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_private_api.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_private_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_private_api.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_private_api.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_api.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_client.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_client.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_client.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_client.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_client.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_client.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_client.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_client.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_if.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_if.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_if.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_if.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_internal.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_internal.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_internal.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_internal.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_server.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_server.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_server.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_server.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_server.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_server.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_server.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_server.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mdns.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mdns.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mdns.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mdns.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mdns.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mdns.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mdns.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mdns.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_meshcop_lib.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_meshcop_lib.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_meshcop_lib.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_meshcop_lib.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mle_message_handler.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mle_message_handler.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mle_message_handler.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mle_message_handler.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mle_message_handler.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mle_message_handler.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mle_message_handler.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mle_message_handler.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nd.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nd.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nd.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nd.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nd.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nd.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nd.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nd.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_neighbor_class.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_neighbor_class.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_neighbor_class.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_neighbor_class.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_neighbor_class.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_neighbor_class.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_neighbor_class.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_neighbor_class.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_net_config_api.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_net_config_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_net_config_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_net_config_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_lib.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_lib.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_lib.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_lib.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_lib.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_lib.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_lib.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_lib.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_storage.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_storage.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_storage.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_storage.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_storage.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_storage.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_storage.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_storage.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_synch.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_synch.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_synch.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_synch.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_synch.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_synch.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_synch.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_synch.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nvm_store.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nvm_store.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nvm_store.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nvm_store.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nvm_store.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nvm_store.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nvm_store.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nvm_store.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_client.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_client.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_client.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_client.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_client.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_client.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_client.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_client.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_server.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_server.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_server.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_server.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_server.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_server.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_server.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_server.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_router_bootstrap.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_router_bootstrap.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_router_bootstrap.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_router_bootstrap.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_router_bootstrap.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_router_bootstrap.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_router_bootstrap.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_router_bootstrap.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_routing.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_routing.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_routing.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_routing.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_routing.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_routing.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_routing.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_routing.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_test_api.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_test_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_test_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_test_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_tmfcop_lib.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_tmfcop_lib.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_tmfcop_lib.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_tmfcop_lib.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/adaptation_interface.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/adaptation_interface.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/adaptation_interface.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/adaptation_interface.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/lowpan_adaptation_interface.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/lowpan_adaptation_interface.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/lowpan_adaptation_interface.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/lowpan_adaptation_interface.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_bbr_api.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_bbr_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_bbr_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_bbr_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_bbr_api_internal.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_bbr_api_internal.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_bbr_api_internal.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_bbr_api_internal.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_bootstrap.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_bootstrap.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_bootstrap.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_bootstrap.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_bootstrap.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_bootstrap.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_bootstrap.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_bootstrap.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_cfg_settings.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_cfg_settings.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_cfg_settings.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_cfg_settings.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_cfg_settings.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_cfg_settings.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_cfg_settings.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_cfg_settings.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_common.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_common.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_common.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_common.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_common.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_common.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_common.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_common.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_common_defines.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_common_defines.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_common_defines.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_common_defines.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_config.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_config.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_config.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_config.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_auth_relay.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_auth_relay.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_auth_relay.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_auth_relay.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_auth_relay.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_auth_relay.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_auth_relay.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_auth_relay.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_pdu.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_pdu.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_pdu.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_pdu.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_pdu.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_pdu.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_pdu.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_pdu.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_relay.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_relay.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_relay.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_relay.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_relay.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_relay.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_relay.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_relay.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_relay_lib.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_relay_lib.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_relay_lib.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_relay_lib.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_relay_lib.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_relay_lib.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_relay_lib.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_eapol_relay_lib.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_empty_functions.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_empty_functions.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_empty_functions.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_empty_functions.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_ie_lib.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_ie_lib.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_ie_lib.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_ie_lib.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_ie_lib.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_ie_lib.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_ie_lib.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_ie_lib.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_llc.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_llc.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_llc.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_llc.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_llc_data_service.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_llc_data_service.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_llc_data_service.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_llc_data_service.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_management_api.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_management_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_management_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_management_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_mpx_header.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_mpx_header.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_mpx_header.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_mpx_header.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_mpx_header.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_mpx_header.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_mpx_header.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_mpx_header.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_neighbor_class.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_neighbor_class.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_neighbor_class.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_neighbor_class.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_neighbor_class.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_neighbor_class.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_neighbor_class.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_neighbor_class.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_auth.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_auth.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_auth.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_auth.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_auth.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_auth.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_auth.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_auth.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_controller.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_controller.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_controller.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_controller.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_controller.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_controller.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_controller.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_controller.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_key_storage.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_key_storage.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_key_storage.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_key_storage.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_key_storage.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_key_storage.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_key_storage.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_key_storage.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_lib.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_lib.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_lib.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_lib.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_lib.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_lib.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_lib.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_lib.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_nvm_data.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_nvm_data.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_nvm_data.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_nvm_data.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_nvm_data.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_nvm_data.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_nvm_data.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_nvm_data.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_nvm_store.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_nvm_store.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_nvm_store.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_nvm_store.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_nvm_store.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_nvm_store.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_nvm_store.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_nvm_store.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_supp.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_supp.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_supp.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_supp.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_supp.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_supp.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_supp.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_supp.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_time.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_time.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_time.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_time.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_time.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_time.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_time.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_time.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_timers.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_timers.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_timers.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_timers.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_timers.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_timers.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_timers.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_pae_timers.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_stats.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_stats.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_stats.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_stats.c
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_stats.h b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_stats.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_stats.h
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_stats.h
diff --git a/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_test_api.c b/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_test_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_test_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws/ws_test_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/BorderRouter/border_router.c b/connectivity/nanostack/sal-stack-nanostack/source/BorderRouter/border_router.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/BorderRouter/border_router.c
rename to connectivity/nanostack/sal-stack-nanostack/source/BorderRouter/border_router.c
diff --git a/features/nanostack/sal-stack-nanostack/source/BorderRouter/border_router.h b/connectivity/nanostack/sal-stack-nanostack/source/BorderRouter/border_router.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/BorderRouter/border_router.h
rename to connectivity/nanostack/sal-stack-nanostack/source/BorderRouter/border_router.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6.c b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6.h b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_prefix.c b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_prefix.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_prefix.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_prefix.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_prefix.h b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_prefix.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_prefix.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_prefix.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_radv.c b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_radv.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_radv.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_radv.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_radv.h b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_radv.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_radv.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_radv.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ip.h b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ip.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/ip.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ip.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6.c b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6.h b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_constants.h b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_constants.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_constants.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_constants.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_flow.c b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_flow.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_flow.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_flow.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_flow.h b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_flow.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_flow.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_flow.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_fragmentation.c b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_fragmentation.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_fragmentation.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_fragmentation.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_fragmentation.h b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_fragmentation.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_fragmentation.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_fragmentation.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_resolution.c b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_resolution.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_resolution.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_resolution.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_resolution.h b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_resolution.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_resolution.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_resolution.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/mld.c b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/mld.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/mld.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/mld.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/mld.h b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/mld.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/mld.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/mld.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/tcp.c b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/tcp.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/tcp.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/tcp.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/tcp.h b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/tcp.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/tcp.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/tcp.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/udp.c b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/udp.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/udp.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/udp.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Common_Protocols/udp.h b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/udp.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Common_Protocols/udp.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/udp.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Core/buffer_dyn.c b/connectivity/nanostack/sal-stack-nanostack/source/Core/buffer_dyn.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Core/buffer_dyn.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Core/buffer_dyn.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Core/include/ns_address_internal.h b/connectivity/nanostack/sal-stack-nanostack/source/Core/include/ns_address_internal.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Core/include/ns_address_internal.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Core/include/ns_address_internal.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Core/include/ns_buffer.h b/connectivity/nanostack/sal-stack-nanostack/source/Core/include/ns_buffer.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Core/include/ns_buffer.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Core/include/ns_buffer.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Core/include/ns_error_types.h b/connectivity/nanostack/sal-stack-nanostack/source/Core/include/ns_error_types.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Core/include/ns_error_types.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Core/include/ns_error_types.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Core/include/ns_monitor.h b/connectivity/nanostack/sal-stack-nanostack/source/Core/include/ns_monitor.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Core/include/ns_monitor.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Core/include/ns_monitor.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Core/include/ns_socket.h b/connectivity/nanostack/sal-stack-nanostack/source/Core/include/ns_socket.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Core/include/ns_socket.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Core/include/ns_socket.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Core/include/sockbuf.h b/connectivity/nanostack/sal-stack-nanostack/source/Core/include/sockbuf.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Core/include/sockbuf.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Core/include/sockbuf.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Core/ns_address_internal.c b/connectivity/nanostack/sal-stack-nanostack/source/Core/ns_address_internal.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Core/ns_address_internal.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Core/ns_address_internal.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Core/ns_monitor.c b/connectivity/nanostack/sal-stack-nanostack/source/Core/ns_monitor.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Core/ns_monitor.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Core/ns_monitor.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Core/ns_socket.c b/connectivity/nanostack/sal-stack-nanostack/source/Core/ns_socket.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Core/ns_socket.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Core/ns_socket.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Core/sockbuf.c b/connectivity/nanostack/sal-stack-nanostack/source/Core/sockbuf.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Core/sockbuf.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Core/sockbuf.c
diff --git a/features/nanostack/sal-stack-nanostack/source/DHCPv6_Server/DHCPv6_Server_service.c b/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_Server/DHCPv6_Server_service.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/DHCPv6_Server/DHCPv6_Server_service.c
rename to connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_Server/DHCPv6_Server_service.c
diff --git a/features/nanostack/sal-stack-nanostack/source/DHCPv6_Server/DHCPv6_server_service.h b/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_Server/DHCPv6_server_service.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/DHCPv6_Server/DHCPv6_server_service.h
rename to connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_Server/DHCPv6_server_service.h
diff --git a/features/nanostack/sal-stack-nanostack/source/DHCPv6_client/dhcpv6_client_api.h b/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_client/dhcpv6_client_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/DHCPv6_client/dhcpv6_client_api.h
rename to connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_client/dhcpv6_client_api.h
diff --git a/features/nanostack/sal-stack-nanostack/source/DHCPv6_client/dhcpv6_client_service.c b/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_client/dhcpv6_client_service.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/DHCPv6_client/dhcpv6_client_service.c
rename to connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_client/dhcpv6_client_service.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/.gitignore b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/.gitignore
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/.gitignore
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/.gitignore
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_cca_threshold.c b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_cca_threshold.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_cca_threshold.c
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_cca_threshold.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_cca_threshold.h b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_cca_threshold.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_cca_threshold.h
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_cca_threshold.h
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_data_buffer.h b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_data_buffer.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_data_buffer.h
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_data_buffer.h
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_defines.h b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_defines.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_defines.h
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_defines.h
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_fhss_callbacks.c b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_fhss_callbacks.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_fhss_callbacks.c
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_fhss_callbacks.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_fhss_callbacks.h b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_fhss_callbacks.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_fhss_callbacks.h
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_fhss_callbacks.h
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_filter.c b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_filter.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_filter.c
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_filter.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_filter.h b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_filter.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_filter.h
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_filter.h
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_header_helper_functions.c b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_header_helper_functions.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_header_helper_functions.c
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_header_helper_functions.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_header_helper_functions.h b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_header_helper_functions.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_header_helper_functions.h
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_header_helper_functions.h
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_indirect_data.c b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_indirect_data.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_indirect_data.c
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_indirect_data.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_indirect_data.h b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_indirect_data.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_indirect_data.h
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_indirect_data.h
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mcps_sap.c b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mcps_sap.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mcps_sap.c
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mcps_sap.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mcps_sap.h b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mcps_sap.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mcps_sap.h
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mcps_sap.h
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mlme.c b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mlme.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mlme.c
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mlme.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mlme.h b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mlme.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mlme.h
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mlme.h
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_pd_sap.c b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_pd_sap.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_pd_sap.c
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_pd_sap.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_pd_sap.h b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_pd_sap.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_pd_sap.h
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_pd_sap.h
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.c b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.c
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.h b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.h
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.h
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_timer.c b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_timer.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_timer.c
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_timer.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_timer.h b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_timer.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_timer.h
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_timer.h
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/sw_mac.c b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/sw_mac.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/sw_mac.c
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/sw_mac.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/sw_mac_internal.h b/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/sw_mac_internal.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/sw_mac_internal.h
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/sw_mac_internal.h
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/ethernet/ethernet_mac_api.c b/connectivity/nanostack/sal-stack-nanostack/source/MAC/ethernet/ethernet_mac_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/ethernet/ethernet_mac_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/ethernet/ethernet_mac_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/rf_driver_storage.c b/connectivity/nanostack/sal-stack-nanostack/source/MAC/rf_driver_storage.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/rf_driver_storage.c
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/rf_driver_storage.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/rf_driver_storage.h b/connectivity/nanostack/sal-stack-nanostack/source/MAC/rf_driver_storage.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/rf_driver_storage.h
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/rf_driver_storage.h
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/serial/serial_mac_api.c b/connectivity/nanostack/sal-stack-nanostack/source/MAC/serial/serial_mac_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/serial/serial_mac_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/serial/serial_mac_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_client.c b/connectivity/nanostack/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_client.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_client.c
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_client.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_defines.h b/connectivity/nanostack/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_defines.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_defines.h
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_defines.h
diff --git a/features/nanostack/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_driver.c b/connectivity/nanostack/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_driver.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_driver.c
rename to connectivity/nanostack/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_driver.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MLE/.gitignore b/connectivity/nanostack/sal-stack-nanostack/source/MLE/.gitignore
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MLE/.gitignore
rename to connectivity/nanostack/sal-stack-nanostack/source/MLE/.gitignore
diff --git a/features/nanostack/sal-stack-nanostack/source/MLE/mle.c b/connectivity/nanostack/sal-stack-nanostack/source/MLE/mle.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MLE/mle.c
rename to connectivity/nanostack/sal-stack-nanostack/source/MLE/mle.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MLE/mle.h b/connectivity/nanostack/sal-stack-nanostack/source/MLE/mle.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MLE/mle.h
rename to connectivity/nanostack/sal-stack-nanostack/source/MLE/mle.h
diff --git a/features/nanostack/sal-stack-nanostack/source/MLE/mle_tlv.c b/connectivity/nanostack/sal-stack-nanostack/source/MLE/mle_tlv.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MLE/mle_tlv.c
rename to connectivity/nanostack/sal-stack-nanostack/source/MLE/mle_tlv.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MLE/mle_tlv.h b/connectivity/nanostack/sal-stack-nanostack/source/MLE/mle_tlv.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MLE/mle_tlv.h
rename to connectivity/nanostack/sal-stack-nanostack/source/MLE/mle_tlv.h
diff --git a/features/nanostack/sal-stack-nanostack/source/MPL/mpl.c b/connectivity/nanostack/sal-stack-nanostack/source/MPL/mpl.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MPL/mpl.c
rename to connectivity/nanostack/sal-stack-nanostack/source/MPL/mpl.c
diff --git a/features/nanostack/sal-stack-nanostack/source/MPL/mpl.h b/connectivity/nanostack/sal-stack-nanostack/source/MPL/mpl.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/MPL/mpl.h
rename to connectivity/nanostack/sal-stack-nanostack/source/MPL/mpl.h
diff --git a/features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol.h b/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol.h
rename to connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol.h
diff --git a/features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_abstract.h b/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_abstract.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_abstract.h
rename to connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_abstract.h
diff --git a/features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_stats.h b/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_stats.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_stats.h
rename to connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_stats.h
diff --git a/features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_timer.h b/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_timer.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_timer.h
rename to connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_timer.h
diff --git a/features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_core.c b/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_core.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_core.c
rename to connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_core.c
diff --git a/features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_core_sleep.c b/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_core_sleep.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_core_sleep.c
rename to connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_core_sleep.c
diff --git a/features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_stats.c b/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_stats.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_stats.c
rename to connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_stats.c
diff --git a/features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_timer.c b/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_timer.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_timer.c
rename to connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_timer.c
diff --git a/features/nanostack/sal-stack-nanostack/source/RPL/rpl_control.c b/connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_control.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/RPL/rpl_control.c
rename to connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_control.c
diff --git a/features/nanostack/sal-stack-nanostack/source/RPL/rpl_control.h b/connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_control.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/RPL/rpl_control.h
rename to connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_control.h
diff --git a/features/nanostack/sal-stack-nanostack/source/RPL/rpl_data.c b/connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_data.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/RPL/rpl_data.c
rename to connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_data.c
diff --git a/features/nanostack/sal-stack-nanostack/source/RPL/rpl_data.h b/connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_data.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/RPL/rpl_data.h
rename to connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_data.h
diff --git a/features/nanostack/sal-stack-nanostack/source/RPL/rpl_downward.c b/connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_downward.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/RPL/rpl_downward.c
rename to connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_downward.c
diff --git a/features/nanostack/sal-stack-nanostack/source/RPL/rpl_downward.h b/connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_downward.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/RPL/rpl_downward.h
rename to connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_downward.h
diff --git a/features/nanostack/sal-stack-nanostack/source/RPL/rpl_mrhof.c b/connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_mrhof.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/RPL/rpl_mrhof.c
rename to connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_mrhof.c
diff --git a/features/nanostack/sal-stack-nanostack/source/RPL/rpl_mrhof.h b/connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_mrhof.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/RPL/rpl_mrhof.h
rename to connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_mrhof.h
diff --git a/features/nanostack/sal-stack-nanostack/source/RPL/rpl_objective.c b/connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_objective.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/RPL/rpl_objective.c
rename to connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_objective.c
diff --git a/features/nanostack/sal-stack-nanostack/source/RPL/rpl_objective.h b/connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_objective.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/RPL/rpl_objective.h
rename to connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_objective.h
diff --git a/features/nanostack/sal-stack-nanostack/source/RPL/rpl_of0.c b/connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_of0.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/RPL/rpl_of0.c
rename to connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_of0.c
diff --git a/features/nanostack/sal-stack-nanostack/source/RPL/rpl_of0.h b/connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_of0.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/RPL/rpl_of0.h
rename to connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_of0.h
diff --git a/features/nanostack/sal-stack-nanostack/source/RPL/rpl_policy.c b/connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_policy.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/RPL/rpl_policy.c
rename to connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_policy.c
diff --git a/features/nanostack/sal-stack-nanostack/source/RPL/rpl_policy.h b/connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_policy.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/RPL/rpl_policy.h
rename to connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_policy.h
diff --git a/features/nanostack/sal-stack-nanostack/source/RPL/rpl_protocol.h b/connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_protocol.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/RPL/rpl_protocol.h
rename to connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_protocol.h
diff --git a/features/nanostack/sal-stack-nanostack/source/RPL/rpl_structures.h b/connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_structures.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/RPL/rpl_structures.h
rename to connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_structures.h
diff --git a/features/nanostack/sal-stack-nanostack/source/RPL/rpl_upward.c b/connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_upward.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/RPL/rpl_upward.c
rename to connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_upward.c
diff --git a/features/nanostack/sal-stack-nanostack/source/RPL/rpl_upward.h b/connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_upward.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/RPL/rpl_upward.h
rename to connectivity/nanostack/sal-stack-nanostack/source/RPL/rpl_upward.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/Common/sec_lib.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/Common/sec_lib.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/Common/sec_lib.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/Common/sec_lib.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/Common/sec_lib_definitions.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/Common/sec_lib_definitions.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/Common/sec_lib_definitions.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/Common/sec_lib_definitions.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/Common/security_lib.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/Common/security_lib.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/Common/security_lib.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/Common/security_lib.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/PANA/eap_protocol.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/eap_protocol.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/PANA/eap_protocol.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/eap_protocol.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/PANA/eap_protocol.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/eap_protocol.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/PANA/eap_protocol.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/eap_protocol.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/PANA/pana.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/PANA/pana.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_avp.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_avp.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_avp.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_avp.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_avp.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_avp.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_avp.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_avp.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_client.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_client.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_client.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_client.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_eap_header.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_eap_header.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_eap_header.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_eap_header.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_eap_header.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_eap_header.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_eap_header.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_eap_header.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_header.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_header.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_header.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_header.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_header.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_header.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_header.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_header.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_internal_api.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_internal_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_internal_api.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_internal_api.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_nvm.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_nvm.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_nvm.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_nvm.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_relay_table.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_relay_table.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_relay_table.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_relay_table.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_relay_table.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_relay_table.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_relay_table.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_relay_table.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_server.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_server.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_server.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/PANA/pana_server.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/TLS/tls_ccm_crypt.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/TLS/tls_ccm_crypt.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/TLS/tls_ccm_crypt.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/TLS/tls_ccm_crypt.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/TLS/tls_ccm_crypt.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/TLS/tls_ccm_crypt.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/TLS/tls_ccm_crypt.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/TLS/tls_ccm_crypt.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/TLS/tls_lib.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/TLS/tls_lib.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/TLS/tls_lib.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/TLS/tls_lib.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/TLS/tls_lib.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/TLS/tls_lib.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/TLS/tls_lib.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/TLS/tls_lib.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/eapol/eapol_helper.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/eapol/eapol_helper.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/eapol/eapol_helper.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/eapol/eapol_helper.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/eapol/eapol_helper.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/eapol/eapol_helper.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/eapol/eapol_helper.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/eapol/eapol_helper.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/eapol/kde_helper.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/eapol/kde_helper.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/eapol/kde_helper.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/eapol/kde_helper.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/eapol/kde_helper.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/eapol/kde_helper.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/eapol/kde_helper.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/eapol/kde_helper.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_addr.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_addr.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_addr.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_addr.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_addr.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_addr.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_addr.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_addr.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_api.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_api.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_api.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_api.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_eapol_pdu_if.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_eapol_pdu_if.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_eapol_pdu_if.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_eapol_pdu_if.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_eapol_pdu_if.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_eapol_pdu_if.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_eapol_pdu_if.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_eapol_pdu_if.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_socket_if.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_socket_if.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_socket_if.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_socket_if.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_socket_if.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_socket_if.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_socket_if.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/kmp/kmp_socket_if.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/auth_eap_tls_sec_prot.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/auth_eap_tls_sec_prot.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/auth_eap_tls_sec_prot.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/auth_eap_tls_sec_prot.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/auth_eap_tls_sec_prot.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/auth_eap_tls_sec_prot.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/auth_eap_tls_sec_prot.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/auth_eap_tls_sec_prot.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/eap_tls_sec_prot_lib.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/supp_eap_tls_sec_prot.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/supp_eap_tls_sec_prot.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/supp_eap_tls_sec_prot.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/supp_eap_tls_sec_prot.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/supp_eap_tls_sec_prot.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/supp_eap_tls_sec_prot.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/supp_eap_tls_sec_prot.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot/supp_eap_tls_sec_prot.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot/auth_fwh_sec_prot.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot/supp_fwh_sec_prot.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot/auth_gkh_sec_prot.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot/supp_gkh_sec_prot.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/key_sec_prot/key_sec_prot.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/key_sec_prot/key_sec_prot.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/key_sec_prot/key_sec_prot.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/key_sec_prot/key_sec_prot.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/key_sec_prot/key_sec_prot.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/key_sec_prot/key_sec_prot.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/key_sec_prot/key_sec_prot.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/key_sec_prot/key_sec_prot.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_certs.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_certs.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_certs.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_certs.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_certs.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_certs.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_certs.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_certs.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_cfg.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_cfg.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_cfg.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_cfg.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_keys.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_keys.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_keys.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_keys.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_keys.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_keys.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_keys.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_keys.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_lib.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_lib.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_lib.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_lib.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_lib.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_lib.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_lib.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/sec_prot_lib.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot/tls_sec_prot.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot/tls_sec_prot.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot/tls_sec_prot.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot/tls_sec_prot.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot/tls_sec_prot.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot/tls_sec_prot.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot/tls_sec_prot.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot/tls_sec_prot.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.c b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.h b/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot/tls_sec_prot_lib.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/CCM_lib/ccm_security.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CCM_lib/ccm_security.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/CCM_lib/ccm_security.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CCM_lib/ccm_security.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls_adapter.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls_adapter.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls_adapter.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls_adapter.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/Neighbor_cache/neighbor_cache.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/Neighbor_cache/neighbor_cache.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/Neighbor_cache/neighbor_cache.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/Neighbor_cache/neighbor_cache.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/Neighbor_cache/neighbor_table_definition.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/Neighbor_cache/neighbor_table_definition.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/Neighbor_cache/neighbor_table_definition.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/Neighbor_cache/neighbor_table_definition.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/README.txt b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/README.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/README.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/README.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/Makefile b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/Makefile
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/Makefile
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/Makefile
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/ns_sha256.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/ns_sha256.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/ns_sha256.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/ns_sha256.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/shalib.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/shalib.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/shalib.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/shalib.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/Trickle/trickle.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/Trickle/trickle.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/Trickle/trickle.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/Trickle/trickle.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/Trickle/trickle.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/Trickle/trickle.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/Trickle/trickle.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/Trickle/trickle.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/blacklist/blacklist.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/blacklist/blacklist.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/blacklist/blacklist.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/blacklist/blacklist.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/blacklist/blacklist.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/blacklist/blacklist.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/blacklist/blacklist.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/blacklist/blacklist.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/etx/etx.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/etx/etx.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/etx/etx.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/etx/etx.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/etx/etx.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/etx/etx.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/etx/etx.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/etx/etx.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_functions.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_functions.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_functions.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_functions.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_functions.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_functions.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_functions.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_functions.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_list.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_list.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_list.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_list.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_list.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_list.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_list.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_list.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_channel.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_channel.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_channel.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_channel.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_channel.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_channel.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_channel.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_channel.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_common.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_common.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_common.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_common.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_common.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_common.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_common.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_common.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_configuration_interface.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_configuration_interface.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_configuration_interface.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_configuration_interface.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_statistics.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_statistics.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_statistics.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_statistics.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_statistics.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_statistics.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_statistics.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_statistics.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_test_api.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_test_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_test_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_test_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_ws.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_ws.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_ws.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_ws.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_ws.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_ws.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_ws.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_ws.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_ws_empty_functions.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_ws_empty_functions.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_ws_empty_functions.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_ws_empty_functions.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/fnv_hash/fnv_hash.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fnv_hash/fnv_hash.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/fnv_hash/fnv_hash.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fnv_hash/fnv_hash.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/fnv_hash/fnv_hash.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fnv_hash/fnv_hash.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/fnv_hash/fnv_hash.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fnv_hash/fnv_hash.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/hmac/hmac_sha1.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/hmac/hmac_sha1.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/hmac/hmac_sha1.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/hmac/hmac_sha1.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/hmac/hmac_sha1.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/hmac/hmac_sha1.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/hmac/hmac_sha1.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/hmac/hmac_sha1.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/ieee_802_11/ieee_802_11.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/ieee_802_11/ieee_802_11.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/ieee_802_11/ieee_802_11.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/ieee_802_11/ieee_802_11.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/ieee_802_11/ieee_802_11.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/ieee_802_11/ieee_802_11.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/ieee_802_11/ieee_802_11.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/ieee_802_11/ieee_802_11.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/load_balance/load_balance.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/load_balance/load_balance.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/load_balance/load_balance.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/load_balance/load_balance.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/load_balance/load_balance_api.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/load_balance/load_balance_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/load_balance/load_balance_api.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/load_balance/load_balance_api.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mac_neighbor_table/mac_neighbor_table.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mac_neighbor_table/mac_neighbor_table.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mac_neighbor_table/mac_neighbor_table.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mac_neighbor_table/mac_neighbor_table.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mac_neighbor_table/mac_neighbor_table.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mac_neighbor_table/mac_neighbor_table.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mac_neighbor_table/mac_neighbor_table.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mac_neighbor_table/mac_neighbor_table.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/README.txt b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/README.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/README.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/README.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_license.txt b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_license.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_license.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_license.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/fnet.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/fnet.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/fnet.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/fnet.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/fnet_config.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/fnet_config.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/fnet_config.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/fnet_config.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp_config.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp_config.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp_config.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp_config.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/cpu/fnet_cpu.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/cpu/fnet_cpu.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/cpu/fnet_cpu.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/cpu/fnet_cpu.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns_config.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns_config.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns_config.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns_config.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns_prv.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns_prv.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns_prv.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns_prv.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services_config.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services_config.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services_config.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services_config.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns_config.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns_config.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns_config.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns_config.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial_config.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial_config.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial_config.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial_config.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_arp.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_arp.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_arp.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_arp.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_assert.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_assert.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_assert.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_assert.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_debug.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_debug.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_debug.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_debug.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_error.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_error.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_error.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_error.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_eth.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_eth.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_eth.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_eth.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_icmp6.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_icmp6.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_icmp6.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_icmp6.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_inet.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_inet.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_inet.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_inet.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_ip.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_ip.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_ip.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_ip.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_ip6.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_ip6.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_ip6.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_ip6.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_isr.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_isr.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_isr.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_isr.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_mempool.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_mempool.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_mempool.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_mempool.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_nd6.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_nd6.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_nd6.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_nd6.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netbuf.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netbuf.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netbuf.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netbuf.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netif.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netif.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netif.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netif.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netif_prv.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netif_prv.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netif_prv.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netif_prv.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_socket.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_socket.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_socket.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_socket.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stack.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stack.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stack.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stack.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stack_config.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stack_config.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stack_config.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stack_config.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_timer.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_timer.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_timer.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_timer.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_timer_prv.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_timer_prv.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_timer_prv.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_timer_prv.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/readme.txt b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/readme.txt
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/readme.txt
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/readme.txt
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet_user_config.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet_user_config.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet_user_config.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet_user_config.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_events.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_events.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_events.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_events.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_events.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_events.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_events.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_events.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_port.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_port.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_port.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_port.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_types.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_types.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_types.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_types.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_mdns_api.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_mdns_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_mdns_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_mdns_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_api.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_api.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_api.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_buffer.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_buffer.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_buffer.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_buffer.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_buffer.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_buffer.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_buffer.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_buffer.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_counter_table.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_counter_table.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_counter_table.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_counter_table.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_counter_table.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_counter_table.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_counter_table.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_frame_counter_table.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_interface.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_interface.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_interface.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_interface.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_interface.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_interface.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_interface.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_interface.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_security.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_security.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_security.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_security.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_security.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_security.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_security.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_security.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/nd_proxy/nd_proxy.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/nd_proxy/nd_proxy.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/nd_proxy/nd_proxy.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/nd_proxy/nd_proxy.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/nd_proxy/nd_proxy.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/nd_proxy/nd_proxy.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/nd_proxy/nd_proxy.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/nd_proxy/nd_proxy.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/nist_aes_kw/nist_aes_kw.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/nist_aes_kw/nist_aes_kw.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/nist_aes_kw/nist_aes_kw.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/nist_aes_kw/nist_aes_kw.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/nist_aes_kw/nist_aes_kw.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/nist_aes_kw/nist_aes_kw.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/nist_aes_kw/nist_aes_kw.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/nist_aes_kw/nist_aes_kw.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/pan_blacklist/pan_blacklist.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/pan_blacklist/pan_blacklist.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/pan_blacklist/pan_blacklist.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/pan_blacklist/pan_blacklist.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/pan_blacklist/pan_blacklist_api.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/pan_blacklist/pan_blacklist_api.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/pan_blacklist/pan_blacklist_api.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/pan_blacklist/pan_blacklist_api.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/isqrt.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/utils/isqrt.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/isqrt.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/utils/isqrt.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/isqrt.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/utils/isqrt.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/isqrt.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/utils/isqrt.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_conf.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_conf.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_conf.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_conf.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_crc.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_crc.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_crc.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_crc.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_crc.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_crc.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_crc.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_crc.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_file.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_file.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_file.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_file.h
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_file_system.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_file_system.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_file_system.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_file_system.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/whiteboard/whiteboard.c b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/whiteboard/whiteboard.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/whiteboard/whiteboard.c
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/whiteboard/whiteboard.c
diff --git a/features/nanostack/sal-stack-nanostack/source/Service_Libs/whiteboard/whiteboard.h b/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/whiteboard/whiteboard.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/Service_Libs/whiteboard/whiteboard.h
rename to connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/whiteboard/whiteboard.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/base/cfg_ethernet.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_ethernet.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/base/cfg_ethernet.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_ethernet.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/base/cfg_local_socket.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_local_socket.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/base/cfg_local_socket.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_local_socket.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/base/cfg_lowpan_border_router.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_lowpan_border_router.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/base/cfg_lowpan_border_router.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_lowpan_border_router.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/base/cfg_lowpan_host.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_lowpan_host.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/base/cfg_lowpan_host.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_lowpan_host.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/base/cfg_lowpan_router.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_lowpan_router.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/base/cfg_lowpan_router.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_lowpan_router.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/base/cfg_rf_tunnel.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_rf_tunnel.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/base/cfg_rf_tunnel.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_rf_tunnel.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_border_router.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_border_router.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_border_router.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_border_router.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_end_device.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_end_device.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_end_device.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_end_device.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_full_end_device.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_full_end_device.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_full_end_device.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_full_end_device.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_router.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_router.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_router.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_thread_router.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/base/cfg_ws_border_router.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_ws_border_router.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/base/cfg_ws_border_router.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_ws_border_router.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/base/cfg_ws_router.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_ws_router.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/base/cfg_ws_router.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/base/cfg_ws_router.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_ethernet_host.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_ethernet_host.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_ethernet_host.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_ethernet_host.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_generic.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_generic.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_generic.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_generic.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router_rf_tunnel.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router_rf_tunnel.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router_rf_tunnel.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router_rf_tunnel.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc_release.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc_release.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc_release.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc_release.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_host.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_host.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_host.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_host.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_router.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_router.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_router.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_router.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_router_ecc.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_router_ecc.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_router_ecc.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_router_ecc.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_router_ecc_release.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_router_ecc_release.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_router_ecc_release.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_router_ecc_release.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_nanostack_full.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_nanostack_full.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_nanostack_full.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_nanostack_full.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_nanostack_full_debug.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_nanostack_full_debug.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_nanostack_full_debug.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_nanostack_full_debug.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_rf_interface.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_rf_interface.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_rf_interface.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_rf_interface.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_thread_border_router.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_thread_border_router.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_thread_border_router.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_thread_border_router.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_thread_end_device.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_thread_end_device.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_thread_end_device.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_thread_end_device.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_thread_full_end_device.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_thread_full_end_device.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_thread_full_end_device.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_thread_full_end_device.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_thread_router.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_thread_router.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_thread_router.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_thread_router.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_thread_thci.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_thread_thci.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_thread_thci.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_thread_thci.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_ws_border_router.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_ws_border_router.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_ws_border_router.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_ws_border_router.h
diff --git a/features/nanostack/sal-stack-nanostack/source/configs/cfg_ws_router.h b/connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_ws_router.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/configs/cfg_ws_router.h
rename to connectivity/nanostack/sal-stack-nanostack/source/configs/cfg_ws_router.h
diff --git a/features/nanostack/sal-stack-nanostack/source/ipv6_stack/ipv6_routing_table.c b/connectivity/nanostack/sal-stack-nanostack/source/ipv6_stack/ipv6_routing_table.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/ipv6_stack/ipv6_routing_table.c
rename to connectivity/nanostack/sal-stack-nanostack/source/ipv6_stack/ipv6_routing_table.c
diff --git a/features/nanostack/sal-stack-nanostack/source/ipv6_stack/ipv6_routing_table.h b/connectivity/nanostack/sal-stack-nanostack/source/ipv6_stack/ipv6_routing_table.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/ipv6_stack/ipv6_routing_table.h
rename to connectivity/nanostack/sal-stack-nanostack/source/ipv6_stack/ipv6_routing_table.h
diff --git a/features/nanostack/sal-stack-nanostack/source/ipv6_stack/protocol_ipv6.c b/connectivity/nanostack/sal-stack-nanostack/source/ipv6_stack/protocol_ipv6.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/ipv6_stack/protocol_ipv6.c
rename to connectivity/nanostack/sal-stack-nanostack/source/ipv6_stack/protocol_ipv6.c
diff --git a/features/nanostack/sal-stack-nanostack/source/ipv6_stack/protocol_ipv6.h b/connectivity/nanostack/sal-stack-nanostack/source/ipv6_stack/protocol_ipv6.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/ipv6_stack/protocol_ipv6.h
rename to connectivity/nanostack/sal-stack-nanostack/source/ipv6_stack/protocol_ipv6.h
diff --git a/features/nanostack/sal-stack-nanostack/source/libDHCPv6/dhcp_service_api.c b/connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/dhcp_service_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/libDHCPv6/dhcp_service_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/dhcp_service_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6.c b/connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6.c
rename to connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6.c
diff --git a/features/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6.h b/connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6.h
rename to connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6.h
diff --git a/features/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6_server.c b/connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6_server.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6_server.c
rename to connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6_server.c
diff --git a/features/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6_server.h b/connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6_server.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6_server.h
rename to connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6_server.h
diff --git a/features/nanostack/sal-stack-nanostack/source/libNET/src/multicast_api.c b/connectivity/nanostack/sal-stack-nanostack/source/libNET/src/multicast_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/libNET/src/multicast_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/libNET/src/multicast_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/libNET/src/net_6lowpan_parameter_api.c b/connectivity/nanostack/sal-stack-nanostack/source/libNET/src/net_6lowpan_parameter_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/libNET/src/net_6lowpan_parameter_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/libNET/src/net_6lowpan_parameter_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/libNET/src/net_ipv6.c b/connectivity/nanostack/sal-stack-nanostack/source/libNET/src/net_ipv6.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/libNET/src/net_ipv6.c
rename to connectivity/nanostack/sal-stack-nanostack/source/libNET/src/net_ipv6.c
diff --git a/features/nanostack/sal-stack-nanostack/source/libNET/src/net_load_balance.c b/connectivity/nanostack/sal-stack-nanostack/source/libNET/src/net_load_balance.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/libNET/src/net_load_balance.c
rename to connectivity/nanostack/sal-stack-nanostack/source/libNET/src/net_load_balance.c
diff --git a/features/nanostack/sal-stack-nanostack/source/libNET/src/net_load_balance_internal.h b/connectivity/nanostack/sal-stack-nanostack/source/libNET/src/net_load_balance_internal.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/libNET/src/net_load_balance_internal.h
rename to connectivity/nanostack/sal-stack-nanostack/source/libNET/src/net_load_balance_internal.h
diff --git a/features/nanostack/sal-stack-nanostack/source/libNET/src/net_mle.c b/connectivity/nanostack/sal-stack-nanostack/source/libNET/src/net_mle.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/libNET/src/net_mle.c
rename to connectivity/nanostack/sal-stack-nanostack/source/libNET/src/net_mle.c
diff --git a/features/nanostack/sal-stack-nanostack/source/libNET/src/net_rpl.c b/connectivity/nanostack/sal-stack-nanostack/source/libNET/src/net_rpl.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/libNET/src/net_rpl.c
rename to connectivity/nanostack/sal-stack-nanostack/source/libNET/src/net_rpl.c
diff --git a/features/nanostack/sal-stack-nanostack/source/libNET/src/net_short_address_extension.c b/connectivity/nanostack/sal-stack-nanostack/source/libNET/src/net_short_address_extension.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/libNET/src/net_short_address_extension.c
rename to connectivity/nanostack/sal-stack-nanostack/source/libNET/src/net_short_address_extension.c
diff --git a/features/nanostack/sal-stack-nanostack/source/libNET/src/net_test.c b/connectivity/nanostack/sal-stack-nanostack/source/libNET/src/net_test.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/libNET/src/net_test.c
rename to connectivity/nanostack/sal-stack-nanostack/source/libNET/src/net_test.c
diff --git a/features/nanostack/sal-stack-nanostack/source/libNET/src/ns_net.c b/connectivity/nanostack/sal-stack-nanostack/source/libNET/src/ns_net.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/libNET/src/ns_net.c
rename to connectivity/nanostack/sal-stack-nanostack/source/libNET/src/ns_net.c
diff --git a/features/nanostack/sal-stack-nanostack/source/libNET/src/socket_api.c b/connectivity/nanostack/sal-stack-nanostack/source/libNET/src/socket_api.c
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/libNET/src/socket_api.c
rename to connectivity/nanostack/sal-stack-nanostack/source/libNET/src/socket_api.c
diff --git a/features/nanostack/sal-stack-nanostack/source/nsconfig.h b/connectivity/nanostack/sal-stack-nanostack/source/nsconfig.h
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/source/nsconfig.h
rename to connectivity/nanostack/sal-stack-nanostack/source/nsconfig.h
diff --git a/features/nanostack/sal-stack-nanostack/sources.mk b/connectivity/nanostack/sal-stack-nanostack/sources.mk
similarity index 100%
rename from features/nanostack/sal-stack-nanostack/sources.mk
rename to connectivity/nanostack/sal-stack-nanostack/sources.mk
diff --git a/features/nanostack/nanostack-interface/Nanostack.cpp b/connectivity/nanostack/source/Nanostack.cpp
similarity index 100%
rename from features/nanostack/nanostack-interface/Nanostack.cpp
rename to connectivity/nanostack/source/Nanostack.cpp
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/.cproject b/features/nanostack/sal-stack-nanostack-eventloop/.cproject
deleted file mode 100644
index c41e8ee746..0000000000
--- a/features/nanostack/sal-stack-nanostack-eventloop/.cproject
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="cdt.managedbuild.toolchain.gnu.cross.base.1189539176">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.cross.base.1189539176" moduleId="org.eclipse.cdt.core.settings" name="ArmCC Cortex-M3">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.ui.ArmCC Error Parser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="" artifactName="eventOS" buildProperties="" description="" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.ui.ArmCC Error Parser;org.eclipse.cdt.core.VCErrorParser" id="cdt.managedbuild.toolchain.gnu.cross.base.1189539176" name="ArmCC Cortex-M3" parent="org.eclipse.cdt.build.core.emptycfg" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="" prebuildStep="">
-					<folderInfo id="cdt.managedbuild.toolchain.gnu.cross.base.1189539176.1169351817" name="/" resourcePath="">
-						<toolChain errorParsers="" id="cdt.managedbuild.toolchain.gnu.cross.base.367759647" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base">
-							<option id="cdt.managedbuild.option.gnu.cross.prefix.660991130" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/>
-							<option id="cdt.managedbuild.option.gnu.cross.path.331710635" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.1196089708" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
-							<builder buildPath="${workspace_loc:/eventOS}/" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.CWDLocator" id="cdt.managedbuild.builder.gnu.cross.836533860" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.builder.gnu.cross"/>
-							<tool errorParsers="" id="cdt.managedbuild.tool.gnu.cross.c.compiler.499691915" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
-								<option id="gnu.c.compiler.option.include.paths.1009581990" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${ARMCC_INCLUDE}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/libService/libService}&quot;"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.490997078" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.146498331" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler"/>
-							<tool errorParsers="org.eclipse.cdt.core.GLDErrorParser" id="cdt.managedbuild.tool.gnu.cross.c.linker.559644121" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker">
-								<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1546200009" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.756120679" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker"/>
-							<tool id="cdt.managedbuild.tool.gnu.cross.archiver.360501954" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
-							<tool errorParsers="org.eclipse.cdt.core.GASErrorParser" id="cdt.managedbuild.tool.gnu.cross.assembler.1933431042" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1501463266" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-		<cconfiguration id="cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087" moduleId="org.eclipse.cdt.core.settings" name="ArmCC Cortex-M0">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.ui.ArmCC Error Parser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="" artifactName="eventOS" buildProperties="" description="" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.ui.ArmCC Error Parser;org.eclipse.cdt.core.VCErrorParser" id="cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087" name="ArmCC Cortex-M0" parent="org.eclipse.cdt.build.core.emptycfg" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="" prebuildStep="">
-					<folderInfo id="cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087." name="/" resourcePath="">
-						<toolChain errorParsers="" id="cdt.managedbuild.toolchain.gnu.cross.base.1138059958" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base">
-							<option id="cdt.managedbuild.option.gnu.cross.prefix.2105129213" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/>
-							<option id="cdt.managedbuild.option.gnu.cross.path.1568321385" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.282790878" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
-							<builder buildPath="${workspace_loc:/eventOS}/" enabledIncrementalBuild="true" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.CWDLocator" id="cdt.managedbuild.builder.gnu.cross.1363458610" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.builder.gnu.cross"/>
-							<tool errorParsers="" id="cdt.managedbuild.tool.gnu.cross.c.compiler.435164393" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
-								<option id="gnu.c.compiler.option.include.paths.241649509" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${ARMCC_INCLUDE}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/libService/libService}&quot;"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1949795978" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.527027148" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler"/>
-							<tool errorParsers="org.eclipse.cdt.core.GLDErrorParser" id="cdt.managedbuild.tool.gnu.cross.c.linker.128423528" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker">
-								<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1297698567" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.180972500" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker"/>
-							<tool id="cdt.managedbuild.tool.gnu.cross.archiver.1580602139" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
-							<tool errorParsers="org.eclipse.cdt.core.GASErrorParser" id="cdt.managedbuild.tool.gnu.cross.assembler.2001265995" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.2135227594" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-		<cconfiguration id="0.2056004298.141662914.2121498000">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.2056004298.141662914.2121498000" moduleId="org.eclipse.cdt.core.settings" name="GCC Cortex-M3">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="eventOS" buildProperties="" description="" id="0.2056004298.141662914.2121498000" name="GCC Cortex-M3" parent="org.eclipse.cdt.build.core.prefbase.cfg">
-					<folderInfo id="0.2056004298.141662914.2121498000." name="/" resourcePath="">
-						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.918568439" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
-							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.918568439.1607495802" name=""/>
-							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1058540032" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1807153236" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.1080063132" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1969769389" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-							</tool>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.1385174078" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1768833971" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-							</tool>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.991434917" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1850008051" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-		<cconfiguration id="0.2056004298.141662914.2121498000.642060230">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.2056004298.141662914.2121498000.642060230" moduleId="org.eclipse.cdt.core.settings" name="GCC Cortex-M0">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="eventOS" buildProperties="" description="" id="0.2056004298.141662914.2121498000.642060230" name="GCC Cortex-M0" parent="org.eclipse.cdt.build.core.prefbase.cfg">
-					<folderInfo id="0.2056004298.141662914.2121498000.642060230." name="/" resourcePath="">
-						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.387353475" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
-							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.387353475.888485765" name=""/>
-							<builder id="org.eclipse.cdt.build.core.settings.default.builder.48511333" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.770690623" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.798622084" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1838730947" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-							</tool>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.1622459001" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1547926363" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-							</tool>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.1687578706" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1372610724" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-		<cconfiguration id="0.2056004298.141662914.1517984773.801758434.1788862897">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.2056004298.141662914.1517984773.801758434.1788862897" moduleId="org.eclipse.cdt.core.settings" name="GCC Native">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration buildProperties="" description="" id="0.2056004298.141662914.1517984773.801758434.1788862897" name="GCC Native" parent="org.eclipse.cdt.build.core.prefbase.cfg">
-					<folderInfo id="0.2056004298.141662914.1517984773.801758434.1788862897." name="/" resourcePath="">
-						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1101544598" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
-							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1101544598.1141380045" name=""/>
-							<builder enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.1381778143" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.225856136" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.224867602" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.107634360" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-							</tool>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.1754316635" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.2029105652" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-							</tool>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.356296733" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.75316590" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="eventOS.null.931576544" name="eventOS"/>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="ArmCC Cortex-M3">
-			<resource resourceType="PROJECT" workspacePath="/event_loop"/>
-		</configuration>
-		<configuration configurationName="GCC Cortex-M0"/>
-		<configuration configurationName="ArmCC Cortex-M0"/>
-		<configuration configurationName="GCC Native"/>
-		<configuration configurationName="GCC Cortex-M3"/>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.1189539176;cdt.managedbuild.toolchain.gnu.cross.base.1189539176.1169351817;cdt.managedbuild.tool.gnu.cross.c.compiler.1945983959;cdt.managedbuild.tool.gnu.c.compiler.input.2069091467">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.lib.debug.1529538572;cdt.managedbuild.config.gnu.cross.lib.debug.1529538572.;cdt.managedbuild.tool.gnu.cross.c.compiler.859614738;cdt.managedbuild.tool.gnu.c.compiler.input.1960426387">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.1189539176;cdt.managedbuild.toolchain.gnu.cross.base.1189539176.1169351817;cdt.managedbuild.tool.gnu.cross.c.compiler.896320276;cdt.managedbuild.tool.gnu.c.compiler.input.1344565279">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.1189539176;cdt.managedbuild.toolchain.gnu.cross.base.1189539176.1169351817;cdt.managedbuild.tool.gnu.cross.c.compiler.499691915;cdt.managedbuild.tool.gnu.c.compiler.input.490997078">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="0.2056004298.141662914.2121498000">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.lib.release.1360582973;cdt.managedbuild.config.gnu.cross.lib.release.1360582973.;cdt.managedbuild.tool.gnu.cross.c.compiler.59710629;cdt.managedbuild.tool.gnu.c.compiler.input.260467457">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-</cproject>
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/.project b/features/nanostack/sal-stack-nanostack-eventloop/.project
deleted file mode 100644
index b2d4cf5ac4..0000000000
--- a/features/nanostack/sal-stack-nanostack-eventloop/.project
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>eventOS</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>?name?</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.append_environment</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.buildArguments</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.buildCommand</key>
-					<value>make</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.buildLocation</key>
-					<value>${workspace_loc:/event_loop/Debug}</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
-					<value>clean</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.contents</key>
-					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
-					<value>false</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.stopOnError</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-					<value>true</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/.settings/org.eclipse.cdt.codan.core.prefs b/features/nanostack/sal-stack-nanostack-eventloop/.settings/org.eclipse.cdt.codan.core.prefs
deleted file mode 100644
index 77386c23cb..0000000000
--- a/features/nanostack/sal-stack-nanostack-eventloop/.settings/org.eclipse.cdt.codan.core.prefs
+++ /dev/null
@@ -1,67 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.cdt.codan.checkers.errnoreturn=Warning
-org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.checkers.errreturnvalue=Error
-org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.checkers.noreturn=Error
-org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=Error
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=Error
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=Error
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>false,empty_case_param\=>false}
-org.eclipse.cdt.codan.internal.checkers.CatchByReference=Warning
-org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=Error
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=Warning
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true}
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments=Error
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=Error
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=Error
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=Error
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem=Error
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=Error
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false}
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false}
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")}
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
diff --git a/features/nanostack/sal-stack-nanostack-eventloop/.settings/org.eclipse.cdt.core.prefs b/features/nanostack/sal-stack-nanostack-eventloop/.settings/org.eclipse.cdt.core.prefs
deleted file mode 100644
index 2eaccaf10b..0000000000
--- a/features/nanostack/sal-stack-nanostack-eventloop/.settings/org.eclipse.cdt.core.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-eclipse.preferences.version=1
-environment/project/0.2056004298.141662914.1517984773.801758434.1788862897/CC/delimiter=;
-environment/project/0.2056004298.141662914.1517984773.801758434.1788862897/CC/operation=append
-environment/project/0.2056004298.141662914.1517984773.801758434.1788862897/CC/value=gcc
-environment/project/0.2056004298.141662914.1517984773.801758434.1788862897/V/delimiter=;
-environment/project/0.2056004298.141662914.1517984773.801758434.1788862897/V/operation=append
-environment/project/0.2056004298.141662914.1517984773.801758434.1788862897/V/value=1
-environment/project/0.2056004298.141662914.1517984773.801758434.1788862897/append=true
-environment/project/0.2056004298.141662914.1517984773.801758434.1788862897/appendContributed=true
-environment/project/0.2056004298.141662914.2121498000.642060230/CPU/delimiter=;
-environment/project/0.2056004298.141662914.2121498000.642060230/CPU/operation=replace
-environment/project/0.2056004298.141662914.2121498000.642060230/CPU/value=Cortex-M0
-environment/project/0.2056004298.141662914.2121498000.642060230/DEBUG/delimiter=;
-environment/project/0.2056004298.141662914.2121498000.642060230/DEBUG/operation=replace
-environment/project/0.2056004298.141662914.2121498000.642060230/DEBUG/value=1
-environment/project/0.2056004298.141662914.2121498000.642060230/PLATFORM/delimiter=;
-environment/project/0.2056004298.141662914.2121498000.642060230/PLATFORM/operation=append
-environment/project/0.2056004298.141662914.2121498000.642060230/PLATFORM/value=arm-unknown-linux-uclibcgnueabi-
-environment/project/0.2056004298.141662914.2121498000.642060230/V/delimiter=;
-environment/project/0.2056004298.141662914.2121498000.642060230/V/operation=append
-environment/project/0.2056004298.141662914.2121498000.642060230/V/value=1
-environment/project/0.2056004298.141662914.2121498000.642060230/append=true
-environment/project/0.2056004298.141662914.2121498000.642060230/appendContributed=true
-environment/project/0.2056004298.141662914.2121498000/CPU/delimiter=;
-environment/project/0.2056004298.141662914.2121498000/CPU/operation=append
-environment/project/0.2056004298.141662914.2121498000/CPU/value=Cortex-M3
-environment/project/0.2056004298.141662914.2121498000/PLATFORM/delimiter=;
-environment/project/0.2056004298.141662914.2121498000/PLATFORM/operation=append
-environment/project/0.2056004298.141662914.2121498000/PLATFORM/value=arm-unknown-linux-uclibcgnueabi-
-environment/project/0.2056004298.141662914.2121498000/V/delimiter=;
-environment/project/0.2056004298.141662914.2121498000/V/operation=append
-environment/project/0.2056004298.141662914.2121498000/V/value=1
-environment/project/0.2056004298.141662914.2121498000/append=true
-environment/project/0.2056004298.141662914.2121498000/appendContributed=true
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087/CC/delimiter=;
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087/CC/operation=replace
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087/CC/value=armcc
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087/CONFIG/delimiter=;
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087/CONFIG/operation=replace
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087/CONFIG/value=generic
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087/CPU/delimiter=;
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087/CPU/operation=replace
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087/CPU/value=Cortex-M0
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087/DEBUG/delimiter=;
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087/DEBUG/operation=replace
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087/DEBUG/value=1
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087/V/delimiter=;
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087/V/operation=append
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087/V/value=1
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087/append=true
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176.535362087/appendContributed=true
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176/CC/delimiter=;
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176/CC/operation=replace
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176/CC/value=armcc
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176/CPU/delimiter=;
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176/CPU/operation=append
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176/CPU/value=Cortex-M3
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176/DEBUG/delimiter=;
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176/DEBUG/operation=replace
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176/DEBUG/value=1
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176/V/delimiter=;
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176/V/operation=append
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176/V/value=1
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176/append=true
-environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1189539176/appendContributed=true