diff --git a/components/802.15.4_RF/atmel-rf-driver/LICENSE b/connectivity/drivers/802.15.4_RF/atmel-rf-driver/LICENSE
similarity index 100%
rename from components/802.15.4_RF/atmel-rf-driver/LICENSE
rename to connectivity/drivers/802.15.4_RF/atmel-rf-driver/LICENSE
diff --git a/components/802.15.4_RF/atmel-rf-driver/README.md b/connectivity/drivers/802.15.4_RF/atmel-rf-driver/README.md
similarity index 100%
rename from components/802.15.4_RF/atmel-rf-driver/README.md
rename to connectivity/drivers/802.15.4_RF/atmel-rf-driver/README.md
diff --git a/components/802.15.4_RF/atmel-rf-driver/apache-2.0.txt b/connectivity/drivers/802.15.4_RF/atmel-rf-driver/apache-2.0.txt
similarity index 100%
rename from components/802.15.4_RF/atmel-rf-driver/apache-2.0.txt
rename to connectivity/drivers/802.15.4_RF/atmel-rf-driver/apache-2.0.txt
diff --git a/components/802.15.4_RF/atmel-rf-driver/atmel-rf-driver/NanostackRfPhyAtmel.h b/connectivity/drivers/802.15.4_RF/atmel-rf-driver/atmel-rf-driver/NanostackRfPhyAtmel.h
similarity index 100%
rename from components/802.15.4_RF/atmel-rf-driver/atmel-rf-driver/NanostackRfPhyAtmel.h
rename to connectivity/drivers/802.15.4_RF/atmel-rf-driver/atmel-rf-driver/NanostackRfPhyAtmel.h
diff --git a/components/802.15.4_RF/atmel-rf-driver/mbed_lib.json b/connectivity/drivers/802.15.4_RF/atmel-rf-driver/mbed_lib.json
similarity index 100%
rename from components/802.15.4_RF/atmel-rf-driver/mbed_lib.json
rename to connectivity/drivers/802.15.4_RF/atmel-rf-driver/mbed_lib.json
diff --git a/components/802.15.4_RF/atmel-rf-driver/source/AT86RF215Reg.h b/connectivity/drivers/802.15.4_RF/atmel-rf-driver/source/AT86RF215Reg.h
similarity index 100%
rename from components/802.15.4_RF/atmel-rf-driver/source/AT86RF215Reg.h
rename to connectivity/drivers/802.15.4_RF/atmel-rf-driver/source/AT86RF215Reg.h
diff --git a/components/802.15.4_RF/atmel-rf-driver/source/AT86RFReg.h b/connectivity/drivers/802.15.4_RF/atmel-rf-driver/source/AT86RFReg.h
similarity index 100%
rename from components/802.15.4_RF/atmel-rf-driver/source/AT86RFReg.h
rename to connectivity/drivers/802.15.4_RF/atmel-rf-driver/source/AT86RFReg.h
diff --git a/components/802.15.4_RF/atmel-rf-driver/source/NanostackRfPhyAT86RF215.cpp b/connectivity/drivers/802.15.4_RF/atmel-rf-driver/source/NanostackRfPhyAT86RF215.cpp
similarity index 100%
rename from components/802.15.4_RF/atmel-rf-driver/source/NanostackRfPhyAT86RF215.cpp
rename to connectivity/drivers/802.15.4_RF/atmel-rf-driver/source/NanostackRfPhyAT86RF215.cpp
diff --git a/components/802.15.4_RF/atmel-rf-driver/source/NanostackRfPhyAtmel.cpp b/connectivity/drivers/802.15.4_RF/atmel-rf-driver/source/NanostackRfPhyAtmel.cpp
similarity index 100%
rename from components/802.15.4_RF/atmel-rf-driver/source/NanostackRfPhyAtmel.cpp
rename to connectivity/drivers/802.15.4_RF/atmel-rf-driver/source/NanostackRfPhyAtmel.cpp
diff --git a/components/802.15.4_RF/atmel-rf-driver/source/at24mac.cpp b/connectivity/drivers/802.15.4_RF/atmel-rf-driver/source/at24mac.cpp
similarity index 100%
rename from components/802.15.4_RF/atmel-rf-driver/source/at24mac.cpp
rename to connectivity/drivers/802.15.4_RF/atmel-rf-driver/source/at24mac.cpp
diff --git a/components/802.15.4_RF/atmel-rf-driver/source/at24mac.h b/connectivity/drivers/802.15.4_RF/atmel-rf-driver/source/at24mac.h
similarity index 100%
rename from components/802.15.4_RF/atmel-rf-driver/source/at24mac.h
rename to connectivity/drivers/802.15.4_RF/atmel-rf-driver/source/at24mac.h
diff --git a/components/802.15.4_RF/atmel-rf-driver/source/rfbits.h b/connectivity/drivers/802.15.4_RF/atmel-rf-driver/source/rfbits.h
similarity index 100%
rename from components/802.15.4_RF/atmel-rf-driver/source/rfbits.h
rename to connectivity/drivers/802.15.4_RF/atmel-rf-driver/source/rfbits.h
diff --git a/components/802.15.4_RF/mcr20a-rf-driver/LICENSE b/connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/LICENSE
similarity index 100%
rename from components/802.15.4_RF/mcr20a-rf-driver/LICENSE
rename to connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/LICENSE
diff --git a/components/802.15.4_RF/mcr20a-rf-driver/README.md b/connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/README.md
similarity index 100%
rename from components/802.15.4_RF/mcr20a-rf-driver/README.md
rename to connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/README.md
diff --git a/components/802.15.4_RF/mcr20a-rf-driver/apache-2.0.txt b/connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/apache-2.0.txt
similarity index 100%
rename from components/802.15.4_RF/mcr20a-rf-driver/apache-2.0.txt
rename to connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/apache-2.0.txt
diff --git a/components/802.15.4_RF/mcr20a-rf-driver/mbed_lib.json b/connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/mbed_lib.json
similarity index 100%
rename from components/802.15.4_RF/mcr20a-rf-driver/mbed_lib.json
rename to connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/mbed_lib.json
diff --git a/components/802.15.4_RF/mcr20a-rf-driver/mcr20a-rf-driver/NanostackRfPhyMcr20a.h b/connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/mcr20a-rf-driver/NanostackRfPhyMcr20a.h
similarity index 100%
rename from components/802.15.4_RF/mcr20a-rf-driver/mcr20a-rf-driver/NanostackRfPhyMcr20a.h
rename to connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/mcr20a-rf-driver/NanostackRfPhyMcr20a.h
diff --git a/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Drv.c b/connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/source/MCR20Drv.c
similarity index 100%
rename from components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Drv.c
rename to connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/source/MCR20Drv.c
diff --git a/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Drv.h b/connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/source/MCR20Drv.h
similarity index 100%
rename from components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Drv.h
rename to connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/source/MCR20Drv.h
diff --git a/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Overwrites.h b/connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/source/MCR20Overwrites.h
similarity index 100%
rename from components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Overwrites.h
rename to connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/source/MCR20Overwrites.h
diff --git a/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Reg.h b/connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/source/MCR20Reg.h
similarity index 100%
rename from components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Reg.h
rename to connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/source/MCR20Reg.h
diff --git a/components/802.15.4_RF/mcr20a-rf-driver/source/NanostackRfPhyMcr20a.cpp b/connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/source/NanostackRfPhyMcr20a.cpp
similarity index 100%
rename from components/802.15.4_RF/mcr20a-rf-driver/source/NanostackRfPhyMcr20a.cpp
rename to connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/source/NanostackRfPhyMcr20a.cpp
diff --git a/components/802.15.4_RF/mcr20a-rf-driver/source/XcvrSpi.h b/connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/source/XcvrSpi.h
similarity index 100%
rename from components/802.15.4_RF/mcr20a-rf-driver/source/XcvrSpi.h
rename to connectivity/drivers/802.15.4_RF/mcr20a-rf-driver/source/XcvrSpi.h
diff --git a/components/802.15.4_RF/stm-s2lp-rf-driver/README.md b/connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/README.md
similarity index 100%
rename from components/802.15.4_RF/stm-s2lp-rf-driver/README.md
rename to connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/README.md
diff --git a/components/802.15.4_RF/stm-s2lp-rf-driver/mbed_lib.json b/connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/mbed_lib.json
similarity index 100%
rename from components/802.15.4_RF/stm-s2lp-rf-driver/mbed_lib.json
rename to connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/mbed_lib.json
diff --git a/components/802.15.4_RF/stm-s2lp-rf-driver/source/NanostackRfPhys2lp.cpp b/connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/source/NanostackRfPhys2lp.cpp
similarity index 100%
rename from components/802.15.4_RF/stm-s2lp-rf-driver/source/NanostackRfPhys2lp.cpp
rename to connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/source/NanostackRfPhys2lp.cpp
diff --git a/components/802.15.4_RF/stm-s2lp-rf-driver/source/at24mac_s2lp.cpp b/connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/source/at24mac_s2lp.cpp
similarity index 100%
rename from components/802.15.4_RF/stm-s2lp-rf-driver/source/at24mac_s2lp.cpp
rename to connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/source/at24mac_s2lp.cpp
diff --git a/components/802.15.4_RF/stm-s2lp-rf-driver/source/at24mac_s2lp.h b/connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/source/at24mac_s2lp.h
similarity index 100%
rename from components/802.15.4_RF/stm-s2lp-rf-driver/source/at24mac_s2lp.h
rename to connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/source/at24mac_s2lp.h
diff --git a/components/802.15.4_RF/stm-s2lp-rf-driver/source/rf_configuration.c b/connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/source/rf_configuration.c
similarity index 100%
rename from components/802.15.4_RF/stm-s2lp-rf-driver/source/rf_configuration.c
rename to connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/source/rf_configuration.c
diff --git a/components/802.15.4_RF/stm-s2lp-rf-driver/source/rf_configuration.h b/connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/source/rf_configuration.h
similarity index 100%
rename from components/802.15.4_RF/stm-s2lp-rf-driver/source/rf_configuration.h
rename to connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/source/rf_configuration.h
diff --git a/components/802.15.4_RF/stm-s2lp-rf-driver/source/s2lpReg.h b/connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/source/s2lpReg.h
similarity index 100%
rename from components/802.15.4_RF/stm-s2lp-rf-driver/source/s2lpReg.h
rename to connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/source/s2lpReg.h
diff --git a/components/802.15.4_RF/stm-s2lp-rf-driver/stm-s2lp-rf-driver/NanostackRfPhys2lp.h b/connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/stm-s2lp-rf-driver/NanostackRfPhys2lp.h
similarity index 100%
rename from components/802.15.4_RF/stm-s2lp-rf-driver/stm-s2lp-rf-driver/NanostackRfPhys2lp.h
rename to connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/stm-s2lp-rf-driver/NanostackRfPhys2lp.h