diff --git a/src/ksf/comp/ksMqttConnector.cpp b/src/ksf/comp/ksMqttConnector.cpp
index da17f36..610be09 100644
--- a/src/ksf/comp/ksMqttConnector.cpp
+++ b/src/ksf/comp/ksMqttConnector.cpp
@@ -22,7 +22,7 @@
 #include "../ksApplication.h"
 #include "../ksConstants.h"
 #include "../ksConfig.h"
-#include "../ksCertUtils.h"
+#include "../misc/ksCertUtils.h"
 #include "ksWifiConnector.h"
 #include "ksMqttConnector.h"
 #include "ksMqttConfigProvider.h"
diff --git a/src/ksf/ksCertUtils.cpp b/src/ksf/misc/ksCertUtils.cpp
similarity index 98%
rename from src/ksf/ksCertUtils.cpp
rename to src/ksf/misc/ksCertUtils.cpp
index e918fa7..f19a55a 100644
--- a/src/ksf/ksCertUtils.cpp
+++ b/src/ksf/misc/ksCertUtils.cpp
@@ -8,7 +8,7 @@
  */
 
 #include "ksCertUtils.h"
-#include "ksConstants.h"
+#include "../ksConstants.h"
 
 namespace ksf
 {
diff --git a/src/ksf/ksCertUtils.h b/src/ksf/misc/ksCertUtils.h
similarity index 99%
rename from src/ksf/ksCertUtils.h
rename to src/ksf/misc/ksCertUtils.h
index 845c0ad..031c9b9 100644
--- a/src/ksf/ksCertUtils.h
+++ b/src/ksf/misc/ksCertUtils.h
@@ -9,10 +9,9 @@
 
 #pragma once
 
-#include <WiFiClientSecure.h>
-
 #include <string>
 #include <stdint.h>
+#include <WiFiClientSecure.h>
 
 namespace ksf
 {