diff --git a/LICENSE.md b/LICENSE.md
index 26f2e47..cf159fe 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -12,7 +12,7 @@
 - [features/FEATURE_PSA/FEATURE_TFM](./features/FEATURE_PSA/FEATURE_TFM) - BSD-3-Clause
 - [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
-- [connectivity/lorawan](./features/lorawan) - Revised BSD
+- [connectivity/lorawan](./connectivity/lorawan) - Revised BSD
 - [connectivity/lwipstack](./connectivity/lwipstack) - BSD-style, MIT-style
 - [connectivity/nanostack/sal-stack-nanostack](./connectivity/nanostack/sal-stack-nanostack) - BSD-3-Clause
 - [features/frameworks/unity/unity](./features/frameworks/unity/unity) - MIT
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/unittest.cmake
index f68bee2..07ed7f3 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/unittest.cmake
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramac/unittest.cmake
@@ -20,13 +20,13 @@
 
 # Source files
 set(unittest-sources
-  ../features/lorawan/lorastack/mac/LoRaMac.cpp
+  ../connectivity/lorawan/lorastack/mac/LoRaMac.cpp
 )
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
   target_h
-  ../features/lorawan/lorastack/mac
+  ../connectivity/lorawan/lorastack/mac
 )
 
 # Test & stub files
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/unittest.cmake
index 4bc3c0a..94c923d 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/unittest.cmake
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramacchannelplan/unittest.cmake
@@ -20,13 +20,13 @@
 
 # Source files
 set(unittest-sources
-  ../features/lorawan/lorastack/mac/LoRaMacChannelPlan.cpp
+  ../connectivity/lorawan/lorastack/mac/LoRaMacChannelPlan.cpp
 )
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
   target_h
-  ../features/lorawan/lorastack/mac
+  ../connectivity/lorawan/lorastack/mac
 )
 
 # Test & stub files
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/unittest.cmake
index a1929ec..50e9c8e 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/unittest.cmake
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccommand/unittest.cmake
@@ -20,13 +20,13 @@
 
 # Source files
 set(unittest-sources
-  ../features/lorawan/lorastack/mac/LoRaMacCommand.cpp
+  ../connectivity/lorawan/lorastack/mac/LoRaMacCommand.cpp
 )
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
   target_h
-  ../features/lorawan/lorastack/mac
+  ../connectivity/lorawan/lorastack/mac
 )
 
 # Test & stub files
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake
index 61aaae9..7aba046 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loramaccrypto/unittest.cmake
@@ -20,13 +20,13 @@
 
 # Source files
 set(unittest-sources
-  ../features/lorawan/lorastack/mac/LoRaMacCrypto.cpp
+  ../connectivity/lorawan/lorastack/mac/LoRaMacCrypto.cpp
 )
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
   target_h
-  ../features/lorawan/lorastack/mac
+  ../connectivity/lorawan/lorastack/mac
 )
 
 # Test & stub files
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/unittest.cmake
index 7566576..bf59481 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/unittest.cmake
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphy/unittest.cmake
@@ -20,13 +20,13 @@
 
 # Source files
 set(unittest-sources
-  ../features/lorawan/lorastack/phy/LoRaPHY.cpp
+  ../connectivity/lorawan/lorastack/phy/LoRaPHY.cpp
 )
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
   target_h
-  ../features/lorawan/lorastack/phy
+  ../connectivity/lorawan/lorastack/phy
 )
 
 # Test & stub files
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/unittest.cmake
index 723ade1..b7307a3 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/unittest.cmake
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyas923/unittest.cmake
@@ -20,13 +20,13 @@
 
 # Source files
 set(unittest-sources
-  ../features/lorawan/lorastack/phy/LoRaPHYAS923.cpp
+  ../connectivity/lorawan/lorastack/phy/LoRaPHYAS923.cpp
 )
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
   target_h
-  ../features/lorawan/lorastack/phy
+  ../connectivity/lorawan/lorastack/phy
 )
 
 # Test & stub files
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/unittest.cmake
index 93c12ac..048eeaa 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/unittest.cmake
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyau915/unittest.cmake
@@ -20,13 +20,13 @@
 
 # Source files
 set(unittest-sources
- ../features/lorawan/lorastack/phy/LoRaPHYAU915.cpp
+ ../connectivity/lorawan/lorastack/phy/LoRaPHYAU915.cpp
 )
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
   target_h
-  ../features/lorawan/lorastack/phy
+  ../connectivity/lorawan/lorastack/phy
 )
 
 # Test & stub files
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/unittest.cmake
index 910ba9a..a336889 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/unittest.cmake
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn470/unittest.cmake
@@ -20,13 +20,13 @@
 
 # Source files
 set(unittest-sources
-  ../features/lorawan/lorastack/phy/LoRaPHYCN470.cpp
+  ../connectivity/lorawan/lorastack/phy/LoRaPHYCN470.cpp
 )
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
   target_h
