diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index 1644caf..8e3d1e0 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -30,7 +30,7 @@ jobs:
         - source-path: ./
         - name: Arduino_DebugUtils
         - source-url: https://github.com/fabik111/Arduino_ConnectionHandler.git
-          version: 0314cf54593029aea05bb8c179e40a26128f7d67
+          version: 54b93d64da130f653fb437819c22fb89b78732d0
         - source-url: https://github.com/arduino-libraries/ArduinoBLE.git
         - source-url: https://github.com/arduino-libraries/Arduino_CloudUtils.git
         - source-url: https://github.com/arduino-libraries/Arduino_KVStore.git
diff --git a/examples/NetworkConfiguratorDemo/NetworkConfiguratorDemo.ino b/examples/NetworkConfiguratorDemo/NetworkConfiguratorDemo.ino
index d832a2a..1bb8e6c 100644
--- a/examples/NetworkConfiguratorDemo/NetworkConfiguratorDemo.ino
+++ b/examples/NetworkConfiguratorDemo/NetworkConfiguratorDemo.ino
@@ -34,8 +34,8 @@
 #include <GenericConnectionHandler.h>
 #include <Arduino_KVStore.h>
 #include <Arduino_NetworkConfigurator.h>
-#include <ConfiguratorAgents/agents/BLE/BLEAgent.h>
-#include <ConfiguratorAgents/agents/Serial/SerialAgent.h>
+#include <configuratorAgents/agents/BLEAgent.h>
+#include <configuratorAgents/agents/SerialAgent.h>
 
 KVStore kvstore;
 BLEAgentClass BLEAgent;
diff --git a/extras/test/CMakeLists.txt b/extras/test/CMakeLists.txt
index 1393140..d8e0556 100644
--- a/extras/test/CMakeLists.txt
+++ b/extras/test/CMakeLists.txt
@@ -46,8 +46,8 @@ endif()
 
 include_directories(include)
 include_directories(../../src)
-include_directories(../../src/ConfiguratorAgents)
-include_directories(../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor)
+include_directories(../../src/configuratorAgents)
+include_directories(../../src/configuratorAgents/agents/BoardConfigurationProtocol/cbor)
 
 # add_library(cloudutils STATIC IMPORTED GLOBAL)
 add_library(cloudutils INTERFACE)
