diff --git a/ChaosTests/CMakeLists.txt b/ChaosTests/CMakeLists.txt
index dad209c..64c2058 100644
--- a/ChaosTests/CMakeLists.txt
+++ b/ChaosTests/CMakeLists.txt
@@ -11,9 +11,9 @@ FetchContent_Declare(
 set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 FetchContent_MakeAvailable(googletest)
 
-set(ChaosTests_SOURCE Md4HasherTests.cpp
-                      Md5HasherTests.cpp
-                      HmacTests.cpp)
+set(ChaosTests_SOURCE Hash/Md4HasherTests.cpp
+                      Hash/Md5HasherTests.cpp
+                      Mac/HmacTests.cpp)
 
 add_executable(ChaosTests ${ChaosTests_SOURCE})
 target_link_libraries(ChaosTests gtest gtest_main)
diff --git a/ChaosTests/Md4HasherTests.cpp b/ChaosTests/Hash/Md4HasherTests.cpp
similarity index 100%
rename from ChaosTests/Md4HasherTests.cpp
rename to ChaosTests/Hash/Md4HasherTests.cpp
diff --git a/ChaosTests/Md5HasherTests.cpp b/ChaosTests/Hash/Md5HasherTests.cpp
similarity index 100%
rename from ChaosTests/Md5HasherTests.cpp
rename to ChaosTests/Hash/Md5HasherTests.cpp
diff --git a/ChaosTests/HmacTests.cpp b/ChaosTests/Mac/HmacTests.cpp
similarity index 100%
rename from ChaosTests/HmacTests.cpp
rename to ChaosTests/Mac/HmacTests.cpp