diff --git a/features/netsocket/ppp/include/ccp.h b/connectivity/libraries/ppp/include/ccp.h
similarity index 100%
rename from features/netsocket/ppp/include/ccp.h
rename to connectivity/libraries/ppp/include/ccp.h
diff --git a/features/netsocket/ppp/include/chap-md5.h b/connectivity/libraries/ppp/include/chap-md5.h
similarity index 100%
rename from features/netsocket/ppp/include/chap-md5.h
rename to connectivity/libraries/ppp/include/chap-md5.h
diff --git a/features/netsocket/ppp/include/chap-new.h b/connectivity/libraries/ppp/include/chap-new.h
similarity index 100%
rename from features/netsocket/ppp/include/chap-new.h
rename to connectivity/libraries/ppp/include/chap-new.h
diff --git a/features/netsocket/ppp/include/chap_ms.h b/connectivity/libraries/ppp/include/chap_ms.h
similarity index 100%
rename from features/netsocket/ppp/include/chap_ms.h
rename to connectivity/libraries/ppp/include/chap_ms.h
diff --git a/features/netsocket/ppp/include/eap.h b/connectivity/libraries/ppp/include/eap.h
similarity index 100%
rename from features/netsocket/ppp/include/eap.h
rename to connectivity/libraries/ppp/include/eap.h
diff --git a/features/netsocket/ppp/include/ecp.h b/connectivity/libraries/ppp/include/ecp.h
similarity index 100%
rename from features/netsocket/ppp/include/ecp.h
rename to connectivity/libraries/ppp/include/ecp.h
diff --git a/features/netsocket/ppp/include/eui64.h b/connectivity/libraries/ppp/include/eui64.h
similarity index 100%
rename from features/netsocket/ppp/include/eui64.h
rename to connectivity/libraries/ppp/include/eui64.h
diff --git a/features/netsocket/ppp/include/fsm.h b/connectivity/libraries/ppp/include/fsm.h
similarity index 100%
rename from features/netsocket/ppp/include/fsm.h
rename to connectivity/libraries/ppp/include/fsm.h
diff --git a/features/netsocket/ppp/include/ipcp.h b/connectivity/libraries/ppp/include/ipcp.h
similarity index 100%
rename from features/netsocket/ppp/include/ipcp.h
rename to connectivity/libraries/ppp/include/ipcp.h
diff --git a/features/netsocket/ppp/include/ipv6cp.h b/connectivity/libraries/ppp/include/ipv6cp.h
similarity index 100%
rename from features/netsocket/ppp/include/ipv6cp.h
rename to connectivity/libraries/ppp/include/ipv6cp.h
diff --git a/features/netsocket/ppp/include/lcp.h b/connectivity/libraries/ppp/include/lcp.h
similarity index 100%
rename from features/netsocket/ppp/include/lcp.h
rename to connectivity/libraries/ppp/include/lcp.h
diff --git a/features/netsocket/ppp/include/magic.h b/connectivity/libraries/ppp/include/magic.h
similarity index 100%
rename from features/netsocket/ppp/include/magic.h
rename to connectivity/libraries/ppp/include/magic.h
diff --git a/features/netsocket/ppp/include/mppe.h b/connectivity/libraries/ppp/include/mppe.h
similarity index 100%
rename from features/netsocket/ppp/include/mppe.h
rename to connectivity/libraries/ppp/include/mppe.h
diff --git a/features/netsocket/ppp/include/polarssl/arc4.h b/connectivity/libraries/ppp/include/polarssl/arc4.h
similarity index 100%
rename from features/netsocket/ppp/include/polarssl/arc4.h
rename to connectivity/libraries/ppp/include/polarssl/arc4.h
diff --git a/features/netsocket/ppp/include/polarssl/des.h b/connectivity/libraries/ppp/include/polarssl/des.h
similarity index 100%
rename from features/netsocket/ppp/include/polarssl/des.h
rename to connectivity/libraries/ppp/include/polarssl/des.h
diff --git a/features/netsocket/ppp/include/polarssl/md4.h b/connectivity/libraries/ppp/include/polarssl/md4.h
similarity index 100%
rename from features/netsocket/ppp/include/polarssl/md4.h
rename to connectivity/libraries/ppp/include/polarssl/md4.h
diff --git a/features/netsocket/ppp/include/polarssl/md5.h b/connectivity/libraries/ppp/include/polarssl/md5.h
similarity index 100%
rename from features/netsocket/ppp/include/polarssl/md5.h
rename to connectivity/libraries/ppp/include/polarssl/md5.h
diff --git a/features/netsocket/ppp/include/polarssl/sha1.h b/connectivity/libraries/ppp/include/polarssl/sha1.h
similarity index 100%
rename from features/netsocket/ppp/include/polarssl/sha1.h
rename to connectivity/libraries/ppp/include/polarssl/sha1.h
diff --git a/features/netsocket/ppp/include/ppp.h b/connectivity/libraries/ppp/include/ppp.h
similarity index 100%
rename from features/netsocket/ppp/include/ppp.h
rename to connectivity/libraries/ppp/include/ppp.h
diff --git a/features/netsocket/ppp/include/ppp_impl.h b/connectivity/libraries/ppp/include/ppp_impl.h
similarity index 100%
rename from features/netsocket/ppp/include/ppp_impl.h
rename to connectivity/libraries/ppp/include/ppp_impl.h
diff --git a/features/netsocket/ppp/include/ppp_opts.h b/connectivity/libraries/ppp/include/ppp_opts.h
similarity index 100%
rename from features/netsocket/ppp/include/ppp_opts.h
rename to connectivity/libraries/ppp/include/ppp_opts.h
diff --git a/features/netsocket/ppp/include/pppapi.h b/connectivity/libraries/ppp/include/pppapi.h
similarity index 100%
rename from features/netsocket/ppp/include/pppapi.h
rename to connectivity/libraries/ppp/include/pppapi.h
diff --git a/features/netsocket/ppp/include/pppcrypt.h b/connectivity/libraries/ppp/include/pppcrypt.h
similarity index 100%
rename from features/netsocket/ppp/include/pppcrypt.h
rename to connectivity/libraries/ppp/include/pppcrypt.h
diff --git a/features/netsocket/ppp/include/pppdebug.h b/connectivity/libraries/ppp/include/pppdebug.h
similarity index 100%
rename from features/netsocket/ppp/include/pppdebug.h
rename to connectivity/libraries/ppp/include/pppdebug.h
diff --git a/features/netsocket/ppp/include/pppoe.h b/connectivity/libraries/ppp/include/pppoe.h
similarity index 100%
rename from features/netsocket/ppp/include/pppoe.h
rename to connectivity/libraries/ppp/include/pppoe.h
diff --git a/features/netsocket/ppp/include/pppol2tp.h b/connectivity/libraries/ppp/include/pppol2tp.h
similarity index 100%
rename from features/netsocket/ppp/include/pppol2tp.h
rename to connectivity/libraries/ppp/include/pppol2tp.h
diff --git a/features/netsocket/ppp/include/pppos.h b/connectivity/libraries/ppp/include/pppos.h
similarity index 100%
rename from features/netsocket/ppp/include/pppos.h
rename to connectivity/libraries/ppp/include/pppos.h
diff --git a/features/netsocket/ppp/include/upap.h b/connectivity/libraries/ppp/include/upap.h
similarity index 100%
rename from features/netsocket/ppp/include/upap.h
rename to connectivity/libraries/ppp/include/upap.h
diff --git a/features/netsocket/ppp/include/vj.h b/connectivity/libraries/ppp/include/vj.h
similarity index 100%
rename from features/netsocket/ppp/include/vj.h
rename to connectivity/libraries/ppp/include/vj.h
diff --git a/features/netsocket/ppp/mbed_lib.json b/connectivity/libraries/ppp/mbed_lib.json
similarity index 100%
rename from features/netsocket/ppp/mbed_lib.json
rename to connectivity/libraries/ppp/mbed_lib.json
diff --git a/features/netsocket/ppp/polarssl/README b/connectivity/libraries/ppp/polarssl/README
similarity index 100%
rename from features/netsocket/ppp/polarssl/README
rename to connectivity/libraries/ppp/polarssl/README
diff --git a/features/netsocket/ppp/polarssl/ppp_arc4.c b/connectivity/libraries/ppp/polarssl/ppp_arc4.c
similarity index 100%
rename from features/netsocket/ppp/polarssl/ppp_arc4.c
rename to connectivity/libraries/ppp/polarssl/ppp_arc4.c
diff --git a/features/netsocket/ppp/polarssl/ppp_des.c b/connectivity/libraries/ppp/polarssl/ppp_des.c
similarity index 100%
rename from features/netsocket/ppp/polarssl/ppp_des.c
rename to connectivity/libraries/ppp/polarssl/ppp_des.c
diff --git a/features/netsocket/ppp/polarssl/ppp_md4.c b/connectivity/libraries/ppp/polarssl/ppp_md4.c
similarity index 100%
rename from features/netsocket/ppp/polarssl/ppp_md4.c
rename to connectivity/libraries/ppp/polarssl/ppp_md4.c
diff --git a/features/netsocket/ppp/polarssl/ppp_md5.c b/connectivity/libraries/ppp/polarssl/ppp_md5.c
similarity index 100%
rename from features/netsocket/ppp/polarssl/ppp_md5.c
rename to connectivity/libraries/ppp/polarssl/ppp_md5.c
diff --git a/features/netsocket/ppp/polarssl/ppp_sha1.c b/connectivity/libraries/ppp/polarssl/ppp_sha1.c
similarity index 100%
rename from features/netsocket/ppp/polarssl/ppp_sha1.c
rename to connectivity/libraries/ppp/polarssl/ppp_sha1.c
diff --git a/features/netsocket/ppp/ppp_nsapi.cpp b/connectivity/libraries/ppp/ppp_nsapi.cpp
similarity index 100%
rename from features/netsocket/ppp/ppp_nsapi.cpp
rename to connectivity/libraries/ppp/ppp_nsapi.cpp
diff --git a/features/netsocket/ppp/ppp_service.cpp b/connectivity/libraries/ppp/ppp_service.cpp
similarity index 100%
rename from features/netsocket/ppp/ppp_service.cpp
rename to connectivity/libraries/ppp/ppp_service.cpp
diff --git a/features/netsocket/ppp/ppp_service.h b/connectivity/libraries/ppp/ppp_service.h
similarity index 100%
rename from features/netsocket/ppp/ppp_service.h
rename to connectivity/libraries/ppp/ppp_service.h
diff --git a/features/netsocket/ppp/ppp_service_if.cpp b/connectivity/libraries/ppp/ppp_service_if.cpp
similarity index 100%
rename from features/netsocket/ppp/ppp_service_if.cpp
rename to connectivity/libraries/ppp/ppp_service_if.cpp
diff --git a/features/netsocket/ppp/ppp_service_if.h b/connectivity/libraries/ppp/ppp_service_if.h
similarity index 100%
rename from features/netsocket/ppp/ppp_service_if.h
rename to connectivity/libraries/ppp/ppp_service_if.h
diff --git a/features/netsocket/ppp/source/PPPD_FOLLOWUP b/connectivity/libraries/ppp/source/PPPD_FOLLOWUP
similarity index 100%
rename from features/netsocket/ppp/source/PPPD_FOLLOWUP
rename to connectivity/libraries/ppp/source/PPPD_FOLLOWUP
diff --git a/features/netsocket/ppp/source/auth.c b/connectivity/libraries/ppp/source/auth.c
similarity index 100%
rename from features/netsocket/ppp/source/auth.c
rename to connectivity/libraries/ppp/source/auth.c
diff --git a/features/netsocket/ppp/source/ccp.c b/connectivity/libraries/ppp/source/ccp.c
similarity index 100%
rename from features/netsocket/ppp/source/ccp.c
rename to connectivity/libraries/ppp/source/ccp.c
diff --git a/features/netsocket/ppp/source/chap-md5.c b/connectivity/libraries/ppp/source/chap-md5.c
similarity index 100%
rename from features/netsocket/ppp/source/chap-md5.c
rename to connectivity/libraries/ppp/source/chap-md5.c
diff --git a/features/netsocket/ppp/source/chap-new.c b/connectivity/libraries/ppp/source/chap-new.c
similarity index 100%
rename from features/netsocket/ppp/source/chap-new.c
rename to connectivity/libraries/ppp/source/chap-new.c
diff --git a/features/netsocket/ppp/source/chap_ms.c b/connectivity/libraries/ppp/source/chap_ms.c
similarity index 100%
rename from features/netsocket/ppp/source/chap_ms.c
rename to connectivity/libraries/ppp/source/chap_ms.c
diff --git a/features/netsocket/ppp/source/demand.c b/connectivity/libraries/ppp/source/demand.c
similarity index 100%
rename from features/netsocket/ppp/source/demand.c
rename to connectivity/libraries/ppp/source/demand.c
diff --git a/features/netsocket/ppp/source/eap.c b/connectivity/libraries/ppp/source/eap.c
similarity index 100%
rename from features/netsocket/ppp/source/eap.c
rename to connectivity/libraries/ppp/source/eap.c
diff --git a/features/netsocket/ppp/source/eui64.c b/connectivity/libraries/ppp/source/eui64.c
similarity index 100%
rename from features/netsocket/ppp/source/eui64.c
rename to connectivity/libraries/ppp/source/eui64.c
diff --git a/features/netsocket/ppp/source/fsm.c b/connectivity/libraries/ppp/source/fsm.c
similarity index 100%
rename from features/netsocket/ppp/source/fsm.c
rename to connectivity/libraries/ppp/source/fsm.c
diff --git a/features/netsocket/ppp/source/ipcp.c b/connectivity/libraries/ppp/source/ipcp.c
similarity index 100%
rename from features/netsocket/ppp/source/ipcp.c
rename to connectivity/libraries/ppp/source/ipcp.c
diff --git a/features/netsocket/ppp/source/ipv6cp.c b/connectivity/libraries/ppp/source/ipv6cp.c
similarity index 100%
rename from features/netsocket/ppp/source/ipv6cp.c
rename to connectivity/libraries/ppp/source/ipv6cp.c
diff --git a/features/netsocket/ppp/source/lcp.c b/connectivity/libraries/ppp/source/lcp.c
similarity index 100%
rename from features/netsocket/ppp/source/lcp.c
rename to connectivity/libraries/ppp/source/lcp.c
diff --git a/features/netsocket/ppp/source/magic.c b/connectivity/libraries/ppp/source/magic.c
similarity index 100%
rename from features/netsocket/ppp/source/magic.c
rename to connectivity/libraries/ppp/source/magic.c
diff --git a/features/netsocket/ppp/source/mppe.c b/connectivity/libraries/ppp/source/mppe.c
similarity index 100%
rename from features/netsocket/ppp/source/mppe.c
rename to connectivity/libraries/ppp/source/mppe.c
diff --git a/features/netsocket/ppp/source/multilink.c b/connectivity/libraries/ppp/source/multilink.c
similarity index 100%
rename from features/netsocket/ppp/source/multilink.c
rename to connectivity/libraries/ppp/source/multilink.c
diff --git a/features/netsocket/ppp/source/ppp.c b/connectivity/libraries/ppp/source/ppp.c
similarity index 100%
rename from features/netsocket/ppp/source/ppp.c
rename to connectivity/libraries/ppp/source/ppp.c
diff --git a/features/netsocket/ppp/source/ppp_ecp.c b/connectivity/libraries/ppp/source/ppp_ecp.c
similarity index 100%
rename from features/netsocket/ppp/source/ppp_ecp.c
rename to connectivity/libraries/ppp/source/ppp_ecp.c
diff --git a/features/netsocket/ppp/source/pppapi.c b/connectivity/libraries/ppp/source/pppapi.c
similarity index 100%
rename from features/netsocket/ppp/source/pppapi.c
rename to connectivity/libraries/ppp/source/pppapi.c
diff --git a/features/netsocket/ppp/source/pppcrypt.c b/connectivity/libraries/ppp/source/pppcrypt.c
similarity index 100%
rename from features/netsocket/ppp/source/pppcrypt.c
rename to connectivity/libraries/ppp/source/pppcrypt.c
diff --git a/features/netsocket/ppp/source/pppoe.c b/connectivity/libraries/ppp/source/pppoe.c
similarity index 100%
rename from features/netsocket/ppp/source/pppoe.c
rename to connectivity/libraries/ppp/source/pppoe.c
diff --git a/features/netsocket/ppp/source/pppol2tp.c b/connectivity/libraries/ppp/source/pppol2tp.c
similarity index 100%
rename from features/netsocket/ppp/source/pppol2tp.c
rename to connectivity/libraries/ppp/source/pppol2tp.c
diff --git a/features/netsocket/ppp/source/pppos.cpp b/connectivity/libraries/ppp/source/pppos.cpp
similarity index 100%
rename from features/netsocket/ppp/source/pppos.cpp
rename to connectivity/libraries/ppp/source/pppos.cpp
diff --git a/features/netsocket/ppp/source/upap.c b/connectivity/libraries/ppp/source/upap.c
similarity index 100%
rename from features/netsocket/ppp/source/upap.c
rename to connectivity/libraries/ppp/source/upap.c
diff --git a/features/netsocket/ppp/source/utils.c b/connectivity/libraries/ppp/source/utils.c
similarity index 100%
rename from features/netsocket/ppp/source/utils.c
rename to connectivity/libraries/ppp/source/utils.c
diff --git a/features/netsocket/ppp/source/vj.c b/connectivity/libraries/ppp/source/vj.c
similarity index 100%
rename from features/netsocket/ppp/source/vj.c
rename to connectivity/libraries/ppp/source/vj.c