diff --git a/libraries/Crypto/AESCommon.cpp b/libraries/Crypto/AESCommon.cpp
index 5c571ccf..012947bc 100644
--- a/libraries/Crypto/AESCommon.cpp
+++ b/libraries/Crypto/AESCommon.cpp
@@ -22,7 +22,7 @@
 
 #include "AES.h"
 #include "Crypto.h"
-#include "ProgMemUtil.h"
+#include "utility/ProgMemUtil.h"
 
 /**
  * \class AESCommon AES.h <AES.h>
diff --git a/libraries/Crypto/ChaCha.cpp b/libraries/Crypto/ChaCha.cpp
index 9cc8973a..6c381534 100644
--- a/libraries/Crypto/ChaCha.cpp
+++ b/libraries/Crypto/ChaCha.cpp
@@ -22,9 +22,9 @@
 
 #include "ChaCha.h"
 #include "Crypto.h"
-#include "RotateUtil.h"
-#include "EndianUtil.h"
-#include "ProgMemUtil.h"
+#include "utility/RotateUtil.h"
+#include "utility/EndianUtil.h"
+#include "utility/ProgMemUtil.h"
 #include <string.h>
 
 /**
diff --git a/libraries/Crypto/SHA1.cpp b/libraries/Crypto/SHA1.cpp
index df6714c2..8209eb45 100644
--- a/libraries/Crypto/SHA1.cpp
+++ b/libraries/Crypto/SHA1.cpp
@@ -22,8 +22,8 @@
 
 #include "SHA1.h"
 #include "Crypto.h"
-#include "RotateUtil.h"
-#include "EndianUtil.h"
+#include "utility/RotateUtil.h"
+#include "utility/EndianUtil.h"
 #include <string.h>
 
 /**
diff --git a/libraries/Crypto/SHA256.cpp b/libraries/Crypto/SHA256.cpp
index ca301a96..96a1003a 100644
--- a/libraries/Crypto/SHA256.cpp
+++ b/libraries/Crypto/SHA256.cpp
@@ -22,9 +22,9 @@
 
 #include "SHA256.h"
 #include "Crypto.h"
-#include "RotateUtil.h"
-#include "EndianUtil.h"
-#include "ProgMemUtil.h"
+#include "utility/RotateUtil.h"
+#include "utility/EndianUtil.h"
+#include "utility/ProgMemUtil.h"
 #include <string.h>
 
 /**
diff --git a/libraries/Crypto/EndianUtil.h b/libraries/Crypto/utility/EndianUtil.h
similarity index 100%
rename from libraries/Crypto/EndianUtil.h
rename to libraries/Crypto/utility/EndianUtil.h
diff --git a/libraries/Crypto/ProgMemUtil.h b/libraries/Crypto/utility/ProgMemUtil.h
similarity index 100%
rename from libraries/Crypto/ProgMemUtil.h
rename to libraries/Crypto/utility/ProgMemUtil.h
diff --git a/libraries/Crypto/RotateUtil.h b/libraries/Crypto/utility/RotateUtil.h
similarity index 100%
rename from libraries/Crypto/RotateUtil.h
rename to libraries/Crypto/utility/RotateUtil.h