From 359dc05f289fb725b70215b8799acd712726c1e0 Mon Sep 17 00:00:00 2001 From: Seppo Takalo Date: Mon, 25 Jul 2016 12:51:42 +0300 Subject: [PATCH] Move FEATURE_IPV6 under features/net --- features/{ => net}/FEATURE_IPV6/CONTRIBUTING.md | 0 .../{ => net}/FEATURE_IPV6/mbed-mesh-api/.gitignore | 0 .../FEATURE_IPV6/mbed-mesh-api/.mbedignore | 0 .../{ => net}/FEATURE_IPV6/mbed-mesh-api/LICENSE | 0 .../{ => net}/FEATURE_IPV6/mbed-mesh-api/README.md | 0 .../FEATURE_IPV6/mbed-mesh-api/apache-2.0.txt | 0 .../mbed-mesh-api/mbed-mesh-api/AbstractMesh.h | 0 .../mbed-mesh-api/AbstractNetworkInterface.h | 0 .../mbed-mesh-api/mbed-mesh-api/Mesh6LoWPAN_ND.h | 0 .../mbed-mesh-api/MeshInterfaceFactory.h | 0 .../mbed-mesh-api/mbed-mesh-api/MeshThread.h | 0 .../mbed-mesh-api/mesh_interface_types.h | 0 .../FEATURE_IPV6/mbed-mesh-api/mbed_lib.json | 0 .../FEATURE_IPV6/mbed-mesh-api/module.json | 0 .../mbed-mesh-api/source/AbstractMesh.cpp | 0 .../source/AbstractNetworkInterface.cpp | 0 .../mbed-mesh-api/source/CallbackHandler.cpp | 0 .../mbed-mesh-api/source/Mesh6LoWPAN_ND.cpp | 0 .../mbed-mesh-api/source/MeshInterfaceFactory.cpp | 0 .../mbed-mesh-api/source/MeshThread.cpp | 0 .../mbed-mesh-api/source/include/callback_handler.h | 0 .../mbed-mesh-api/source/include/mesh_system.h | 0 .../mbed-mesh-api/source/include/nd_tasklet.h | 0 .../mbed-mesh-api/source/include/static_config.h | 0 .../mbed-mesh-api/source/include/thread_tasklet.h | 0 .../FEATURE_IPV6/mbed-mesh-api/source/mesh_system.c | 0 .../FEATURE_IPV6/mbed-mesh-api/source/nd_tasklet.c | 0 .../mbed-mesh-api/source/thread_tasklet.c | 0 .../mbed-mesh-api/source/to_be_ported.c | 0 .../mbed-mesh-api/test/6lowpan_nd/README.md | 0 .../mbed-mesh-api/test/6lowpan_nd/main.cpp | 0 .../mbed-mesh-api/test/system_test/main.cpp | 0 .../mbed-mesh-api/test/system_test/test_cases.cpp | 0 .../mbed-mesh-api/test/system_test/test_cases.h | 0 .../{ => net}/FEATURE_IPV6/mbed-trace/.gitignore | 0 .../{ => net}/FEATURE_IPV6/mbed-trace/.mbedignore | 0 .../{ => net}/FEATURE_IPV6/mbed-trace/.yotta_ignore | 0 .../FEATURE_IPV6/mbed-trace/CONTRIBUTING.md | 0 features/{ => net}/FEATURE_IPV6/mbed-trace/LICENSE | 0 .../FEATURE_IPV6/mbed-trace/Makefile.nanomesh | 0 .../{ => net}/FEATURE_IPV6/mbed-trace/README.md | 0 .../FEATURE_IPV6/mbed-trace/mbed-trace/mbed_trace.h | 0 .../{ => net}/FEATURE_IPV6/mbed-trace/mbed_lib.json | 0 .../{ => net}/FEATURE_IPV6/mbed-trace/module.json | 0 .../FEATURE_IPV6/mbed-trace/source/CMakeLists.txt | 0 .../FEATURE_IPV6/mbed-trace/source/mbed_trace.c | 0 .../FEATURE_IPV6/mbed-trace/test/CMakeLists.txt | 0 .../{ => net}/FEATURE_IPV6/mbed-trace/test/Test.cpp | 0 .../mbed-trace/test/stubs/ip6tos_stub.c | 0 .../mbed-trace/test/stubs/ip6tos_stub.h | 0 .../nanostack-hal-mbed-cmsis-rtos/.gitattributes | 0 .../nanostack-hal-mbed-cmsis-rtos/.mbedignore | 0 .../nanostack-hal-mbed-cmsis-rtos/README.md | 0 .../arm_hal_interrupt.c | 0 .../arm_hal_interrupt_private.h | 0 .../nanostack-hal-mbed-cmsis-rtos/arm_hal_random.c | 0 .../nanostack-hal-mbed-cmsis-rtos/arm_hal_timer.cpp | 0 .../nanostack-hal-mbed-cmsis-rtos/cs_nvm/cs_nvm.c | 0 .../test_cs_nvm_unit/unittest/MakefileWorker.mk | 0 .../test_cs_nvm_unit/unittest/cs_nvm/csnvmtest.cpp | 0 .../test/test_cs_nvm_unit/unittest/cs_nvm/main.cpp | 0 .../test_cs_nvm_unit/unittest/cs_nvm/test_cs_nvm.c | 0 .../test_cs_nvm_unit/unittest/cs_nvm/test_cs_nvm.h | 0 .../test_cs_nvm_unit/unittest/makefile_defines.txt | 0 .../cs_nvm/test/test_cs_nvm_unit/unittest/run_tests | 0 .../unittest/stubs/configuration_store_stub.c | 0 .../unittest/stubs/configuration_store_stub.h | 0 .../test_cs_nvm_unit/unittest/stubs/ns_trace_stub.c | 0 .../unittest/stubs/nsdynmemLIB_stub.c | 0 .../unittest/stubs/nsdynmemLIB_stub.h | 0 .../test_cs_nvm_unit/unittest/stubs/timeout_stub.c | 0 .../nanostack-hal-mbed-cmsis-rtos/mbed_lib.json | 0 .../nanostack-hal-mbed-cmsis-rtos/ns_event_loop.c | 0 .../nanostack-hal-mbed-cmsis-rtos/ns_event_loop.h | 0 .../nanostack-hal-mbed-cmsis-rtos/ns_hal_init.c | 0 .../nanostack-hal-mbed-cmsis-rtos/ns_hal_init.h | 0 .../nanostack-hal-mbed-cmsis-rtos/nvm/README.md | 0 .../nanostack-hal-mbed-cmsis-rtos/nvm/nvm_ram.c | 0 .../nanostack-interface/NanostackInterface.cpp | 0 .../nanostack-interface/NanostackInterface.h | 0 .../FEATURE_IPV6/nanostack-libservice/.gitignore | 0 .../FEATURE_IPV6/nanostack-libservice/.mbedignore | 0 .../FEATURE_IPV6/nanostack-libservice/.yotta_ignore | 0 .../FEATURE_IPV6/nanostack-libservice/LICENSE | 0 .../FEATURE_IPV6/nanostack-libservice/README.md | 0 .../nanostack-libservice/apache-2.0.txt | 0 .../mbed-client-libservice/common_functions.h | 0 .../mbed-client-libservice/ip6string.h | 0 .../mbed-client-libservice/ip_fsc.h | 0 .../mbed-client-libservice/ns_list.h | 0 .../mbed-client-libservice/ns_nvm_helper.h | 0 .../mbed-client-libservice/ns_trace.h | 0 .../mbed-client-libservice/ns_types.h | 0 .../mbed-client-libservice/nsdynmemLIB.h | 0 .../platform/arm_hal_interrupt.h | 0 .../mbed-client-libservice/platform/arm_hal_nvm.h | 0 .../FEATURE_IPV6/nanostack-libservice/module.json | 0 .../source/IPv6_fcf_lib/ip_fsc.c | 0 .../source/libBits/common_functions.c | 0 .../nanostack-libservice/source/libList/ns_list.c | 0 .../nanostack-libservice/source/libTrace/ns_trace.c | 0 .../source/libTrace/scripts/fetch_groups.sh | 0 .../source/libip6string/ip6tos.c | 0 .../source/libip6string/stoip6.c | 0 .../source/nsdynmemLIB/nsdynmemLIB.c | 0 .../source/nvmHelper/ns_nvm_helper.c | 0 .../test/libService/unittest/.gitignore | 0 .../test/libService/unittest/MakefileWorker.mk | 0 .../test/libService/unittest/ip6tos/ip6tos_test.cpp | 0 .../test/libService/unittest/ip6tos/main.cpp | 0 .../libService/unittest/libTrace/libtracetest.cpp | 0 .../test/libService/unittest/libTrace/main.cpp | 0 .../libService/unittest/libTrace/test_libtrace.cpp | 0 .../libService/unittest/libTrace/test_libtrace.h | 0 .../test/libService/unittest/makefile_defines.txt | 0 .../libService/unittest/nsdynmem/dynmemtest.cpp | 0 .../libService/unittest/nsdynmem/error_callback.c | 0 .../libService/unittest/nsdynmem/error_callback.h | 0 .../test/libService/unittest/nsdynmem/main.cpp | 0 .../test/libService/unittest/nsnvmhelper/main.cpp | 0 .../unittest/nsnvmhelper/nsnvmhelpertest.cpp | 0 .../unittest/nsnvmhelper/test_ns_nvm_helper.c | 0 .../unittest/nsnvmhelper/test_ns_nvm_helper.h | 0 .../test/libService/unittest/run_tests | 0 .../test/libService/unittest/stoip6/main.cpp | 0 .../test/libService/unittest/stoip6/stoip6test.cpp | 0 .../unittest/stubs/common_functions_stub.c | 0 .../test/libService/unittest/stubs/ip6tos_stub.c | 0 .../test/libService/unittest/stubs/ip6tos_stub.h | 0 .../libService/unittest/stubs/ipv6_test_values.h | 0 .../test/libService/unittest/stubs/ns_list_stub.c | 0 .../test/libService/unittest/stubs/ns_trace_stub.c | 0 .../libService/unittest/stubs/nsdynmemLIB_stub.c | 0 .../libService/unittest/stubs/nsdynmemLIB_stub.h | 0 .../libService/unittest/stubs/platform_critical.c | 0 .../libService/unittest/stubs/platform_nvm_stub.c | 0 .../sal-stack-nanostack-eventloop/.gitignore | 0 .../sal-stack-nanostack-eventloop/.mbedignore | 0 .../sal-stack-nanostack-eventloop/LICENSE | 0 .../sal-stack-nanostack-eventloop/apache-2.0.txt | 0 .../bare-metal/event.c | 0 .../bare-metal/ns_timer.c | 0 .../bare-metal/ns_timer.h | 0 .../bare-metal/system_timer.c | 0 .../bare-metal/timeout.c | 0 .../bare-metal/timer_sys.h | 0 .../sal-stack-nanostack-eventloop/module.json | 0 .../nanostack-event-loop/eventOS_callback_timer.h | 0 .../nanostack-event-loop/eventOS_event.h | 0 .../nanostack-event-loop/eventOS_event_timer.h | 0 .../nanostack-event-loop/eventOS_scheduler.h | 0 .../nanostack-event-loop/platform/arm_hal_timer.h | 0 .../sal-stack-nanostack-eventloop/source/event.c | 0 .../sal-stack-nanostack-eventloop/source/ns_timer.c | 0 .../sal-stack-nanostack-eventloop/source/ns_timer.h | 0 .../source/system_timer.cpp | 0 .../sal-stack-nanostack-eventloop/source/timeout.c | 0 .../source/timer_sys.h | 0 .../FEATURE_IPV6/sal-stack-nanostack/.gitignore | 0 .../FEATURE_IPV6/sal-stack-nanostack/DEPENDENCIES | 0 .../sal-stack-nanostack/DOXYGEN_FRONTPAGE.md | 0 .../FEATURE_IPV6/sal-stack-nanostack/Doxyfile | 0 .../FEATURE_IPV6/sal-stack-nanostack/LICENSE | 0 .../LICENSE-permissive-binary-license-1.0.txt | 0 .../FEATURE_IPV6/sal-stack-nanostack/README.md | 0 .../TARGET_M3/libnanostack_armcc_Cortex-M3.ar | Bin .../TARGET_M4/libnanostack_armcc_Cortex-M3.ar | Bin .../libnanostack_arm-none-eabi-gcc_Cortex-M3.a | Bin .../libnanostack_arm-none-eabi-gcc_Cortex-M3.a | Bin .../TARGET_M3/libnanostack_iccarm_Cortex-M3.a | Bin .../TARGET_M4/libnanostack_iccarm_Cortex-M3.a | Bin .../sal-stack-nanostack/docs/01_overview.md | 0 .../sal-stack-nanostack/docs/02_N_arch.md | 0 .../sal-stack-nanostack/docs/03_N_usage.md | 0 .../sal-stack-nanostack/docs/04_N_networking.md | 0 .../sal-stack-nanostack/docs/05_reference.md | 0 .../sal-stack-nanostack/docs/06_API_introduction.md | 0 .../sal-stack-nanostack/docs/07_API_initialize.md | 0 .../sal-stack-nanostack/docs/08_API_events.md | 0 .../sal-stack-nanostack/docs/09_API_network_def.md | 0 .../sal-stack-nanostack/docs/10_API_timer.md | 0 .../sal-stack-nanostack/docs/11_API_sockets.md | 0 .../sal-stack-nanostack/docs/12_API_network.md | 0 .../sal-stack-nanostack/docs/13_API_memory.md | 0 .../sal-stack-nanostack/docs/14_API_data.md | 0 .../sal-stack-nanostack/docs/15_API_debug.md | 0 .../sal-stack-nanostack/docs/16_API_porting.md | 0 .../docs/api_changes_to_v4_0_0.md | 0 .../docs/api_changes_to_v5_0_0.md | 0 .../sal-stack-nanostack/docs/dev_stats.md | 0 .../sal-stack-nanostack/docs/driver_api.md | 0 .../sal-stack-nanostack/docs/img/6lh.png | Bin ...lowpan_border_router_embedded_C_architecture.png | Bin .../docs/img/6lowpan_network_architecture.png | Bin .../docs/img/6lowpan_stack_architecture.png | Bin .../img/6lowpan_stack_networking_topologies.png | Bin .../docs/img/6lowpan_stack_osi_model.png | Bin .../sal-stack-nanostack/docs/img/6lr.png | Bin .../sal-stack-nanostack/docs/img/Thread_General.png | Bin .../docs/img/Thread_Prot_Arch2.png | Bin .../docs/img/Thread_Prot_Arch_Comb.png | Bin .../docs/img/Thread_Proto_Arch.png | Bin .../sal-stack-nanostack/docs/img/arch_general.png | Bin .../sal-stack-nanostack/docs/img/br.png | Bin .../sal-stack-nanostack/docs/img/bw.png | Bin .../docs/img/ed_scan_process.png | Bin .../sal-stack-nanostack/docs/img/examples.png | Bin .../docs/img/high_level_stack_API_interfaces.png | Bin .../docs/img/join_process_star_6lowpan_router.png | Bin .../img/join_process_to_router_mesh_6lowpan.png | Bin .../sal-stack-nanostack/docs/img/mbedOS_sockets.png | Bin .../sal-stack-nanostack/docs/img/mesh.png | Bin .../docs/img/nanostack_in_mbed_OS.png | Bin .../docs/img/network_bootstrap_high_level_view.png | Bin .../docs/img/network_bootstrapping_process.png | Bin .../sal-stack-nanostack/docs/img/node_to_server.png | Bin .../docs/img/rpl_layer_reg_multiple_hops.png | Bin .../docs/img/rpl_layer_reg_single_hop.png | Bin .../docs/img/rpl_mesh_high_level_view.png | Bin .../sal-stack-nanostack/docs/img/star_topology.png | Bin .../docs/img/state_machine_6lowpan.png | Bin .../sal-stack-nanostack/docs/img/temp.png | Bin .../sal-stack-nanostack/docs/img/thread_case1.png | Bin .../sal-stack-nanostack/docs/img/thread_case2.png | Bin .../sal-stack-nanostack/docs/img/thread_case3.png | Bin .../sal-stack-nanostack/docs/img/thread_case4.png | Bin .../docs/img/thread_comm_ext.png | Bin .../docs/img/thread_ext_pet_seq.png | Bin .../docs/img/thread_nat_pet_seq.png | Bin .../docs/img/thread_native_comm_pet.png | Bin .../docs/img/thread_pet_auth_seq.png | Bin .../sal-stack-nanostack/docs/img/tx_process.png | Bin .../FEATURE_IPV6/sal-stack-nanostack/docs/index.md | 0 .../sal-stack-nanostack/docs/platform_API.md | 0 .../sal-stack-nanostack/docs/quick_start_build.md | 0 .../sal-stack-nanostack/docs/quick_start_config.md | 0 .../sal-stack-nanostack/docs/quick_start_hw.md | 0 .../sal-stack-nanostack/docs/quick_start_intro.md | 0 .../sal-stack-nanostack/docs/thread_APIs.md | 0 .../sal-stack-nanostack/docs/thread_comm.md | 0 .../sal-stack-nanostack/docs/thread_dev_typ.md | 0 .../sal-stack-nanostack/docs/thread_overview.md | 0 .../sal-stack-nanostack/docs/thread_sec.md | 0 .../sal-stack-nanostack/doxygen/mainpage.dox | 0 .../FEATURE_IPV6/sal-stack-nanostack/mbed_lib.json | 0 .../FEATURE_IPV6/sal-stack-nanostack/mkdocs.yml | 0 .../sal-stack-nanostack/nanostack/cca_api.h | 0 .../sal-stack-nanostack/nanostack/ccmLIB.h | 0 .../sal-stack-nanostack/nanostack/dev_stat_api.h | 0 .../nanostack/dhcp_service_api.h | 0 .../nanostack/ethernet_mac_api.h | 0 .../sal-stack-nanostack/nanostack/mac_api.h | 0 .../nanostack/mac_common_defines.h | 0 .../sal-stack-nanostack/nanostack/mac_filter_api.h | 0 .../sal-stack-nanostack/nanostack/mac_mcps.h | 0 .../sal-stack-nanostack/nanostack/mlme.h | 0 .../sal-stack-nanostack/nanostack/multicast_api.h | 0 .../nanostack/net_6lowpan_parameter_api.h | 0 .../nanostack/net_address_extension.h | 0 .../sal-stack-nanostack/nanostack/net_fhss.h | 0 .../sal-stack-nanostack/nanostack/net_interface.h | 0 .../sal-stack-nanostack/nanostack/net_ipv6_api.h | 0 .../sal-stack-nanostack/nanostack/net_mle_api.h | 0 .../sal-stack-nanostack/nanostack/net_nvm_api.h | 0 .../sal-stack-nanostack/nanostack/net_nwk_scan.h | 0 .../nanostack/net_pana_parameters_api.h | 0 .../sal-stack-nanostack/nanostack/net_polling_api.h | 0 .../sal-stack-nanostack/nanostack/net_rpl.h | 0 .../sal-stack-nanostack/nanostack/net_sleep.h | 0 .../sal-stack-nanostack/nanostack/net_thread_test.h | 0 .../sal-stack-nanostack/nanostack/ns_address.h | 0 .../nanostack/ns_virtual_rf_api.h | 0 .../sal-stack-nanostack/nanostack/nwk_stats_api.h | 0 .../nanostack/platform/arm_hal_aes.h | 0 .../nanostack/platform/arm_hal_phy.h | 0 .../nanostack/platform/os_whiteboard.h | 0 .../nanostack/platform/topo_trace.h | 0 .../sal-stack-nanostack/nanostack/serial_mac_api.h | 0 .../sal-stack-nanostack/nanostack/shalib.h | 0 .../sal-stack-nanostack/nanostack/socket_api.h | 0 .../sal-stack-nanostack/nanostack/sw_mac.h | 0 .../nanostack/thread_border_router_api.h | 0 .../nanostack/thread_commissioning_api.h | 0 .../nanostack/thread_dhcpv6_server.h | 0 .../nanostack/thread_diagcop_lib.h | 0 .../nanostack/thread_management_api.h | 0 .../nanostack/thread_management_if.h | 0 .../nanostack/thread_meshcop_lib.h | 0 .../sal-stack-nanostack/nanostack/whiteboard_api.h | 0 289 files changed, 0 insertions(+), 0 deletions(-) rename features/{ => net}/FEATURE_IPV6/CONTRIBUTING.md (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/.gitignore (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/.mbedignore (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/LICENSE (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/README.md (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/apache-2.0.txt (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/AbstractMesh.h (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/AbstractNetworkInterface.h (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/Mesh6LoWPAN_ND.h (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/MeshInterfaceFactory.h (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/MeshThread.h (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/mesh_interface_types.h (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/mbed_lib.json (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/module.json (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/source/AbstractMesh.cpp (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/source/AbstractNetworkInterface.cpp (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/source/CallbackHandler.cpp (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/source/Mesh6LoWPAN_ND.cpp (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/source/MeshInterfaceFactory.cpp (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/source/MeshThread.cpp (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/source/include/callback_handler.h (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/source/include/mesh_system.h (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/source/include/nd_tasklet.h (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/source/include/static_config.h (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/source/include/thread_tasklet.h (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/source/mesh_system.c (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/source/nd_tasklet.c (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/source/thread_tasklet.c (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/source/to_be_ported.c (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/test/6lowpan_nd/README.md (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/test/6lowpan_nd/main.cpp (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/test/system_test/main.cpp (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/test/system_test/test_cases.cpp (100%) rename features/{ => net}/FEATURE_IPV6/mbed-mesh-api/test/system_test/test_cases.h (100%) rename features/{ => net}/FEATURE_IPV6/mbed-trace/.gitignore (100%) rename features/{ => net}/FEATURE_IPV6/mbed-trace/.mbedignore (100%) rename features/{ => net}/FEATURE_IPV6/mbed-trace/.yotta_ignore (100%) rename features/{ => net}/FEATURE_IPV6/mbed-trace/CONTRIBUTING.md (100%) rename features/{ => net}/FEATURE_IPV6/mbed-trace/LICENSE (100%) rename features/{ => net}/FEATURE_IPV6/mbed-trace/Makefile.nanomesh (100%) rename features/{ => net}/FEATURE_IPV6/mbed-trace/README.md (100%) rename features/{ => net}/FEATURE_IPV6/mbed-trace/mbed-trace/mbed_trace.h (100%) rename features/{ => net}/FEATURE_IPV6/mbed-trace/mbed_lib.json (100%) rename features/{ => net}/FEATURE_IPV6/mbed-trace/module.json (100%) rename features/{ => net}/FEATURE_IPV6/mbed-trace/source/CMakeLists.txt (100%) rename features/{ => net}/FEATURE_IPV6/mbed-trace/source/mbed_trace.c (100%) rename features/{ => net}/FEATURE_IPV6/mbed-trace/test/CMakeLists.txt (100%) rename features/{ => net}/FEATURE_IPV6/mbed-trace/test/Test.cpp (100%) rename features/{ => net}/FEATURE_IPV6/mbed-trace/test/stubs/ip6tos_stub.c (100%) rename features/{ => net}/FEATURE_IPV6/mbed-trace/test/stubs/ip6tos_stub.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/.gitattributes (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/.mbedignore (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/README.md (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_interrupt.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_interrupt_private.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_random.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_timer.cpp (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/cs_nvm.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/MakefileWorker.mk (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/csnvmtest.cpp (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/main.cpp (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/test_cs_nvm.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/test_cs_nvm.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/makefile_defines.txt (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/run_tests (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/configuration_store_stub.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/configuration_store_stub.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/ns_trace_stub.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/nsdynmemLIB_stub.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/nsdynmemLIB_stub.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/timeout_stub.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/mbed_lib.json (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_event_loop.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_event_loop.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_hal_init.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_hal_init.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/nvm/README.md (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/nvm/nvm_ram.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-interface/NanostackInterface.cpp (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-interface/NanostackInterface.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/.gitignore (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/.mbedignore (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/.yotta_ignore (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/LICENSE (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/README.md (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/apache-2.0.txt (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/common_functions.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ip6string.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ip_fsc.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_list.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_nvm_helper.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_trace.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_types.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/nsdynmemLIB.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/platform/arm_hal_interrupt.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/platform/arm_hal_nvm.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/module.json (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/source/IPv6_fcf_lib/ip_fsc.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/source/libBits/common_functions.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/source/libList/ns_list.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/source/libTrace/ns_trace.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/source/libTrace/scripts/fetch_groups.sh (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/source/libip6string/ip6tos.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/source/libip6string/stoip6.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/source/nsdynmemLIB/nsdynmemLIB.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/source/nvmHelper/ns_nvm_helper.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/.gitignore (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/MakefileWorker.mk (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/ip6tos/ip6tos_test.cpp (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/ip6tos/main.cpp (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/libtracetest.cpp (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/main.cpp (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/test_libtrace.cpp (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/test_libtrace.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/makefile_defines.txt (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/dynmemtest.cpp (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/error_callback.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/error_callback.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/main.cpp (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/main.cpp (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/nsnvmhelpertest.cpp (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/test_ns_nvm_helper.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/test_ns_nvm_helper.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/run_tests (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stoip6/main.cpp (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stoip6/stoip6test.cpp (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/common_functions_stub.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ip6tos_stub.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ip6tos_stub.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ipv6_test_values.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ns_list_stub.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ns_trace_stub.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/nsdynmemLIB_stub.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/nsdynmemLIB_stub.h (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/platform_critical.c (100%) rename features/{ => net}/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/platform_nvm_stub.c (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/.gitignore (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/.mbedignore (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/LICENSE (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/apache-2.0.txt (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/event.c (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/ns_timer.c (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/ns_timer.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/system_timer.c (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/timeout.c (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/timer_sys.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/module.json (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_callback_timer.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_event.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_event_timer.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_scheduler.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/platform/arm_hal_timer.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/event.c (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/ns_timer.c (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/ns_timer.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/system_timer.cpp (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/timeout.c (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/timer_sys.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/.gitignore (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/DEPENDENCIES (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/DOXYGEN_FRONTPAGE.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/Doxyfile (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/LICENSE (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/LICENSE-permissive-binary-license-1.0.txt (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/README.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_ARM/TARGET_CORTEX_M/TARGET_M3/libnanostack_armcc_Cortex-M3.ar (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_ARM/TARGET_CORTEX_M/TARGET_M4/libnanostack_armcc_Cortex-M3.ar (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_GCC/TARGET_CORTEX_M/TARGET_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3.a (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_GCC/TARGET_CORTEX_M/TARGET_M4/libnanostack_arm-none-eabi-gcc_Cortex-M3.a (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_IAR/TARGET_CORTEX_M/TARGET_M3/libnanostack_iccarm_Cortex-M3.a (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_IAR/TARGET_CORTEX_M/TARGET_M4/libnanostack_iccarm_Cortex-M3.a (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/01_overview.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/02_N_arch.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/03_N_usage.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/04_N_networking.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/05_reference.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/06_API_introduction.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/07_API_initialize.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/08_API_events.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/09_API_network_def.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/10_API_timer.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/11_API_sockets.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/12_API_network.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/13_API_memory.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/14_API_data.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/15_API_debug.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/16_API_porting.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/api_changes_to_v4_0_0.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/api_changes_to_v5_0_0.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/dev_stats.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/driver_api.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lh.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_border_router_embedded_C_architecture.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_network_architecture.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_stack_architecture.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_stack_networking_topologies.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_stack_osi_model.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lr.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_General.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_Prot_Arch2.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_Prot_Arch_Comb.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_Proto_Arch.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/arch_general.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/br.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/bw.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/ed_scan_process.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/examples.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/high_level_stack_API_interfaces.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/join_process_star_6lowpan_router.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/join_process_to_router_mesh_6lowpan.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/mbedOS_sockets.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/mesh.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/nanostack_in_mbed_OS.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/network_bootstrap_high_level_view.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/network_bootstrapping_process.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/node_to_server.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/rpl_layer_reg_multiple_hops.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/rpl_layer_reg_single_hop.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/rpl_mesh_high_level_view.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/star_topology.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/state_machine_6lowpan.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/temp.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case1.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case2.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case3.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case4.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_comm_ext.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_ext_pet_seq.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_nat_pet_seq.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_native_comm_pet.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_pet_auth_seq.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/img/tx_process.png (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/index.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/platform_API.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_build.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_config.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_hw.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_intro.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/thread_APIs.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/thread_comm.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/thread_dev_typ.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/thread_overview.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/docs/thread_sec.md (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/doxygen/mainpage.dox (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/mbed_lib.json (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/mkdocs.yml (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/cca_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/ccmLIB.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/dev_stat_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/dhcp_service_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/ethernet_mac_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_common_defines.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_filter_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_mcps.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/mlme.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/multicast_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_6lowpan_parameter_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_address_extension.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_fhss.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_interface.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_ipv6_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_mle_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_nvm_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_nwk_scan.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_pana_parameters_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_polling_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_rpl.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_sleep.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_thread_test.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/ns_address.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/ns_virtual_rf_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/nwk_stats_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/arm_hal_aes.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/arm_hal_phy.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/os_whiteboard.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/topo_trace.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/serial_mac_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/shalib.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/socket_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/sw_mac.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_border_router_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_commissioning_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_dhcpv6_server.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_diagcop_lib.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_management_api.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_management_if.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_meshcop_lib.h (100%) rename features/{ => net}/FEATURE_IPV6/sal-stack-nanostack/nanostack/whiteboard_api.h (100%) diff --git a/features/FEATURE_IPV6/CONTRIBUTING.md b/features/net/FEATURE_IPV6/CONTRIBUTING.md similarity index 100% rename from features/FEATURE_IPV6/CONTRIBUTING.md rename to features/net/FEATURE_IPV6/CONTRIBUTING.md diff --git a/features/FEATURE_IPV6/mbed-mesh-api/.gitignore b/features/net/FEATURE_IPV6/mbed-mesh-api/.gitignore similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/.gitignore rename to features/net/FEATURE_IPV6/mbed-mesh-api/.gitignore diff --git a/features/FEATURE_IPV6/mbed-mesh-api/.mbedignore b/features/net/FEATURE_IPV6/mbed-mesh-api/.mbedignore similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/.mbedignore rename to features/net/FEATURE_IPV6/mbed-mesh-api/.mbedignore diff --git a/features/FEATURE_IPV6/mbed-mesh-api/LICENSE b/features/net/FEATURE_IPV6/mbed-mesh-api/LICENSE similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/LICENSE rename to features/net/FEATURE_IPV6/mbed-mesh-api/LICENSE diff --git a/features/FEATURE_IPV6/mbed-mesh-api/README.md b/features/net/FEATURE_IPV6/mbed-mesh-api/README.md similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/README.md rename to features/net/FEATURE_IPV6/mbed-mesh-api/README.md diff --git a/features/FEATURE_IPV6/mbed-mesh-api/apache-2.0.txt b/features/net/FEATURE_IPV6/mbed-mesh-api/apache-2.0.txt similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/apache-2.0.txt rename to features/net/FEATURE_IPV6/mbed-mesh-api/apache-2.0.txt diff --git a/features/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/AbstractMesh.h b/features/net/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/AbstractMesh.h similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/AbstractMesh.h rename to features/net/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/AbstractMesh.h diff --git a/features/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/AbstractNetworkInterface.h b/features/net/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/AbstractNetworkInterface.h similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/AbstractNetworkInterface.h rename to features/net/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/AbstractNetworkInterface.h diff --git a/features/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/Mesh6LoWPAN_ND.h b/features/net/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/Mesh6LoWPAN_ND.h similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/Mesh6LoWPAN_ND.h rename to features/net/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/Mesh6LoWPAN_ND.h diff --git a/features/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/MeshInterfaceFactory.h b/features/net/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/MeshInterfaceFactory.h similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/MeshInterfaceFactory.h rename to features/net/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/MeshInterfaceFactory.h diff --git a/features/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/MeshThread.h b/features/net/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/MeshThread.h similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/MeshThread.h rename to features/net/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/MeshThread.h diff --git a/features/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/mesh_interface_types.h b/features/net/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/mesh_interface_types.h similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/mesh_interface_types.h rename to features/net/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/mesh_interface_types.h diff --git a/features/FEATURE_IPV6/mbed-mesh-api/mbed_lib.json b/features/net/FEATURE_IPV6/mbed-mesh-api/mbed_lib.json similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/mbed_lib.json rename to features/net/FEATURE_IPV6/mbed-mesh-api/mbed_lib.json diff --git a/features/FEATURE_IPV6/mbed-mesh-api/module.json b/features/net/FEATURE_IPV6/mbed-mesh-api/module.json similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/module.json rename to features/net/FEATURE_IPV6/mbed-mesh-api/module.json diff --git a/features/FEATURE_IPV6/mbed-mesh-api/source/AbstractMesh.cpp b/features/net/FEATURE_IPV6/mbed-mesh-api/source/AbstractMesh.cpp similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/source/AbstractMesh.cpp rename to features/net/FEATURE_IPV6/mbed-mesh-api/source/AbstractMesh.cpp diff --git a/features/FEATURE_IPV6/mbed-mesh-api/source/AbstractNetworkInterface.cpp b/features/net/FEATURE_IPV6/mbed-mesh-api/source/AbstractNetworkInterface.cpp similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/source/AbstractNetworkInterface.cpp rename to features/net/FEATURE_IPV6/mbed-mesh-api/source/AbstractNetworkInterface.cpp diff --git a/features/FEATURE_IPV6/mbed-mesh-api/source/CallbackHandler.cpp b/features/net/FEATURE_IPV6/mbed-mesh-api/source/CallbackHandler.cpp similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/source/CallbackHandler.cpp rename to features/net/FEATURE_IPV6/mbed-mesh-api/source/CallbackHandler.cpp diff --git a/features/FEATURE_IPV6/mbed-mesh-api/source/Mesh6LoWPAN_ND.cpp b/features/net/FEATURE_IPV6/mbed-mesh-api/source/Mesh6LoWPAN_ND.cpp similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/source/Mesh6LoWPAN_ND.cpp rename to features/net/FEATURE_IPV6/mbed-mesh-api/source/Mesh6LoWPAN_ND.cpp diff --git a/features/FEATURE_IPV6/mbed-mesh-api/source/MeshInterfaceFactory.cpp b/features/net/FEATURE_IPV6/mbed-mesh-api/source/MeshInterfaceFactory.cpp similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/source/MeshInterfaceFactory.cpp rename to features/net/FEATURE_IPV6/mbed-mesh-api/source/MeshInterfaceFactory.cpp diff --git a/features/FEATURE_IPV6/mbed-mesh-api/source/MeshThread.cpp b/features/net/FEATURE_IPV6/mbed-mesh-api/source/MeshThread.cpp similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/source/MeshThread.cpp rename to features/net/FEATURE_IPV6/mbed-mesh-api/source/MeshThread.cpp diff --git a/features/FEATURE_IPV6/mbed-mesh-api/source/include/callback_handler.h b/features/net/FEATURE_IPV6/mbed-mesh-api/source/include/callback_handler.h similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/source/include/callback_handler.h rename to features/net/FEATURE_IPV6/mbed-mesh-api/source/include/callback_handler.h diff --git a/features/FEATURE_IPV6/mbed-mesh-api/source/include/mesh_system.h b/features/net/FEATURE_IPV6/mbed-mesh-api/source/include/mesh_system.h similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/source/include/mesh_system.h rename to features/net/FEATURE_IPV6/mbed-mesh-api/source/include/mesh_system.h diff --git a/features/FEATURE_IPV6/mbed-mesh-api/source/include/nd_tasklet.h b/features/net/FEATURE_IPV6/mbed-mesh-api/source/include/nd_tasklet.h similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/source/include/nd_tasklet.h rename to features/net/FEATURE_IPV6/mbed-mesh-api/source/include/nd_tasklet.h diff --git a/features/FEATURE_IPV6/mbed-mesh-api/source/include/static_config.h b/features/net/FEATURE_IPV6/mbed-mesh-api/source/include/static_config.h similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/source/include/static_config.h rename to features/net/FEATURE_IPV6/mbed-mesh-api/source/include/static_config.h diff --git a/features/FEATURE_IPV6/mbed-mesh-api/source/include/thread_tasklet.h b/features/net/FEATURE_IPV6/mbed-mesh-api/source/include/thread_tasklet.h similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/source/include/thread_tasklet.h rename to features/net/FEATURE_IPV6/mbed-mesh-api/source/include/thread_tasklet.h diff --git a/features/FEATURE_IPV6/mbed-mesh-api/source/mesh_system.c b/features/net/FEATURE_IPV6/mbed-mesh-api/source/mesh_system.c similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/source/mesh_system.c rename to features/net/FEATURE_IPV6/mbed-mesh-api/source/mesh_system.c diff --git a/features/FEATURE_IPV6/mbed-mesh-api/source/nd_tasklet.c b/features/net/FEATURE_IPV6/mbed-mesh-api/source/nd_tasklet.c similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/source/nd_tasklet.c rename to features/net/FEATURE_IPV6/mbed-mesh-api/source/nd_tasklet.c diff --git a/features/FEATURE_IPV6/mbed-mesh-api/source/thread_tasklet.c b/features/net/FEATURE_IPV6/mbed-mesh-api/source/thread_tasklet.c similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/source/thread_tasklet.c rename to features/net/FEATURE_IPV6/mbed-mesh-api/source/thread_tasklet.c diff --git a/features/FEATURE_IPV6/mbed-mesh-api/source/to_be_ported.c b/features/net/FEATURE_IPV6/mbed-mesh-api/source/to_be_ported.c similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/source/to_be_ported.c rename to features/net/FEATURE_IPV6/mbed-mesh-api/source/to_be_ported.c diff --git a/features/FEATURE_IPV6/mbed-mesh-api/test/6lowpan_nd/README.md b/features/net/FEATURE_IPV6/mbed-mesh-api/test/6lowpan_nd/README.md similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/test/6lowpan_nd/README.md rename to features/net/FEATURE_IPV6/mbed-mesh-api/test/6lowpan_nd/README.md diff --git a/features/FEATURE_IPV6/mbed-mesh-api/test/6lowpan_nd/main.cpp b/features/net/FEATURE_IPV6/mbed-mesh-api/test/6lowpan_nd/main.cpp similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/test/6lowpan_nd/main.cpp rename to features/net/FEATURE_IPV6/mbed-mesh-api/test/6lowpan_nd/main.cpp diff --git a/features/FEATURE_IPV6/mbed-mesh-api/test/system_test/main.cpp b/features/net/FEATURE_IPV6/mbed-mesh-api/test/system_test/main.cpp similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/test/system_test/main.cpp rename to features/net/FEATURE_IPV6/mbed-mesh-api/test/system_test/main.cpp diff --git a/features/FEATURE_IPV6/mbed-mesh-api/test/system_test/test_cases.cpp b/features/net/FEATURE_IPV6/mbed-mesh-api/test/system_test/test_cases.cpp similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/test/system_test/test_cases.cpp rename to features/net/FEATURE_IPV6/mbed-mesh-api/test/system_test/test_cases.cpp diff --git a/features/FEATURE_IPV6/mbed-mesh-api/test/system_test/test_cases.h b/features/net/FEATURE_IPV6/mbed-mesh-api/test/system_test/test_cases.h similarity index 100% rename from features/FEATURE_IPV6/mbed-mesh-api/test/system_test/test_cases.h rename to features/net/FEATURE_IPV6/mbed-mesh-api/test/system_test/test_cases.h diff --git a/features/FEATURE_IPV6/mbed-trace/.gitignore b/features/net/FEATURE_IPV6/mbed-trace/.gitignore similarity index 100% rename from features/FEATURE_IPV6/mbed-trace/.gitignore rename to features/net/FEATURE_IPV6/mbed-trace/.gitignore diff --git a/features/FEATURE_IPV6/mbed-trace/.mbedignore b/features/net/FEATURE_IPV6/mbed-trace/.mbedignore similarity index 100% rename from features/FEATURE_IPV6/mbed-trace/.mbedignore rename to features/net/FEATURE_IPV6/mbed-trace/.mbedignore diff --git a/features/FEATURE_IPV6/mbed-trace/.yotta_ignore b/features/net/FEATURE_IPV6/mbed-trace/.yotta_ignore similarity index 100% rename from features/FEATURE_IPV6/mbed-trace/.yotta_ignore rename to features/net/FEATURE_IPV6/mbed-trace/.yotta_ignore diff --git a/features/FEATURE_IPV6/mbed-trace/CONTRIBUTING.md b/features/net/FEATURE_IPV6/mbed-trace/CONTRIBUTING.md similarity index 100% rename from features/FEATURE_IPV6/mbed-trace/CONTRIBUTING.md rename to features/net/FEATURE_IPV6/mbed-trace/CONTRIBUTING.md diff --git a/features/FEATURE_IPV6/mbed-trace/LICENSE b/features/net/FEATURE_IPV6/mbed-trace/LICENSE similarity index 100% rename from features/FEATURE_IPV6/mbed-trace/LICENSE rename to features/net/FEATURE_IPV6/mbed-trace/LICENSE diff --git a/features/FEATURE_IPV6/mbed-trace/Makefile.nanomesh b/features/net/FEATURE_IPV6/mbed-trace/Makefile.nanomesh similarity index 100% rename from features/FEATURE_IPV6/mbed-trace/Makefile.nanomesh rename to features/net/FEATURE_IPV6/mbed-trace/Makefile.nanomesh diff --git a/features/FEATURE_IPV6/mbed-trace/README.md b/features/net/FEATURE_IPV6/mbed-trace/README.md similarity index 100% rename from features/FEATURE_IPV6/mbed-trace/README.md rename to features/net/FEATURE_IPV6/mbed-trace/README.md diff --git a/features/FEATURE_IPV6/mbed-trace/mbed-trace/mbed_trace.h b/features/net/FEATURE_IPV6/mbed-trace/mbed-trace/mbed_trace.h similarity index 100% rename from features/FEATURE_IPV6/mbed-trace/mbed-trace/mbed_trace.h rename to features/net/FEATURE_IPV6/mbed-trace/mbed-trace/mbed_trace.h diff --git a/features/FEATURE_IPV6/mbed-trace/mbed_lib.json b/features/net/FEATURE_IPV6/mbed-trace/mbed_lib.json similarity index 100% rename from features/FEATURE_IPV6/mbed-trace/mbed_lib.json rename to features/net/FEATURE_IPV6/mbed-trace/mbed_lib.json diff --git a/features/FEATURE_IPV6/mbed-trace/module.json b/features/net/FEATURE_IPV6/mbed-trace/module.json similarity index 100% rename from features/FEATURE_IPV6/mbed-trace/module.json rename to features/net/FEATURE_IPV6/mbed-trace/module.json diff --git a/features/FEATURE_IPV6/mbed-trace/source/CMakeLists.txt b/features/net/FEATURE_IPV6/mbed-trace/source/CMakeLists.txt similarity index 100% rename from features/FEATURE_IPV6/mbed-trace/source/CMakeLists.txt rename to features/net/FEATURE_IPV6/mbed-trace/source/CMakeLists.txt diff --git a/features/FEATURE_IPV6/mbed-trace/source/mbed_trace.c b/features/net/FEATURE_IPV6/mbed-trace/source/mbed_trace.c similarity index 100% rename from features/FEATURE_IPV6/mbed-trace/source/mbed_trace.c rename to features/net/FEATURE_IPV6/mbed-trace/source/mbed_trace.c diff --git a/features/FEATURE_IPV6/mbed-trace/test/CMakeLists.txt b/features/net/FEATURE_IPV6/mbed-trace/test/CMakeLists.txt similarity index 100% rename from features/FEATURE_IPV6/mbed-trace/test/CMakeLists.txt rename to features/net/FEATURE_IPV6/mbed-trace/test/CMakeLists.txt diff --git a/features/FEATURE_IPV6/mbed-trace/test/Test.cpp b/features/net/FEATURE_IPV6/mbed-trace/test/Test.cpp similarity index 100% rename from features/FEATURE_IPV6/mbed-trace/test/Test.cpp rename to features/net/FEATURE_IPV6/mbed-trace/test/Test.cpp diff --git a/features/FEATURE_IPV6/mbed-trace/test/stubs/ip6tos_stub.c b/features/net/FEATURE_IPV6/mbed-trace/test/stubs/ip6tos_stub.c similarity index 100% rename from features/FEATURE_IPV6/mbed-trace/test/stubs/ip6tos_stub.c rename to features/net/FEATURE_IPV6/mbed-trace/test/stubs/ip6tos_stub.c diff --git a/features/FEATURE_IPV6/mbed-trace/test/stubs/ip6tos_stub.h b/features/net/FEATURE_IPV6/mbed-trace/test/stubs/ip6tos_stub.h similarity index 100% rename from features/FEATURE_IPV6/mbed-trace/test/stubs/ip6tos_stub.h rename to features/net/FEATURE_IPV6/mbed-trace/test/stubs/ip6tos_stub.h diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/.gitattributes b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/.gitattributes similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/.gitattributes rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/.gitattributes diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/.mbedignore b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/.mbedignore similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/.mbedignore rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/.mbedignore diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/README.md b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/README.md similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/README.md rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/README.md diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_interrupt.c b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_interrupt.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_interrupt.c rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_interrupt.c diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_interrupt_private.h b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_interrupt_private.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_interrupt_private.h rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_interrupt_private.h diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_random.c b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_random.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_random.c rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_random.c diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_timer.cpp b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_timer.cpp similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_timer.cpp rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/arm_hal_timer.cpp diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/cs_nvm.c b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/cs_nvm.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/cs_nvm.c rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/cs_nvm.c diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/MakefileWorker.mk b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/MakefileWorker.mk similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/MakefileWorker.mk rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/MakefileWorker.mk diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/csnvmtest.cpp b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/csnvmtest.cpp similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/csnvmtest.cpp rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/csnvmtest.cpp diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/main.cpp b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/main.cpp similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/main.cpp rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/main.cpp diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/test_cs_nvm.c b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/test_cs_nvm.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/test_cs_nvm.c rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/test_cs_nvm.c diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/test_cs_nvm.h b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/test_cs_nvm.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/test_cs_nvm.h rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/cs_nvm/test_cs_nvm.h diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/makefile_defines.txt b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/makefile_defines.txt similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/makefile_defines.txt rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/makefile_defines.txt diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/run_tests b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/run_tests similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/run_tests rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/run_tests diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/configuration_store_stub.c b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/configuration_store_stub.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/configuration_store_stub.c rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/configuration_store_stub.c diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/configuration_store_stub.h b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/configuration_store_stub.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/configuration_store_stub.h rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/configuration_store_stub.h diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/ns_trace_stub.c b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/ns_trace_stub.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/ns_trace_stub.c rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/ns_trace_stub.c diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/nsdynmemLIB_stub.c b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/nsdynmemLIB_stub.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/nsdynmemLIB_stub.c rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/nsdynmemLIB_stub.c diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/nsdynmemLIB_stub.h b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/nsdynmemLIB_stub.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/nsdynmemLIB_stub.h rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/nsdynmemLIB_stub.h diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/timeout_stub.c b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/timeout_stub.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/timeout_stub.c rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/cs_nvm/test/test_cs_nvm_unit/unittest/stubs/timeout_stub.c diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/mbed_lib.json b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/mbed_lib.json similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/mbed_lib.json rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/mbed_lib.json diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_event_loop.c b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_event_loop.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_event_loop.c rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_event_loop.c diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_event_loop.h b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_event_loop.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_event_loop.h rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_event_loop.h diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_hal_init.c b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_hal_init.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_hal_init.c rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_hal_init.c diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_hal_init.h b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_hal_init.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_hal_init.h rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/ns_hal_init.h diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/nvm/README.md b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/nvm/README.md similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/nvm/README.md rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/nvm/README.md diff --git a/features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/nvm/nvm_ram.c b/features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/nvm/nvm_ram.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/nvm/nvm_ram.c rename to features/net/FEATURE_IPV6/nanostack-hal-mbed-cmsis-rtos/nvm/nvm_ram.c diff --git a/features/FEATURE_IPV6/nanostack-interface/NanostackInterface.cpp b/features/net/FEATURE_IPV6/nanostack-interface/NanostackInterface.cpp similarity index 100% rename from features/FEATURE_IPV6/nanostack-interface/NanostackInterface.cpp rename to features/net/FEATURE_IPV6/nanostack-interface/NanostackInterface.cpp diff --git a/features/FEATURE_IPV6/nanostack-interface/NanostackInterface.h b/features/net/FEATURE_IPV6/nanostack-interface/NanostackInterface.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-interface/NanostackInterface.h rename to features/net/FEATURE_IPV6/nanostack-interface/NanostackInterface.h diff --git a/features/FEATURE_IPV6/nanostack-libservice/.gitignore b/features/net/FEATURE_IPV6/nanostack-libservice/.gitignore similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/.gitignore rename to features/net/FEATURE_IPV6/nanostack-libservice/.gitignore diff --git a/features/FEATURE_IPV6/nanostack-libservice/.mbedignore b/features/net/FEATURE_IPV6/nanostack-libservice/.mbedignore similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/.mbedignore rename to features/net/FEATURE_IPV6/nanostack-libservice/.mbedignore diff --git a/features/FEATURE_IPV6/nanostack-libservice/.yotta_ignore b/features/net/FEATURE_IPV6/nanostack-libservice/.yotta_ignore similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/.yotta_ignore rename to features/net/FEATURE_IPV6/nanostack-libservice/.yotta_ignore diff --git a/features/FEATURE_IPV6/nanostack-libservice/LICENSE b/features/net/FEATURE_IPV6/nanostack-libservice/LICENSE similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/LICENSE rename to features/net/FEATURE_IPV6/nanostack-libservice/LICENSE diff --git a/features/FEATURE_IPV6/nanostack-libservice/README.md b/features/net/FEATURE_IPV6/nanostack-libservice/README.md similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/README.md rename to features/net/FEATURE_IPV6/nanostack-libservice/README.md diff --git a/features/FEATURE_IPV6/nanostack-libservice/apache-2.0.txt b/features/net/FEATURE_IPV6/nanostack-libservice/apache-2.0.txt similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/apache-2.0.txt rename to features/net/FEATURE_IPV6/nanostack-libservice/apache-2.0.txt diff --git a/features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/common_functions.h b/features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/common_functions.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/common_functions.h rename to features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/common_functions.h diff --git a/features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ip6string.h b/features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ip6string.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ip6string.h rename to features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ip6string.h diff --git a/features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ip_fsc.h b/features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ip_fsc.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ip_fsc.h rename to features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ip_fsc.h diff --git a/features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_list.h b/features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_list.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_list.h rename to features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_list.h diff --git a/features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_nvm_helper.h b/features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_nvm_helper.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_nvm_helper.h rename to features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_nvm_helper.h diff --git a/features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_trace.h b/features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_trace.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_trace.h rename to features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_trace.h diff --git a/features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_types.h b/features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_types.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_types.h rename to features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/ns_types.h diff --git a/features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/nsdynmemLIB.h b/features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/nsdynmemLIB.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/nsdynmemLIB.h rename to features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/nsdynmemLIB.h diff --git a/features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/platform/arm_hal_interrupt.h b/features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/platform/arm_hal_interrupt.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/platform/arm_hal_interrupt.h rename to features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/platform/arm_hal_interrupt.h diff --git a/features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/platform/arm_hal_nvm.h b/features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/platform/arm_hal_nvm.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/platform/arm_hal_nvm.h rename to features/net/FEATURE_IPV6/nanostack-libservice/mbed-client-libservice/platform/arm_hal_nvm.h diff --git a/features/FEATURE_IPV6/nanostack-libservice/module.json b/features/net/FEATURE_IPV6/nanostack-libservice/module.json similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/module.json rename to features/net/FEATURE_IPV6/nanostack-libservice/module.json diff --git a/features/FEATURE_IPV6/nanostack-libservice/source/IPv6_fcf_lib/ip_fsc.c b/features/net/FEATURE_IPV6/nanostack-libservice/source/IPv6_fcf_lib/ip_fsc.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/source/IPv6_fcf_lib/ip_fsc.c rename to features/net/FEATURE_IPV6/nanostack-libservice/source/IPv6_fcf_lib/ip_fsc.c diff --git a/features/FEATURE_IPV6/nanostack-libservice/source/libBits/common_functions.c b/features/net/FEATURE_IPV6/nanostack-libservice/source/libBits/common_functions.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/source/libBits/common_functions.c rename to features/net/FEATURE_IPV6/nanostack-libservice/source/libBits/common_functions.c diff --git a/features/FEATURE_IPV6/nanostack-libservice/source/libList/ns_list.c b/features/net/FEATURE_IPV6/nanostack-libservice/source/libList/ns_list.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/source/libList/ns_list.c rename to features/net/FEATURE_IPV6/nanostack-libservice/source/libList/ns_list.c diff --git a/features/FEATURE_IPV6/nanostack-libservice/source/libTrace/ns_trace.c b/features/net/FEATURE_IPV6/nanostack-libservice/source/libTrace/ns_trace.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/source/libTrace/ns_trace.c rename to features/net/FEATURE_IPV6/nanostack-libservice/source/libTrace/ns_trace.c diff --git a/features/FEATURE_IPV6/nanostack-libservice/source/libTrace/scripts/fetch_groups.sh b/features/net/FEATURE_IPV6/nanostack-libservice/source/libTrace/scripts/fetch_groups.sh similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/source/libTrace/scripts/fetch_groups.sh rename to features/net/FEATURE_IPV6/nanostack-libservice/source/libTrace/scripts/fetch_groups.sh diff --git a/features/FEATURE_IPV6/nanostack-libservice/source/libip6string/ip6tos.c b/features/net/FEATURE_IPV6/nanostack-libservice/source/libip6string/ip6tos.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/source/libip6string/ip6tos.c rename to features/net/FEATURE_IPV6/nanostack-libservice/source/libip6string/ip6tos.c diff --git a/features/FEATURE_IPV6/nanostack-libservice/source/libip6string/stoip6.c b/features/net/FEATURE_IPV6/nanostack-libservice/source/libip6string/stoip6.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/source/libip6string/stoip6.c rename to features/net/FEATURE_IPV6/nanostack-libservice/source/libip6string/stoip6.c diff --git a/features/FEATURE_IPV6/nanostack-libservice/source/nsdynmemLIB/nsdynmemLIB.c b/features/net/FEATURE_IPV6/nanostack-libservice/source/nsdynmemLIB/nsdynmemLIB.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/source/nsdynmemLIB/nsdynmemLIB.c rename to features/net/FEATURE_IPV6/nanostack-libservice/source/nsdynmemLIB/nsdynmemLIB.c diff --git a/features/FEATURE_IPV6/nanostack-libservice/source/nvmHelper/ns_nvm_helper.c b/features/net/FEATURE_IPV6/nanostack-libservice/source/nvmHelper/ns_nvm_helper.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/source/nvmHelper/ns_nvm_helper.c rename to features/net/FEATURE_IPV6/nanostack-libservice/source/nvmHelper/ns_nvm_helper.c diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/.gitignore b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/.gitignore similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/.gitignore rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/.gitignore diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/MakefileWorker.mk b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/MakefileWorker.mk similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/MakefileWorker.mk rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/MakefileWorker.mk diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/ip6tos/ip6tos_test.cpp b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/ip6tos/ip6tos_test.cpp similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/ip6tos/ip6tos_test.cpp rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/ip6tos/ip6tos_test.cpp diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/ip6tos/main.cpp b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/ip6tos/main.cpp similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/ip6tos/main.cpp rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/ip6tos/main.cpp diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/libtracetest.cpp b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/libtracetest.cpp similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/libtracetest.cpp rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/libtracetest.cpp diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/main.cpp b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/main.cpp similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/main.cpp rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/main.cpp diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/test_libtrace.cpp b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/test_libtrace.cpp similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/test_libtrace.cpp rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/test_libtrace.cpp diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/test_libtrace.h b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/test_libtrace.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/test_libtrace.h rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/libTrace/test_libtrace.h diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/makefile_defines.txt b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/makefile_defines.txt similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/makefile_defines.txt rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/makefile_defines.txt diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/dynmemtest.cpp b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/dynmemtest.cpp similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/dynmemtest.cpp rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/dynmemtest.cpp diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/error_callback.c b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/error_callback.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/error_callback.c rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/error_callback.c diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/error_callback.h b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/error_callback.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/error_callback.h rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/error_callback.h diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/main.cpp b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/main.cpp similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/main.cpp rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsdynmem/main.cpp diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/main.cpp b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/main.cpp similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/main.cpp rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/main.cpp diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/nsnvmhelpertest.cpp b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/nsnvmhelpertest.cpp similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/nsnvmhelpertest.cpp rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/nsnvmhelpertest.cpp diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/test_ns_nvm_helper.c b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/test_ns_nvm_helper.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/test_ns_nvm_helper.c rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/test_ns_nvm_helper.c diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/test_ns_nvm_helper.h b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/test_ns_nvm_helper.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/test_ns_nvm_helper.h rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/nsnvmhelper/test_ns_nvm_helper.h diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/run_tests b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/run_tests similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/run_tests rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/run_tests diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stoip6/main.cpp b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stoip6/main.cpp similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stoip6/main.cpp rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stoip6/main.cpp diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stoip6/stoip6test.cpp b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stoip6/stoip6test.cpp similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stoip6/stoip6test.cpp rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stoip6/stoip6test.cpp diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/common_functions_stub.c b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/common_functions_stub.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/common_functions_stub.c rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/common_functions_stub.c diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ip6tos_stub.c b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ip6tos_stub.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ip6tos_stub.c rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ip6tos_stub.c diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ip6tos_stub.h b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ip6tos_stub.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ip6tos_stub.h rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ip6tos_stub.h diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ipv6_test_values.h b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ipv6_test_values.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ipv6_test_values.h rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ipv6_test_values.h diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ns_list_stub.c b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ns_list_stub.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ns_list_stub.c rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ns_list_stub.c diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ns_trace_stub.c b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ns_trace_stub.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ns_trace_stub.c rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/ns_trace_stub.c diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/nsdynmemLIB_stub.c b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/nsdynmemLIB_stub.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/nsdynmemLIB_stub.c rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/nsdynmemLIB_stub.c diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/nsdynmemLIB_stub.h b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/nsdynmemLIB_stub.h similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/nsdynmemLIB_stub.h rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/nsdynmemLIB_stub.h diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/platform_critical.c b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/platform_critical.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/platform_critical.c rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/platform_critical.c diff --git a/features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/platform_nvm_stub.c b/features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/platform_nvm_stub.c similarity index 100% rename from features/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/platform_nvm_stub.c rename to features/net/FEATURE_IPV6/nanostack-libservice/test/libService/unittest/stubs/platform_nvm_stub.c diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/.gitignore b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/.gitignore similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/.gitignore rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/.gitignore diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/.mbedignore b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/.mbedignore similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/.mbedignore rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/.mbedignore diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/LICENSE b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/LICENSE similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/LICENSE rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/LICENSE diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/apache-2.0.txt b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/apache-2.0.txt similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/apache-2.0.txt rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/apache-2.0.txt diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/event.c b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/event.c similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/event.c rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/event.c diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/ns_timer.c b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/ns_timer.c similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/ns_timer.c rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/ns_timer.c diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/ns_timer.h b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/ns_timer.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/ns_timer.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/ns_timer.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/system_timer.c b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/system_timer.c similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/system_timer.c rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/system_timer.c diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/timeout.c b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/timeout.c similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/timeout.c rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/timeout.c diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/timer_sys.h b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/timer_sys.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/timer_sys.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/bare-metal/timer_sys.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/module.json b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/module.json similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/module.json rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/module.json diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_callback_timer.h b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_callback_timer.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_callback_timer.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_callback_timer.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_event.h b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_event.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_event.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_event.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_event_timer.h b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_event_timer.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_event_timer.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_event_timer.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_scheduler.h b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_scheduler.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_scheduler.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/eventOS_scheduler.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/platform/arm_hal_timer.h b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/platform/arm_hal_timer.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/platform/arm_hal_timer.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/nanostack-event-loop/platform/arm_hal_timer.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/event.c b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/event.c similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/event.c rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/event.c diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/ns_timer.c b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/ns_timer.c similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/ns_timer.c rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/ns_timer.c diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/ns_timer.h b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/ns_timer.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/ns_timer.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/ns_timer.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/system_timer.cpp b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/system_timer.cpp similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/system_timer.cpp rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/system_timer.cpp diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/timeout.c b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/timeout.c similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/timeout.c rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/timeout.c diff --git a/features/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/timer_sys.h b/features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/timer_sys.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/timer_sys.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack-eventloop/source/timer_sys.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/.gitignore b/features/net/FEATURE_IPV6/sal-stack-nanostack/.gitignore similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/.gitignore rename to features/net/FEATURE_IPV6/sal-stack-nanostack/.gitignore diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/DEPENDENCIES b/features/net/FEATURE_IPV6/sal-stack-nanostack/DEPENDENCIES similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/DEPENDENCIES rename to features/net/FEATURE_IPV6/sal-stack-nanostack/DEPENDENCIES diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/DOXYGEN_FRONTPAGE.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/DOXYGEN_FRONTPAGE.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/DOXYGEN_FRONTPAGE.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/DOXYGEN_FRONTPAGE.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/Doxyfile b/features/net/FEATURE_IPV6/sal-stack-nanostack/Doxyfile similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/Doxyfile rename to features/net/FEATURE_IPV6/sal-stack-nanostack/Doxyfile diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/LICENSE b/features/net/FEATURE_IPV6/sal-stack-nanostack/LICENSE similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/LICENSE rename to features/net/FEATURE_IPV6/sal-stack-nanostack/LICENSE diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/LICENSE-permissive-binary-license-1.0.txt b/features/net/FEATURE_IPV6/sal-stack-nanostack/LICENSE-permissive-binary-license-1.0.txt similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/LICENSE-permissive-binary-license-1.0.txt rename to features/net/FEATURE_IPV6/sal-stack-nanostack/LICENSE-permissive-binary-license-1.0.txt diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/README.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/README.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/README.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/README.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_ARM/TARGET_CORTEX_M/TARGET_M3/libnanostack_armcc_Cortex-M3.ar b/features/net/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_ARM/TARGET_CORTEX_M/TARGET_M3/libnanostack_armcc_Cortex-M3.ar similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_ARM/TARGET_CORTEX_M/TARGET_M3/libnanostack_armcc_Cortex-M3.ar rename to features/net/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_ARM/TARGET_CORTEX_M/TARGET_M3/libnanostack_armcc_Cortex-M3.ar diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_ARM/TARGET_CORTEX_M/TARGET_M4/libnanostack_armcc_Cortex-M3.ar b/features/net/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_ARM/TARGET_CORTEX_M/TARGET_M4/libnanostack_armcc_Cortex-M3.ar similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_ARM/TARGET_CORTEX_M/TARGET_M4/libnanostack_armcc_Cortex-M3.ar rename to features/net/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_ARM/TARGET_CORTEX_M/TARGET_M4/libnanostack_armcc_Cortex-M3.ar diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_GCC/TARGET_CORTEX_M/TARGET_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3.a b/features/net/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_GCC/TARGET_CORTEX_M/TARGET_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3.a similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_GCC/TARGET_CORTEX_M/TARGET_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3.a rename to features/net/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_GCC/TARGET_CORTEX_M/TARGET_M3/libnanostack_arm-none-eabi-gcc_Cortex-M3.a diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_GCC/TARGET_CORTEX_M/TARGET_M4/libnanostack_arm-none-eabi-gcc_Cortex-M3.a b/features/net/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_GCC/TARGET_CORTEX_M/TARGET_M4/libnanostack_arm-none-eabi-gcc_Cortex-M3.a similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_GCC/TARGET_CORTEX_M/TARGET_M4/libnanostack_arm-none-eabi-gcc_Cortex-M3.a rename to features/net/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_GCC/TARGET_CORTEX_M/TARGET_M4/libnanostack_arm-none-eabi-gcc_Cortex-M3.a diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_IAR/TARGET_CORTEX_M/TARGET_M3/libnanostack_iccarm_Cortex-M3.a b/features/net/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_IAR/TARGET_CORTEX_M/TARGET_M3/libnanostack_iccarm_Cortex-M3.a similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_IAR/TARGET_CORTEX_M/TARGET_M3/libnanostack_iccarm_Cortex-M3.a rename to features/net/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_IAR/TARGET_CORTEX_M/TARGET_M3/libnanostack_iccarm_Cortex-M3.a diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_IAR/TARGET_CORTEX_M/TARGET_M4/libnanostack_iccarm_Cortex-M3.a b/features/net/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_IAR/TARGET_CORTEX_M/TARGET_M4/libnanostack_iccarm_Cortex-M3.a similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_IAR/TARGET_CORTEX_M/TARGET_M4/libnanostack_iccarm_Cortex-M3.a rename to features/net/FEATURE_IPV6/sal-stack-nanostack/TOOLCHAIN_IAR/TARGET_CORTEX_M/TARGET_M4/libnanostack_iccarm_Cortex-M3.a diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/01_overview.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/01_overview.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/01_overview.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/01_overview.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/02_N_arch.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/02_N_arch.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/02_N_arch.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/02_N_arch.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/03_N_usage.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/03_N_usage.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/03_N_usage.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/03_N_usage.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/04_N_networking.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/04_N_networking.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/04_N_networking.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/04_N_networking.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/05_reference.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/05_reference.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/05_reference.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/05_reference.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/06_API_introduction.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/06_API_introduction.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/06_API_introduction.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/06_API_introduction.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/07_API_initialize.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/07_API_initialize.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/07_API_initialize.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/07_API_initialize.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/08_API_events.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/08_API_events.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/08_API_events.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/08_API_events.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/09_API_network_def.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/09_API_network_def.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/09_API_network_def.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/09_API_network_def.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/10_API_timer.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/10_API_timer.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/10_API_timer.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/10_API_timer.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/11_API_sockets.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/11_API_sockets.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/11_API_sockets.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/11_API_sockets.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/12_API_network.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/12_API_network.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/12_API_network.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/12_API_network.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/13_API_memory.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/13_API_memory.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/13_API_memory.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/13_API_memory.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/14_API_data.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/14_API_data.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/14_API_data.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/14_API_data.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/15_API_debug.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/15_API_debug.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/15_API_debug.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/15_API_debug.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/16_API_porting.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/16_API_porting.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/16_API_porting.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/16_API_porting.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/api_changes_to_v4_0_0.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/api_changes_to_v4_0_0.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/api_changes_to_v4_0_0.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/api_changes_to_v4_0_0.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/api_changes_to_v5_0_0.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/api_changes_to_v5_0_0.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/api_changes_to_v5_0_0.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/api_changes_to_v5_0_0.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/dev_stats.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/dev_stats.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/dev_stats.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/dev_stats.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/driver_api.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/driver_api.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/driver_api.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/driver_api.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lh.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lh.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lh.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lh.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_border_router_embedded_C_architecture.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_border_router_embedded_C_architecture.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_border_router_embedded_C_architecture.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_border_router_embedded_C_architecture.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_network_architecture.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_network_architecture.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_network_architecture.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_network_architecture.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_stack_architecture.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_stack_architecture.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_stack_architecture.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_stack_architecture.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_stack_networking_topologies.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_stack_networking_topologies.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_stack_networking_topologies.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_stack_networking_topologies.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_stack_osi_model.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_stack_osi_model.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_stack_osi_model.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lowpan_stack_osi_model.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lr.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lr.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lr.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/6lr.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_General.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_General.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_General.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_General.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_Prot_Arch2.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_Prot_Arch2.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_Prot_Arch2.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_Prot_Arch2.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_Prot_Arch_Comb.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_Prot_Arch_Comb.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_Prot_Arch_Comb.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_Prot_Arch_Comb.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_Proto_Arch.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_Proto_Arch.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_Proto_Arch.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/Thread_Proto_Arch.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/arch_general.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/arch_general.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/arch_general.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/arch_general.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/br.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/br.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/br.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/br.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/bw.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/bw.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/bw.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/bw.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/ed_scan_process.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/ed_scan_process.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/ed_scan_process.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/ed_scan_process.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/examples.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/examples.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/examples.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/examples.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/high_level_stack_API_interfaces.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/high_level_stack_API_interfaces.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/high_level_stack_API_interfaces.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/high_level_stack_API_interfaces.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/join_process_star_6lowpan_router.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/join_process_star_6lowpan_router.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/join_process_star_6lowpan_router.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/join_process_star_6lowpan_router.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/join_process_to_router_mesh_6lowpan.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/join_process_to_router_mesh_6lowpan.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/join_process_to_router_mesh_6lowpan.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/join_process_to_router_mesh_6lowpan.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/mbedOS_sockets.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/mbedOS_sockets.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/mbedOS_sockets.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/mbedOS_sockets.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/mesh.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/mesh.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/mesh.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/mesh.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/nanostack_in_mbed_OS.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/nanostack_in_mbed_OS.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/nanostack_in_mbed_OS.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/nanostack_in_mbed_OS.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/network_bootstrap_high_level_view.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/network_bootstrap_high_level_view.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/network_bootstrap_high_level_view.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/network_bootstrap_high_level_view.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/network_bootstrapping_process.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/network_bootstrapping_process.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/network_bootstrapping_process.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/network_bootstrapping_process.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/node_to_server.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/node_to_server.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/node_to_server.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/node_to_server.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/rpl_layer_reg_multiple_hops.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/rpl_layer_reg_multiple_hops.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/rpl_layer_reg_multiple_hops.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/rpl_layer_reg_multiple_hops.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/rpl_layer_reg_single_hop.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/rpl_layer_reg_single_hop.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/rpl_layer_reg_single_hop.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/rpl_layer_reg_single_hop.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/rpl_mesh_high_level_view.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/rpl_mesh_high_level_view.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/rpl_mesh_high_level_view.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/rpl_mesh_high_level_view.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/star_topology.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/star_topology.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/star_topology.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/star_topology.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/state_machine_6lowpan.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/state_machine_6lowpan.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/state_machine_6lowpan.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/state_machine_6lowpan.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/temp.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/temp.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/temp.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/temp.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case1.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case1.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case1.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case1.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case2.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case2.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case2.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case2.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case3.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case3.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case3.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case3.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case4.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case4.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case4.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_case4.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_comm_ext.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_comm_ext.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_comm_ext.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_comm_ext.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_ext_pet_seq.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_ext_pet_seq.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_ext_pet_seq.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_ext_pet_seq.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_nat_pet_seq.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_nat_pet_seq.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_nat_pet_seq.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_nat_pet_seq.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_native_comm_pet.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_native_comm_pet.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_native_comm_pet.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_native_comm_pet.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_pet_auth_seq.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_pet_auth_seq.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_pet_auth_seq.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/thread_pet_auth_seq.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/img/tx_process.png b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/tx_process.png similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/img/tx_process.png rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/img/tx_process.png diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/index.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/index.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/index.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/index.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/platform_API.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/platform_API.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/platform_API.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/platform_API.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_build.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_build.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_build.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_build.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_config.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_config.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_config.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_config.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_hw.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_hw.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_hw.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_hw.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_intro.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_intro.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_intro.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/quick_start_intro.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/thread_APIs.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/thread_APIs.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/thread_APIs.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/thread_APIs.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/thread_comm.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/thread_comm.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/thread_comm.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/thread_comm.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/thread_dev_typ.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/thread_dev_typ.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/thread_dev_typ.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/thread_dev_typ.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/thread_overview.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/thread_overview.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/thread_overview.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/thread_overview.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/docs/thread_sec.md b/features/net/FEATURE_IPV6/sal-stack-nanostack/docs/thread_sec.md similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/docs/thread_sec.md rename to features/net/FEATURE_IPV6/sal-stack-nanostack/docs/thread_sec.md diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/doxygen/mainpage.dox b/features/net/FEATURE_IPV6/sal-stack-nanostack/doxygen/mainpage.dox similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/doxygen/mainpage.dox rename to features/net/FEATURE_IPV6/sal-stack-nanostack/doxygen/mainpage.dox diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/mbed_lib.json b/features/net/FEATURE_IPV6/sal-stack-nanostack/mbed_lib.json similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/mbed_lib.json rename to features/net/FEATURE_IPV6/sal-stack-nanostack/mbed_lib.json diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/mkdocs.yml b/features/net/FEATURE_IPV6/sal-stack-nanostack/mkdocs.yml similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/mkdocs.yml rename to features/net/FEATURE_IPV6/sal-stack-nanostack/mkdocs.yml diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/cca_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/cca_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/cca_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/cca_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/ccmLIB.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/ccmLIB.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/ccmLIB.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/ccmLIB.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/dev_stat_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/dev_stat_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/dev_stat_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/dev_stat_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/dhcp_service_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/dhcp_service_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/dhcp_service_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/dhcp_service_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/ethernet_mac_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/ethernet_mac_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/ethernet_mac_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/ethernet_mac_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_common_defines.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_common_defines.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_common_defines.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_common_defines.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_filter_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_filter_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_filter_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_filter_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_mcps.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_mcps.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_mcps.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/mac_mcps.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/mlme.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/mlme.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/mlme.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/mlme.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/multicast_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/multicast_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/multicast_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/multicast_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_6lowpan_parameter_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_6lowpan_parameter_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_6lowpan_parameter_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_6lowpan_parameter_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_address_extension.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_address_extension.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_address_extension.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_address_extension.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_fhss.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_fhss.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_fhss.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_fhss.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_interface.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_interface.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_interface.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_interface.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_ipv6_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_ipv6_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_ipv6_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_ipv6_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_mle_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_mle_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_mle_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_mle_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_nvm_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_nvm_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_nvm_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_nvm_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_nwk_scan.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_nwk_scan.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_nwk_scan.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_nwk_scan.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_pana_parameters_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_pana_parameters_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_pana_parameters_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_pana_parameters_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_polling_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_polling_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_polling_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_polling_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_rpl.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_rpl.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_rpl.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_rpl.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_sleep.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_sleep.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_sleep.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_sleep.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_thread_test.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_thread_test.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_thread_test.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/net_thread_test.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/ns_address.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/ns_address.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/ns_address.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/ns_address.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/ns_virtual_rf_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/ns_virtual_rf_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/ns_virtual_rf_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/ns_virtual_rf_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/nwk_stats_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/nwk_stats_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/nwk_stats_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/nwk_stats_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/arm_hal_aes.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/arm_hal_aes.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/arm_hal_aes.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/arm_hal_aes.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/arm_hal_phy.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/arm_hal_phy.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/arm_hal_phy.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/arm_hal_phy.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/os_whiteboard.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/os_whiteboard.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/os_whiteboard.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/os_whiteboard.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/topo_trace.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/topo_trace.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/topo_trace.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/platform/topo_trace.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/serial_mac_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/serial_mac_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/serial_mac_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/serial_mac_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/shalib.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/shalib.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/shalib.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/shalib.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/socket_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/socket_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/socket_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/socket_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/sw_mac.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/sw_mac.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/sw_mac.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/sw_mac.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_border_router_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_border_router_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_border_router_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_border_router_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_commissioning_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_commissioning_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_commissioning_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_commissioning_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_dhcpv6_server.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_dhcpv6_server.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_dhcpv6_server.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_dhcpv6_server.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_diagcop_lib.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_diagcop_lib.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_diagcop_lib.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_diagcop_lib.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_management_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_management_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_management_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_management_api.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_management_if.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_management_if.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_management_if.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_management_if.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_meshcop_lib.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_meshcop_lib.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_meshcop_lib.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/thread_meshcop_lib.h diff --git a/features/FEATURE_IPV6/sal-stack-nanostack/nanostack/whiteboard_api.h b/features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/whiteboard_api.h similarity index 100% rename from features/FEATURE_IPV6/sal-stack-nanostack/nanostack/whiteboard_api.h rename to features/net/FEATURE_IPV6/sal-stack-nanostack/nanostack/whiteboard_api.h