diff --git a/Chaos/Hashing/Hash.hpp b/Chaos/Hash/Hash.hpp
similarity index 77%
rename from Chaos/Hashing/Hash.hpp
rename to Chaos/Hash/Hash.hpp
index 1dda817..2168bbf 100644
--- a/Chaos/Hashing/Hash.hpp
+++ b/Chaos/Hash/Hash.hpp
@@ -1,9 +1,9 @@
-#ifndef CHAOS_HASHING_HASH_HPP
-#define CHAOS_HASHING_HASH_HPP
+#ifndef CHAOS_HASH_HASH_HPP
+#define CHAOS_HASH_HASH_HPP
 
 #include <string>
 
-namespace Chaos::Hashing
+namespace Chaos::Hash
 {
 
 template<typename T>
@@ -32,6 +32,6 @@ private:
     }
 };
 
-} // namespace Chaos::Hashing
+} // namespace Chaos::Hash
 
 #endif
diff --git a/Chaos/Hashing/Hasher.hpp b/Chaos/Hash/Hasher.hpp
similarity index 77%
rename from Chaos/Hashing/Hasher.hpp
rename to Chaos/Hash/Hasher.hpp
index 2783fa4..3597fe1 100644
--- a/Chaos/Hashing/Hasher.hpp
+++ b/Chaos/Hash/Hasher.hpp
@@ -1,7 +1,7 @@
-#ifndef CHAOS_HASHING_HASHER_HPP
-#define CHAOS_HASHING_HASHER_HPP
+#ifndef CHAOS_HASH_HASHER_HPP
+#define CHAOS_HASH_HASHER_HPP
 
-namespace Chaos::Hashing
+namespace Chaos::Hash
 {
 
 template<typename T>
@@ -31,6 +31,6 @@ private:
     }
 };
 
-} // namespace Chaos::Hashing
+} // namespace Chaos::Hash
 
 #endif
diff --git a/Chaos/Hashing/Md4.hpp b/Chaos/Hash/Md4.hpp
similarity index 97%
rename from Chaos/Hashing/Md4.hpp
rename to Chaos/Hash/Md4.hpp
index 7cd6588..0bb07cc 100644
--- a/Chaos/Hashing/Md4.hpp
+++ b/Chaos/Hash/Md4.hpp
@@ -1,5 +1,5 @@
-#ifndef CHAOS_HASHING_MD4HASHER_HPP
-#define CHAOS_HASHING_MD4HASHER_HPP
+#ifndef CHAOS_HASH_MD4HASHER_HPP
+#define CHAOS_HASH_MD4HASHER_HPP
 
 #include <cstdint>
 #include <array>
@@ -8,7 +8,7 @@
 #include "Hash.hpp"
 #include "Hasher.hpp"
 
-namespace Chaos::Hashing::Md4::Inner_
+namespace Chaos::Hash::Md4::Inner_
 {
 
 struct Buffer
@@ -129,9 +129,9 @@ private:
     }
 };
 
-} // namespace Chaos::Hashing::Md4::Inner_
+} // namespace Chaos::Hash::Md4::Inner_
 
-namespace Chaos::Hashing::Md4
+namespace Chaos::Hash::Md4
 {
 
 struct Md4Hash : public Hash<Md4Hash>
@@ -284,6 +284,6 @@ private:
     }
 };
 
-} // namespace Chaos::Hashing::Md4
+} // namespace Chaos::Hash::Md4
 
 #endif
diff --git a/Chaos/Hashing/Md5.hpp b/Chaos/Hash/Md5.hpp
similarity index 97%
rename from Chaos/Hashing/Md5.hpp
rename to Chaos/Hash/Md5.hpp
index f2d44eb..596d1d6 100644
--- a/Chaos/Hashing/Md5.hpp
+++ b/Chaos/Hash/Md5.hpp
@@ -1,5 +1,5 @@
-#ifndef CHAOS_HASHING_MD5HASHER_HPP
-#define CHAOS_HASHING_MD5HASHER_HPP
+#ifndef CHAOS_HASH_MD5HASHER_HPP
+#define CHAOS_HASH_MD5HASHER_HPP
 
 #include <cstdint>
 #include <array>
@@ -8,7 +8,7 @@
 #include "Hash.hpp"
 #include "Hasher.hpp"
 
-namespace Chaos::Hashing::Md5::Inner_
+namespace Chaos::Hash::Md5::Inner_
 {
 
 struct Buffer
@@ -153,9 +153,9 @@ private:
     }
 };
 
-} // namespace Chaos::Hashing::Md5::Inner_
+} // namespace Chaos::Hash::Md5::Inner_
 
-namespace Chaos::Hashing::Md5
+namespace Chaos::Hash::Md5
 {
 
 struct Md5Hash : public Hash<Md5Hash>
@@ -308,6 +308,6 @@ private:
     }
 };
 
-} // namespace Chaos::Hashing::Md5
+} // namespace Chaos::Hash::Md5
 
 #endif
diff --git a/ChaosTests/Md4HasherTests.cpp b/ChaosTests/Md4HasherTests.cpp
index 39526f4..57bd709 100644
--- a/ChaosTests/Md4HasherTests.cpp
+++ b/ChaosTests/Md4HasherTests.cpp
@@ -1,8 +1,8 @@
 #include <gtest/gtest.h>
 
-#include "Hashing/Md4.hpp"
+#include "Hash/Md4.hpp"
 
-using namespace Chaos::Hashing::Md4;
+using namespace Chaos::Hash::Md4;
 
 TEST(Md4Tests, RFCTest)
 {
diff --git a/ChaosTests/Md5HasherTests.cpp b/ChaosTests/Md5HasherTests.cpp
index 6d267ca..9845439 100644
--- a/ChaosTests/Md5HasherTests.cpp
+++ b/ChaosTests/Md5HasherTests.cpp
@@ -1,8 +1,8 @@
 #include <gtest/gtest.h>
 
-#include "Hashing/Md5.hpp"
+#include "Hash/Md5.hpp"
 
-using namespace Chaos::Hashing::Md5;
+using namespace Chaos::Hash::Md5;
 
 TEST(Md5Tests, RFCTest)
 {