diff --git a/src/Arduino_ConnectionHandler.h b/src/Arduino_ConnectionHandler.h
index bb4c0e64..b04e600e 100644
--- a/src/Arduino_ConnectionHandler.h
+++ b/src/Arduino_ConnectionHandler.h
@@ -27,34 +27,34 @@
 #endif
 
 #include <Arduino.h>
-#include "ConnectionHandlerDefinitions.h"
+#include "definitions/ConnectionHandlerDefinitions.h"
 
 #if defined(BOARD_HAS_WIFI)
-  #include "WiFiConnectionHandler.h"
+  #include "handlers/WiFiConnectionHandler.h"
 #endif
 
 #if defined(BOARD_HAS_GSM)
-  #include "GSMConnectionHandler.h"
+  #include "handlers/GSMConnectionHandler.h"
 #endif
 
 #if defined(BOARD_HAS_NB)
-  #include "NBConnectionHandler.h"
+  #include "handlers/NBConnectionHandler.h"
 #endif
 
 #if defined(BOARD_HAS_LORA)
-  #include "LoRaConnectionHandler.h"
+  #include "handlers/LoRaConnectionHandler.h"
 #endif
 
 #if defined(BOARD_HAS_ETHERNET)
-  #include "EthernetConnectionHandler.h"
+  #include "handlers/EthernetConnectionHandler.h"
 #endif
 
 #if defined(BOARD_HAS_CATM1_NBIOT)
-  #include "CatM1ConnectionHandler.h"
+  #include "handlers/CatM1ConnectionHandler.h"
 #endif
 
 #if defined(BOARD_HAS_CELLULAR)
-  #include "CellularConnectionHandler.h"
+  #include "handlers/CellularConnectionHandler.h"
 #endif
 
 #endif /* CONNECTION_HANDLER_H_ */
diff --git a/src/ConnectionHandlerDefinitions.h b/src/definitions/ConnectionHandlerDefinitions.h
similarity index 100%
rename from src/ConnectionHandlerDefinitions.h
rename to src/definitions/ConnectionHandlerDefinitions.h
diff --git a/src/CatM1ConnectionHandler.cpp b/src/handlers/CatM1ConnectionHandler.cpp
similarity index 96%
rename from src/CatM1ConnectionHandler.cpp
rename to src/handlers/CatM1ConnectionHandler.cpp
index 0263a397..5b9cb811 100644
--- a/src/CatM1ConnectionHandler.cpp
+++ b/src/handlers/CatM1ConnectionHandler.cpp
@@ -19,10 +19,10 @@
    INCLUDE
  ******************************************************************************/
 
-#include "ConnectionHandlerDefinitions.h"
+#include "definitions/ConnectionHandlerDefinitions.h"
 
 #ifdef BOARD_HAS_CATM1_NBIOT /* Only compile if the board has CatM1 BN-IoT */
-#include "CatM1ConnectionHandler.h"
+#include "handlers/CatM1ConnectionHandler.h"
 
 /******************************************************************************
    CTOR/DTOR
diff --git a/src/CatM1ConnectionHandler.h b/src/handlers/CatM1ConnectionHandler.h
similarity index 98%
rename from src/CatM1ConnectionHandler.h
rename to src/handlers/CatM1ConnectionHandler.h
index 33ac9fea..458ad698 100644
--- a/src/CatM1ConnectionHandler.h
+++ b/src/handlers/CatM1ConnectionHandler.h
@@ -22,7 +22,7 @@
    INCLUDE
  ******************************************************************************/
 
-#include "ConnectionHandlerInterface.h"
+#include "interface/ConnectionHandlerInterface.h"
 
 #if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_EDGE_CONTROL)
   #include <GSM.h>
diff --git a/src/CellularConnectionHandler.cpp b/src/handlers/CellularConnectionHandler.cpp
similarity index 96%
rename from src/CellularConnectionHandler.cpp
rename to src/handlers/CellularConnectionHandler.cpp
index 2e4499a0..2f7c4e57 100644
--- a/src/CellularConnectionHandler.cpp
+++ b/src/handlers/CellularConnectionHandler.cpp
@@ -13,10 +13,10 @@
    INCLUDE
  ******************************************************************************/
 
-#include "ConnectionHandlerDefinitions.h"
+#include "definitions/ConnectionHandlerDefinitions.h"
 
 #ifdef BOARD_HAS_CELLULAR /* Only compile if the board has Cellular */
-#include "CellularConnectionHandler.h"
+#include "handlers/CellularConnectionHandler.h"
 
 /******************************************************************************
    CTOR/DTOR
diff --git a/src/CellularConnectionHandler.h b/src/handlers/CellularConnectionHandler.h
similarity index 97%
rename from src/CellularConnectionHandler.h
rename to src/handlers/CellularConnectionHandler.h
index 048c9f74..1d26ebdc 100644
--- a/src/CellularConnectionHandler.h
+++ b/src/handlers/CellularConnectionHandler.h
@@ -16,12 +16,7 @@
    INCLUDE
  ******************************************************************************/
 
