diff --git a/.astyleignore b/.astyleignore
index 69d3360767..54b1117385 100644
--- a/.astyleignore
+++ b/.astyleignore
@@ -8,8 +8,8 @@
 ^features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV
 ^features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM
 ^features/frameworks
-^features/lwipstack/lwip
-^features/lwipstack/lwip-sys
+^connectivity/lwipstack/lwip
+^connectivity/lwipstack/lwip-sys
 ^features/mbedtls
 ^features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet
 ^features/nanostack/targets
diff --git a/.travis.yml b/.travis.yml
index ab8d2b6fdf..864f68b35d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -250,7 +250,7 @@ matrix:
         - sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' ${EVENTS}/README.md > main.cpp
         - |
           rm -r rtos/source/TARGET_CORTEX drivers/source/usb connectivity/cellular connectivity/drivers/cellular \
-            connectivity/libraries/ppp connectivity/netsocket features/nanostack features/lwipstack features/frameworks/greentea-client \
+            connectivity/libraries/ppp connectivity/netsocket features/nanostack connectivity/lwipstack features/frameworks/greentea-client \
             features/frameworks/utest features/frameworks/unity components BUILD
         - python tools/make.py -t GCC_ARM -m NUCLEO_F103RB --source=. --build=BUILD/NUCLEO_F103RB/GCC_ARM -j0
         # Run profiling tests
diff --git a/LICENSE.md b/LICENSE.md
index 32f47056b4..7863be4b52 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -13,7 +13,7 @@ Folders containing files under different permissive license than Apache 2.0 are
 - [features/FEATURE_PSA/FEATURE_MBED_PSA_SRV/services/attestation](./features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation) - BSD-3-Clause
 - [features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation/qcbor](./features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation/qcbor) - BSD-3-Clause
 - [features/lorawan](./features/lorawan) - Revised BSD
-- [features/lwipstack](./features/lwipstack) - BSD-style, MIT-style
+- [connectivity/lwipstack](./connectivity/lwipstack) - BSD-style, MIT-style
 - [features/nanostack/sal-stack-nanostack](./features/nanostack/sal-stack-nanostack) - BSD-3-Clause
 - [features/frameworks/unity/unity](./features/frameworks/unity/unity) - MIT
 - [features/unsupported](./features/unsupported) - MIT-style, BSD-style
diff --git a/features/lwipstack/.mbedignore b/connectivity/lwipstack/.mbedignore
similarity index 100%
rename from features/lwipstack/.mbedignore
rename to connectivity/lwipstack/.mbedignore
diff --git a/features/lwipstack/CONTRIBUTING.md b/connectivity/lwipstack/CONTRIBUTING.md
similarity index 92%
rename from features/lwipstack/CONTRIBUTING.md
rename to connectivity/lwipstack/CONTRIBUTING.md
index fe3af0e0c7..33356a23af 100644
--- a/features/lwipstack/CONTRIBUTING.md
+++ b/connectivity/lwipstack/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Description
 
-This document describes how to update the Arm Mbed OS LWIP stack. The Mbed OS LWIP stack is a copy of the LWIP master repository. Stack is located in `features/lwipstack/lwip` directory.
+This document describes how to update the Arm Mbed OS LWIP stack. The Mbed OS LWIP stack is a copy of the LWIP master repository. Stack is located in `connectivity/lwipstack/lwip` directory.
 
 When you add new releases or single commits from the LWIP master repository, you must fetch them using the Mbed OS LWIP fork repository. Use the repository to rename LWIP source files with the `lwip_` prefix to make them compatible with the Mbed OS build system.
 
@@ -109,9 +109,9 @@ You can integrate a new release using the following steps.
 
 3. Do a subtree pull for LWIP prefixed branch in the Mbed OS root directory.
 
-    `git subtree pull --squash -P features/lwipstack/lwip <remote name> <new prefixed branch> -m "<commit message>"`
+    `git subtree pull --squash -P connectivity/lwipstack/lwip <remote name> <new prefixed branch> -m "<commit message>"`
 
-    `e.g. git subtree pull --squash -P features/lwipstack/lwip lwip-fork mbed-os-lwip-stable-2_0_2-prefixed -m "Merged lwip 2.0.2 stable"`
+    `e.g. git subtree pull --squash -P connectivity/lwipstack/lwip lwip-fork mbed-os-lwip-stable-2_0_2-prefixed -m "Merged lwip 2.0.2 stable"`
 
     After this step, there is a new commit visible in the Mbed OS master branch that contains the changes.
 
