diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/.gitignore b/features/nanostack/coap-service/.gitignore
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/.gitignore
rename to features/nanostack/coap-service/.gitignore
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/.mbedignore b/features/nanostack/coap-service/.mbedignore
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/.mbedignore
rename to features/nanostack/coap-service/.mbedignore
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/LICENSE b/features/nanostack/coap-service/LICENSE
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/LICENSE
rename to features/nanostack/coap-service/LICENSE
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/Makefile b/features/nanostack/coap-service/Makefile
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/Makefile
rename to features/nanostack/coap-service/Makefile
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/Makefile.test b/features/nanostack/coap-service/Makefile.test
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/Makefile.test
rename to features/nanostack/coap-service/Makefile.test
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/apache-2.0.txt b/features/nanostack/coap-service/apache-2.0.txt
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/apache-2.0.txt
rename to features/nanostack/coap-service/apache-2.0.txt
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/coap-service/coap_service_api.h b/features/nanostack/coap-service/coap-service/coap_service_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/coap-service/coap_service_api.h
rename to features/nanostack/coap-service/coap-service/coap_service_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/junit_xsl.xslt b/features/nanostack/coap-service/junit_xsl.xslt
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/junit_xsl.xslt
rename to features/nanostack/coap-service/junit_xsl.xslt
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/run_unit_tests.sh b/features/nanostack/coap-service/run_unit_tests.sh
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/run_unit_tests.sh
rename to features/nanostack/coap-service/run_unit_tests.sh
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_connection_handler.c b/features/nanostack/coap-service/source/coap_connection_handler.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_connection_handler.c
rename to features/nanostack/coap-service/source/coap_connection_handler.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_message_handler.c b/features/nanostack/coap-service/source/coap_message_handler.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_message_handler.c
rename to features/nanostack/coap-service/source/coap_message_handler.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_security_handler.c b/features/nanostack/coap-service/source/coap_security_handler.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_security_handler.c
rename to features/nanostack/coap-service/source/coap_security_handler.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_service_api.c b/features/nanostack/coap-service/source/coap_service_api.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_service_api.c
rename to features/nanostack/coap-service/source/coap_service_api.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/source/include/coap_connection_handler.h b/features/nanostack/coap-service/source/include/coap_connection_handler.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/source/include/coap_connection_handler.h
rename to features/nanostack/coap-service/source/include/coap_connection_handler.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/source/include/coap_message_handler.h b/features/nanostack/coap-service/source/include/coap_message_handler.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/source/include/coap_message_handler.h
rename to features/nanostack/coap-service/source/include/coap_message_handler.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/source/include/coap_security_handler.h b/features/nanostack/coap-service/source/include/coap_security_handler.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/source/include/coap_security_handler.h
rename to features/nanostack/coap-service/source/include/coap_security_handler.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/source/include/coap_service_api_internal.h b/features/nanostack/coap-service/source/include/coap_service_api_internal.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/source/include/coap_service_api_internal.h
rename to features/nanostack/coap-service/source/include/coap_service_api_internal.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/Makefile b/features/nanostack/coap-service/test/coap-service/unittest/Makefile
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/Makefile
rename to features/nanostack/coap-service/test/coap-service/unittest/Makefile
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/MakefileWorker.mk b/features/nanostack/coap-service/test/coap-service/unittest/MakefileWorker.mk
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/MakefileWorker.mk
rename to features/nanostack/coap-service/test/coap-service/unittest/MakefileWorker.mk
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_connection_handler/Makefile b/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/Makefile
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_connection_handler/Makefile
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/Makefile
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_connection_handler/coap_connection_handlertest.cpp b/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/coap_connection_handlertest.cpp
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_connection_handler/coap_connection_handlertest.cpp
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/coap_connection_handlertest.cpp
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_connection_handler/main.cpp b/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/main.cpp
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_connection_handler/main.cpp
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/main.cpp
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.c b/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.c
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.h b/features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.h
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_message_handler/Makefile b/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/Makefile
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_message_handler/Makefile
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/Makefile
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_message_handler/coap_message_handlertest.cpp b/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/coap_message_handlertest.cpp
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_message_handler/coap_message_handlertest.cpp
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/coap_message_handlertest.cpp
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_message_handler/main.cpp b/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/main.cpp
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_message_handler/main.cpp
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/main.cpp
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.c b/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.c
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.h b/features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.h
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_message_handler/test_coap_message_handler.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_security_handler/Makefile b/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/Makefile
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_security_handler/Makefile
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/Makefile
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_security_handler/coap_security_handlertest.cpp b/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/coap_security_handlertest.cpp
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_security_handler/coap_security_handlertest.cpp
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/coap_security_handlertest.cpp
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_security_handler/main.cpp b/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/main.cpp
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_security_handler/main.cpp
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/main.cpp
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.c b/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.c
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.h b/features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.h
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_security_handler/test_coap_security_handler.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_service_api/Makefile b/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/Makefile
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_service_api/Makefile
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/Makefile
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_service_api/coap_service_apitest.cpp b/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/coap_service_apitest.cpp
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_service_api/coap_service_apitest.cpp
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/coap_service_apitest.cpp
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_service_api/main.cpp b/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/main.cpp
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_service_api/main.cpp
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/main.cpp
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.c b/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.c
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.h b/features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.h
rename to features/nanostack/coap-service/test/coap-service/unittest/coap_service_api/test_coap_service_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/makefile_defines.txt b/features/nanostack/coap-service/test/coap-service/unittest/makefile_defines.txt
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/makefile_defines.txt
rename to features/nanostack/coap-service/test/coap-service/unittest/makefile_defines.txt
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/run_tests b/features/nanostack/coap-service/test/coap-service/unittest/run_tests
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/run_tests
rename to features/nanostack/coap-service/test/coap-service/unittest/run_tests
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.c
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.h
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/coap_connection_handler_stub.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.c
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.h
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/coap_message_handler_stub.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.c
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.h
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/coap_security_handler_stub.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/coap_service_api_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/coap_service_api_stub.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/coap_service_api_stub.c
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/coap_service_api_stub.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/common_functions_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/common_functions_stub.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/common_functions_stub.c
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/common_functions_stub.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.c
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.h
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/eventOS_event_stub.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/mbed_trace_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/mbed_trace_stub.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/mbed_trace_stub.c
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/mbed_trace_stub.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/mbedtls_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/mbedtls_stub.h
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/mbedtls_stub.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/ns_list_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/ns_list_stub.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/ns_list_stub.c
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/ns_list_stub.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/ns_timer_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/ns_timer_stub.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/ns_timer_stub.c
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/ns_timer_stub.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/ns_timer_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/ns_timer_stub.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/ns_timer_stub.h
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/ns_timer_stub.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.c
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.h
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/nsdynmemLIB_stub.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/randLIB_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/randLIB_stub.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/randLIB_stub.c
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/randLIB_stub.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.c
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.h
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_builder_stub.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.c
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.h
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_parser_stub.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.c
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.h
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/sn_coap_protocol_stub.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/socket_api_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/socket_api_stub.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/socket_api_stub.c
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/socket_api_stub.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/socket_api_stub.h b/features/nanostack/coap-service/test/coap-service/unittest/stub/socket_api_stub.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/socket_api_stub.h
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/socket_api_stub.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/system_timer_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/system_timer_stub.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/system_timer_stub.c
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/system_timer_stub.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/timeout_stub.c b/features/nanostack/coap-service/test/coap-service/unittest/stub/timeout_stub.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/stub/timeout_stub.c
rename to features/nanostack/coap-service/test/coap-service/unittest/stub/timeout_stub.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/coap-service/xsl_script.sh b/features/nanostack/coap-service/xsl_script.sh
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/coap-service/xsl_script.sh
rename to features/nanostack/coap-service/xsl_script.sh
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/.gitignore b/features/nanostack/mbed-mesh-api/.gitignore
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/.gitignore
rename to features/nanostack/mbed-mesh-api/.gitignore
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/.mbedignore b/features/nanostack/mbed-mesh-api/.mbedignore
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/.mbedignore
rename to features/nanostack/mbed-mesh-api/.mbedignore
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/LICENSE b/features/nanostack/mbed-mesh-api/LICENSE
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/LICENSE
rename to features/nanostack/mbed-mesh-api/LICENSE
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/apache-2.0.txt b/features/nanostack/mbed-mesh-api/apache-2.0.txt
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/apache-2.0.txt
rename to features/nanostack/mbed-mesh-api/apache-2.0.txt
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/LoWPANNDInterface.h b/features/nanostack/mbed-mesh-api/mbed-mesh-api/LoWPANNDInterface.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/LoWPANNDInterface.h
rename to features/nanostack/mbed-mesh-api/mbed-mesh-api/LoWPANNDInterface.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h b/features/nanostack/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h
rename to features/nanostack/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/NanostackEthernetInterface.h b/features/nanostack/mbed-mesh-api/mbed-mesh-api/NanostackEthernetInterface.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/NanostackEthernetInterface.h
rename to features/nanostack/mbed-mesh-api/mbed-mesh-api/NanostackEthernetInterface.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/ThreadInterface.h b/features/nanostack/mbed-mesh-api/mbed-mesh-api/ThreadInterface.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/ThreadInterface.h
rename to features/nanostack/mbed-mesh-api/mbed-mesh-api/ThreadInterface.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/mesh_interface_types.h b/features/nanostack/mbed-mesh-api/mbed-mesh-api/mesh_interface_types.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/mesh_interface_types.h
rename to features/nanostack/mbed-mesh-api/mbed-mesh-api/mesh_interface_types.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed_lib.json b/features/nanostack/mbed-mesh-api/mbed_lib.json
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed_lib.json
rename to features/nanostack/mbed-mesh-api/mbed_lib.json
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/module.json b/features/nanostack/mbed-mesh-api/module.json
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/module.json
rename to features/nanostack/mbed-mesh-api/module.json
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/CallbackHandler.cpp b/features/nanostack/mbed-mesh-api/source/CallbackHandler.cpp
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/CallbackHandler.cpp
rename to features/nanostack/mbed-mesh-api/source/CallbackHandler.cpp
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/LoWPANNDInterface.cpp b/features/nanostack/mbed-mesh-api/source/LoWPANNDInterface.cpp
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/LoWPANNDInterface.cpp
rename to features/nanostack/mbed-mesh-api/source/LoWPANNDInterface.cpp
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/MeshInterfaceNanostack.cpp b/features/nanostack/mbed-mesh-api/source/MeshInterfaceNanostack.cpp
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/MeshInterfaceNanostack.cpp
rename to features/nanostack/mbed-mesh-api/source/MeshInterfaceNanostack.cpp
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/NanostackEthernetInterface.cpp b/features/nanostack/mbed-mesh-api/source/NanostackEthernetInterface.cpp
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/NanostackEthernetInterface.cpp
rename to features/nanostack/mbed-mesh-api/source/NanostackEthernetInterface.cpp
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/ThreadInterface.cpp b/features/nanostack/mbed-mesh-api/source/ThreadInterface.cpp
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/ThreadInterface.cpp
rename to features/nanostack/mbed-mesh-api/source/ThreadInterface.cpp
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/ethernet_tasklet.c b/features/nanostack/mbed-mesh-api/source/ethernet_tasklet.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/ethernet_tasklet.c
rename to features/nanostack/mbed-mesh-api/source/ethernet_tasklet.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/include/callback_handler.h b/features/nanostack/mbed-mesh-api/source/include/callback_handler.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/include/callback_handler.h
rename to features/nanostack/mbed-mesh-api/source/include/callback_handler.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/include/enet_tasklet.h b/features/nanostack/mbed-mesh-api/source/include/enet_tasklet.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/include/enet_tasklet.h
rename to features/nanostack/mbed-mesh-api/source/include/enet_tasklet.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/include/mesh_system.h b/features/nanostack/mbed-mesh-api/source/include/mesh_system.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/include/mesh_system.h
rename to features/nanostack/mbed-mesh-api/source/include/mesh_system.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/include/nd_tasklet.h b/features/nanostack/mbed-mesh-api/source/include/nd_tasklet.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/include/nd_tasklet.h
rename to features/nanostack/mbed-mesh-api/source/include/nd_tasklet.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/include/thread_tasklet.h b/features/nanostack/mbed-mesh-api/source/include/thread_tasklet.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/include/thread_tasklet.h
rename to features/nanostack/mbed-mesh-api/source/include/thread_tasklet.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/mesh_system.c b/features/nanostack/mbed-mesh-api/source/mesh_system.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/mesh_system.c
rename to features/nanostack/mbed-mesh-api/source/mesh_system.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/nd_tasklet.c b/features/nanostack/mbed-mesh-api/source/nd_tasklet.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/nd_tasklet.c
rename to features/nanostack/mbed-mesh-api/source/nd_tasklet.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/thread_tasklet.c b/features/nanostack/mbed-mesh-api/source/thread_tasklet.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/thread_tasklet.c
rename to features/nanostack/mbed-mesh-api/source/thread_tasklet.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackEthernetPhy.h b/features/nanostack/nanostack-interface/NanostackEthernetPhy.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackEthernetPhy.h
rename to features/nanostack/nanostack-interface/NanostackEthernetPhy.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackInterface.cpp b/features/nanostack/nanostack-interface/NanostackInterface.cpp
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackInterface.cpp
rename to features/nanostack/nanostack-interface/NanostackInterface.cpp
diff --git a/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackInterface.h b/features/nanostack/nanostack-interface/NanostackInterface.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackInterface.h
rename to features/nanostack/nanostack-interface/NanostackInterface.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackLockGuard.h b/features/nanostack/nanostack-interface/NanostackLockGuard.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackLockGuard.h
rename to features/nanostack/nanostack-interface/NanostackLockGuard.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackPhy.h b/features/nanostack/nanostack-interface/NanostackPhy.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackPhy.h
rename to features/nanostack/nanostack-interface/NanostackPhy.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackRfPhy.h b/features/nanostack/nanostack-interface/NanostackRfPhy.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackRfPhy.h
rename to features/nanostack/nanostack-interface/NanostackRfPhy.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/.gitattributes b/features/nanostack/sal-stack-nanostack/.gitattributes
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/.gitattributes
rename to features/nanostack/sal-stack-nanostack/.gitattributes
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/.gitignore b/features/nanostack/sal-stack-nanostack/.gitignore
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/.gitignore
rename to features/nanostack/sal-stack-nanostack/.gitignore
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/.mbedignore b/features/nanostack/sal-stack-nanostack/.mbedignore
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/.mbedignore
rename to features/nanostack/sal-stack-nanostack/.mbedignore
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/DOXYGEN_FRONTPAGE.md b/features/nanostack/sal-stack-nanostack/DOXYGEN_FRONTPAGE.md
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/DOXYGEN_FRONTPAGE.md
rename to features/nanostack/sal-stack-nanostack/DOXYGEN_FRONTPAGE.md
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/Doxyfile b/features/nanostack/sal-stack-nanostack/Doxyfile
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/Doxyfile
rename to features/nanostack/sal-stack-nanostack/Doxyfile
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/LICENSE-Apache-2.0 b/features/nanostack/sal-stack-nanostack/LICENSE-Apache-2.0
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/LICENSE-Apache-2.0
rename to features/nanostack/sal-stack-nanostack/LICENSE-Apache-2.0
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/LICENSE-BSD-3-Clause b/features/nanostack/sal-stack-nanostack/LICENSE-BSD-3-Clause
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/LICENSE-BSD-3-Clause
rename to features/nanostack/sal-stack-nanostack/LICENSE-BSD-3-Clause
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/Makefile b/features/nanostack/sal-stack-nanostack/Makefile
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/Makefile
rename to features/nanostack/sal-stack-nanostack/Makefile
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/NOTICE b/features/nanostack/sal-stack-nanostack/NOTICE
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/NOTICE
rename to features/nanostack/sal-stack-nanostack/NOTICE
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/README.md b/features/nanostack/sal-stack-nanostack/README.md
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/README.md
rename to features/nanostack/sal-stack-nanostack/README.md
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/docs/img/thread_certified.png b/features/nanostack/sal-stack-nanostack/docs/img/thread_certified.png
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/docs/img/thread_certified.png
rename to features/nanostack/sal-stack-nanostack/docs/img/thread_certified.png
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/doxygen/mainpage.dox b/features/nanostack/sal-stack-nanostack/doxygen/mainpage.dox
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/doxygen/mainpage.dox
rename to features/nanostack/sal-stack-nanostack/doxygen/mainpage.dox
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/include_dirs.mk b/features/nanostack/sal-stack-nanostack/include_dirs.mk
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/include_dirs.mk
rename to features/nanostack/sal-stack-nanostack/include_dirs.mk
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/mbed_lib.json b/features/nanostack/sal-stack-nanostack/mbed_lib.json
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/mbed_lib.json
rename to features/nanostack/sal-stack-nanostack/mbed_lib.json
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/cca_api.h b/features/nanostack/sal-stack-nanostack/nanostack/cca_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/cca_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/cca_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/ccmLIB.h b/features/nanostack/sal-stack-nanostack/nanostack/ccmLIB.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/ccmLIB.h
rename to features/nanostack/sal-stack-nanostack/nanostack/ccmLIB.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/dhcp_service_api.h b/features/nanostack/sal-stack-nanostack/nanostack/dhcp_service_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/dhcp_service_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/dhcp_service_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/ethernet_mac_api.h b/features/nanostack/sal-stack-nanostack/nanostack/ethernet_mac_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/ethernet_mac_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/ethernet_mac_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/fhss_api.h b/features/nanostack/sal-stack-nanostack/nanostack/fhss_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/fhss_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/fhss_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/fhss_config.h b/features/nanostack/sal-stack-nanostack/nanostack/fhss_config.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/fhss_config.h
rename to features/nanostack/sal-stack-nanostack/nanostack/fhss_config.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/mac_api.h b/features/nanostack/sal-stack-nanostack/nanostack/mac_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/mac_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/mac_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/mac_common_defines.h b/features/nanostack/sal-stack-nanostack/nanostack/mac_common_defines.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/mac_common_defines.h
rename to features/nanostack/sal-stack-nanostack/nanostack/mac_common_defines.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/mac_filter_api.h b/features/nanostack/sal-stack-nanostack/nanostack/mac_filter_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/mac_filter_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/mac_filter_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/mac_mcps.h b/features/nanostack/sal-stack-nanostack/nanostack/mac_mcps.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/mac_mcps.h
rename to features/nanostack/sal-stack-nanostack/nanostack/mac_mcps.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/mlme.h b/features/nanostack/sal-stack-nanostack/nanostack/mlme.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/mlme.h
rename to features/nanostack/sal-stack-nanostack/nanostack/mlme.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/multicast_api.h b/features/nanostack/sal-stack-nanostack/nanostack/multicast_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/multicast_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/multicast_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_6lowpan_parameter_api.h b/features/nanostack/sal-stack-nanostack/nanostack/net_6lowpan_parameter_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_6lowpan_parameter_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/net_6lowpan_parameter_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_address_extension.h b/features/nanostack/sal-stack-nanostack/nanostack/net_address_extension.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_address_extension.h
rename to features/nanostack/sal-stack-nanostack/nanostack/net_address_extension.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_fhss.h b/features/nanostack/sal-stack-nanostack/nanostack/net_fhss.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_fhss.h
rename to features/nanostack/sal-stack-nanostack/nanostack/net_fhss.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_interface.h b/features/nanostack/sal-stack-nanostack/nanostack/net_interface.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_interface.h
rename to features/nanostack/sal-stack-nanostack/nanostack/net_interface.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_ipv6_api.h b/features/nanostack/sal-stack-nanostack/nanostack/net_ipv6_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_ipv6_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/net_ipv6_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_load_balance_api.h b/features/nanostack/sal-stack-nanostack/nanostack/net_load_balance_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_load_balance_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/net_load_balance_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_mle_api.h b/features/nanostack/sal-stack-nanostack/nanostack/net_mle_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_mle_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/net_mle_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_nvm_api.h b/features/nanostack/sal-stack-nanostack/nanostack/net_nvm_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_nvm_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/net_nvm_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_nwk_scan.h b/features/nanostack/sal-stack-nanostack/nanostack/net_nwk_scan.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_nwk_scan.h
rename to features/nanostack/sal-stack-nanostack/nanostack/net_nwk_scan.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_pana_parameters_api.h b/features/nanostack/sal-stack-nanostack/nanostack/net_pana_parameters_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_pana_parameters_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/net_pana_parameters_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_polling_api.h b/features/nanostack/sal-stack-nanostack/nanostack/net_polling_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_polling_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/net_polling_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_rpl.h b/features/nanostack/sal-stack-nanostack/nanostack/net_rpl.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_rpl.h
rename to features/nanostack/sal-stack-nanostack/nanostack/net_rpl.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_sleep.h b/features/nanostack/sal-stack-nanostack/nanostack/net_sleep.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_sleep.h
rename to features/nanostack/sal-stack-nanostack/nanostack/net_sleep.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_test_api.h b/features/nanostack/sal-stack-nanostack/nanostack/net_test_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_test_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/net_test_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_thread_test.h b/features/nanostack/sal-stack-nanostack/nanostack/net_thread_test.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/net_thread_test.h
rename to features/nanostack/sal-stack-nanostack/nanostack/net_thread_test.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/ns_address.h b/features/nanostack/sal-stack-nanostack/nanostack/ns_address.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/ns_address.h
rename to features/nanostack/sal-stack-nanostack/nanostack/ns_address.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/ns_file_system.h b/features/nanostack/sal-stack-nanostack/nanostack/ns_file_system.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/ns_file_system.h
rename to features/nanostack/sal-stack-nanostack/nanostack/ns_file_system.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/ns_mdns_api.h b/features/nanostack/sal-stack-nanostack/nanostack/ns_mdns_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/ns_mdns_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/ns_mdns_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/ns_sha256.h b/features/nanostack/sal-stack-nanostack/nanostack/ns_sha256.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/ns_sha256.h
rename to features/nanostack/sal-stack-nanostack/nanostack/ns_sha256.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/ns_virtual_rf_api.h b/features/nanostack/sal-stack-nanostack/nanostack/ns_virtual_rf_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/ns_virtual_rf_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/ns_virtual_rf_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/nwk_stats_api.h b/features/nanostack/sal-stack-nanostack/nanostack/nwk_stats_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/nwk_stats_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/nwk_stats_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/platform/arm_hal_aes.h b/features/nanostack/sal-stack-nanostack/nanostack/platform/arm_hal_aes.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/platform/arm_hal_aes.h
rename to features/nanostack/sal-stack-nanostack/nanostack/platform/arm_hal_aes.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/platform/arm_hal_phy.h b/features/nanostack/sal-stack-nanostack/nanostack/platform/arm_hal_phy.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/platform/arm_hal_phy.h
rename to features/nanostack/sal-stack-nanostack/nanostack/platform/arm_hal_phy.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/platform/os_whiteboard.h b/features/nanostack/sal-stack-nanostack/nanostack/platform/os_whiteboard.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/platform/os_whiteboard.h
rename to features/nanostack/sal-stack-nanostack/nanostack/platform/os_whiteboard.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/platform/topo_trace.h b/features/nanostack/sal-stack-nanostack/nanostack/platform/topo_trace.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/platform/topo_trace.h
rename to features/nanostack/sal-stack-nanostack/nanostack/platform/topo_trace.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/serial_mac_api.h b/features/nanostack/sal-stack-nanostack/nanostack/serial_mac_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/serial_mac_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/serial_mac_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/shalib.h b/features/nanostack/sal-stack-nanostack/nanostack/shalib.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/shalib.h
rename to features/nanostack/sal-stack-nanostack/nanostack/shalib.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/socket_api.h b/features/nanostack/sal-stack-nanostack/nanostack/socket_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/socket_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/socket_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/sw_mac.h b/features/nanostack/sal-stack-nanostack/nanostack/sw_mac.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/sw_mac.h
rename to features/nanostack/sal-stack-nanostack/nanostack/sw_mac.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_bbr_api.h b/features/nanostack/sal-stack-nanostack/nanostack/thread_bbr_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_bbr_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/thread_bbr_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_border_router_api.h b/features/nanostack/sal-stack-nanostack/nanostack/thread_border_router_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_border_router_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/thread_border_router_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_commissioning_api.h b/features/nanostack/sal-stack-nanostack/nanostack/thread_commissioning_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_commissioning_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/thread_commissioning_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_dhcpv6_server.h b/features/nanostack/sal-stack-nanostack/nanostack/thread_dhcpv6_server.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_dhcpv6_server.h
rename to features/nanostack/sal-stack-nanostack/nanostack/thread_dhcpv6_server.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_diagcop_lib.h b/features/nanostack/sal-stack-nanostack/nanostack/thread_diagcop_lib.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_diagcop_lib.h
rename to features/nanostack/sal-stack-nanostack/nanostack/thread_diagcop_lib.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_lowpower_api.h b/features/nanostack/sal-stack-nanostack/nanostack/thread_lowpower_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_lowpower_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/thread_lowpower_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_management_api.h b/features/nanostack/sal-stack-nanostack/nanostack/thread_management_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_management_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/thread_management_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_management_if.h b/features/nanostack/sal-stack-nanostack/nanostack/thread_management_if.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_management_if.h
rename to features/nanostack/sal-stack-nanostack/nanostack/thread_management_if.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_meshcop_lib.h b/features/nanostack/sal-stack-nanostack/nanostack/thread_meshcop_lib.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_meshcop_lib.h
rename to features/nanostack/sal-stack-nanostack/nanostack/thread_meshcop_lib.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_net_config_api.h b/features/nanostack/sal-stack-nanostack/nanostack/thread_net_config_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/thread_net_config_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/thread_net_config_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/whiteboard_api.h b/features/nanostack/sal-stack-nanostack/nanostack/whiteboard_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/nanostack/whiteboard_api.h
rename to features/nanostack/sal-stack-nanostack/nanostack/whiteboard_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/network_lib.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/network_lib.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/network_lib.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/network_lib.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_bootstrap.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_interface.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_interface.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_interface.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan_interface.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Bootstraps/network_lib.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/network_lib.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Bootstraps/network_lib.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/network_lib.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan_bootstrap.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan_bootstrap.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan_bootstrap.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan_bootstrap.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan_interface.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan_interface.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan_interface.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps/protocol_6lowpan_interface.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Fragmentation/cipv6_fragmenter.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Fragmentation/cipv6_fragmenter.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Fragmentation/cipv6_fragmenter.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Fragmentation/cipv6_fragmenter.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Fragmentation/cipv6_fragmenter.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Fragmentation/cipv6_fragmenter.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Fragmentation/cipv6_fragmenter.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Fragmentation/cipv6_fragmenter.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/6lowpan_iphc.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/6lowpan_iphc.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/6lowpan_iphc.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/6lowpan_iphc.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/cipv6.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/cipv6.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/cipv6.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/cipv6.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_compress.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_compress.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_compress.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_compress.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_compress.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_compress.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_compress.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_compress.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_decompress.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_decompress.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_decompress.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_decompress.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_decompress.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_decompress.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_decompress.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/iphc_decompress.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/lowpan_context.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/lowpan_context.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/lowpan_context.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/lowpan_context.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/lowpan_context.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/lowpan_context.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/lowpan_context.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode/lowpan_context.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/beacon_handler.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/beacon_handler.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/beacon_handler.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/beacon_handler.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/beacon_handler.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/beacon_handler.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/beacon_handler.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/beacon_handler.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/mac_data_poll.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_data_poll.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/mac_data_poll.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_data_poll.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/mac_data_poll.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_data_poll.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/mac_data_poll.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_data_poll.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/mac_helper.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_helper.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/mac_helper.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_helper.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/mac_helper.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_helper.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/mac_helper.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_helper.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/mac_pairwise_key.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_pairwise_key.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/mac_pairwise_key.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_pairwise_key.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/mac_pairwise_key.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_pairwise_key.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/mac_pairwise_key.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_pairwise_key.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/mac_response_handler.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_response_handler.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/mac_response_handler.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_response_handler.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/mac_response_handler.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_response_handler.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/MAC/mac_response_handler.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC/mac_response_handler.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Mesh/mesh.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Mesh/mesh.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Mesh/mesh.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Mesh/mesh.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Mesh/mesh.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Mesh/mesh.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Mesh/mesh.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Mesh/mesh.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/ND/nd_defines.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ND/nd_defines.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/ND/nd_defines.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/ND/nd_defines.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/ND/nd_router_object.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ND/nd_router_object.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/ND/nd_router_object.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/ND/nd_router_object.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/ND/nd_router_object.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/ND/nd_router_object.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/ND/nd_router_object.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/ND/nd_router_object.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/NVM/nwk_nvm.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/NVM/nwk_nvm.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/NVM/nwk_nvm.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/NVM/nwk_nvm.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/NVM/nwk_nvm.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/NVM/nwk_nvm.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/NVM/nwk_nvm.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/NVM/nwk_nvm.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_address_registration_client.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_address_registration_client.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_address_registration_client.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_address_registration_client.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_api.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_api.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_api.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_api.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_api_internal.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_api_internal.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_api_internal.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bbr_api_internal.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_beacon.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_beacon.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_beacon.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_beacon.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_beacon.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_beacon.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_beacon.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_beacon.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bootstrap.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bootstrap.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bootstrap.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bootstrap.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bootstrap.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bootstrap.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bootstrap.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_bootstrap.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_border_router_api.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_border_router_api.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_border_router_api.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_border_router_api.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_border_router_api_internal.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_border_router_api_internal.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_border_router_api_internal.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_border_router_api_internal.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_api.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_api.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_api.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_api.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_if.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_if.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_if.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_if.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_if.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_if.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_if.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_commissioning_if.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_common.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_common.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_common.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_common.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_common.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_common.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_common.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_common.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_config.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_config.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_config.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_config.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_constants.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_constants.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_constants.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_constants.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_dhcpv6_client.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_dhcpv6_client.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_dhcpv6_client.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_dhcpv6_client.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_dhcpv6_client.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_dhcpv6_client.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_dhcpv6_client.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_dhcpv6_client.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_diagnostic.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_diagnostic.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_diagnostic.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_diagnostic.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_diagnostic.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_diagnostic.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_diagnostic.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_diagnostic.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_discovery.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_discovery.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_discovery.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_discovery.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_discovery.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_discovery.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_discovery.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_discovery.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_extension.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_extension.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_extension.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_extension.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_extension_bbr.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_extension_bbr.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_extension_bbr.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_extension_bbr.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_extension_bootstrap.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_extension_bootstrap.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_extension_bootstrap.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_extension_bootstrap.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_host_bootstrap.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_host_bootstrap.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_host_bootstrap.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_host_bootstrap.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_host_bootstrap.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_host_bootstrap.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_host_bootstrap.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_host_bootstrap.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_joiner_application.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_joiner_application.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_joiner_application.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_joiner_application.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_joiner_application.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_joiner_application.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_joiner_application.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_joiner_application.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_leader_service.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_leader_service.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_leader_service.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_leader_service.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_leader_service.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_leader_service.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_leader_service.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_leader_service.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_private_api.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_private_api.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_private_api.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_private_api.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_private_api.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_private_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_private_api.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_lowpower_private_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_api.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_api.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_api.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_api.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_client.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_client.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_client.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_client.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_client.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_client.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_client.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_client.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_if.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_if.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_if.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_if.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_internal.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_internal.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_internal.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_internal.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_server.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_server.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_server.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_server.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_server.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_server.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_server.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_management_server.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mdns.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mdns.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mdns.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mdns.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mdns.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mdns.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mdns.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mdns.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_meshcop_lib.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_meshcop_lib.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_meshcop_lib.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_meshcop_lib.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mle_message_handler.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mle_message_handler.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mle_message_handler.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mle_message_handler.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mle_message_handler.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mle_message_handler.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mle_message_handler.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_mle_message_handler.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nd.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nd.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nd.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nd.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nd.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nd.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nd.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nd.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_net_config_api.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_net_config_api.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_net_config_api.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_net_config_api.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_lib.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_lib.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_lib.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_lib.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_lib.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_lib.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_lib.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_lib.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_storage.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_storage.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_storage.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_storage.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_storage.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_storage.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_storage.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_data_storage.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_synch.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_synch.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_synch.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_synch.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_synch.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_synch.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_synch.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_network_synch.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nvm_store.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nvm_store.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nvm_store.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nvm_store.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nvm_store.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nvm_store.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nvm_store.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_nvm_store.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_client.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_client.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_client.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_client.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_client.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_client.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_client.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_client.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_server.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_server.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_server.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_server.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_server.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_server.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_server.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_resolution_server.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_router_bootstrap.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_router_bootstrap.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_router_bootstrap.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_router_bootstrap.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_router_bootstrap.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_router_bootstrap.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_router_bootstrap.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_router_bootstrap.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_routing.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_routing.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_routing.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_routing.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_routing.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_routing.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_routing.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_routing.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_test_api.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_test_api.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_test_api.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_test_api.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_tmfcop_lib.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_tmfcop_lib.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/Thread/thread_tmfcop_lib.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread/thread_tmfcop_lib.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/adaptation_interface.c b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/adaptation_interface.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/adaptation_interface.c
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/adaptation_interface.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/lowpan_adaptation_interface.h b/features/nanostack/sal-stack-nanostack/source/6LoWPAN/lowpan_adaptation_interface.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/6LoWPAN/lowpan_adaptation_interface.h
rename to features/nanostack/sal-stack-nanostack/source/6LoWPAN/lowpan_adaptation_interface.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/BorderRouter/border_router.c b/features/nanostack/sal-stack-nanostack/source/BorderRouter/border_router.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/BorderRouter/border_router.c
rename to features/nanostack/sal-stack-nanostack/source/BorderRouter/border_router.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/BorderRouter/border_router.h b/features/nanostack/sal-stack-nanostack/source/BorderRouter/border_router.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/BorderRouter/border_router.h
rename to features/nanostack/sal-stack-nanostack/source/BorderRouter/border_router.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/icmpv6.c b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/icmpv6.c
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/icmpv6.h b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/icmpv6.h
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/icmpv6_prefix.c b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_prefix.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/icmpv6_prefix.c
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_prefix.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/icmpv6_prefix.h b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_prefix.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/icmpv6_prefix.h
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_prefix.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/icmpv6_radv.c b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_radv.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/icmpv6_radv.c
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_radv.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/icmpv6_radv.h b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_radv.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/icmpv6_radv.h
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/icmpv6_radv.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ip.h b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ip.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ip.h
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/ip.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ipv6.c b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ipv6.c
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ipv6.h b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ipv6.h
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ipv6_constants.h b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_constants.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ipv6_constants.h
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_constants.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ipv6_flow.c b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_flow.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ipv6_flow.c
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_flow.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ipv6_flow.h b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_flow.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ipv6_flow.h
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_flow.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ipv6_fragmentation.c b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_fragmentation.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ipv6_fragmentation.c
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_fragmentation.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ipv6_fragmentation.h b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_fragmentation.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ipv6_fragmentation.h
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_fragmentation.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ipv6_resolution.c b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_resolution.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ipv6_resolution.c
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_resolution.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ipv6_resolution.h b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_resolution.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/ipv6_resolution.h
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/ipv6_resolution.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/mld.c b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/mld.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/mld.c
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/mld.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/mld.h b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/mld.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/mld.h
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/mld.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/tcp.c b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/tcp.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/tcp.c
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/tcp.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/tcp.h b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/tcp.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/tcp.h
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/tcp.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/udp.c b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/udp.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/udp.c
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/udp.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/udp.h b/features/nanostack/sal-stack-nanostack/source/Common_Protocols/udp.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Common_Protocols/udp.h
rename to features/nanostack/sal-stack-nanostack/source/Common_Protocols/udp.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Core/address.c b/features/nanostack/sal-stack-nanostack/source/Core/address.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Core/address.c
rename to features/nanostack/sal-stack-nanostack/source/Core/address.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Core/buffer_dyn.c b/features/nanostack/sal-stack-nanostack/source/Core/buffer_dyn.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Core/buffer_dyn.c
rename to features/nanostack/sal-stack-nanostack/source/Core/buffer_dyn.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Core/include/address.h b/features/nanostack/sal-stack-nanostack/source/Core/include/address.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Core/include/address.h
rename to features/nanostack/sal-stack-nanostack/source/Core/include/address.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Core/include/ns_buffer.h b/features/nanostack/sal-stack-nanostack/source/Core/include/ns_buffer.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Core/include/ns_buffer.h
rename to features/nanostack/sal-stack-nanostack/source/Core/include/ns_buffer.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Core/include/ns_error_types.h b/features/nanostack/sal-stack-nanostack/source/Core/include/ns_error_types.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Core/include/ns_error_types.h
rename to features/nanostack/sal-stack-nanostack/source/Core/include/ns_error_types.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Core/include/sockbuf.h b/features/nanostack/sal-stack-nanostack/source/Core/include/sockbuf.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Core/include/sockbuf.h
rename to features/nanostack/sal-stack-nanostack/source/Core/include/sockbuf.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Core/include/socket.h b/features/nanostack/sal-stack-nanostack/source/Core/include/socket.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Core/include/socket.h
rename to features/nanostack/sal-stack-nanostack/source/Core/include/socket.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Core/ns_socket.c b/features/nanostack/sal-stack-nanostack/source/Core/ns_socket.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Core/ns_socket.c
rename to features/nanostack/sal-stack-nanostack/source/Core/ns_socket.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Core/sockbuf.c b/features/nanostack/sal-stack-nanostack/source/Core/sockbuf.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Core/sockbuf.c
rename to features/nanostack/sal-stack-nanostack/source/Core/sockbuf.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/DHCPv6_Server/DHCPv6_Server_service.c b/features/nanostack/sal-stack-nanostack/source/DHCPv6_Server/DHCPv6_Server_service.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/DHCPv6_Server/DHCPv6_Server_service.c
rename to features/nanostack/sal-stack-nanostack/source/DHCPv6_Server/DHCPv6_Server_service.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/DHCPv6_Server/DHCPv6_server_service.h b/features/nanostack/sal-stack-nanostack/source/DHCPv6_Server/DHCPv6_server_service.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/DHCPv6_Server/DHCPv6_server_service.h
rename to features/nanostack/sal-stack-nanostack/source/DHCPv6_Server/DHCPv6_server_service.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/.gitignore b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/.gitignore
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/.gitignore
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/.gitignore
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_defines.h b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_defines.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_defines.h
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_defines.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_fhss_callbacks.c b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_fhss_callbacks.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_fhss_callbacks.c
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_fhss_callbacks.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_fhss_callbacks.h b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_fhss_callbacks.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_fhss_callbacks.h
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_fhss_callbacks.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_filter.c b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_filter.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_filter.c
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_filter.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_filter.h b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_filter.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_filter.h
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_filter.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_header_helper_functions.c b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_header_helper_functions.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_header_helper_functions.c
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_header_helper_functions.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_header_helper_functions.h b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_header_helper_functions.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_header_helper_functions.h
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_header_helper_functions.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_indirect_data.c b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_indirect_data.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_indirect_data.c
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_indirect_data.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_indirect_data.h b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_indirect_data.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_indirect_data.h
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_indirect_data.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mcps_sap.c b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mcps_sap.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mcps_sap.c
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mcps_sap.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mcps_sap.h b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mcps_sap.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mcps_sap.h
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mcps_sap.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mlme.c b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mlme.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mlme.c
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mlme.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mlme.h b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mlme.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mlme.h
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_mlme.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_pd_sap.c b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_pd_sap.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_pd_sap.c
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_pd_sap.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_pd_sap.h b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_pd_sap.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_pd_sap.h
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_pd_sap.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.c b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.c
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.h b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.h
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_timer.c b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_timer.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_timer.c
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_timer.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_timer.h b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_timer.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_timer.h
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_timer.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/sw_mac.c b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/sw_mac.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/sw_mac.c
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/sw_mac.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/sw_mac_internal.h b/features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/sw_mac_internal.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/IEEE802_15_4/sw_mac_internal.h
rename to features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/sw_mac_internal.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/ethernet/ethernet_mac_api.c b/features/nanostack/sal-stack-nanostack/source/MAC/ethernet/ethernet_mac_api.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/ethernet/ethernet_mac_api.c
rename to features/nanostack/sal-stack-nanostack/source/MAC/ethernet/ethernet_mac_api.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/rf_driver_storage.c b/features/nanostack/sal-stack-nanostack/source/MAC/rf_driver_storage.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/rf_driver_storage.c
rename to features/nanostack/sal-stack-nanostack/source/MAC/rf_driver_storage.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/rf_driver_storage.h b/features/nanostack/sal-stack-nanostack/source/MAC/rf_driver_storage.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/rf_driver_storage.h
rename to features/nanostack/sal-stack-nanostack/source/MAC/rf_driver_storage.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/serial/serial_mac_api.c b/features/nanostack/sal-stack-nanostack/source/MAC/serial/serial_mac_api.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/serial/serial_mac_api.c
rename to features/nanostack/sal-stack-nanostack/source/MAC/serial/serial_mac_api.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_client.c b/features/nanostack/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_client.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_client.c
rename to features/nanostack/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_client.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_defines.h b/features/nanostack/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_defines.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_defines.h
rename to features/nanostack/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_defines.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_driver.c b/features/nanostack/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_driver.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_driver.c
rename to features/nanostack/sal-stack-nanostack/source/MAC/virtual_rf/virtual_rf_driver.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MLE/.gitignore b/features/nanostack/sal-stack-nanostack/source/MLE/.gitignore
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MLE/.gitignore
rename to features/nanostack/sal-stack-nanostack/source/MLE/.gitignore
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MLE/mle.c b/features/nanostack/sal-stack-nanostack/source/MLE/mle.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MLE/mle.c
rename to features/nanostack/sal-stack-nanostack/source/MLE/mle.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MLE/mle.h b/features/nanostack/sal-stack-nanostack/source/MLE/mle.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MLE/mle.h
rename to features/nanostack/sal-stack-nanostack/source/MLE/mle.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MLE/mle_tlv.c b/features/nanostack/sal-stack-nanostack/source/MLE/mle_tlv.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MLE/mle_tlv.c
rename to features/nanostack/sal-stack-nanostack/source/MLE/mle_tlv.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MLE/mle_tlv.h b/features/nanostack/sal-stack-nanostack/source/MLE/mle_tlv.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MLE/mle_tlv.h
rename to features/nanostack/sal-stack-nanostack/source/MLE/mle_tlv.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MPL/mpl.c b/features/nanostack/sal-stack-nanostack/source/MPL/mpl.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MPL/mpl.c
rename to features/nanostack/sal-stack-nanostack/source/MPL/mpl.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MPL/mpl.h b/features/nanostack/sal-stack-nanostack/source/MPL/mpl.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/MPL/mpl.h
rename to features/nanostack/sal-stack-nanostack/source/MPL/mpl.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol.h b/features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol.h
rename to features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_abstract.h b/features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_abstract.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_abstract.h
rename to features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_abstract.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_stats.h b/features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_stats.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_stats.h
rename to features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_stats.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_timer.h b/features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_timer.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_timer.h
rename to features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include/protocol_timer.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/NWK_INTERFACE/protocol_core.c b/features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_core.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/NWK_INTERFACE/protocol_core.c
rename to features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_core.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/NWK_INTERFACE/protocol_core_sleep.c b/features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_core_sleep.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/NWK_INTERFACE/protocol_core_sleep.c
rename to features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_core_sleep.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/NWK_INTERFACE/protocol_stats.c b/features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_stats.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/NWK_INTERFACE/protocol_stats.c
rename to features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_stats.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/NWK_INTERFACE/protocol_timer.c b/features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_timer.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/NWK_INTERFACE/protocol_timer.c
rename to features/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/protocol_timer.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_control.c b/features/nanostack/sal-stack-nanostack/source/RPL/rpl_control.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_control.c
rename to features/nanostack/sal-stack-nanostack/source/RPL/rpl_control.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_control.h b/features/nanostack/sal-stack-nanostack/source/RPL/rpl_control.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_control.h
rename to features/nanostack/sal-stack-nanostack/source/RPL/rpl_control.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_data.c b/features/nanostack/sal-stack-nanostack/source/RPL/rpl_data.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_data.c
rename to features/nanostack/sal-stack-nanostack/source/RPL/rpl_data.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_data.h b/features/nanostack/sal-stack-nanostack/source/RPL/rpl_data.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_data.h
rename to features/nanostack/sal-stack-nanostack/source/RPL/rpl_data.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_downward.c b/features/nanostack/sal-stack-nanostack/source/RPL/rpl_downward.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_downward.c
rename to features/nanostack/sal-stack-nanostack/source/RPL/rpl_downward.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_downward.h b/features/nanostack/sal-stack-nanostack/source/RPL/rpl_downward.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_downward.h
rename to features/nanostack/sal-stack-nanostack/source/RPL/rpl_downward.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_mrhof.c b/features/nanostack/sal-stack-nanostack/source/RPL/rpl_mrhof.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_mrhof.c
rename to features/nanostack/sal-stack-nanostack/source/RPL/rpl_mrhof.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_mrhof.h b/features/nanostack/sal-stack-nanostack/source/RPL/rpl_mrhof.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_mrhof.h
rename to features/nanostack/sal-stack-nanostack/source/RPL/rpl_mrhof.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_objective.c b/features/nanostack/sal-stack-nanostack/source/RPL/rpl_objective.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_objective.c
rename to features/nanostack/sal-stack-nanostack/source/RPL/rpl_objective.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_objective.h b/features/nanostack/sal-stack-nanostack/source/RPL/rpl_objective.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_objective.h
rename to features/nanostack/sal-stack-nanostack/source/RPL/rpl_objective.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_of0.c b/features/nanostack/sal-stack-nanostack/source/RPL/rpl_of0.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_of0.c
rename to features/nanostack/sal-stack-nanostack/source/RPL/rpl_of0.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_of0.h b/features/nanostack/sal-stack-nanostack/source/RPL/rpl_of0.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_of0.h
rename to features/nanostack/sal-stack-nanostack/source/RPL/rpl_of0.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_policy.c b/features/nanostack/sal-stack-nanostack/source/RPL/rpl_policy.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_policy.c
rename to features/nanostack/sal-stack-nanostack/source/RPL/rpl_policy.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_policy.h b/features/nanostack/sal-stack-nanostack/source/RPL/rpl_policy.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_policy.h
rename to features/nanostack/sal-stack-nanostack/source/RPL/rpl_policy.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_protocol.h b/features/nanostack/sal-stack-nanostack/source/RPL/rpl_protocol.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_protocol.h
rename to features/nanostack/sal-stack-nanostack/source/RPL/rpl_protocol.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_structures.h b/features/nanostack/sal-stack-nanostack/source/RPL/rpl_structures.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_structures.h
rename to features/nanostack/sal-stack-nanostack/source/RPL/rpl_structures.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_upward.c b/features/nanostack/sal-stack-nanostack/source/RPL/rpl_upward.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_upward.c
rename to features/nanostack/sal-stack-nanostack/source/RPL/rpl_upward.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_upward.h b/features/nanostack/sal-stack-nanostack/source/RPL/rpl_upward.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/RPL/rpl_upward.h
rename to features/nanostack/sal-stack-nanostack/source/RPL/rpl_upward.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/Common/sec_lib.h b/features/nanostack/sal-stack-nanostack/source/Security/Common/sec_lib.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/Common/sec_lib.h
rename to features/nanostack/sal-stack-nanostack/source/Security/Common/sec_lib.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/Common/sec_lib_definitions.h b/features/nanostack/sal-stack-nanostack/source/Security/Common/sec_lib_definitions.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/Common/sec_lib_definitions.h
rename to features/nanostack/sal-stack-nanostack/source/Security/Common/sec_lib_definitions.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/Common/security_lib.c b/features/nanostack/sal-stack-nanostack/source/Security/Common/security_lib.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/Common/security_lib.c
rename to features/nanostack/sal-stack-nanostack/source/Security/Common/security_lib.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/eap_protocol.c b/features/nanostack/sal-stack-nanostack/source/Security/PANA/eap_protocol.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/eap_protocol.c
rename to features/nanostack/sal-stack-nanostack/source/Security/PANA/eap_protocol.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/eap_protocol.h b/features/nanostack/sal-stack-nanostack/source/Security/PANA/eap_protocol.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/eap_protocol.h
rename to features/nanostack/sal-stack-nanostack/source/Security/PANA/eap_protocol.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana.c b/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana.c
rename to features/nanostack/sal-stack-nanostack/source/Security/PANA/pana.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana.h b/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana.h
rename to features/nanostack/sal-stack-nanostack/source/Security/PANA/pana.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_avp.c b/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_avp.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_avp.c
rename to features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_avp.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_avp.h b/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_avp.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_avp.h
rename to features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_avp.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_client.c b/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_client.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_client.c
rename to features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_client.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_eap_header.c b/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_eap_header.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_eap_header.c
rename to features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_eap_header.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_eap_header.h b/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_eap_header.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_eap_header.h
rename to features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_eap_header.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_header.c b/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_header.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_header.c
rename to features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_header.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_header.h b/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_header.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_header.h
rename to features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_header.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_internal_api.h b/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_internal_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_internal_api.h
rename to features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_internal_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_nvm.h b/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_nvm.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_nvm.h
rename to features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_nvm.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_relay_table.c b/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_relay_table.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_relay_table.c
rename to features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_relay_table.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_relay_table.h b/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_relay_table.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_relay_table.h
rename to features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_relay_table.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_server.c b/features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_server.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/PANA/pana_server.c
rename to features/nanostack/sal-stack-nanostack/source/Security/PANA/pana_server.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/TLS/tls_ccm_crypt.c b/features/nanostack/sal-stack-nanostack/source/Security/TLS/tls_ccm_crypt.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/TLS/tls_ccm_crypt.c
rename to features/nanostack/sal-stack-nanostack/source/Security/TLS/tls_ccm_crypt.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/TLS/tls_ccm_crypt.h b/features/nanostack/sal-stack-nanostack/source/Security/TLS/tls_ccm_crypt.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/TLS/tls_ccm_crypt.h
rename to features/nanostack/sal-stack-nanostack/source/Security/TLS/tls_ccm_crypt.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/TLS/tls_lib.c b/features/nanostack/sal-stack-nanostack/source/Security/TLS/tls_lib.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/TLS/tls_lib.c
rename to features/nanostack/sal-stack-nanostack/source/Security/TLS/tls_lib.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/TLS/tls_lib.h b/features/nanostack/sal-stack-nanostack/source/Security/TLS/tls_lib.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Security/TLS/tls_lib.h
rename to features/nanostack/sal-stack-nanostack/source/Security/TLS/tls_lib.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/CCM_lib/ccm_security.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/CCM_lib/ccm_security.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/CCM_lib/ccm_security.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/CCM_lib/ccm_security.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls_adapter.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls_adapter.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls_adapter.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/CCM_lib/mbedOS/aes_mbedtls_adapter.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/Neighbor_cache/neighbor_cache.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/Neighbor_cache/neighbor_cache.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/Neighbor_cache/neighbor_cache.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/Neighbor_cache/neighbor_cache.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/Neighbor_cache/neighbor_table_definition.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/Neighbor_cache/neighbor_table_definition.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/Neighbor_cache/neighbor_table_definition.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/Neighbor_cache/neighbor_table_definition.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/README.txt b/features/nanostack/sal-stack-nanostack/source/Service_Libs/README.txt
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/README.txt
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/README.txt
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/Makefile b/features/nanostack/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/Makefile
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/Makefile
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/Makefile
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/ns_sha256.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/ns_sha256.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/ns_sha256.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/ns_sha256.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/shalib.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/shalib.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/shalib.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/SHA256_Lib/shalib.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/Trickle/trickle.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/Trickle/trickle.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/Trickle/trickle.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/Trickle/trickle.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/Trickle/trickle.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/Trickle/trickle.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/Trickle/trickle.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/Trickle/trickle.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/blacklist/blacklist.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/blacklist/blacklist.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/blacklist/blacklist.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/blacklist/blacklist.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/blacklist/blacklist.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/blacklist/blacklist.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/blacklist/blacklist.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/blacklist/blacklist.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/etx/etx.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/etx/etx.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/etx/etx.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/etx/etx.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/etx/etx.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/etx/etx.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/etx/etx.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/etx/etx.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/channel_list.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_list.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/channel_list.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_list.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/channel_list.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_list.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/channel_list.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/channel_list.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_beacon.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_beacon.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_beacon.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_beacon.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_beacon.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_beacon.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_beacon.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_beacon.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_beacon_tasklet.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_beacon_tasklet.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_beacon_tasklet.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_beacon_tasklet.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_channel.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_channel.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_channel.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_channel.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_channel.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_channel.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_channel.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_channel.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_configuration_interface.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_configuration_interface.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_configuration_interface.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_configuration_interface.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_mac_interface.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_mac_interface.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_mac_interface.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_mac_interface.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_mac_interface.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_mac_interface.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_mac_interface.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_mac_interface.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_statistics.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_statistics.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_statistics.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_statistics.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_statistics.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_statistics.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fhss/fhss_statistics.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/fhss/fhss_statistics.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fnv_hash/fnv_hash.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/fnv_hash/fnv_hash.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fnv_hash/fnv_hash.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/fnv_hash/fnv_hash.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fnv_hash/fnv_hash.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/fnv_hash/fnv_hash.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/fnv_hash/fnv_hash.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/fnv_hash/fnv_hash.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/load_balance/load_balance.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/load_balance/load_balance.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/load_balance/load_balance.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/load_balance/load_balance.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/load_balance/load_balance_api.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/load_balance/load_balance_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/load_balance/load_balance_api.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/load_balance/load_balance_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/README.txt b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/README.txt
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/README.txt
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/README.txt
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_license.txt b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_license.txt
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_license.txt
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_license.txt
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/fnet.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/fnet.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/fnet.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/fnet.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/fnet_config.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/fnet_config.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/fnet_config.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/fnet_config.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp_config.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp_config.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp_config.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler/fnet_comp_config.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/cpu/fnet_cpu.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/cpu/fnet_cpu.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/cpu/fnet_cpu.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/cpu/fnet_cpu.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns_config.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns_config.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns_config.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns_config.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns_prv.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns_prv.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns_prv.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns/fnet_dns_prv.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services_config.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services_config.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services_config.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/fnet_services_config.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns_config.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns_config.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns_config.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns/fnet_mdns_config.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll/fnet_poll.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial_config.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial_config.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial_config.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial/fnet_serial_config.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_arp.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_arp.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_arp.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_arp.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_assert.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_assert.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_assert.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_assert.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_debug.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_debug.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_debug.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_debug.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_error.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_error.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_error.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_error.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_eth.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_eth.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_eth.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_eth.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_icmp6.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_icmp6.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_icmp6.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_icmp6.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_inet.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_inet.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_inet.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_inet.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_ip.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_ip.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_ip.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_ip.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_ip6.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_ip6.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_ip6.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_ip6.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_isr.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_isr.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_isr.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_isr.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_mempool.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_mempool.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_mempool.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_mempool.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_nd6.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_nd6.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_nd6.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_nd6.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netbuf.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netbuf.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netbuf.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netbuf.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netif.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netif.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netif.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netif.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netif_prv.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netif_prv.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netif_prv.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_netif_prv.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_socket.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_socket.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_socket.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_socket.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stack.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stack.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stack.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stack.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stack_config.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stack_config.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stack_config.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stack_config.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_stdlib.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_timer.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_timer.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_timer.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_timer.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_timer_prv.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_timer_prv.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_timer_prv.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack/fnet_timer_prv.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/readme.txt b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/readme.txt
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet/readme.txt
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/readme.txt
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet_user_config.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet_user_config.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/fnet_user_config.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet_user_config.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_events.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_events.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_events.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_events.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_events.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_events.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_events.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_events.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_port.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_port.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_port.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_port.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_types.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_types.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_types.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_fnet_types.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/ns_mdns_api.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_mdns_api.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mdns/ns_mdns_api.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/ns_mdns_api.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_api.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_api.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_buffer.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_buffer.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_buffer.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_buffer.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_buffer.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_buffer.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_buffer.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_buffer.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_interface.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_interface.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_interface.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_interface.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_interface.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_interface.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_interface.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_interface.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_security.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_security.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_security.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_security.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_security.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_security.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_security.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service/mle_service_security.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/nd_proxy/nd_proxy.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/nd_proxy/nd_proxy.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/nd_proxy/nd_proxy.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/nd_proxy/nd_proxy.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/nd_proxy/nd_proxy.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/nd_proxy/nd_proxy.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/nd_proxy/nd_proxy.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/nd_proxy/nd_proxy.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/pan_blacklist/pan_blacklist.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/pan_blacklist/pan_blacklist.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/pan_blacklist/pan_blacklist.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/pan_blacklist/pan_blacklist.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/pan_blacklist/pan_blacklist_api.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/pan_blacklist/pan_blacklist_api.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/pan_blacklist/pan_blacklist_api.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/pan_blacklist/pan_blacklist_api.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/utils/isqrt.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/isqrt.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/utils/isqrt.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/isqrt.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/utils/isqrt.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/isqrt.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/utils/isqrt.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/isqrt.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/utils/ns_crc.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_crc.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/utils/ns_crc.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_crc.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/utils/ns_crc.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_crc.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/utils/ns_crc.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_crc.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/utils/ns_file_system.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_file_system.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/utils/ns_file_system.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/utils/ns_file_system.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/whiteboard/whiteboard.c b/features/nanostack/sal-stack-nanostack/source/Service_Libs/whiteboard/whiteboard.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/whiteboard/whiteboard.c
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/whiteboard/whiteboard.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/whiteboard/whiteboard.h b/features/nanostack/sal-stack-nanostack/source/Service_Libs/whiteboard/whiteboard.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/Service_Libs/whiteboard/whiteboard.h
rename to features/nanostack/sal-stack-nanostack/source/Service_Libs/whiteboard/whiteboard.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/ethernet.cfg b/features/nanostack/sal-stack-nanostack/source/configs/base/ethernet.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/ethernet.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/base/ethernet.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/local_socket.cfg b/features/nanostack/sal-stack-nanostack/source/configs/base/local_socket.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/local_socket.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/base/local_socket.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/lowpan_border_router.cfg b/features/nanostack/sal-stack-nanostack/source/configs/base/lowpan_border_router.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/lowpan_border_router.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/base/lowpan_border_router.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/lowpan_host.cfg b/features/nanostack/sal-stack-nanostack/source/configs/base/lowpan_host.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/lowpan_host.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/base/lowpan_host.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/lowpan_router.cfg b/features/nanostack/sal-stack-nanostack/source/configs/base/lowpan_router.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/lowpan_router.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/base/lowpan_router.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/rf_tunnel.cfg b/features/nanostack/sal-stack-nanostack/source/configs/base/rf_tunnel.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/rf_tunnel.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/base/rf_tunnel.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/thread_border_router.cfg b/features/nanostack/sal-stack-nanostack/source/configs/base/thread_border_router.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/thread_border_router.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/base/thread_border_router.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/thread_end_device.cfg b/features/nanostack/sal-stack-nanostack/source/configs/base/thread_end_device.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/thread_end_device.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/base/thread_end_device.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/thread_full_end_device.cfg b/features/nanostack/sal-stack-nanostack/source/configs/base/thread_full_end_device.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/thread_full_end_device.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/base/thread_full_end_device.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/thread_router.cfg b/features/nanostack/sal-stack-nanostack/source/configs/base/thread_router.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/base/thread_router.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/base/thread_router.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/ethernet_host.cfg b/features/nanostack/sal-stack-nanostack/source/configs/ethernet_host.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/ethernet_host.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/ethernet_host.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/generic.cfg b/features/nanostack/sal-stack-nanostack/source/configs/generic.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/generic.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/generic.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/lowpan_border_router.cfg b/features/nanostack/sal-stack-nanostack/source/configs/lowpan_border_router.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/lowpan_border_router.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/lowpan_border_router.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/lowpan_border_router_rf_tunnel.cfg b/features/nanostack/sal-stack-nanostack/source/configs/lowpan_border_router_rf_tunnel.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/lowpan_border_router_rf_tunnel.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/lowpan_border_router_rf_tunnel.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/lowpan_border_router_rf_tunnel_ecc.cfg b/features/nanostack/sal-stack-nanostack/source/configs/lowpan_border_router_rf_tunnel_ecc.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/lowpan_border_router_rf_tunnel_ecc.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/lowpan_border_router_rf_tunnel_ecc.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/lowpan_border_router_rf_tunnel_ecc_release.cfg b/features/nanostack/sal-stack-nanostack/source/configs/lowpan_border_router_rf_tunnel_ecc_release.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/lowpan_border_router_rf_tunnel_ecc_release.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/lowpan_border_router_rf_tunnel_ecc_release.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/lowpan_host.cfg b/features/nanostack/sal-stack-nanostack/source/configs/lowpan_host.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/lowpan_host.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/lowpan_host.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/lowpan_router.cfg b/features/nanostack/sal-stack-nanostack/source/configs/lowpan_router.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/lowpan_router.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/lowpan_router.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/lowpan_router_ecc.cfg b/features/nanostack/sal-stack-nanostack/source/configs/lowpan_router_ecc.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/lowpan_router_ecc.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/lowpan_router_ecc.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/lowpan_router_ecc_release.cfg b/features/nanostack/sal-stack-nanostack/source/configs/lowpan_router_ecc_release.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/lowpan_router_ecc_release.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/lowpan_router_ecc_release.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/nanostack_full.cfg b/features/nanostack/sal-stack-nanostack/source/configs/nanostack_full.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/nanostack_full.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/nanostack_full.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/nanostack_full_debug.cfg b/features/nanostack/sal-stack-nanostack/source/configs/nanostack_full_debug.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/nanostack_full_debug.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/nanostack_full_debug.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/rf_interface.cfg b/features/nanostack/sal-stack-nanostack/source/configs/rf_interface.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/rf_interface.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/rf_interface.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/thread_border_router.cfg b/features/nanostack/sal-stack-nanostack/source/configs/thread_border_router.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/thread_border_router.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/thread_border_router.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/thread_end_device.cfg b/features/nanostack/sal-stack-nanostack/source/configs/thread_end_device.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/thread_end_device.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/thread_end_device.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/thread_full_end_device.cfg b/features/nanostack/sal-stack-nanostack/source/configs/thread_full_end_device.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/thread_full_end_device.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/thread_full_end_device.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/thread_router.cfg b/features/nanostack/sal-stack-nanostack/source/configs/thread_router.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/thread_router.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/thread_router.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/thread_thci.cfg b/features/nanostack/sal-stack-nanostack/source/configs/thread_thci.cfg
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/configs/thread_thci.cfg
rename to features/nanostack/sal-stack-nanostack/source/configs/thread_thci.cfg
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/ipv6_stack/ipv6_routing_table.c b/features/nanostack/sal-stack-nanostack/source/ipv6_stack/ipv6_routing_table.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/ipv6_stack/ipv6_routing_table.c
rename to features/nanostack/sal-stack-nanostack/source/ipv6_stack/ipv6_routing_table.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/ipv6_stack/ipv6_routing_table.h b/features/nanostack/sal-stack-nanostack/source/ipv6_stack/ipv6_routing_table.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/ipv6_stack/ipv6_routing_table.h
rename to features/nanostack/sal-stack-nanostack/source/ipv6_stack/ipv6_routing_table.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/ipv6_stack/protocol_ipv6.c b/features/nanostack/sal-stack-nanostack/source/ipv6_stack/protocol_ipv6.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/ipv6_stack/protocol_ipv6.c
rename to features/nanostack/sal-stack-nanostack/source/ipv6_stack/protocol_ipv6.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/ipv6_stack/protocol_ipv6.h b/features/nanostack/sal-stack-nanostack/source/ipv6_stack/protocol_ipv6.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/ipv6_stack/protocol_ipv6.h
rename to features/nanostack/sal-stack-nanostack/source/ipv6_stack/protocol_ipv6.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libDHCPv6/dhcp_service_api.c b/features/nanostack/sal-stack-nanostack/source/libDHCPv6/dhcp_service_api.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libDHCPv6/dhcp_service_api.c
rename to features/nanostack/sal-stack-nanostack/source/libDHCPv6/dhcp_service_api.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libDHCPv6/libDHCPv6.c b/features/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libDHCPv6/libDHCPv6.c
rename to features/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libDHCPv6/libDHCPv6.h b/features/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libDHCPv6/libDHCPv6.h
rename to features/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libDHCPv6/libDHCPv6_server.c b/features/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6_server.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libDHCPv6/libDHCPv6_server.c
rename to features/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6_server.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libDHCPv6/libDHCPv6_server.h b/features/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6_server.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libDHCPv6/libDHCPv6_server.h
rename to features/nanostack/sal-stack-nanostack/source/libDHCPv6/libDHCPv6_server.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/multicast_api.c b/features/nanostack/sal-stack-nanostack/source/libNET/src/multicast_api.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/multicast_api.c
rename to features/nanostack/sal-stack-nanostack/source/libNET/src/multicast_api.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/net_6lowpan_parameter_api.c b/features/nanostack/sal-stack-nanostack/source/libNET/src/net_6lowpan_parameter_api.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/net_6lowpan_parameter_api.c
rename to features/nanostack/sal-stack-nanostack/source/libNET/src/net_6lowpan_parameter_api.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/net_ipv6.c b/features/nanostack/sal-stack-nanostack/source/libNET/src/net_ipv6.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/net_ipv6.c
rename to features/nanostack/sal-stack-nanostack/source/libNET/src/net_ipv6.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/net_load_balance.c b/features/nanostack/sal-stack-nanostack/source/libNET/src/net_load_balance.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/net_load_balance.c
rename to features/nanostack/sal-stack-nanostack/source/libNET/src/net_load_balance.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/net_load_balance_internal.h b/features/nanostack/sal-stack-nanostack/source/libNET/src/net_load_balance_internal.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/net_load_balance_internal.h
rename to features/nanostack/sal-stack-nanostack/source/libNET/src/net_load_balance_internal.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/net_mle.c b/features/nanostack/sal-stack-nanostack/source/libNET/src/net_mle.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/net_mle.c
rename to features/nanostack/sal-stack-nanostack/source/libNET/src/net_mle.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/net_rpl.c b/features/nanostack/sal-stack-nanostack/source/libNET/src/net_rpl.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/net_rpl.c
rename to features/nanostack/sal-stack-nanostack/source/libNET/src/net_rpl.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/net_short_address_extension.c b/features/nanostack/sal-stack-nanostack/source/libNET/src/net_short_address_extension.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/net_short_address_extension.c
rename to features/nanostack/sal-stack-nanostack/source/libNET/src/net_short_address_extension.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/net_test.c b/features/nanostack/sal-stack-nanostack/source/libNET/src/net_test.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/net_test.c
rename to features/nanostack/sal-stack-nanostack/source/libNET/src/net_test.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/ns_net.c b/features/nanostack/sal-stack-nanostack/source/libNET/src/ns_net.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/ns_net.c
rename to features/nanostack/sal-stack-nanostack/source/libNET/src/ns_net.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/socket_api.c b/features/nanostack/sal-stack-nanostack/source/libNET/src/socket_api.c
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/libNET/src/socket_api.c
rename to features/nanostack/sal-stack-nanostack/source/libNET/src/socket_api.c
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/nsconfig.h b/features/nanostack/sal-stack-nanostack/source/nsconfig.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/source/nsconfig.h
rename to features/nanostack/sal-stack-nanostack/source/nsconfig.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/sources.mk b/features/nanostack/sal-stack-nanostack/sources.mk
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/sal-stack-nanostack/sources.mk
rename to features/nanostack/sal-stack-nanostack/sources.mk
diff --git a/features/nanostack/FEATURE_NANOSTACK/targets/TARGET_NCS36510/NanostackRfPhyNcs36510.cpp b/features/nanostack/targets/TARGET_NCS36510/NanostackRfPhyNcs36510.cpp
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/targets/TARGET_NCS36510/NanostackRfPhyNcs36510.cpp
rename to features/nanostack/targets/TARGET_NCS36510/NanostackRfPhyNcs36510.cpp
diff --git a/features/nanostack/FEATURE_NANOSTACK/targets/TARGET_NCS36510/NanostackRfPhyNcs36510.h b/features/nanostack/targets/TARGET_NCS36510/NanostackRfPhyNcs36510.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/targets/TARGET_NCS36510/NanostackRfPhyNcs36510.h
rename to features/nanostack/targets/TARGET_NCS36510/NanostackRfPhyNcs36510.h
diff --git a/features/nanostack/FEATURE_NANOSTACK/targets/TARGET_SL_RAIL/NanostackRfPhyEfr32.cpp b/features/nanostack/targets/TARGET_SL_RAIL/NanostackRfPhyEfr32.cpp
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/targets/TARGET_SL_RAIL/NanostackRfPhyEfr32.cpp
rename to features/nanostack/targets/TARGET_SL_RAIL/NanostackRfPhyEfr32.cpp
diff --git a/features/nanostack/FEATURE_NANOSTACK/targets/TARGET_SL_RAIL/NanostackRfPhyEfr32.h b/features/nanostack/targets/TARGET_SL_RAIL/NanostackRfPhyEfr32.h
similarity index 100%
rename from features/nanostack/FEATURE_NANOSTACK/targets/TARGET_SL_RAIL/NanostackRfPhyEfr32.h
rename to features/nanostack/targets/TARGET_SL_RAIL/NanostackRfPhyEfr32.h