-#include "Arduino_ConnectionHandler.h"
-
-
-/******************************************************************************
-   CLASS DECLARATION
- ******************************************************************************/
+#include "interface/ConnectionHandlerInterface.h"
 
 #if defined(ARDUINO_PORTENTA_C33) || defined(ARDUINO_PORTENTA_H7_M7)
 #include <Arduino_Cellular.h>
@@ -31,6 +26,10 @@
   #error "Board doesn't support CELLULAR"
 #endif
 
+/******************************************************************************
+   CLASS DECLARATION
+ ******************************************************************************/
+
 class CellularConnectionHandler : public ConnectionHandler
 {
   public:
diff --git a/src/EthernetConnectionHandler.cpp b/src/handlers/EthernetConnectionHandler.cpp
similarity index 97%
rename from src/EthernetConnectionHandler.cpp
rename to src/handlers/EthernetConnectionHandler.cpp
index 14f7aee4..b29c9aef 100644
--- a/src/EthernetConnectionHandler.cpp
+++ b/src/handlers/EthernetConnectionHandler.cpp
@@ -16,10 +16,10 @@
    INCLUDE
  ******************************************************************************/
 
-#include "ConnectionHandlerDefinitions.h"
+#include "definitions/ConnectionHandlerDefinitions.h"
 
 #ifdef BOARD_HAS_ETHERNET /* Only compile if the board has ethernet */
-#include "EthernetConnectionHandler.h"
+#include "handlers/EthernetConnectionHandler.h"
 
 /******************************************************************************
    CTOR/DTOR
diff --git a/src/EthernetConnectionHandler.h b/src/handlers/EthernetConnectionHandler.h
similarity index 98%
rename from src/EthernetConnectionHandler.h
rename to src/handlers/EthernetConnectionHandler.h
index 35a02cd9..0bce256a 100644
--- a/src/EthernetConnectionHandler.h
+++ b/src/handlers/EthernetConnectionHandler.h
@@ -19,7 +19,7 @@
    INCLUDE
  ******************************************************************************/
 
-#include "ConnectionHandlerInterface.h"
+#include "interface/ConnectionHandlerInterface.h"
 
 #if defined(ARDUINO_PORTENTA_H7_M7)
   #include <Ethernet.h>
diff --git a/src/GSMConnectionHandler.cpp b/src/handlers/GSMConnectionHandler.cpp
similarity index 97%
rename from src/GSMConnectionHandler.cpp
rename to src/handlers/GSMConnectionHandler.cpp
index 34bf1792..a80786af 100644
--- a/src/GSMConnectionHandler.cpp
+++ b/src/handlers/GSMConnectionHandler.cpp
@@ -19,10 +19,10 @@
    INCLUDE
  ******************************************************************************/
 
-#include "ConnectionHandlerDefinitions.h"
+#include "definitions/ConnectionHandlerDefinitions.h"
 
 #ifdef BOARD_HAS_GSM /* Only compile if this is a board with GSM */
-#include "GSMConnectionHandler.h"
+#include "handlers/GSMConnectionHandler.h"
 
 /******************************************************************************
    CONSTANTS
diff --git a/src/GSMConnectionHandler.h b/src/handlers/GSMConnectionHandler.h
similarity index 97%
rename from src/GSMConnectionHandler.h
rename to src/handlers/GSMConnectionHandler.h
index 1f3db49a..4ae950e6 100644
--- a/src/GSMConnectionHandler.h
+++ b/src/handlers/GSMConnectionHandler.h
@@ -22,7 +22,7 @@
    INCLUDE
  ******************************************************************************/
 
-#include "ConnectionHandlerInterface.h"
+#include "interface/ConnectionHandlerInterface.h"
 
 #if defined(ARDUINO_SAMD_MKRGSM1400)
   #include <MKRGSM.h>
diff --git a/src/LoRaConnectionHandler.cpp b/src/handlers/LoRaConnectionHandler.cpp
similarity index 98%
rename from src/LoRaConnectionHandler.cpp
rename to src/handlers/LoRaConnectionHandler.cpp
index 1f454a51..e05d706b 100644
--- a/src/LoRaConnectionHandler.cpp
+++ b/src/handlers/LoRaConnectionHandler.cpp
@@ -19,10 +19,10 @@
    INCLUDE
  ******************************************************************************/
 
-#include "ConnectionHandlerDefinitions.h"
+#include "definitions/ConnectionHandlerDefinitions.h"
 
 #if defined(BOARD_HAS_LORA) /* Only compile if the board has LoRa */
-#include "LoRaConnectionHandler.h"
+#include "handlers/LoRaConnectionHandler.h"
 
 /******************************************************************************
    TYPEDEF
diff --git a/src/LoRaConnectionHandler.h b/src/handlers/LoRaConnectionHandler.h
similarity index 98%
rename from src/LoRaConnectionHandler.h
rename to src/handlers/LoRaConnectionHandler.h
index 3ddcca24..d889cd13 100644
--- a/src/LoRaConnectionHandler.h
+++ b/src/handlers/LoRaConnectionHandler.h
@@ -22,7 +22,7 @@
    INCLUDE
  ******************************************************************************/
 
-#include "ConnectionHandlerInterface.h"
+#include "interface/ConnectionHandlerInterface.h"
 
 #if defined(ARDUINO_SAMD_MKRWAN1300) || defined(ARDUINO_SAMD_MKRWAN1310)
   #include <MKRWAN.h>
diff --git a/src/NBConnectionHandler.cpp b/src/handlers/NBConnectionHandler.cpp
similarity index 97%
rename from src/NBConnectionHandler.cpp
rename to src/handlers/NBConnectionHandler.cpp
index eb72f3e7..e574822b 100644
--- a/src/NBConnectionHandler.cpp
+++ b/src/handlers/NBConnectionHandler.cpp
@@ -19,10 +19,10 @@
    INCLUDE
  ******************************************************************************/
 
-#include "ConnectionHandlerDefinitions.h"
+#include "definitions/ConnectionHandlerDefinitions.h"
 
 #ifdef BOARD_HAS_NB /* Only compile if this is a board with NB */
-#include "NBConnectionHandler.h"
+#include "handlers/NBConnectionHandler.h"
 
 /******************************************************************************
    CONSTANTS
diff --git a/src/NBConnectionHandler.h b/src/handlers/NBConnectionHandler.h
similarity index 98%
rename from src/NBConnectionHandler.h
rename to src/handlers/NBConnectionHandler.h
index fd2afb6c..05a92d74 100644
--- a/src/NBConnectionHandler.h
+++ b/src/handlers/NBConnectionHandler.h
@@ -22,7 +22,7 @@
    INCLUDE
  ******************************************************************************/
 
-#include "ConnectionHandlerInterface.h"
+#include "interface/ConnectionHandlerInterface.h"
 
 #ifdef ARDUINO_SAMD_MKRNB1500
   #include <MKRNB.h>
diff --git a/src/WiFiConnectionHandler.cpp b/src/handlers/WiFiConnectionHandler.cpp
similarity index 98%
rename from src/WiFiConnectionHandler.cpp
rename to src/handlers/WiFiConnectionHandler.cpp
index 0cd2e126..354f2c81 100644
--- a/src/WiFiConnectionHandler.cpp
+++ b/src/handlers/WiFiConnectionHandler.cpp
@@ -19,10 +19,10 @@
    INCLUDE
  ******************************************************************************/
 
-#include "ConnectionHandlerDefinitions.h"
+#include "definitions/ConnectionHandlerDefinitions.h"
 
 #ifdef BOARD_HAS_WIFI /* Only compile if the board has WiFi */
-#include "WiFiConnectionHandler.h"
+#include "handlers/WiFiConnectionHandler.h"
 
 /******************************************************************************
    CONSTANTS
diff --git a/src/WiFiConnectionHandler.h b/src/handlers/WiFiConnectionHandler.h
similarity index 98%
rename from src/WiFiConnectionHandler.h
rename to src/handlers/WiFiConnectionHandler.h
index e5e2e25d..b8e50cd7 100644
--- a/src/WiFiConnectionHandler.h
+++ b/src/handlers/WiFiConnectionHandler.h
@@ -22,7 +22,7 @@
    INCLUDE
  ******************************************************************************/
 
-#include "ConnectionHandlerInterface.h"
+#include "interface/ConnectionHandlerInterface.h"
 
 #ifdef ARDUINO_SAMD_MKR1000
   #include <WiFi101.h>
diff --git a/src/ConnectionHandlerInterface.cpp b/src/interface/ConnectionHandlerInterface.cpp
similarity index 100%
rename from src/ConnectionHandlerInterface.cpp
rename to src/interface/ConnectionHandlerInterface.cpp
diff --git a/src/ConnectionHandlerInterface.h b/src/interface/ConnectionHandlerInterface.h
similarity index 98%
rename from src/ConnectionHandlerInterface.h
rename to src/interface/ConnectionHandlerInterface.h
index 94768ea8..812c46f3 100644
--- a/src/ConnectionHandlerInterface.h
+++ b/src/interface/ConnectionHandlerInterface.h
@@ -28,7 +28,7 @@
 #include <Arduino.h>
 #include <Client.h>
 #include <Udp.h>
-#include "ConnectionHandlerDefinitions.h"
+#include "definitions/ConnectionHandlerDefinitions.h"
 
 /******************************************************************************
    TYPEDEFS