diff --git a/features/lwipstack/LWIPMemoryManager.h b/connectivity/lwipstack/include/lwipstack/LWIPMemoryManager.h
similarity index 100%
rename from features/lwipstack/LWIPMemoryManager.h
rename to connectivity/lwipstack/include/lwipstack/LWIPMemoryManager.h
diff --git a/features/lwipstack/LWIPStack.h b/connectivity/lwipstack/include/lwipstack/LWIPStack.h
similarity index 100%
rename from features/lwipstack/LWIPStack.h
rename to connectivity/lwipstack/include/lwipstack/LWIPStack.h
diff --git a/features/lwipstack/lwip_tools.h b/connectivity/lwipstack/include/lwipstack/lwip_tools.h
similarity index 100%
rename from features/lwipstack/lwip_tools.h
rename to connectivity/lwipstack/include/lwipstack/lwip_tools.h
diff --git a/features/lwipstack/lwipopts.h b/connectivity/lwipstack/include/lwipstack/lwipopts.h
similarity index 100%
rename from features/lwipstack/lwipopts.h
rename to connectivity/lwipstack/include/lwipstack/lwipopts.h
diff --git a/features/lwipstack/lwip-sys/arch/cc.h b/connectivity/lwipstack/lwip-sys/arch/cc.h
similarity index 100%
rename from features/lwipstack/lwip-sys/arch/cc.h
rename to connectivity/lwipstack/lwip-sys/arch/cc.h
diff --git a/features/lwipstack/lwip-sys/arch/lwip_checksum.c b/connectivity/lwipstack/lwip-sys/arch/lwip_checksum.c
similarity index 100%
rename from features/lwipstack/lwip-sys/arch/lwip_checksum.c
rename to connectivity/lwipstack/lwip-sys/arch/lwip_checksum.c
diff --git a/features/lwipstack/lwip-sys/arch/lwip_memcpy.c b/connectivity/lwipstack/lwip-sys/arch/lwip_memcpy.c
similarity index 100%
rename from features/lwipstack/lwip-sys/arch/lwip_memcpy.c
rename to connectivity/lwipstack/lwip-sys/arch/lwip_memcpy.c
diff --git a/features/lwipstack/lwip-sys/arch/lwip_sys_arch.c b/connectivity/lwipstack/lwip-sys/arch/lwip_sys_arch.c
similarity index 100%
rename from features/lwipstack/lwip-sys/arch/lwip_sys_arch.c
rename to connectivity/lwipstack/lwip-sys/arch/lwip_sys_arch.c
diff --git a/features/lwipstack/lwip-sys/arch/perf.h b/connectivity/lwipstack/lwip-sys/arch/perf.h
similarity index 100%
rename from features/lwipstack/lwip-sys/arch/perf.h
rename to connectivity/lwipstack/lwip-sys/arch/perf.h
diff --git a/features/lwipstack/lwip-sys/arch/sys_arch.h b/connectivity/lwipstack/lwip-sys/arch/sys_arch.h
similarity index 100%
rename from features/lwipstack/lwip-sys/arch/sys_arch.h
rename to connectivity/lwipstack/lwip-sys/arch/sys_arch.h
diff --git a/features/lwipstack/lwip-sys/lwip_random.c b/connectivity/lwipstack/lwip-sys/lwip_random.c
similarity index 100%
rename from features/lwipstack/lwip-sys/lwip_random.c
rename to connectivity/lwipstack/lwip-sys/lwip_random.c
diff --git a/features/lwipstack/lwip-sys/lwip_random.h b/connectivity/lwipstack/lwip-sys/lwip_random.h
similarity index 100%
rename from features/lwipstack/lwip-sys/lwip_random.h
rename to connectivity/lwipstack/lwip-sys/lwip_random.h
diff --git a/features/lwipstack/lwip-sys/lwip_tcp_isn.c b/connectivity/lwipstack/lwip-sys/lwip_tcp_isn.c
similarity index 100%
rename from features/lwipstack/lwip-sys/lwip_tcp_isn.c
rename to connectivity/lwipstack/lwip-sys/lwip_tcp_isn.c
diff --git a/features/lwipstack/lwip-sys/lwip_tcp_isn.h b/connectivity/lwipstack/lwip-sys/lwip_tcp_isn.h
similarity index 100%
rename from features/lwipstack/lwip-sys/lwip_tcp_isn.h
rename to connectivity/lwipstack/lwip-sys/lwip_tcp_isn.h
diff --git a/features/lwipstack/lwip/.gitattributes b/connectivity/lwipstack/lwip/.gitattributes
similarity index 100%
rename from features/lwipstack/lwip/.gitattributes
rename to connectivity/lwipstack/lwip/.gitattributes
diff --git a/features/lwipstack/lwip/.gitignore b/connectivity/lwipstack/lwip/.gitignore
similarity index 100%
rename from features/lwipstack/lwip/.gitignore
rename to connectivity/lwipstack/lwip/.gitignore
diff --git a/features/lwipstack/lwip/CHANGELOG b/connectivity/lwipstack/lwip/CHANGELOG
similarity index 100%
rename from features/lwipstack/lwip/CHANGELOG
rename to connectivity/lwipstack/lwip/CHANGELOG
diff --git a/features/lwipstack/lwip/COPYING b/connectivity/lwipstack/lwip/COPYING
similarity index 100%
rename from features/lwipstack/lwip/COPYING
rename to connectivity/lwipstack/lwip/COPYING
diff --git a/features/lwipstack/lwip/FEATURES b/connectivity/lwipstack/lwip/FEATURES
similarity index 100%
rename from features/lwipstack/lwip/FEATURES
rename to connectivity/lwipstack/lwip/FEATURES
diff --git a/features/lwipstack/lwip/FILES b/connectivity/lwipstack/lwip/FILES
similarity index 100%
rename from features/lwipstack/lwip/FILES
rename to connectivity/lwipstack/lwip/FILES
diff --git a/features/lwipstack/lwip/README b/connectivity/lwipstack/lwip/README
similarity index 100%
rename from features/lwipstack/lwip/README
rename to connectivity/lwipstack/lwip/README
diff --git a/features/lwipstack/lwip/UPGRADING b/connectivity/lwipstack/lwip/UPGRADING
similarity index 100%
rename from features/lwipstack/lwip/UPGRADING
rename to connectivity/lwipstack/lwip/UPGRADING
diff --git a/features/lwipstack/lwip/doc/FILES b/connectivity/lwipstack/lwip/doc/FILES
similarity index 100%
rename from features/lwipstack/lwip/doc/FILES
rename to connectivity/lwipstack/lwip/doc/FILES
diff --git a/features/lwipstack/lwip/doc/NO_SYS_SampleCode.c b/connectivity/lwipstack/lwip/doc/NO_SYS_SampleCode.c
similarity index 100%
rename from features/lwipstack/lwip/doc/NO_SYS_SampleCode.c
rename to connectivity/lwipstack/lwip/doc/NO_SYS_SampleCode.c
diff --git a/features/lwipstack/lwip/doc/ZeroCopyRx.c b/connectivity/lwipstack/lwip/doc/ZeroCopyRx.c
similarity index 100%
rename from features/lwipstack/lwip/doc/ZeroCopyRx.c
rename to connectivity/lwipstack/lwip/doc/ZeroCopyRx.c
diff --git a/features/lwipstack/lwip/doc/contrib.txt b/connectivity/lwipstack/lwip/doc/contrib.txt
similarity index 100%
rename from features/lwipstack/lwip/doc/contrib.txt
rename to connectivity/lwipstack/lwip/doc/contrib.txt
diff --git a/features/lwipstack/lwip/doc/doxygen/generate.bat b/connectivity/lwipstack/lwip/doc/doxygen/generate.bat
similarity index 100%
rename from features/lwipstack/lwip/doc/doxygen/generate.bat
rename to connectivity/lwipstack/lwip/doc/doxygen/generate.bat
diff --git a/features/lwipstack/lwip/doc/doxygen/generate.sh b/connectivity/lwipstack/lwip/doc/doxygen/generate.sh
similarity index 100%
rename from features/lwipstack/lwip/doc/doxygen/generate.sh
rename to connectivity/lwipstack/lwip/doc/doxygen/generate.sh
diff --git a/features/lwipstack/lwip/doc/doxygen/lwip.Doxyfile b/connectivity/lwipstack/lwip/doc/doxygen/lwip.Doxyfile
similarity index 100%
rename from features/lwipstack/lwip/doc/doxygen/lwip.Doxyfile
rename to connectivity/lwipstack/lwip/doc/doxygen/lwip.Doxyfile
diff --git a/features/lwipstack/lwip/doc/doxygen/lwip.Doxyfile.cmake.in b/connectivity/lwipstack/lwip/doc/doxygen/lwip.Doxyfile.cmake.in
similarity index 100%
rename from features/lwipstack/lwip/doc/doxygen/lwip.Doxyfile.cmake.in
rename to connectivity/lwipstack/lwip/doc/doxygen/lwip.Doxyfile.cmake.in
diff --git a/features/lwipstack/lwip/doc/doxygen/main_page.h b/connectivity/lwipstack/lwip/doc/doxygen/main_page.h
similarity index 100%
rename from features/lwipstack/lwip/doc/doxygen/main_page.h
rename to connectivity/lwipstack/lwip/doc/doxygen/main_page.h
diff --git a/features/lwipstack/lwip/doc/doxygen/output/index.html b/connectivity/lwipstack/lwip/doc/doxygen/output/index.html
similarity index 100%
rename from features/lwipstack/lwip/doc/doxygen/output/index.html
rename to connectivity/lwipstack/lwip/doc/doxygen/output/index.html
diff --git a/features/lwipstack/lwip/doc/mdns.txt b/connectivity/lwipstack/lwip/doc/mdns.txt
similarity index 100%
rename from features/lwipstack/lwip/doc/mdns.txt
rename to connectivity/lwipstack/lwip/doc/mdns.txt
diff --git a/features/lwipstack/lwip/doc/mqtt_client.txt b/connectivity/lwipstack/lwip/doc/mqtt_client.txt
similarity index 100%
rename from features/lwipstack/lwip/doc/mqtt_client.txt
rename to connectivity/lwipstack/lwip/doc/mqtt_client.txt
diff --git a/features/lwipstack/lwip/doc/ppp.txt b/connectivity/lwipstack/lwip/doc/ppp.txt
similarity index 100%
rename from features/lwipstack/lwip/doc/ppp.txt
rename to connectivity/lwipstack/lwip/doc/ppp.txt
diff --git a/features/lwipstack/lwip/doc/savannah.txt b/connectivity/lwipstack/lwip/doc/savannah.txt
similarity index 100%
rename from features/lwipstack/lwip/doc/savannah.txt
rename to connectivity/lwipstack/lwip/doc/savannah.txt
diff --git a/features/lwipstack/lwip/src/FILES b/connectivity/lwipstack/lwip/src/FILES
similarity index 100%
rename from features/lwipstack/lwip/src/FILES
rename to connectivity/lwipstack/lwip/src/FILES
diff --git a/features/lwipstack/lwip/src/Filelists.mk b/connectivity/lwipstack/lwip/src/Filelists.mk
similarity index 100%
rename from features/lwipstack/lwip/src/Filelists.mk
rename to connectivity/lwipstack/lwip/src/Filelists.mk
diff --git a/features/lwipstack/lwip/src/api/lwip_api_lib.c b/connectivity/lwipstack/lwip/src/api/lwip_api_lib.c
similarity index 100%
rename from features/lwipstack/lwip/src/api/lwip_api_lib.c
rename to connectivity/lwipstack/lwip/src/api/lwip_api_lib.c
diff --git a/features/lwipstack/lwip/src/api/lwip_api_msg.c b/connectivity/lwipstack/lwip/src/api/lwip_api_msg.c
similarity index 100%
rename from features/lwipstack/lwip/src/api/lwip_api_msg.c
rename to connectivity/lwipstack/lwip/src/api/lwip_api_msg.c
diff --git a/features/lwipstack/lwip/src/api/lwip_err.c b/connectivity/lwipstack/lwip/src/api/lwip_err.c
similarity index 100%
rename from features/lwipstack/lwip/src/api/lwip_err.c
rename to connectivity/lwipstack/lwip/src/api/lwip_err.c
diff --git a/features/lwipstack/lwip/src/api/lwip_if_api.c b/connectivity/lwipstack/lwip/src/api/lwip_if_api.c
similarity index 100%
rename from features/lwipstack/lwip/src/api/lwip_if_api.c
rename to connectivity/lwipstack/lwip/src/api/lwip_if_api.c
diff --git a/features/lwipstack/lwip/src/api/lwip_netbuf.c b/connectivity/lwipstack/lwip/src/api/lwip_netbuf.c
similarity index 100%
rename from features/lwipstack/lwip/src/api/lwip_netbuf.c
rename to connectivity/lwipstack/lwip/src/api/lwip_netbuf.c
diff --git a/features/lwipstack/lwip/src/api/lwip_netdb.c b/connectivity/lwipstack/lwip/src/api/lwip_netdb.c
similarity index 100%
rename from features/lwipstack/lwip/src/api/lwip_netdb.c
rename to connectivity/lwipstack/lwip/src/api/lwip_netdb.c
diff --git a/features/lwipstack/lwip/src/api/lwip_netifapi.c b/connectivity/lwipstack/lwip/src/api/lwip_netifapi.c
similarity index 100%
rename from features/lwipstack/lwip/src/api/lwip_netifapi.c
rename to connectivity/lwipstack/lwip/src/api/lwip_netifapi.c
diff --git a/features/lwipstack/lwip/src/api/lwip_sockets.c b/connectivity/lwipstack/lwip/src/api/lwip_sockets.c
similarity index 100%
rename from features/lwipstack/lwip/src/api/lwip_sockets.c
rename to connectivity/lwipstack/lwip/src/api/lwip_sockets.c
diff --git a/features/lwipstack/lwip/src/api/lwip_tcpip.c b/connectivity/lwipstack/lwip/src/api/lwip_tcpip.c
similarity index 100%
rename from features/lwipstack/lwip/src/api/lwip_tcpip.c
rename to connectivity/lwipstack/lwip/src/api/lwip_tcpip.c
diff --git a/features/lwipstack/lwip/src/apps/altcp_tls/altcp_tls_mbedtls.c b/connectivity/lwipstack/lwip/src/apps/altcp_tls/altcp_tls_mbedtls.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/altcp_tls/altcp_tls_mbedtls.c
rename to connectivity/lwipstack/lwip/src/apps/altcp_tls/altcp_tls_mbedtls.c
diff --git a/features/lwipstack/lwip/src/apps/altcp_tls/altcp_tls_mbedtls_mem.c b/connectivity/lwipstack/lwip/src/apps/altcp_tls/altcp_tls_mbedtls_mem.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/altcp_tls/altcp_tls_mbedtls_mem.c
rename to connectivity/lwipstack/lwip/src/apps/altcp_tls/altcp_tls_mbedtls_mem.c
diff --git a/features/lwipstack/lwip/src/apps/altcp_tls/altcp_tls_mbedtls_mem.h b/connectivity/lwipstack/lwip/src/apps/altcp_tls/altcp_tls_mbedtls_mem.h
similarity index 100%
rename from features/lwipstack/lwip/src/apps/altcp_tls/altcp_tls_mbedtls_mem.h
rename to connectivity/lwipstack/lwip/src/apps/altcp_tls/altcp_tls_mbedtls_mem.h
diff --git a/features/lwipstack/lwip/src/apps/altcp_tls/altcp_tls_mbedtls_structs.h b/connectivity/lwipstack/lwip/src/apps/altcp_tls/altcp_tls_mbedtls_structs.h
similarity index 100%
rename from features/lwipstack/lwip/src/apps/altcp_tls/altcp_tls_mbedtls_structs.h
rename to connectivity/lwipstack/lwip/src/apps/altcp_tls/altcp_tls_mbedtls_structs.h
diff --git a/features/lwipstack/lwip/src/apps/http/fs/404.html b/connectivity/lwipstack/lwip/src/apps/http/fs/404.html
similarity index 100%
rename from features/lwipstack/lwip/src/apps/http/fs/404.html
rename to connectivity/lwipstack/lwip/src/apps/http/fs/404.html
diff --git a/features/lwipstack/lwip/src/apps/http/fs/img/sics.gif b/connectivity/lwipstack/lwip/src/apps/http/fs/img/sics.gif
similarity index 100%
rename from features/lwipstack/lwip/src/apps/http/fs/img/sics.gif
rename to connectivity/lwipstack/lwip/src/apps/http/fs/img/sics.gif
diff --git a/features/lwipstack/lwip/src/apps/http/fs/index.html b/connectivity/lwipstack/lwip/src/apps/http/fs/index.html
similarity index 100%
rename from features/lwipstack/lwip/src/apps/http/fs/index.html
rename to connectivity/lwipstack/lwip/src/apps/http/fs/index.html
diff --git a/features/lwipstack/lwip/src/apps/http/fsdata.h b/connectivity/lwipstack/lwip/src/apps/http/fsdata.h
similarity index 100%
rename from features/lwipstack/lwip/src/apps/http/fsdata.h
rename to connectivity/lwipstack/lwip/src/apps/http/fsdata.h
diff --git a/features/lwipstack/lwip/src/apps/http/httpd_structs.h b/connectivity/lwipstack/lwip/src/apps/http/httpd_structs.h
similarity index 100%
rename from features/lwipstack/lwip/src/apps/http/httpd_structs.h
rename to connectivity/lwipstack/lwip/src/apps/http/httpd_structs.h
diff --git a/features/lwipstack/lwip/src/apps/http/lwip_altcp_proxyconnect.c b/connectivity/lwipstack/lwip/src/apps/http/lwip_altcp_proxyconnect.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/http/lwip_altcp_proxyconnect.c
rename to connectivity/lwipstack/lwip/src/apps/http/lwip_altcp_proxyconnect.c
diff --git a/features/lwipstack/lwip/src/apps/http/lwip_fs.c b/connectivity/lwipstack/lwip/src/apps/http/lwip_fs.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/http/lwip_fs.c
rename to connectivity/lwipstack/lwip/src/apps/http/lwip_fs.c
diff --git a/features/lwipstack/lwip/src/apps/http/lwip_fsdata.c b/connectivity/lwipstack/lwip/src/apps/http/lwip_fsdata.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/http/lwip_fsdata.c
rename to connectivity/lwipstack/lwip/src/apps/http/lwip_fsdata.c
diff --git a/features/lwipstack/lwip/src/apps/http/lwip_http_client.c b/connectivity/lwipstack/lwip/src/apps/http/lwip_http_client.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/http/lwip_http_client.c
rename to connectivity/lwipstack/lwip/src/apps/http/lwip_http_client.c
diff --git a/features/lwipstack/lwip/src/apps/http/lwip_httpd.c b/connectivity/lwipstack/lwip/src/apps/http/lwip_httpd.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/http/lwip_httpd.c
rename to connectivity/lwipstack/lwip/src/apps/http/lwip_httpd.c
diff --git a/features/lwipstack/lwip/src/apps/http/makefsdata/lwip_makefsdata.c b/connectivity/lwipstack/lwip/src/apps/http/makefsdata/lwip_makefsdata.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/http/makefsdata/lwip_makefsdata.c
rename to connectivity/lwipstack/lwip/src/apps/http/makefsdata/lwip_makefsdata.c
diff --git a/features/lwipstack/lwip/src/apps/http/makefsdata/makefsdata b/connectivity/lwipstack/lwip/src/apps/http/makefsdata/makefsdata
similarity index 100%
rename from features/lwipstack/lwip/src/apps/http/makefsdata/makefsdata
rename to connectivity/lwipstack/lwip/src/apps/http/makefsdata/makefsdata
diff --git a/features/lwipstack/lwip/src/apps/http/makefsdata/readme.txt b/connectivity/lwipstack/lwip/src/apps/http/makefsdata/readme.txt
similarity index 100%
rename from features/lwipstack/lwip/src/apps/http/makefsdata/readme.txt
rename to connectivity/lwipstack/lwip/src/apps/http/makefsdata/readme.txt
diff --git a/features/lwipstack/lwip/src/apps/http/makefsdata/tinydir.h b/connectivity/lwipstack/lwip/src/apps/http/makefsdata/tinydir.h
similarity index 100%
rename from features/lwipstack/lwip/src/apps/http/makefsdata/tinydir.h
rename to connectivity/lwipstack/lwip/src/apps/http/makefsdata/tinydir.h
diff --git a/features/lwipstack/lwip/src/apps/lwiperf/lwip_lwiperf.c b/connectivity/lwipstack/lwip/src/apps/lwiperf/lwip_lwiperf.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/lwiperf/lwip_lwiperf.c
rename to connectivity/lwipstack/lwip/src/apps/lwiperf/lwip_lwiperf.c
diff --git a/features/lwipstack/lwip/src/apps/mdns/lwip_mdns.c b/connectivity/lwipstack/lwip/src/apps/mdns/lwip_mdns.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/mdns/lwip_mdns.c
rename to connectivity/lwipstack/lwip/src/apps/mdns/lwip_mdns.c
diff --git a/features/lwipstack/lwip/src/apps/mqtt/lwip_mqtt.c b/connectivity/lwipstack/lwip/src/apps/mqtt/lwip_mqtt.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/mqtt/lwip_mqtt.c
rename to connectivity/lwipstack/lwip/src/apps/mqtt/lwip_mqtt.c
diff --git a/features/lwipstack/lwip/src/apps/netbiosns/lwip_netbiosns.c b/connectivity/lwipstack/lwip/src/apps/netbiosns/lwip_netbiosns.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/netbiosns/lwip_netbiosns.c
rename to connectivity/lwipstack/lwip/src/apps/netbiosns/lwip_netbiosns.c
diff --git a/features/lwipstack/lwip/src/apps/smtp/lwip_smtp.c b/connectivity/lwipstack/lwip/src/apps/smtp/lwip_smtp.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/smtp/lwip_smtp.c
rename to connectivity/lwipstack/lwip/src/apps/smtp/lwip_smtp.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_asn1.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_asn1.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_asn1.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_asn1.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_asn1.h b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_asn1.h
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_asn1.h
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_asn1.h
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_core.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_core.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_core.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_core.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_core_priv.h b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_core_priv.h
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_core_priv.h
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_core_priv.h
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_icmp.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_icmp.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_icmp.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_icmp.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_interfaces.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_interfaces.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_interfaces.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_interfaces.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_ip.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_ip.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_ip.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_ip.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_snmp.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_snmp.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_snmp.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_snmp.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_system.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_system.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_system.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_system.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_tcp.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_tcp.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_tcp.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_tcp.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_udp.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_udp.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_udp.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_mib2_udp.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_msg.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_msg.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_msg.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_msg.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_msg.h b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_msg.h
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_msg.h
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_msg.h
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_netconn.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_netconn.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_netconn.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_netconn.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_pbuf_stream.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_pbuf_stream.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_pbuf_stream.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_pbuf_stream.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_pbuf_stream.h b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_pbuf_stream.h
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_pbuf_stream.h
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_pbuf_stream.h
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_raw.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_raw.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_raw.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_raw.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_scalar.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_scalar.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_scalar.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_scalar.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_snmpv2_framework.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_snmpv2_framework.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_snmpv2_framework.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_snmpv2_framework.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_snmpv2_usm.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_snmpv2_usm.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_snmpv2_usm.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_snmpv2_usm.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_table.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_table.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_table.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_table.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_threadsync.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_threadsync.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_threadsync.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_threadsync.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmp_traps.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_traps.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmp_traps.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmp_traps.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmpv3.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmpv3.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmpv3.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmpv3.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmpv3_mbedtls.c b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmpv3_mbedtls.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmpv3_mbedtls.c
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmpv3_mbedtls.c
diff --git a/features/lwipstack/lwip/src/apps/snmp/lwip_snmpv3_priv.h b/connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmpv3_priv.h
similarity index 100%
rename from features/lwipstack/lwip/src/apps/snmp/lwip_snmpv3_priv.h
rename to connectivity/lwipstack/lwip/src/apps/snmp/lwip_snmpv3_priv.h
diff --git a/features/lwipstack/lwip/src/apps/sntp/lwip_sntp.c b/connectivity/lwipstack/lwip/src/apps/sntp/lwip_sntp.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/sntp/lwip_sntp.c
rename to connectivity/lwipstack/lwip/src/apps/sntp/lwip_sntp.c
diff --git a/features/lwipstack/lwip/src/apps/tftp/lwip_tftp_server.c b/connectivity/lwipstack/lwip/src/apps/tftp/lwip_tftp_server.c
similarity index 100%
rename from features/lwipstack/lwip/src/apps/tftp/lwip_tftp_server.c
rename to connectivity/lwipstack/lwip/src/apps/tftp/lwip_tftp_server.c
diff --git a/features/lwipstack/lwip/src/core/ipv4/lwip_autoip.c b/connectivity/lwipstack/lwip/src/core/ipv4/lwip_autoip.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/ipv4/lwip_autoip.c
rename to connectivity/lwipstack/lwip/src/core/ipv4/lwip_autoip.c
diff --git a/features/lwipstack/lwip/src/core/ipv4/lwip_dhcp.c b/connectivity/lwipstack/lwip/src/core/ipv4/lwip_dhcp.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/ipv4/lwip_dhcp.c
rename to connectivity/lwipstack/lwip/src/core/ipv4/lwip_dhcp.c
diff --git a/features/lwipstack/lwip/src/core/ipv4/lwip_etharp.c b/connectivity/lwipstack/lwip/src/core/ipv4/lwip_etharp.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/ipv4/lwip_etharp.c
rename to connectivity/lwipstack/lwip/src/core/ipv4/lwip_etharp.c
diff --git a/features/lwipstack/lwip/src/core/ipv4/lwip_icmp.c b/connectivity/lwipstack/lwip/src/core/ipv4/lwip_icmp.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/ipv4/lwip_icmp.c
rename to connectivity/lwipstack/lwip/src/core/ipv4/lwip_icmp.c
diff --git a/features/lwipstack/lwip/src/core/ipv4/lwip_igmp.c b/connectivity/lwipstack/lwip/src/core/ipv4/lwip_igmp.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/ipv4/lwip_igmp.c
rename to connectivity/lwipstack/lwip/src/core/ipv4/lwip_igmp.c
diff --git a/features/lwipstack/lwip/src/core/ipv4/lwip_ip4.c b/connectivity/lwipstack/lwip/src/core/ipv4/lwip_ip4.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/ipv4/lwip_ip4.c
rename to connectivity/lwipstack/lwip/src/core/ipv4/lwip_ip4.c
diff --git a/features/lwipstack/lwip/src/core/ipv4/lwip_ip4_addr.c b/connectivity/lwipstack/lwip/src/core/ipv4/lwip_ip4_addr.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/ipv4/lwip_ip4_addr.c
rename to connectivity/lwipstack/lwip/src/core/ipv4/lwip_ip4_addr.c
diff --git a/features/lwipstack/lwip/src/core/ipv4/lwip_ip4_frag.c b/connectivity/lwipstack/lwip/src/core/ipv4/lwip_ip4_frag.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/ipv4/lwip_ip4_frag.c
rename to connectivity/lwipstack/lwip/src/core/ipv4/lwip_ip4_frag.c
diff --git a/features/lwipstack/lwip/src/core/ipv6/lwip_dhcp6.c b/connectivity/lwipstack/lwip/src/core/ipv6/lwip_dhcp6.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/ipv6/lwip_dhcp6.c
rename to connectivity/lwipstack/lwip/src/core/ipv6/lwip_dhcp6.c
diff --git a/features/lwipstack/lwip/src/core/ipv6/lwip_ethip6.c b/connectivity/lwipstack/lwip/src/core/ipv6/lwip_ethip6.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/ipv6/lwip_ethip6.c
rename to connectivity/lwipstack/lwip/src/core/ipv6/lwip_ethip6.c
diff --git a/features/lwipstack/lwip/src/core/ipv6/lwip_icmp6.c b/connectivity/lwipstack/lwip/src/core/ipv6/lwip_icmp6.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/ipv6/lwip_icmp6.c
rename to connectivity/lwipstack/lwip/src/core/ipv6/lwip_icmp6.c
diff --git a/features/lwipstack/lwip/src/core/ipv6/lwip_inet6.c b/connectivity/lwipstack/lwip/src/core/ipv6/lwip_inet6.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/ipv6/lwip_inet6.c
rename to connectivity/lwipstack/lwip/src/core/ipv6/lwip_inet6.c
diff --git a/features/lwipstack/lwip/src/core/ipv6/lwip_ip6.c b/connectivity/lwipstack/lwip/src/core/ipv6/lwip_ip6.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/ipv6/lwip_ip6.c
rename to connectivity/lwipstack/lwip/src/core/ipv6/lwip_ip6.c
diff --git a/features/lwipstack/lwip/src/core/ipv6/lwip_ip6_addr.c b/connectivity/lwipstack/lwip/src/core/ipv6/lwip_ip6_addr.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/ipv6/lwip_ip6_addr.c
rename to connectivity/lwipstack/lwip/src/core/ipv6/lwip_ip6_addr.c
diff --git a/features/lwipstack/lwip/src/core/ipv6/lwip_ip6_frag.c b/connectivity/lwipstack/lwip/src/core/ipv6/lwip_ip6_frag.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/ipv6/lwip_ip6_frag.c
rename to connectivity/lwipstack/lwip/src/core/ipv6/lwip_ip6_frag.c
diff --git a/features/lwipstack/lwip/src/core/ipv6/lwip_mld6.c b/connectivity/lwipstack/lwip/src/core/ipv6/lwip_mld6.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/ipv6/lwip_mld6.c
rename to connectivity/lwipstack/lwip/src/core/ipv6/lwip_mld6.c
diff --git a/features/lwipstack/lwip/src/core/ipv6/lwip_nd6.c b/connectivity/lwipstack/lwip/src/core/ipv6/lwip_nd6.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/ipv6/lwip_nd6.c
rename to connectivity/lwipstack/lwip/src/core/ipv6/lwip_nd6.c
diff --git a/features/lwipstack/lwip/src/core/lwip_altcp.c b/connectivity/lwipstack/lwip/src/core/lwip_altcp.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_altcp.c
rename to connectivity/lwipstack/lwip/src/core/lwip_altcp.c
diff --git a/features/lwipstack/lwip/src/core/lwip_altcp_alloc.c b/connectivity/lwipstack/lwip/src/core/lwip_altcp_alloc.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_altcp_alloc.c
rename to connectivity/lwipstack/lwip/src/core/lwip_altcp_alloc.c
diff --git a/features/lwipstack/lwip/src/core/lwip_altcp_tcp.c b/connectivity/lwipstack/lwip/src/core/lwip_altcp_tcp.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_altcp_tcp.c
rename to connectivity/lwipstack/lwip/src/core/lwip_altcp_tcp.c
diff --git a/features/lwipstack/lwip/src/core/lwip_def.c b/connectivity/lwipstack/lwip/src/core/lwip_def.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_def.c
rename to connectivity/lwipstack/lwip/src/core/lwip_def.c
diff --git a/features/lwipstack/lwip/src/core/lwip_dns.c b/connectivity/lwipstack/lwip/src/core/lwip_dns.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_dns.c
rename to connectivity/lwipstack/lwip/src/core/lwip_dns.c
diff --git a/features/lwipstack/lwip/src/core/lwip_inet_chksum.c b/connectivity/lwipstack/lwip/src/core/lwip_inet_chksum.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_inet_chksum.c
rename to connectivity/lwipstack/lwip/src/core/lwip_inet_chksum.c
diff --git a/features/lwipstack/lwip/src/core/lwip_init.c b/connectivity/lwipstack/lwip/src/core/lwip_init.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_init.c
rename to connectivity/lwipstack/lwip/src/core/lwip_init.c
diff --git a/features/lwipstack/lwip/src/core/lwip_ip.c b/connectivity/lwipstack/lwip/src/core/lwip_ip.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_ip.c
rename to connectivity/lwipstack/lwip/src/core/lwip_ip.c
diff --git a/features/lwipstack/lwip/src/core/lwip_mem.c b/connectivity/lwipstack/lwip/src/core/lwip_mem.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_mem.c
rename to connectivity/lwipstack/lwip/src/core/lwip_mem.c
diff --git a/features/lwipstack/lwip/src/core/lwip_memp.c b/connectivity/lwipstack/lwip/src/core/lwip_memp.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_memp.c
rename to connectivity/lwipstack/lwip/src/core/lwip_memp.c
diff --git a/features/lwipstack/lwip/src/core/lwip_netif.c b/connectivity/lwipstack/lwip/src/core/lwip_netif.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_netif.c
rename to connectivity/lwipstack/lwip/src/core/lwip_netif.c
diff --git a/features/lwipstack/lwip/src/core/lwip_pbuf.c b/connectivity/lwipstack/lwip/src/core/lwip_pbuf.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_pbuf.c
rename to connectivity/lwipstack/lwip/src/core/lwip_pbuf.c
diff --git a/features/lwipstack/lwip/src/core/lwip_raw.c b/connectivity/lwipstack/lwip/src/core/lwip_raw.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_raw.c
rename to connectivity/lwipstack/lwip/src/core/lwip_raw.c
diff --git a/features/lwipstack/lwip/src/core/lwip_stats.c b/connectivity/lwipstack/lwip/src/core/lwip_stats.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_stats.c
rename to connectivity/lwipstack/lwip/src/core/lwip_stats.c
diff --git a/features/lwipstack/lwip/src/core/lwip_sys.c b/connectivity/lwipstack/lwip/src/core/lwip_sys.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_sys.c
rename to connectivity/lwipstack/lwip/src/core/lwip_sys.c
diff --git a/features/lwipstack/lwip/src/core/lwip_tcp.c b/connectivity/lwipstack/lwip/src/core/lwip_tcp.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_tcp.c
rename to connectivity/lwipstack/lwip/src/core/lwip_tcp.c
diff --git a/features/lwipstack/lwip/src/core/lwip_tcp_in.c b/connectivity/lwipstack/lwip/src/core/lwip_tcp_in.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_tcp_in.c
rename to connectivity/lwipstack/lwip/src/core/lwip_tcp_in.c
diff --git a/features/lwipstack/lwip/src/core/lwip_tcp_out.c b/connectivity/lwipstack/lwip/src/core/lwip_tcp_out.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_tcp_out.c
rename to connectivity/lwipstack/lwip/src/core/lwip_tcp_out.c
diff --git a/features/lwipstack/lwip/src/core/lwip_timeouts.c b/connectivity/lwipstack/lwip/src/core/lwip_timeouts.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_timeouts.c
rename to connectivity/lwipstack/lwip/src/core/lwip_timeouts.c
diff --git a/features/lwipstack/lwip/src/core/lwip_udp.c b/connectivity/lwipstack/lwip/src/core/lwip_udp.c
similarity index 100%
rename from features/lwipstack/lwip/src/core/lwip_udp.c
rename to connectivity/lwipstack/lwip/src/core/lwip_udp.c
diff --git a/features/lwipstack/lwip/src/include/compat/posix/arpa/inet.h b/connectivity/lwipstack/lwip/src/include/compat/posix/arpa/inet.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/compat/posix/arpa/inet.h
rename to connectivity/lwipstack/lwip/src/include/compat/posix/arpa/inet.h
diff --git a/features/lwipstack/lwip/src/include/compat/posix/net/if.h b/connectivity/lwipstack/lwip/src/include/compat/posix/net/if.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/compat/posix/net/if.h
rename to connectivity/lwipstack/lwip/src/include/compat/posix/net/if.h
diff --git a/features/lwipstack/lwip/src/include/compat/posix/netdb.h b/connectivity/lwipstack/lwip/src/include/compat/posix/netdb.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/compat/posix/netdb.h
rename to connectivity/lwipstack/lwip/src/include/compat/posix/netdb.h
diff --git a/features/lwipstack/lwip/src/include/compat/posix/sys/socket.h b/connectivity/lwipstack/lwip/src/include/compat/posix/sys/socket.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/compat/posix/sys/socket.h
rename to connectivity/lwipstack/lwip/src/include/compat/posix/sys/socket.h
diff --git a/features/lwipstack/lwip/src/include/compat/stdc/errno.h b/connectivity/lwipstack/lwip/src/include/compat/stdc/errno.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/compat/stdc/errno.h
rename to connectivity/lwipstack/lwip/src/include/compat/stdc/errno.h
diff --git a/features/lwipstack/lwip/src/include/lwip/altcp.h b/connectivity/lwipstack/lwip/src/include/lwip/altcp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/altcp.h
rename to connectivity/lwipstack/lwip/src/include/lwip/altcp.h
diff --git a/features/lwipstack/lwip/src/include/lwip/altcp_tcp.h b/connectivity/lwipstack/lwip/src/include/lwip/altcp_tcp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/altcp_tcp.h
rename to connectivity/lwipstack/lwip/src/include/lwip/altcp_tcp.h
diff --git a/features/lwipstack/lwip/src/include/lwip/altcp_tls.h b/connectivity/lwipstack/lwip/src/include/lwip/altcp_tls.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/altcp_tls.h
rename to connectivity/lwipstack/lwip/src/include/lwip/altcp_tls.h
diff --git a/features/lwipstack/lwip/src/include/lwip/api.h b/connectivity/lwipstack/lwip/src/include/lwip/api.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/api.h
rename to connectivity/lwipstack/lwip/src/include/lwip/api.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/FILES b/connectivity/lwipstack/lwip/src/include/lwip/apps/FILES
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/FILES
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/FILES
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/altcp_proxyconnect.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/altcp_proxyconnect.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/altcp_proxyconnect.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/altcp_proxyconnect.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/altcp_tls_mbedtls_opts.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/altcp_tls_mbedtls_opts.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/altcp_tls_mbedtls_opts.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/altcp_tls_mbedtls_opts.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/fs.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/fs.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/fs.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/fs.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/http_client.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/http_client.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/http_client.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/http_client.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/httpd.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/httpd.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/httpd.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/httpd.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/httpd_opts.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/httpd_opts.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/httpd_opts.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/httpd_opts.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/lwiperf.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/lwiperf.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/lwiperf.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/lwiperf.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/mdns.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/mdns.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/mdns.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/mdns.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/mdns_opts.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/mdns_opts.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/mdns_opts.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/mdns_opts.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/mdns_priv.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/mdns_priv.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/mdns_priv.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/mdns_priv.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/mqtt.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/mqtt.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/mqtt.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/mqtt.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/mqtt_opts.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/mqtt_opts.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/mqtt_opts.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/mqtt_opts.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/mqtt_priv.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/mqtt_priv.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/mqtt_priv.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/mqtt_priv.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/netbiosns.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/netbiosns.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/netbiosns.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/netbiosns.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/netbiosns_opts.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/netbiosns_opts.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/netbiosns_opts.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/netbiosns_opts.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/smtp.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/smtp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/smtp.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/smtp.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/smtp_opts.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/smtp_opts.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/smtp_opts.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/smtp_opts.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/snmp.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/snmp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/snmp.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/snmp.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/snmp_core.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/snmp_core.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/snmp_core.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/snmp_core.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/snmp_mib2.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/snmp_mib2.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/snmp_mib2.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/snmp_mib2.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/snmp_opts.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/snmp_opts.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/snmp_opts.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/snmp_opts.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/snmp_scalar.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/snmp_scalar.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/snmp_scalar.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/snmp_scalar.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/snmp_snmpv2_framework.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/snmp_snmpv2_framework.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/snmp_snmpv2_framework.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/snmp_snmpv2_framework.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/snmp_snmpv2_usm.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/snmp_snmpv2_usm.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/snmp_snmpv2_usm.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/snmp_snmpv2_usm.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/snmp_table.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/snmp_table.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/snmp_table.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/snmp_table.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/snmp_threadsync.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/snmp_threadsync.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/snmp_threadsync.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/snmp_threadsync.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/snmpv3.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/snmpv3.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/snmpv3.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/snmpv3.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/sntp.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/sntp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/sntp.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/sntp.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/sntp_opts.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/sntp_opts.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/sntp_opts.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/sntp_opts.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/tftp_opts.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/tftp_opts.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/tftp_opts.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/tftp_opts.h
diff --git a/features/lwipstack/lwip/src/include/lwip/apps/tftp_server.h b/connectivity/lwipstack/lwip/src/include/lwip/apps/tftp_server.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/apps/tftp_server.h
rename to connectivity/lwipstack/lwip/src/include/lwip/apps/tftp_server.h
diff --git a/features/lwipstack/lwip/src/include/lwip/arch.h b/connectivity/lwipstack/lwip/src/include/lwip/arch.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/arch.h
rename to connectivity/lwipstack/lwip/src/include/lwip/arch.h
diff --git a/features/lwipstack/lwip/src/include/lwip/autoip.h b/connectivity/lwipstack/lwip/src/include/lwip/autoip.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/autoip.h
rename to connectivity/lwipstack/lwip/src/include/lwip/autoip.h
diff --git a/features/lwipstack/lwip/src/include/lwip/debug.h b/connectivity/lwipstack/lwip/src/include/lwip/debug.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/debug.h
rename to connectivity/lwipstack/lwip/src/include/lwip/debug.h
diff --git a/features/lwipstack/lwip/src/include/lwip/def.h b/connectivity/lwipstack/lwip/src/include/lwip/def.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/def.h
rename to connectivity/lwipstack/lwip/src/include/lwip/def.h
diff --git a/features/lwipstack/lwip/src/include/lwip/dhcp.h b/connectivity/lwipstack/lwip/src/include/lwip/dhcp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/dhcp.h
rename to connectivity/lwipstack/lwip/src/include/lwip/dhcp.h
diff --git a/features/lwipstack/lwip/src/include/lwip/dhcp6.h b/connectivity/lwipstack/lwip/src/include/lwip/dhcp6.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/dhcp6.h
rename to connectivity/lwipstack/lwip/src/include/lwip/dhcp6.h
diff --git a/features/lwipstack/lwip/src/include/lwip/dns.h b/connectivity/lwipstack/lwip/src/include/lwip/dns.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/dns.h
rename to connectivity/lwipstack/lwip/src/include/lwip/dns.h
diff --git a/features/lwipstack/lwip/src/include/lwip/err.h b/connectivity/lwipstack/lwip/src/include/lwip/err.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/err.h
rename to connectivity/lwipstack/lwip/src/include/lwip/err.h
diff --git a/features/lwipstack/lwip/src/include/lwip/etharp.h b/connectivity/lwipstack/lwip/src/include/lwip/etharp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/etharp.h
rename to connectivity/lwipstack/lwip/src/include/lwip/etharp.h
diff --git a/features/lwipstack/lwip/src/include/lwip/ethip6.h b/connectivity/lwipstack/lwip/src/include/lwip/ethip6.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/ethip6.h
rename to connectivity/lwipstack/lwip/src/include/lwip/ethip6.h
diff --git a/features/lwipstack/lwip/src/include/lwip/icmp.h b/connectivity/lwipstack/lwip/src/include/lwip/icmp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/icmp.h
rename to connectivity/lwipstack/lwip/src/include/lwip/icmp.h
diff --git a/features/lwipstack/lwip/src/include/lwip/icmp6.h b/connectivity/lwipstack/lwip/src/include/lwip/icmp6.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/icmp6.h
rename to connectivity/lwipstack/lwip/src/include/lwip/icmp6.h
diff --git a/features/lwipstack/lwip/src/include/lwip/if_api.h b/connectivity/lwipstack/lwip/src/include/lwip/if_api.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/if_api.h
rename to connectivity/lwipstack/lwip/src/include/lwip/if_api.h
diff --git a/features/lwipstack/lwip/src/include/lwip/igmp.h b/connectivity/lwipstack/lwip/src/include/lwip/igmp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/igmp.h
rename to connectivity/lwipstack/lwip/src/include/lwip/igmp.h
diff --git a/features/lwipstack/lwip/src/include/lwip/inet.h b/connectivity/lwipstack/lwip/src/include/lwip/inet.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/inet.h
rename to connectivity/lwipstack/lwip/src/include/lwip/inet.h
diff --git a/features/lwipstack/lwip/src/include/lwip/inet_chksum.h b/connectivity/lwipstack/lwip/src/include/lwip/inet_chksum.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/inet_chksum.h
rename to connectivity/lwipstack/lwip/src/include/lwip/inet_chksum.h
diff --git a/features/lwipstack/lwip/src/include/lwip/init.h b/connectivity/lwipstack/lwip/src/include/lwip/init.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/init.h
rename to connectivity/lwipstack/lwip/src/include/lwip/init.h
diff --git a/features/lwipstack/lwip/src/include/lwip/init.h.cmake.in b/connectivity/lwipstack/lwip/src/include/lwip/init.h.cmake.in
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/init.h.cmake.in
rename to connectivity/lwipstack/lwip/src/include/lwip/init.h.cmake.in
diff --git a/features/lwipstack/lwip/src/include/lwip/ip.h b/connectivity/lwipstack/lwip/src/include/lwip/ip.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/ip.h
rename to connectivity/lwipstack/lwip/src/include/lwip/ip.h
diff --git a/features/lwipstack/lwip/src/include/lwip/ip4.h b/connectivity/lwipstack/lwip/src/include/lwip/ip4.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/ip4.h
rename to connectivity/lwipstack/lwip/src/include/lwip/ip4.h
diff --git a/features/lwipstack/lwip/src/include/lwip/ip4_addr.h b/connectivity/lwipstack/lwip/src/include/lwip/ip4_addr.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/ip4_addr.h
rename to connectivity/lwipstack/lwip/src/include/lwip/ip4_addr.h
diff --git a/features/lwipstack/lwip/src/include/lwip/ip4_frag.h b/connectivity/lwipstack/lwip/src/include/lwip/ip4_frag.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/ip4_frag.h
rename to connectivity/lwipstack/lwip/src/include/lwip/ip4_frag.h
diff --git a/features/lwipstack/lwip/src/include/lwip/ip6.h b/connectivity/lwipstack/lwip/src/include/lwip/ip6.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/ip6.h
rename to connectivity/lwipstack/lwip/src/include/lwip/ip6.h
diff --git a/features/lwipstack/lwip/src/include/lwip/ip6_addr.h b/connectivity/lwipstack/lwip/src/include/lwip/ip6_addr.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/ip6_addr.h
rename to connectivity/lwipstack/lwip/src/include/lwip/ip6_addr.h
diff --git a/features/lwipstack/lwip/src/include/lwip/ip6_frag.h b/connectivity/lwipstack/lwip/src/include/lwip/ip6_frag.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/ip6_frag.h
rename to connectivity/lwipstack/lwip/src/include/lwip/ip6_frag.h
diff --git a/features/lwipstack/lwip/src/include/lwip/ip6_zone.h b/connectivity/lwipstack/lwip/src/include/lwip/ip6_zone.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/ip6_zone.h
rename to connectivity/lwipstack/lwip/src/include/lwip/ip6_zone.h
diff --git a/features/lwipstack/lwip/src/include/lwip/ip_addr.h b/connectivity/lwipstack/lwip/src/include/lwip/ip_addr.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/ip_addr.h
rename to connectivity/lwipstack/lwip/src/include/lwip/ip_addr.h
diff --git a/features/lwipstack/lwip/src/include/lwip/lwip_errno.h b/connectivity/lwipstack/lwip/src/include/lwip/lwip_errno.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/lwip_errno.h
rename to connectivity/lwipstack/lwip/src/include/lwip/lwip_errno.h
diff --git a/features/lwipstack/lwip/src/include/lwip/mem.h b/connectivity/lwipstack/lwip/src/include/lwip/mem.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/mem.h
rename to connectivity/lwipstack/lwip/src/include/lwip/mem.h
diff --git a/features/lwipstack/lwip/src/include/lwip/memp.h b/connectivity/lwipstack/lwip/src/include/lwip/memp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/memp.h
rename to connectivity/lwipstack/lwip/src/include/lwip/memp.h
diff --git a/features/lwipstack/lwip/src/include/lwip/mld6.h b/connectivity/lwipstack/lwip/src/include/lwip/mld6.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/mld6.h
rename to connectivity/lwipstack/lwip/src/include/lwip/mld6.h
diff --git a/features/lwipstack/lwip/src/include/lwip/nd6.h b/connectivity/lwipstack/lwip/src/include/lwip/nd6.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/nd6.h
rename to connectivity/lwipstack/lwip/src/include/lwip/nd6.h
diff --git a/features/lwipstack/lwip/src/include/lwip/netbuf.h b/connectivity/lwipstack/lwip/src/include/lwip/netbuf.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/netbuf.h
rename to connectivity/lwipstack/lwip/src/include/lwip/netbuf.h
diff --git a/features/lwipstack/lwip/src/include/lwip/netdb.h b/connectivity/lwipstack/lwip/src/include/lwip/netdb.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/netdb.h
rename to connectivity/lwipstack/lwip/src/include/lwip/netdb.h
diff --git a/features/lwipstack/lwip/src/include/lwip/netif.h b/connectivity/lwipstack/lwip/src/include/lwip/netif.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/netif.h
rename to connectivity/lwipstack/lwip/src/include/lwip/netif.h
diff --git a/features/lwipstack/lwip/src/include/lwip/netifapi.h b/connectivity/lwipstack/lwip/src/include/lwip/netifapi.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/netifapi.h
rename to connectivity/lwipstack/lwip/src/include/lwip/netifapi.h
diff --git a/features/lwipstack/lwip/src/include/lwip/opt.h b/connectivity/lwipstack/lwip/src/include/lwip/opt.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/opt.h
rename to connectivity/lwipstack/lwip/src/include/lwip/opt.h
diff --git a/features/lwipstack/lwip/src/include/lwip/pbuf.h b/connectivity/lwipstack/lwip/src/include/lwip/pbuf.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/pbuf.h
rename to connectivity/lwipstack/lwip/src/include/lwip/pbuf.h
diff --git a/features/lwipstack/lwip/src/include/lwip/priv/altcp_priv.h b/connectivity/lwipstack/lwip/src/include/lwip/priv/altcp_priv.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/priv/altcp_priv.h
rename to connectivity/lwipstack/lwip/src/include/lwip/priv/altcp_priv.h
diff --git a/features/lwipstack/lwip/src/include/lwip/priv/api_msg.h b/connectivity/lwipstack/lwip/src/include/lwip/priv/api_msg.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/priv/api_msg.h
rename to connectivity/lwipstack/lwip/src/include/lwip/priv/api_msg.h
diff --git a/features/lwipstack/lwip/src/include/lwip/priv/mem_priv.h b/connectivity/lwipstack/lwip/src/include/lwip/priv/mem_priv.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/priv/mem_priv.h
rename to connectivity/lwipstack/lwip/src/include/lwip/priv/mem_priv.h
diff --git a/features/lwipstack/lwip/src/include/lwip/priv/memp_priv.h b/connectivity/lwipstack/lwip/src/include/lwip/priv/memp_priv.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/priv/memp_priv.h
rename to connectivity/lwipstack/lwip/src/include/lwip/priv/memp_priv.h
diff --git a/features/lwipstack/lwip/src/include/lwip/priv/memp_std.h b/connectivity/lwipstack/lwip/src/include/lwip/priv/memp_std.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/priv/memp_std.h
rename to connectivity/lwipstack/lwip/src/include/lwip/priv/memp_std.h
diff --git a/features/lwipstack/lwip/src/include/lwip/priv/nd6_priv.h b/connectivity/lwipstack/lwip/src/include/lwip/priv/nd6_priv.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/priv/nd6_priv.h
rename to connectivity/lwipstack/lwip/src/include/lwip/priv/nd6_priv.h
diff --git a/features/lwipstack/lwip/src/include/lwip/priv/raw_priv.h b/connectivity/lwipstack/lwip/src/include/lwip/priv/raw_priv.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/priv/raw_priv.h
rename to connectivity/lwipstack/lwip/src/include/lwip/priv/raw_priv.h
diff --git a/features/lwipstack/lwip/src/include/lwip/priv/sockets_priv.h b/connectivity/lwipstack/lwip/src/include/lwip/priv/sockets_priv.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/priv/sockets_priv.h
rename to connectivity/lwipstack/lwip/src/include/lwip/priv/sockets_priv.h
diff --git a/features/lwipstack/lwip/src/include/lwip/priv/tcp_priv.h b/connectivity/lwipstack/lwip/src/include/lwip/priv/tcp_priv.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/priv/tcp_priv.h
rename to connectivity/lwipstack/lwip/src/include/lwip/priv/tcp_priv.h
diff --git a/features/lwipstack/lwip/src/include/lwip/priv/tcpip_priv.h b/connectivity/lwipstack/lwip/src/include/lwip/priv/tcpip_priv.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/priv/tcpip_priv.h
rename to connectivity/lwipstack/lwip/src/include/lwip/priv/tcpip_priv.h
diff --git a/features/lwipstack/lwip/src/include/lwip/prot/autoip.h b/connectivity/lwipstack/lwip/src/include/lwip/prot/autoip.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/prot/autoip.h
rename to connectivity/lwipstack/lwip/src/include/lwip/prot/autoip.h
diff --git a/features/lwipstack/lwip/src/include/lwip/prot/dhcp.h b/connectivity/lwipstack/lwip/src/include/lwip/prot/dhcp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/prot/dhcp.h
rename to connectivity/lwipstack/lwip/src/include/lwip/prot/dhcp.h
diff --git a/features/lwipstack/lwip/src/include/lwip/prot/dhcp6.h b/connectivity/lwipstack/lwip/src/include/lwip/prot/dhcp6.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/prot/dhcp6.h
rename to connectivity/lwipstack/lwip/src/include/lwip/prot/dhcp6.h
diff --git a/features/lwipstack/lwip/src/include/lwip/prot/dns.h b/connectivity/lwipstack/lwip/src/include/lwip/prot/dns.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/prot/dns.h
rename to connectivity/lwipstack/lwip/src/include/lwip/prot/dns.h
diff --git a/features/lwipstack/lwip/src/include/lwip/prot/etharp.h b/connectivity/lwipstack/lwip/src/include/lwip/prot/etharp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/prot/etharp.h
rename to connectivity/lwipstack/lwip/src/include/lwip/prot/etharp.h
diff --git a/features/lwipstack/lwip/src/include/lwip/prot/ethernet.h b/connectivity/lwipstack/lwip/src/include/lwip/prot/ethernet.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/prot/ethernet.h
rename to connectivity/lwipstack/lwip/src/include/lwip/prot/ethernet.h
diff --git a/features/lwipstack/lwip/src/include/lwip/prot/iana.h b/connectivity/lwipstack/lwip/src/include/lwip/prot/iana.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/prot/iana.h
rename to connectivity/lwipstack/lwip/src/include/lwip/prot/iana.h
diff --git a/features/lwipstack/lwip/src/include/lwip/prot/icmp.h b/connectivity/lwipstack/lwip/src/include/lwip/prot/icmp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/prot/icmp.h
rename to connectivity/lwipstack/lwip/src/include/lwip/prot/icmp.h
diff --git a/features/lwipstack/lwip/src/include/lwip/prot/icmp6.h b/connectivity/lwipstack/lwip/src/include/lwip/prot/icmp6.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/prot/icmp6.h
rename to connectivity/lwipstack/lwip/src/include/lwip/prot/icmp6.h
diff --git a/features/lwipstack/lwip/src/include/lwip/prot/ieee.h b/connectivity/lwipstack/lwip/src/include/lwip/prot/ieee.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/prot/ieee.h
rename to connectivity/lwipstack/lwip/src/include/lwip/prot/ieee.h
diff --git a/features/lwipstack/lwip/src/include/lwip/prot/igmp.h b/connectivity/lwipstack/lwip/src/include/lwip/prot/igmp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/prot/igmp.h
rename to connectivity/lwipstack/lwip/src/include/lwip/prot/igmp.h
diff --git a/features/lwipstack/lwip/src/include/lwip/prot/ip.h b/connectivity/lwipstack/lwip/src/include/lwip/prot/ip.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/prot/ip.h
rename to connectivity/lwipstack/lwip/src/include/lwip/prot/ip.h
diff --git a/features/lwipstack/lwip/src/include/lwip/prot/ip4.h b/connectivity/lwipstack/lwip/src/include/lwip/prot/ip4.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/prot/ip4.h
rename to connectivity/lwipstack/lwip/src/include/lwip/prot/ip4.h
diff --git a/features/lwipstack/lwip/src/include/lwip/prot/ip6.h b/connectivity/lwipstack/lwip/src/include/lwip/prot/ip6.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/prot/ip6.h
rename to connectivity/lwipstack/lwip/src/include/lwip/prot/ip6.h
diff --git a/features/lwipstack/lwip/src/include/lwip/prot/mld6.h b/connectivity/lwipstack/lwip/src/include/lwip/prot/mld6.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/prot/mld6.h
rename to connectivity/lwipstack/lwip/src/include/lwip/prot/mld6.h
diff --git a/features/lwipstack/lwip/src/include/lwip/prot/nd6.h b/connectivity/lwipstack/lwip/src/include/lwip/prot/nd6.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/prot/nd6.h
rename to connectivity/lwipstack/lwip/src/include/lwip/prot/nd6.h
diff --git a/features/lwipstack/lwip/src/include/lwip/prot/tcp.h b/connectivity/lwipstack/lwip/src/include/lwip/prot/tcp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/prot/tcp.h
rename to connectivity/lwipstack/lwip/src/include/lwip/prot/tcp.h
diff --git a/features/lwipstack/lwip/src/include/lwip/prot/udp.h b/connectivity/lwipstack/lwip/src/include/lwip/prot/udp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/prot/udp.h
rename to connectivity/lwipstack/lwip/src/include/lwip/prot/udp.h
diff --git a/features/lwipstack/lwip/src/include/lwip/raw.h b/connectivity/lwipstack/lwip/src/include/lwip/raw.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/raw.h
rename to connectivity/lwipstack/lwip/src/include/lwip/raw.h
diff --git a/features/lwipstack/lwip/src/include/lwip/sio.h b/connectivity/lwipstack/lwip/src/include/lwip/sio.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/sio.h
rename to connectivity/lwipstack/lwip/src/include/lwip/sio.h
diff --git a/features/lwipstack/lwip/src/include/lwip/snmp.h b/connectivity/lwipstack/lwip/src/include/lwip/snmp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/snmp.h
rename to connectivity/lwipstack/lwip/src/include/lwip/snmp.h
diff --git a/features/lwipstack/lwip/src/include/lwip/sockets.h b/connectivity/lwipstack/lwip/src/include/lwip/sockets.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/sockets.h
rename to connectivity/lwipstack/lwip/src/include/lwip/sockets.h
diff --git a/features/lwipstack/lwip/src/include/lwip/stats.h b/connectivity/lwipstack/lwip/src/include/lwip/stats.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/stats.h
rename to connectivity/lwipstack/lwip/src/include/lwip/stats.h
diff --git a/features/lwipstack/lwip/src/include/lwip/sys.h b/connectivity/lwipstack/lwip/src/include/lwip/sys.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/sys.h
rename to connectivity/lwipstack/lwip/src/include/lwip/sys.h
diff --git a/features/lwipstack/lwip/src/include/lwip/tcp.h b/connectivity/lwipstack/lwip/src/include/lwip/tcp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/tcp.h
rename to connectivity/lwipstack/lwip/src/include/lwip/tcp.h
diff --git a/features/lwipstack/lwip/src/include/lwip/tcpbase.h b/connectivity/lwipstack/lwip/src/include/lwip/tcpbase.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/tcpbase.h
rename to connectivity/lwipstack/lwip/src/include/lwip/tcpbase.h
diff --git a/features/lwipstack/lwip/src/include/lwip/tcpip.h b/connectivity/lwipstack/lwip/src/include/lwip/tcpip.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/tcpip.h
rename to connectivity/lwipstack/lwip/src/include/lwip/tcpip.h
diff --git a/features/lwipstack/lwip/src/include/lwip/timeouts.h b/connectivity/lwipstack/lwip/src/include/lwip/timeouts.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/timeouts.h
rename to connectivity/lwipstack/lwip/src/include/lwip/timeouts.h
diff --git a/features/lwipstack/lwip/src/include/lwip/udp.h b/connectivity/lwipstack/lwip/src/include/lwip/udp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/lwip/udp.h
rename to connectivity/lwipstack/lwip/src/include/lwip/udp.h
diff --git a/features/lwipstack/lwip/src/include/netif/bridgeif.h b/connectivity/lwipstack/lwip/src/include/netif/bridgeif.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/netif/bridgeif.h
rename to connectivity/lwipstack/lwip/src/include/netif/bridgeif.h
diff --git a/features/lwipstack/lwip/src/include/netif/bridgeif_opts.h b/connectivity/lwipstack/lwip/src/include/netif/bridgeif_opts.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/netif/bridgeif_opts.h
rename to connectivity/lwipstack/lwip/src/include/netif/bridgeif_opts.h
diff --git a/features/lwipstack/lwip/src/include/netif/etharp.h b/connectivity/lwipstack/lwip/src/include/netif/etharp.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/netif/etharp.h
rename to connectivity/lwipstack/lwip/src/include/netif/etharp.h
diff --git a/features/lwipstack/lwip/src/include/netif/ethernet.h b/connectivity/lwipstack/lwip/src/include/netif/ethernet.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/netif/ethernet.h
rename to connectivity/lwipstack/lwip/src/include/netif/ethernet.h
diff --git a/features/lwipstack/lwip/src/include/netif/ieee802154.h b/connectivity/lwipstack/lwip/src/include/netif/ieee802154.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/netif/ieee802154.h
rename to connectivity/lwipstack/lwip/src/include/netif/ieee802154.h
diff --git a/features/lwipstack/lwip/src/include/netif/lowpan6.h b/connectivity/lwipstack/lwip/src/include/netif/lowpan6.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/netif/lowpan6.h
rename to connectivity/lwipstack/lwip/src/include/netif/lowpan6.h
diff --git a/features/lwipstack/lwip/src/include/netif/lowpan6_ble.h b/connectivity/lwipstack/lwip/src/include/netif/lowpan6_ble.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/netif/lowpan6_ble.h
rename to connectivity/lwipstack/lwip/src/include/netif/lowpan6_ble.h
diff --git a/features/lwipstack/lwip/src/include/netif/lowpan6_common.h b/connectivity/lwipstack/lwip/src/include/netif/lowpan6_common.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/netif/lowpan6_common.h
rename to connectivity/lwipstack/lwip/src/include/netif/lowpan6_common.h
diff --git a/features/lwipstack/lwip/src/include/netif/lowpan6_opts.h b/connectivity/lwipstack/lwip/src/include/netif/lowpan6_opts.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/netif/lowpan6_opts.h
rename to connectivity/lwipstack/lwip/src/include/netif/lowpan6_opts.h
diff --git a/features/lwipstack/lwip/src/include/netif/slipif.h b/connectivity/lwipstack/lwip/src/include/netif/slipif.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/netif/slipif.h
rename to connectivity/lwipstack/lwip/src/include/netif/slipif.h
diff --git a/features/lwipstack/lwip/src/include/netif/zepif.h b/connectivity/lwipstack/lwip/src/include/netif/zepif.h
similarity index 100%
rename from features/lwipstack/lwip/src/include/netif/zepif.h
rename to connectivity/lwipstack/lwip/src/include/netif/zepif.h
diff --git a/features/lwipstack/lwip/src/netif/FILES b/connectivity/lwipstack/lwip/src/netif/FILES
similarity index 100%
rename from features/lwipstack/lwip/src/netif/FILES
rename to connectivity/lwipstack/lwip/src/netif/FILES
diff --git a/features/lwipstack/lwip/src/netif/lwip_bridgeif.c b/connectivity/lwipstack/lwip/src/netif/lwip_bridgeif.c
similarity index 100%
rename from features/lwipstack/lwip/src/netif/lwip_bridgeif.c
rename to connectivity/lwipstack/lwip/src/netif/lwip_bridgeif.c
diff --git a/features/lwipstack/lwip/src/netif/lwip_bridgeif_fdb.c b/connectivity/lwipstack/lwip/src/netif/lwip_bridgeif_fdb.c
similarity index 100%
rename from features/lwipstack/lwip/src/netif/lwip_bridgeif_fdb.c
rename to connectivity/lwipstack/lwip/src/netif/lwip_bridgeif_fdb.c
diff --git a/features/lwipstack/lwip/src/netif/lwip_ethernet.c b/connectivity/lwipstack/lwip/src/netif/lwip_ethernet.c
similarity index 100%
rename from features/lwipstack/lwip/src/netif/lwip_ethernet.c
rename to connectivity/lwipstack/lwip/src/netif/lwip_ethernet.c
diff --git a/features/lwipstack/lwip/src/netif/lwip_lowpan6.c b/connectivity/lwipstack/lwip/src/netif/lwip_lowpan6.c
similarity index 100%
rename from features/lwipstack/lwip/src/netif/lwip_lowpan6.c
rename to connectivity/lwipstack/lwip/src/netif/lwip_lowpan6.c
diff --git a/features/lwipstack/lwip/src/netif/lwip_lowpan6_ble.c b/connectivity/lwipstack/lwip/src/netif/lwip_lowpan6_ble.c
similarity index 100%
rename from features/lwipstack/lwip/src/netif/lwip_lowpan6_ble.c
rename to connectivity/lwipstack/lwip/src/netif/lwip_lowpan6_ble.c
diff --git a/features/lwipstack/lwip/src/netif/lwip_lowpan6_common.c b/connectivity/lwipstack/lwip/src/netif/lwip_lowpan6_common.c
similarity index 100%
rename from features/lwipstack/lwip/src/netif/lwip_lowpan6_common.c
rename to connectivity/lwipstack/lwip/src/netif/lwip_lowpan6_common.c
diff --git a/features/lwipstack/lwip/src/netif/lwip_slipif.c b/connectivity/lwipstack/lwip/src/netif/lwip_slipif.c
similarity index 100%
rename from features/lwipstack/lwip/src/netif/lwip_slipif.c
rename to connectivity/lwipstack/lwip/src/netif/lwip_slipif.c
diff --git a/features/lwipstack/lwip/src/netif/lwip_zepif.c b/connectivity/lwipstack/lwip/src/netif/lwip_zepif.c
similarity index 100%
rename from features/lwipstack/lwip/src/netif/lwip_zepif.c
rename to connectivity/lwipstack/lwip/src/netif/lwip_zepif.c
diff --git a/features/lwipstack/lwip/test/fuzz/Makefile b/connectivity/lwipstack/lwip/test/fuzz/Makefile
similarity index 100%
rename from features/lwipstack/lwip/test/fuzz/Makefile
rename to connectivity/lwipstack/lwip/test/fuzz/Makefile
diff --git a/features/lwipstack/lwip/test/fuzz/README b/connectivity/lwipstack/lwip/test/fuzz/README
similarity index 100%
rename from features/lwipstack/lwip/test/fuzz/README
rename to connectivity/lwipstack/lwip/test/fuzz/README
diff --git a/features/lwipstack/lwip/test/fuzz/config.h b/connectivity/lwipstack/lwip/test/fuzz/config.h
similarity index 100%
rename from features/lwipstack/lwip/test/fuzz/config.h
rename to connectivity/lwipstack/lwip/test/fuzz/config.h
diff --git a/features/lwipstack/lwip/test/fuzz/fuzz.c b/connectivity/lwipstack/lwip/test/fuzz/fuzz.c
similarity index 100%
rename from features/lwipstack/lwip/test/fuzz/fuzz.c
rename to connectivity/lwipstack/lwip/test/fuzz/fuzz.c
diff --git a/features/lwipstack/lwip/test/fuzz/inputs/arp/arp_req.bin b/connectivity/lwipstack/lwip/test/fuzz/inputs/arp/arp_req.bin
similarity index 100%
rename from features/lwipstack/lwip/test/fuzz/inputs/arp/arp_req.bin
rename to connectivity/lwipstack/lwip/test/fuzz/inputs/arp/arp_req.bin
diff --git a/features/lwipstack/lwip/test/fuzz/inputs/icmp/icmp_ping.bin b/connectivity/lwipstack/lwip/test/fuzz/inputs/icmp/icmp_ping.bin
similarity index 100%
rename from features/lwipstack/lwip/test/fuzz/inputs/icmp/icmp_ping.bin
rename to connectivity/lwipstack/lwip/test/fuzz/inputs/icmp/icmp_ping.bin
diff --git a/features/lwipstack/lwip/test/fuzz/inputs/ipv6/neighbor_solicitation.bin b/connectivity/lwipstack/lwip/test/fuzz/inputs/ipv6/neighbor_solicitation.bin
similarity index 100%
rename from features/lwipstack/lwip/test/fuzz/inputs/ipv6/neighbor_solicitation.bin
rename to connectivity/lwipstack/lwip/test/fuzz/inputs/ipv6/neighbor_solicitation.bin
diff --git a/features/lwipstack/lwip/test/fuzz/inputs/ipv6/router_adv.bin b/connectivity/lwipstack/lwip/test/fuzz/inputs/ipv6/router_adv.bin
similarity index 100%
rename from features/lwipstack/lwip/test/fuzz/inputs/ipv6/router_adv.bin
rename to connectivity/lwipstack/lwip/test/fuzz/inputs/ipv6/router_adv.bin
diff --git a/features/lwipstack/lwip/test/fuzz/inputs/tcp/tcp_syn.bin b/connectivity/lwipstack/lwip/test/fuzz/inputs/tcp/tcp_syn.bin
similarity index 100%
rename from features/lwipstack/lwip/test/fuzz/inputs/tcp/tcp_syn.bin
rename to connectivity/lwipstack/lwip/test/fuzz/inputs/tcp/tcp_syn.bin
diff --git a/features/lwipstack/lwip/test/fuzz/inputs/udp/udp_port_5000.bin b/connectivity/lwipstack/lwip/test/fuzz/inputs/udp/udp_port_5000.bin
similarity index 100%
rename from features/lwipstack/lwip/test/fuzz/inputs/udp/udp_port_5000.bin
rename to connectivity/lwipstack/lwip/test/fuzz/inputs/udp/udp_port_5000.bin
diff --git a/features/lwipstack/lwip/test/fuzz/lwipopts.h b/connectivity/lwipstack/lwip/test/fuzz/lwipopts.h
similarity index 100%
rename from features/lwipstack/lwip/test/fuzz/lwipopts.h
rename to connectivity/lwipstack/lwip/test/fuzz/lwipopts.h
diff --git a/features/lwipstack/lwip/test/fuzz/output_to_pcap.sh b/connectivity/lwipstack/lwip/test/fuzz/output_to_pcap.sh
similarity index 100%
rename from features/lwipstack/lwip/test/fuzz/output_to_pcap.sh
rename to connectivity/lwipstack/lwip/test/fuzz/output_to_pcap.sh
diff --git a/features/lwipstack/lwip/test/sockets/sockets_stresstest.c b/connectivity/lwipstack/lwip/test/sockets/sockets_stresstest.c
similarity index 100%
rename from features/lwipstack/lwip/test/sockets/sockets_stresstest.c
rename to connectivity/lwipstack/lwip/test/sockets/sockets_stresstest.c
diff --git a/features/lwipstack/lwip/test/sockets/sockets_stresstest.h b/connectivity/lwipstack/lwip/test/sockets/sockets_stresstest.h
similarity index 100%
rename from features/lwipstack/lwip/test/sockets/sockets_stresstest.h
rename to connectivity/lwipstack/lwip/test/sockets/sockets_stresstest.h
diff --git a/features/lwipstack/lwip/test/unit/Filelists.cmake b/connectivity/lwipstack/lwip/test/unit/Filelists.cmake
similarity index 100%
rename from features/lwipstack/lwip/test/unit/Filelists.cmake
rename to connectivity/lwipstack/lwip/test/unit/Filelists.cmake
diff --git a/features/lwipstack/lwip/test/unit/Filelists.mk b/connectivity/lwipstack/lwip/test/unit/Filelists.mk
similarity index 100%
rename from features/lwipstack/lwip/test/unit/Filelists.mk
rename to connectivity/lwipstack/lwip/test/unit/Filelists.mk
diff --git a/features/lwipstack/lwip/test/unit/api/test_sockets.c b/connectivity/lwipstack/lwip/test/unit/api/test_sockets.c
similarity index 100%
rename from features/lwipstack/lwip/test/unit/api/test_sockets.c
rename to connectivity/lwipstack/lwip/test/unit/api/test_sockets.c
diff --git a/features/lwipstack/lwip/test/unit/api/test_sockets.h b/connectivity/lwipstack/lwip/test/unit/api/test_sockets.h
similarity index 100%
rename from features/lwipstack/lwip/test/unit/api/test_sockets.h
rename to connectivity/lwipstack/lwip/test/unit/api/test_sockets.h
diff --git a/features/lwipstack/lwip/test/unit/arch/sys_arch.c b/connectivity/lwipstack/lwip/test/unit/arch/sys_arch.c
similarity index 100%
rename from features/lwipstack/lwip/test/unit/arch/sys_arch.c
rename to connectivity/lwipstack/lwip/test/unit/arch/sys_arch.c
diff --git a/features/lwipstack/lwip/test/unit/arch/sys_arch.h b/connectivity/lwipstack/lwip/test/unit/arch/sys_arch.h
similarity index 100%
rename from features/lwipstack/lwip/test/unit/arch/sys_arch.h
rename to connectivity/lwipstack/lwip/test/unit/arch/sys_arch.h
diff --git a/features/lwipstack/lwip/test/unit/core/test_def.c b/connectivity/lwipstack/lwip/test/unit/core/test_def.c
similarity index 100%
rename from features/lwipstack/lwip/test/unit/core/test_def.c
rename to connectivity/lwipstack/lwip/test/unit/core/test_def.c
diff --git a/features/lwipstack/lwip/test/unit/core/test_def.h b/connectivity/lwipstack/lwip/test/unit/core/test_def.h
similarity index 100%
rename from features/lwipstack/lwip/test/unit/core/test_def.h
rename to connectivity/lwipstack/lwip/test/unit/core/test_def.h
diff --git a/features/lwipstack/lwip/test/unit/core/test_mem.c b/connectivity/lwipstack/lwip/test/unit/core/test_mem.c
similarity index 100%
rename from features/lwipstack/lwip/test/unit/core/test_mem.c
rename to connectivity/lwipstack/lwip/test/unit/core/test_mem.c
diff --git a/features/lwipstack/lwip/test/unit/core/test_mem.h b/connectivity/lwipstack/lwip/test/unit/core/test_mem.h
similarity index 100%
rename from features/lwipstack/lwip/test/unit/core/test_mem.h
rename to connectivity/lwipstack/lwip/test/unit/core/test_mem.h
diff --git a/features/lwipstack/lwip/test/unit/core/test_netif.c b/connectivity/lwipstack/lwip/test/unit/core/test_netif.c
similarity index 100%
rename from features/lwipstack/lwip/test/unit/core/test_netif.c
rename to connectivity/lwipstack/lwip/test/unit/core/test_netif.c
diff --git a/features/lwipstack/lwip/test/unit/core/test_netif.h b/connectivity/lwipstack/lwip/test/unit/core/test_netif.h
similarity index 100%
rename from features/lwipstack/lwip/test/unit/core/test_netif.h
rename to connectivity/lwipstack/lwip/test/unit/core/test_netif.h
diff --git a/features/lwipstack/lwip/test/unit/core/test_pbuf.c b/connectivity/lwipstack/lwip/test/unit/core/test_pbuf.c
similarity index 100%
rename from features/lwipstack/lwip/test/unit/core/test_pbuf.c
rename to connectivity/lwipstack/lwip/test/unit/core/test_pbuf.c
diff --git a/features/lwipstack/lwip/test/unit/core/test_pbuf.h b/connectivity/lwipstack/lwip/test/unit/core/test_pbuf.h
similarity index 100%
rename from features/lwipstack/lwip/test/unit/core/test_pbuf.h
rename to connectivity/lwipstack/lwip/test/unit/core/test_pbuf.h
diff --git a/features/lwipstack/lwip/test/unit/core/test_timers.c b/connectivity/lwipstack/lwip/test/unit/core/test_timers.c
similarity index 100%
rename from features/lwipstack/lwip/test/unit/core/test_timers.c
rename to connectivity/lwipstack/lwip/test/unit/core/test_timers.c
diff --git a/features/lwipstack/lwip/test/unit/core/test_timers.h b/connectivity/lwipstack/lwip/test/unit/core/test_timers.h
similarity index 100%
rename from features/lwipstack/lwip/test/unit/core/test_timers.h
rename to connectivity/lwipstack/lwip/test/unit/core/test_timers.h
diff --git a/features/lwipstack/lwip/test/unit/dhcp/test_dhcp.c b/connectivity/lwipstack/lwip/test/unit/dhcp/test_dhcp.c
similarity index 100%
rename from features/lwipstack/lwip/test/unit/dhcp/test_dhcp.c
rename to connectivity/lwipstack/lwip/test/unit/dhcp/test_dhcp.c
diff --git a/features/lwipstack/lwip/test/unit/dhcp/test_dhcp.h b/connectivity/lwipstack/lwip/test/unit/dhcp/test_dhcp.h
similarity index 100%
rename from features/lwipstack/lwip/test/unit/dhcp/test_dhcp.h
rename to connectivity/lwipstack/lwip/test/unit/dhcp/test_dhcp.h
diff --git a/features/lwipstack/lwip/test/unit/etharp/test_etharp.c b/connectivity/lwipstack/lwip/test/unit/etharp/test_etharp.c
similarity index 100%
rename from features/lwipstack/lwip/test/unit/etharp/test_etharp.c
rename to connectivity/lwipstack/lwip/test/unit/etharp/test_etharp.c
diff --git a/features/lwipstack/lwip/test/unit/etharp/test_etharp.h b/connectivity/lwipstack/lwip/test/unit/etharp/test_etharp.h
similarity index 100%
rename from features/lwipstack/lwip/test/unit/etharp/test_etharp.h
rename to connectivity/lwipstack/lwip/test/unit/etharp/test_etharp.h
diff --git a/features/lwipstack/lwip/test/unit/ip4/test_ip4.c b/connectivity/lwipstack/lwip/test/unit/ip4/test_ip4.c
similarity index 100%
rename from features/lwipstack/lwip/test/unit/ip4/test_ip4.c
rename to connectivity/lwipstack/lwip/test/unit/ip4/test_ip4.c
diff --git a/features/lwipstack/lwip/test/unit/ip4/test_ip4.h b/connectivity/lwipstack/lwip/test/unit/ip4/test_ip4.h
similarity index 100%
rename from features/lwipstack/lwip/test/unit/ip4/test_ip4.h
rename to connectivity/lwipstack/lwip/test/unit/ip4/test_ip4.h
diff --git a/features/lwipstack/lwip/test/unit/ip6/test_ip6.c b/connectivity/lwipstack/lwip/test/unit/ip6/test_ip6.c
similarity index 100%
rename from features/lwipstack/lwip/test/unit/ip6/test_ip6.c
rename to connectivity/lwipstack/lwip/test/unit/ip6/test_ip6.c
diff --git a/features/lwipstack/lwip/test/unit/ip6/test_ip6.h b/connectivity/lwipstack/lwip/test/unit/ip6/test_ip6.h
similarity index 100%
rename from features/lwipstack/lwip/test/unit/ip6/test_ip6.h
rename to connectivity/lwipstack/lwip/test/unit/ip6/test_ip6.h
diff --git a/features/lwipstack/lwip/test/unit/lwip_check.h b/connectivity/lwipstack/lwip/test/unit/lwip_check.h
similarity index 100%
rename from features/lwipstack/lwip/test/unit/lwip_check.h
rename to connectivity/lwipstack/lwip/test/unit/lwip_check.h
diff --git a/features/lwipstack/lwip/test/unit/lwip_unittests.c b/connectivity/lwipstack/lwip/test/unit/lwip_unittests.c
similarity index 100%
rename from features/lwipstack/lwip/test/unit/lwip_unittests.c
rename to connectivity/lwipstack/lwip/test/unit/lwip_unittests.c
diff --git a/features/lwipstack/lwip/test/unit/lwipopts.h b/connectivity/lwipstack/lwip/test/unit/lwipopts.h
similarity index 100%
rename from features/lwipstack/lwip/test/unit/lwipopts.h
rename to connectivity/lwipstack/lwip/test/unit/lwipopts.h
diff --git a/features/lwipstack/lwip/test/unit/mdns/test_mdns.c b/connectivity/lwipstack/lwip/test/unit/mdns/test_mdns.c
similarity index 100%
rename from features/lwipstack/lwip/test/unit/mdns/test_mdns.c
rename to connectivity/lwipstack/lwip/test/unit/mdns/test_mdns.c
diff --git a/features/lwipstack/lwip/test/unit/mdns/test_mdns.h b/connectivity/lwipstack/lwip/test/unit/mdns/test_mdns.h
similarity index 100%
rename from features/lwipstack/lwip/test/unit/mdns/test_mdns.h
rename to connectivity/lwipstack/lwip/test/unit/mdns/test_mdns.h
diff --git a/features/lwipstack/lwip/test/unit/mqtt/test_mqtt.c b/connectivity/lwipstack/lwip/test/unit/mqtt/test_mqtt.c
similarity index 100%
rename from features/lwipstack/lwip/test/unit/mqtt/test_mqtt.c
rename to connectivity/lwipstack/lwip/test/unit/mqtt/test_mqtt.c
diff --git a/features/lwipstack/lwip/test/unit/mqtt/test_mqtt.h b/connectivity/lwipstack/lwip/test/unit/mqtt/test_mqtt.h
similarity index 100%
rename from features/lwipstack/lwip/test/unit/mqtt/test_mqtt.h
rename to connectivity/lwipstack/lwip/test/unit/mqtt/test_mqtt.h
diff --git a/features/lwipstack/lwip/test/unit/tcp/tcp_helper.c b/connectivity/lwipstack/lwip/test/unit/tcp/tcp_helper.c
similarity index 100%
rename from features/lwipstack/lwip/test/unit/tcp/tcp_helper.c
rename to connectivity/lwipstack/lwip/test/unit/tcp/tcp_helper.c
diff --git a/features/lwipstack/lwip/test/unit/tcp/tcp_helper.h b/connectivity/lwipstack/lwip/test/unit/tcp/tcp_helper.h
similarity index 100%
rename from features/lwipstack/lwip/test/unit/tcp/tcp_helper.h
rename to connectivity/lwipstack/lwip/test/unit/tcp/tcp_helper.h
diff --git a/features/lwipstack/lwip/test/unit/tcp/test_tcp.c b/connectivity/lwipstack/lwip/test/unit/tcp/test_tcp.c
similarity index 100%
rename from features/lwipstack/lwip/test/unit/tcp/test_tcp.c
rename to connectivity/lwipstack/lwip/test/unit/tcp/test_tcp.c
diff --git a/features/lwipstack/lwip/test/unit/tcp/test_tcp.h b/connectivity/lwipstack/lwip/test/unit/tcp/test_tcp.h
similarity index 100%
rename from features/lwipstack/lwip/test/unit/tcp/test_tcp.h
rename to connectivity/lwipstack/lwip/test/unit/tcp/test_tcp.h
diff --git a/features/lwipstack/lwip/test/unit/tcp/test_tcp_oos.c b/connectivity/lwipstack/lwip/test/unit/tcp/test_tcp_oos.c
similarity index 100%
rename from features/lwipstack/lwip/test/unit/tcp/test_tcp_oos.c
rename to connectivity/lwipstack/lwip/test/unit/tcp/test_tcp_oos.c
diff --git a/features/lwipstack/lwip/test/unit/tcp/test_tcp_oos.h b/connectivity/lwipstack/lwip/test/unit/tcp/test_tcp_oos.h
similarity index 100%
rename from features/lwipstack/lwip/test/unit/tcp/test_tcp_oos.h
rename to connectivity/lwipstack/lwip/test/unit/tcp/test_tcp_oos.h
diff --git a/features/lwipstack/lwip/test/unit/udp/test_udp.c b/connectivity/lwipstack/lwip/test/unit/udp/test_udp.c
similarity index 100%
rename from features/lwipstack/lwip/test/unit/udp/test_udp.c
rename to connectivity/lwipstack/lwip/test/unit/udp/test_udp.c
diff --git a/features/lwipstack/lwip/test/unit/udp/test_udp.h b/connectivity/lwipstack/lwip/test/unit/udp/test_udp.h
similarity index 100%
rename from features/lwipstack/lwip/test/unit/udp/test_udp.h
rename to connectivity/lwipstack/lwip/test/unit/udp/test_udp.h
diff --git a/features/lwipstack/mbed_lib.json b/connectivity/lwipstack/mbed_lib.json
similarity index 100%
rename from features/lwipstack/mbed_lib.json
rename to connectivity/lwipstack/mbed_lib.json
diff --git a/features/lwipstack/LWIPInterface.cpp b/connectivity/lwipstack/source/LWIPInterface.cpp
similarity index 100%
rename from features/lwipstack/LWIPInterface.cpp
rename to connectivity/lwipstack/source/LWIPInterface.cpp
diff --git a/features/lwipstack/LWIPInterfaceEMAC.cpp b/connectivity/lwipstack/source/LWIPInterfaceEMAC.cpp
similarity index 100%
rename from features/lwipstack/LWIPInterfaceEMAC.cpp
rename to connectivity/lwipstack/source/LWIPInterfaceEMAC.cpp
diff --git a/features/lwipstack/LWIPInterfaceL3IP.cpp b/connectivity/lwipstack/source/LWIPInterfaceL3IP.cpp
similarity index 100%
rename from features/lwipstack/LWIPInterfaceL3IP.cpp
rename to connectivity/lwipstack/source/LWIPInterfaceL3IP.cpp
diff --git a/features/lwipstack/LWIPInterfacePPP.cpp b/connectivity/lwipstack/source/LWIPInterfacePPP.cpp
similarity index 100%
rename from features/lwipstack/LWIPInterfacePPP.cpp
rename to connectivity/lwipstack/source/LWIPInterfacePPP.cpp
diff --git a/features/lwipstack/LWIPMemoryManager.cpp b/connectivity/lwipstack/source/LWIPMemoryManager.cpp
similarity index 100%
rename from features/lwipstack/LWIPMemoryManager.cpp
rename to connectivity/lwipstack/source/LWIPMemoryManager.cpp
diff --git a/features/lwipstack/LWIPStack.cpp b/connectivity/lwipstack/source/LWIPStack.cpp
similarity index 100%
rename from features/lwipstack/LWIPStack.cpp
rename to connectivity/lwipstack/source/LWIPStack.cpp
diff --git a/features/lwipstack/lwip_tools.cpp b/connectivity/lwipstack/source/lwip_tools.cpp
similarity index 100%
rename from features/lwipstack/lwip_tools.cpp
rename to connectivity/lwipstack/source/lwip_tools.cpp
diff --git a/doxyfile_options b/doxyfile_options
index 3ae390ddd1..bdab04540d 100644
--- a/doxyfile_options
+++ b/doxyfile_options
@@ -845,7 +845,7 @@ EXCLUDE_PATTERNS       = */tools/* \
                          */features/cryptocell/* \
                          */features/mbedtls/* \
                          */features/unsupported/* \
-                         */features/lwipstack/* \
+                         */connectivity/lwipstack/* \
                          */features/nanostack/sal-stack-nanostack/* \
                          */features/nanostack/coap-service/* \
                          */mbed-trace/* \