diff --git a/ChaosTests/CMakeLists.txt b/ChaosTests/CMakeLists.txt
index a564a66..b238c2f 100644
--- a/ChaosTests/CMakeLists.txt
+++ b/ChaosTests/CMakeLists.txt
@@ -16,10 +16,10 @@ set(ChaosTests_SOURCE SanCallbacks.cpp
                       Hash/Md5HasherTests.cpp
                       Hash/Sha1HasherTests.cpp
                       Mac/HmacTests.cpp
-                      Cipher/Arc4GenTests.cpp
-                      Cipher/Arc4CryptTests.cpp
-                      Cipher/DesCryptTests.cpp
-                      Cipher/EcbModeTests.cpp
+                      Cipher/Arc4/Arc4GenTests.cpp
+                      Cipher/Arc4/Arc4CryptTests.cpp
+                      Cipher/Block/Des/DesCryptTests.cpp
+                      Cipher/Block/Mode/EcbModeTests.cpp
                       Padding/PadderPkcs7Tests.cpp
                       Padding/PadderIso7816Tests.cpp
                       Service/SeArrayTests.cpp
diff --git a/ChaosTests/Cipher/Arc4CryptTests.cpp b/ChaosTests/Cipher/Arc4/Arc4CryptTests.cpp
similarity index 100%
rename from ChaosTests/Cipher/Arc4CryptTests.cpp
rename to ChaosTests/Cipher/Arc4/Arc4CryptTests.cpp
diff --git a/ChaosTests/Cipher/Arc4GenTests.cpp b/ChaosTests/Cipher/Arc4/Arc4GenTests.cpp
similarity index 100%
rename from ChaosTests/Cipher/Arc4GenTests.cpp
rename to ChaosTests/Cipher/Arc4/Arc4GenTests.cpp
diff --git a/ChaosTests/Cipher/DesCryptTests.cpp b/ChaosTests/Cipher/Block/Des/DesCryptTests.cpp
similarity index 100%
rename from ChaosTests/Cipher/DesCryptTests.cpp
rename to ChaosTests/Cipher/Block/Des/DesCryptTests.cpp
diff --git a/ChaosTests/Cipher/EcbModeTests.cpp b/ChaosTests/Cipher/Block/Mode/EcbModeTests.cpp
similarity index 100%
rename from ChaosTests/Cipher/EcbModeTests.cpp
rename to ChaosTests/Cipher/Block/Mode/EcbModeTests.cpp