-  ../features/lorawan/lorastack/phy
+  ../connectivity/lorawan/lorastack/phy
 )
 
 # Test & stub files
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/unittest.cmake
index 66c11e2..dbc5d0c 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/unittest.cmake
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphycn779/unittest.cmake
@@ -20,13 +20,13 @@
 
 # Source files
 set(unittest-sources
-  ../features/lorawan/lorastack/phy/LoRaPHYCN779.cpp
+  ../connectivity/lorawan/lorastack/phy/LoRaPHYCN779.cpp
 )
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
   target_h
-  ../features/lorawan/lorastack/phy
+  ../connectivity/lorawan/lorastack/phy
 )
 
 # Test & stub files
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake
index ffafac6..2dedae7 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/unittest.cmake
@@ -20,13 +20,13 @@
 
 # Source files
 set(unittest-sources
-  ../features/lorawan/lorastack/phy/LoRaPHYEU433.cpp
+  ../connectivity/lorawan/lorastack/phy/LoRaPHYEU433.cpp
 )
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
   target_h
-  ../features/lorawan/lorastack/phy
+  ../connectivity/lorawan/lorastack/phy
 )
 
 # Test & stub files
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake
index 009eb04..a48febd 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu868/unittest.cmake
@@ -20,13 +20,13 @@
 
 # Source files
 set(unittest-sources
-  ../features/lorawan/lorastack/phy/LoRaPHYEU868.cpp
+  ../connectivity/lorawan/lorastack/phy/LoRaPHYEU868.cpp
 )
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
   target_h
-  ../features/lorawan/lorastack/phy
+  ../connectivity/lorawan/lorastack/phy
 )
 
 # Test & stub files
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/unittest.cmake
index 1ba6039..d6d014a 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/unittest.cmake
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyin865/unittest.cmake
@@ -20,13 +20,13 @@
 
 # Source files
 set(unittest-sources
-  ../features/lorawan/lorastack/phy/LoRaPHYIN865.cpp
+  ../connectivity/lorawan/lorastack/phy/LoRaPHYIN865.cpp
 )
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
   target_h
-  ../features/lorawan/lorastack/phy
+  ../connectivity/lorawan/lorastack/phy
 )
 
 # Test & stub files
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/unittest.cmake
index a34e3aa..f981844 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/unittest.cmake
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/unittest.cmake
@@ -20,13 +20,13 @@
 
 # Source files
 set(unittest-sources
-  ../features/lorawan/lorastack/phy/LoRaPHYKR920.cpp
+  ../connectivity/lorawan/lorastack/phy/LoRaPHYKR920.cpp
 )
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
   target_h
-  ../features/lorawan/lorastack/phy
+  ../connectivity/lorawan/lorastack/phy
 )
 
 # Test & stub files
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/unittest.cmake
index d68bca9..cbd179b 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/unittest.cmake
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/unittest.cmake
@@ -20,13 +20,13 @@
 
 # Source files
 set(unittest-sources
-  ../features/lorawan/lorastack/phy/LoRaPHYUS915.cpp
+  ../connectivity/lorawan/lorastack/phy/LoRaPHYUS915.cpp
 )
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
   target_h
-  ../features/lorawan/lorastack/phy
+  ../connectivity/lorawan/lorastack/phy
 )
 
 # Test & stub files
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake
index 0db5b7a..fdc82da 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake
@@ -20,13 +20,13 @@
 
 # Source files
 set(unittest-sources
-  ../features/lorawan/LoRaWANInterface.cpp
+  ../connectivity/lorawan/LoRaWANInterface.cpp
 )
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
   target_h
-  ../features/lorawan
+  ../connectivity/lorawan
 )
 
 # Test & stub files
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake
index cbedd9c..1a9e47c 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake
@@ -20,13 +20,13 @@
 
 # Source files
 set(unittest-sources
-  ../features/lorawan/LoRaWANStack.cpp
+  ../connectivity/lorawan/LoRaWANStack.cpp
 )
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
   target_h
-  ../features/lorawan
+  ../connectivity/lorawan
 )
 
 # Test & stub files
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/unittest.cmake b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/unittest.cmake
index b4ee1c9..3ee9ddf 100644
--- a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/unittest.cmake
+++ b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawantimer/unittest.cmake
@@ -20,13 +20,13 @@
 
 # Source files
 set(unittest-sources
-  ../features/lorawan/system/LoRaWANTimer.cpp
+  ../connectivity/lorawan/system/LoRaWANTimer.cpp
 )
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
   target_h
-  ../features/lorawan/system
+  ../connectivity/lorawan/system
 )
 
 # Test & stub files