diff --git a/Chaos/Cipher/Arc4/Arc4Crypt.hpp b/Chaos/Cipher/Stream/Arc4/Arc4Crypt.hpp
similarity index 89%
rename from Chaos/Cipher/Arc4/Arc4Crypt.hpp
rename to Chaos/Cipher/Stream/Arc4/Arc4Crypt.hpp
index 7d09c96..7395d1e 100644
--- a/Chaos/Cipher/Arc4/Arc4Crypt.hpp
+++ b/Chaos/Cipher/Stream/Arc4/Arc4Crypt.hpp
@@ -1,5 +1,5 @@
-#ifndef CHAOS_CIPHER_ARC4_ARC4CRYPT_HPP
-#define CHAOS_CIPHER_ARC4_ARC4CRYPT_HPP
+#ifndef CHAOS_CIPHER_STREAM_ARC4_ARC4CRYPT_HPP
+#define CHAOS_CIPHER_STREAM_ARC4_ARC4CRYPT_HPP
 
 #include <cstdint>
 #include <algorithm>
@@ -8,7 +8,7 @@
 #include "Service/SeArray.hpp"
 #include "Service/ChaosException.hpp"
 
-namespace Chaos::Cipher::Arc4
+namespace Chaos::Cipher::Stream::Arc4
 {
 
 class Arc4Crypt
@@ -83,6 +83,6 @@ private:
     }
 };
 
-} // namespace Chaos::Cipher::Arc4
+} // namespace Chaos::Cipher::Stream::Arc4
 
-#endif // CHAOS_CIPHER_ARC4_ARC4CRYPT_HPP
+#endif // CHAOS_CIPHER_STREAM_ARC4_ARC4CRYPT_HPP
diff --git a/Chaos/Cipher/Arc4/Arc4Gen.hpp b/Chaos/Cipher/Stream/Arc4/Arc4Gen.hpp
similarity index 90%
rename from Chaos/Cipher/Arc4/Arc4Gen.hpp
rename to Chaos/Cipher/Stream/Arc4/Arc4Gen.hpp
index be1eb91..98dcaa5 100644
--- a/Chaos/Cipher/Arc4/Arc4Gen.hpp
+++ b/Chaos/Cipher/Stream/Arc4/Arc4Gen.hpp
@@ -1,5 +1,5 @@
-#ifndef CHAOS_CIPHER_ARC4_ARC4GEN_HPP
-#define CHAOS_CIPHER_ARC4_ARC4GEN_HPP
+#ifndef CHAOS_CIPHER_STREAM_ARC4_ARC4GEN_HPP
+#define CHAOS_CIPHER_STREAM_ARC4_ARC4GEN_HPP
 
 #include <array>
 #include <cstdint>
@@ -8,7 +8,7 @@
 
 #include "Service/ChaosException.hpp"
 
-namespace Chaos::Cipher::Arc4
+namespace Chaos::Cipher::Stream::Arc4
 {
 
 class Arc4Gen
@@ -107,6 +107,6 @@ private:
     }
 };
 
-} // namespace Chaos::Cipher::Arc4
+} // namespace Chaos::Cipher::Stream::Arc4
 
-#endif // CHAOS_CIPHER_ARC4_ARC4GEN_HPP
+#endif // CHAOS_CIPHER_STREAM_ARC4_ARC4GEN_HPP
diff --git a/ChaosTests/CMakeLists.txt b/ChaosTests/CMakeLists.txt
index cf39b3c..b7299ef 100644
--- a/ChaosTests/CMakeLists.txt
+++ b/ChaosTests/CMakeLists.txt
@@ -16,8 +16,8 @@ set(ChaosTests_SOURCE SanCallbacks.cpp
                       Hash/Md5HasherTests.cpp
                       Hash/Sha1HasherTests.cpp
                       Mac/HmacTests.cpp
-                      Cipher/Arc4/Arc4GenTests.cpp
-                      Cipher/Arc4/Arc4CryptTests.cpp
+                      Cipher/Stream/Arc4/Arc4GenTests.cpp
+                      Cipher/Stream/Arc4/Arc4CryptTests.cpp
                       Cipher/Block/Des/DesCryptTests.cpp
                       Cipher/Block/Mode/EcbModeTests.cpp
                       Padding/PadderPkcs7Tests.cpp
diff --git a/ChaosTests/Cipher/Arc4/Arc4CryptTests.cpp b/ChaosTests/Cipher/Stream/Arc4/Arc4CryptTests.cpp
similarity index 98%
rename from ChaosTests/Cipher/Arc4/Arc4CryptTests.cpp
rename to ChaosTests/Cipher/Stream/Arc4/Arc4CryptTests.cpp
index 915d353..763f293 100644
--- a/ChaosTests/Cipher/Arc4/Arc4CryptTests.cpp
+++ b/ChaosTests/Cipher/Stream/Arc4/Arc4CryptTests.cpp
@@ -6,10 +6,10 @@
 #include <cstdint>
 #include <cstring>
 
-#include "Cipher/Arc4/Arc4Crypt.hpp"
+#include "Cipher/Stream/Arc4/Arc4Crypt.hpp"
 #include "Service/ChaosException.hpp"
 
-using namespace Chaos::Cipher::Arc4;
+using namespace Chaos::Cipher::Stream::Arc4;
 
 static std::vector<uint8_t> StrToU8Vec(const char * str)
 {
diff --git a/ChaosTests/Cipher/Arc4/Arc4GenTests.cpp b/ChaosTests/Cipher/Stream/Arc4/Arc4GenTests.cpp
similarity index 99%
rename from ChaosTests/Cipher/Arc4/Arc4GenTests.cpp
rename to ChaosTests/Cipher/Stream/Arc4/Arc4GenTests.cpp
index ff964d8..14b5b98 100644
--- a/ChaosTests/Cipher/Arc4/Arc4GenTests.cpp
+++ b/ChaosTests/Cipher/Stream/Arc4/Arc4GenTests.cpp
@@ -6,10 +6,10 @@
 #include <iterator>
 #include <cstring>
 
-#include "Cipher/Arc4/Arc4Gen.hpp"
+#include "Cipher/Stream/Arc4/Arc4Gen.hpp"
 #include "Service/ChaosException.hpp"
 
-using namespace Chaos::Cipher::Arc4;
+using namespace Chaos::Cipher::Stream::Arc4;
 
 TEST(Arc4GenTests, RFCTest)
 {