diff --git a/src/CircularBuffer.h b/src/Utility/CircularBuffer.h
similarity index 100%
rename from src/CircularBuffer.h
rename to src/Utility/CircularBuffer.h
diff --git a/src/Cryptographic.cpp b/src/Utility/Cryptographic.cpp
similarity index 100%
rename from src/Cryptographic.cpp
rename to src/Utility/Cryptographic.cpp
diff --git a/src/Cryptographic.h b/src/Utility/Cryptographic.h
similarity index 100%
rename from src/Cryptographic.h
rename to src/Utility/Cryptographic.h
diff --git a/src/ScopeGuard.h b/src/Utility/ScopeGuard.h
similarity index 100%
rename from src/ScopeGuard.h
rename to src/Utility/ScopeGuard.h
diff --git a/src/Spin.h b/src/Utility/Spin.h
similarity index 100%
rename from src/Spin.h
rename to src/Utility/Spin.h