@@ -98,8 +98,8 @@ set(TEST_SRCS
 )
 
 set(TEST_DUT_SRCS
-  ../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.cpp
-  ../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.cpp
+  ../../src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.cpp
+  ../../src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.cpp
 
   ${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborencoder.c
   ${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborencoder_close_container_checked.c
diff --git a/extras/test/src/test_provisioning_command_decode.cpp b/extras/test/src/test_provisioning_command_decode.cpp
index 8571697..7346e1a 100644
--- a/extras/test/src/test_provisioning_command_decode.cpp
+++ b/extras/test/src/test_provisioning_command_decode.cpp
@@ -13,8 +13,8 @@
 
  #include <Decoder.h>
  #include <cbor/MessageDecoder.h>
- #include "../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h"
- #include "../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h"
+ #include "../../src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h"
+ #include "../../src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h"
  #include <IPAddress.h>
 
  /******************************************************************************
diff --git a/extras/test/src/test_provisioning_command_encode.cpp b/extras/test/src/test_provisioning_command_encode.cpp
index 28ef8f5..c137ee1 100644
--- a/extras/test/src/test_provisioning_command_encode.cpp
+++ b/extras/test/src/test_provisioning_command_encode.cpp
@@ -11,8 +11,8 @@
  #include <memory>
  #include <Encoder.h>
  #include <cbor/MessageEncoder.h>
- #include "../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h"
- #include "../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h"
+ #include "../../src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h"
+ #include "../../src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h"
 
  /******************************************************************************
     TEST CODE
diff --git a/src/Arduino_NetworkConfigurator.cpp b/src/Arduino_NetworkConfigurator.cpp
index 5e0b0f4..85bf4a0 100644
--- a/src/Arduino_NetworkConfigurator.cpp
+++ b/src/Arduino_NetworkConfigurator.cpp
@@ -11,8 +11,8 @@
 
 #include <Arduino_DebugUtils.h>
 #include "ConnectionHandlerDefinitions.h"
-#include "ConfiguratorAgents/MessagesDefinitions.h"
-#include "Utility/LEDFeedback/LEDFeedback.h"
+#include "configuratorAgents/MessagesDefinitions.h"
+
 #ifdef BOARD_HAS_WIFI
 #include "WiFiConnectionHandler.h"
 #endif
diff --git a/src/Arduino_NetworkConfigurator.h b/src/Arduino_NetworkConfigurator.h
index fe6c7bc..ff1d1db 100644
--- a/src/Arduino_NetworkConfigurator.h
+++ b/src/Arduino_NetworkConfigurator.h
@@ -12,12 +12,12 @@
 
 #include "Arduino.h"
 #include "Arduino_ConnectionHandler.h"
-#include "ConfiguratorAgents/AgentsManager.h"
+#include "configuratorAgents/AgentsManager.h"
 #include <settings/settings.h>
 #include <Arduino_TimedAttempt.h>
 #include <Arduino_KVStore.h>
-#include "Utility/ResetInput/ResetInput.h"
-#include "Utility/LEDFeedback/LEDFeedback.h"
+#include "utility/ResetInput.h"
+#include "utility/LEDFeedback.h"
 
 /**
  * @enum NetworkConfiguratorStates
diff --git a/src/ConfiguratorAgents/AgentsManager.cpp b/src/configuratorAgents/AgentsManager.cpp
similarity index 99%
rename from src/ConfiguratorAgents/AgentsManager.cpp
rename to src/configuratorAgents/AgentsManager.cpp
index b9ce385..5d29311 100644
--- a/src/ConfiguratorAgents/AgentsManager.cpp
+++ b/src/configuratorAgents/AgentsManager.cpp
@@ -13,7 +13,7 @@
 #include <settings/settings.h>
 #include "AgentsManager.h"
 #include "NetworkOptionsDefinitions.h"
-#include "Utility/LEDFeedback/LEDFeedback.h"
+#include "utility/LEDFeedback.h"
 
 /******************************************************************************
  * PUBLIC MEMBER FUNCTIONS
diff --git a/src/ConfiguratorAgents/AgentsManager.h b/src/configuratorAgents/AgentsManager.h
similarity index 100%
rename from src/ConfiguratorAgents/AgentsManager.h
rename to src/configuratorAgents/AgentsManager.h
diff --git a/src/ConfiguratorAgents/MessagesDefinitions.h b/src/configuratorAgents/MessagesDefinitions.h
similarity index 100%
rename from src/ConfiguratorAgents/MessagesDefinitions.h
rename to src/configuratorAgents/MessagesDefinitions.h
diff --git a/src/ConfiguratorAgents/NetworkOptionsDefinitions.h b/src/configuratorAgents/NetworkOptionsDefinitions.h
similarity index 100%
rename from src/ConfiguratorAgents/NetworkOptionsDefinitions.h
rename to src/configuratorAgents/NetworkOptionsDefinitions.h
diff --git a/src/ConfiguratorAgents/agents/BLE/BLEAgent.h b/src/configuratorAgents/agents/BLEAgent.h
similarity index 97%
rename from src/ConfiguratorAgents/agents/BLE/BLEAgent.h
rename to src/configuratorAgents/agents/BLEAgent.h
index d9b45d0..813d5a1 100644
--- a/src/ConfiguratorAgents/agents/BLE/BLEAgent.h
+++ b/src/configuratorAgents/agents/BLEAgent.h
@@ -15,10 +15,10 @@
 #include "utility/HCI.h"
 #include "BLEStringCharacteristic.h"
 #include "BLECharacteristic.h"
-#include "ConfiguratorAgents/agents/ConfiguratorAgent.h"
-#include "ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h"
-#include "Utility/LEDFeedback/LEDFeedback.h"
-#include "ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h"
+#include "configuratorAgents/agents/ConfiguratorAgent.h"
+#include "configuratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h"
+#include "utility/LEDFeedback.h"
+#include "configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h"
 
 #define BASE_LOCAL_NAME "Arduino"
 #define ARDUINO_COMPANY_ID 0x09A3
diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.cpp b/src/configuratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.cpp
similarity index 100%
rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.cpp
rename to src/configuratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.cpp
diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h b/src/configuratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h
similarity index 98%
rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h
rename to src/configuratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h
index 4db3bba..3a82291 100644
--- a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h
+++ b/src/configuratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h
@@ -9,7 +9,7 @@
 #pragma once
 #include <list>
 #include "PacketManager.h"
-#include "ConfiguratorAgents/MessagesDefinitions.h"
+#include "configuratorAgents/MessagesDefinitions.h"
 
 /**
  * @class BoardConfigurationProtocol
diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.cpp b/src/configuratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.cpp
similarity index 100%
rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.cpp
rename to src/configuratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.cpp
diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.h b/src/configuratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.h
similarity index 97%
rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.h
rename to src/configuratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.h
index 40917df..88fc856 100644
--- a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.h
+++ b/src/configuratorAgents/agents/BoardConfigurationProtocol/CBORAdapter.h
@@ -8,7 +8,7 @@
 
 #pragma once
 #include "Arduino.h"
-#include "ConfiguratorAgents/MessagesDefinitions.h"
+#include "configuratorAgents/MessagesDefinitions.h"
 #include "settings/settings.h"
 #include "cbor/CBOR.h"
 #include "./cbor/CBOR.h"
diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/PacketBuffer.h b/src/configuratorAgents/agents/BoardConfigurationProtocol/PacketBuffer.h
similarity index 100%
rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/PacketBuffer.h
rename to src/configuratorAgents/agents/BoardConfigurationProtocol/PacketBuffer.h
diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/PacketManager.cpp b/src/configuratorAgents/agents/BoardConfigurationProtocol/PacketManager.cpp
similarity index 100%
rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/PacketManager.cpp
rename to src/configuratorAgents/agents/BoardConfigurationProtocol/PacketManager.cpp
diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/PacketManager.h b/src/configuratorAgents/agents/BoardConfigurationProtocol/PacketManager.h
similarity index 100%
rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/PacketManager.h
rename to src/configuratorAgents/agents/BoardConfigurationProtocol/PacketManager.h
diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h b/src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h
similarity index 100%
rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h
rename to src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h
diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h b/src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h
similarity index 100%
rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h
rename to src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h
diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.cpp b/src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.cpp
similarity index 100%
rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.cpp
rename to src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.cpp
diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.h b/src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.h
similarity index 100%
rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.h
rename to src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Decoder.h
diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.cpp b/src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.cpp
similarity index 100%
rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.cpp
rename to src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.cpp
diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.h b/src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.h
similarity index 100%
rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.h
rename to src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/Encoder.h
diff --git a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/ProvisioningMessage.h b/src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/ProvisioningMessage.h
similarity index 98%
rename from src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/ProvisioningMessage.h
rename to src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/ProvisioningMessage.h
index 383c9ef..ac9d467 100644
--- a/src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/ProvisioningMessage.h
+++ b/src/configuratorAgents/agents/BoardConfigurationProtocol/cbor/ProvisioningMessage.h
@@ -12,7 +12,7 @@
 #include <Arduino_CBOR.h>
 #include <ConnectionHandlerDefinitions.h>
 #include <settings/settings.h>
-#include <ConfiguratorAgents/NetworkOptionsDefinitions.h>
+#include <configuratorAgents/NetworkOptionsDefinitions.h>
 
 #define UHWID_SIZE                  32
 #define PROVISIONING_JWT_SIZE      269 // Max length of jwt is 268 + \0
diff --git a/src/ConfiguratorAgents/agents/ConfiguratorAgent.h b/src/configuratorAgents/agents/ConfiguratorAgent.h
similarity index 96%
rename from src/ConfiguratorAgents/agents/ConfiguratorAgent.h
rename to src/configuratorAgents/agents/ConfiguratorAgent.h
index 4022e11..32cd731 100644
--- a/src/ConfiguratorAgents/agents/ConfiguratorAgent.h
+++ b/src/configuratorAgents/agents/ConfiguratorAgent.h
@@ -8,8 +8,8 @@
 
 #pragma once
 #include "settings/settings.h"
-#include "ConfiguratorAgents/NetworkOptionsDefinitions.h"
-#include "ConfiguratorAgents/MessagesDefinitions.h"
+#include "configuratorAgents/NetworkOptionsDefinitions.h"
+#include "configuratorAgents/MessagesDefinitions.h"
 #include "Arduino.h"
 
 /**
diff --git a/src/ConfiguratorAgents/agents/Serial/SerialAgent.h b/src/configuratorAgents/agents/SerialAgent.h
similarity index 96%
rename from src/ConfiguratorAgents/agents/Serial/SerialAgent.h
rename to src/configuratorAgents/agents/SerialAgent.h
index abcdb85..fdab7cc 100644
--- a/src/ConfiguratorAgents/agents/Serial/SerialAgent.h
+++ b/src/configuratorAgents/agents/SerialAgent.h
@@ -9,10 +9,10 @@
 #pragma once
 #include <list>
 #include "Arduino.h"
-#include "ConfiguratorAgents/agents/ConfiguratorAgent.h"
-#include "ConfiguratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h"
-#include "ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h"
-#include "Utility/LEDFeedback/LEDFeedback.h"
+#include "configuratorAgents/agents/ConfiguratorAgent.h"
+#include "configuratorAgents/agents/BoardConfigurationProtocol/BoardConfigurationProtocol.h"
+#include "configuratorAgents/agents/BoardConfigurationProtocol/cbor/CBORInstances.h"
+#include "utility/LEDFeedback.h"
 
 /**
  * @class SerialAgentClass
diff --git a/src/Utility/LEDFeedback/LEDFeedback.cpp b/src/utility/LEDFeedback.cpp
similarity index 100%
rename from src/Utility/LEDFeedback/LEDFeedback.cpp
rename to src/utility/LEDFeedback.cpp
diff --git a/src/Utility/LEDFeedback/LEDFeedback.h b/src/utility/LEDFeedback.h
similarity index 100%
rename from src/Utility/LEDFeedback/LEDFeedback.h
rename to src/utility/LEDFeedback.h
diff --git a/src/Utility/ResetInput/ResetInput.cpp b/src/utility/ResetInput.cpp
similarity index 97%
rename from src/Utility/ResetInput/ResetInput.cpp
rename to src/utility/ResetInput.cpp
index ddfc1f2..0df5fc0 100644
--- a/src/Utility/ResetInput/ResetInput.cpp
+++ b/src/utility/ResetInput.cpp
@@ -9,7 +9,7 @@
 #if NETWORK_CONFIGURATOR_COMPATIBLE
 
 #include "ResetInput.h"
-#include "Utility/LEDFeedback/LEDFeedback.h"
+#include "utility/LEDFeedback.h"
 
 ResetInput &ResetInput::getInstance() {
   static ResetInput instance;
diff --git a/src/Utility/ResetInput/ResetInput.h b/src/utility/ResetInput.h
similarity index 100%
rename from src/Utility/ResetInput/ResetInput.h
rename to src/utility/ResetInput.h