diff --git a/NetCrypsi.Lib/Src/Aesx/AesCbc.cs b/NetCrypsi.Lib/Src/Aesx/AesCbc.cs
index 8b21410..51f7621 100644
--- a/NetCrypsi.Lib/Src/Aesx/AesCbc.cs
+++ b/NetCrypsi.Lib/Src/Aesx/AesCbc.cs
@@ -3,7 +3,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace NetCrypsi.Lib.Aesx
+namespace NetCrypsi.Lib
 {
     internal sealed class AesCbc
     {
diff --git a/NetCrypsi.Lib/Src/Aesx/AesGcm.cs b/NetCrypsi.Lib/Src/Aesx/AesGcm.cs
index abf51ea..daf76cd 100644
--- a/NetCrypsi.Lib/Src/Aesx/AesGcm.cs
+++ b/NetCrypsi.Lib/Src/Aesx/AesGcm.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Text;
 
-namespace NetCrypsi.Lib.Aesx
+namespace NetCrypsi.Lib
 {
     internal sealed class AesGcm
     {
diff --git a/NetCrypsi.Lib/Src/Aesx/AesKey.cs b/NetCrypsi.Lib/Src/Aesx/AesKey.cs
index 6b0472f..ec8aa58 100644
--- a/NetCrypsi.Lib/Src/Aesx/AesKey.cs
+++ b/NetCrypsi.Lib/Src/Aesx/AesKey.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace NetCrypsi.Lib.Aesx
+namespace NetCrypsi.Lib
 {
     internal enum AesKey
     {
diff --git a/NetCrypsi.Lib/Src/Aesx/Aesx.cs b/NetCrypsi.Lib/Src/Aesx/Aesx.cs
index 2fe8a7b..f94d5da 100644
--- a/NetCrypsi.Lib/Src/Aesx/Aesx.cs
+++ b/NetCrypsi.Lib/Src/Aesx/Aesx.cs
@@ -3,7 +3,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace NetCrypsi.Lib.Aesx
+namespace NetCrypsi.Lib
 {
     public sealed class Aesx
     {
@@ -16,67 +16,67 @@ private Aesx()
         }
 
         // CBC
-        public static byte[] EncryptWithAES128CBC(byte[] plaindata, byte[] key) => Lib.Aesx.AesCbc.EncryptWithAES128CBC(plaindata, key);
+        public static byte[] EncryptWithAES128CBC(byte[] plaindata, byte[] key) => Lib.AesCbc.EncryptWithAES128CBC(plaindata, key);
 
-        public static byte[] EncryptWithAES192CBC(byte[] plaindata, byte[] key) => Lib.Aesx.AesCbc.EncryptWithAES192CBC(plaindata, key);
+        public static byte[] EncryptWithAES192CBC(byte[] plaindata, byte[] key) => Lib.AesCbc.EncryptWithAES192CBC(plaindata, key);
 
-        public static byte[] EncryptWithAES256CBC(byte[] plaindata, byte[] key) => Lib.Aesx.AesCbc.EncryptWithAES256CBC(plaindata, key);
+        public static byte[] EncryptWithAES256CBC(byte[] plaindata, byte[] key) => Lib.AesCbc.EncryptWithAES256CBC(plaindata, key);
 
-        public static byte[] DecryptWithAES128CBC(byte[] encryptedData, byte[] key) => Lib.Aesx.AesCbc.DecryptWithAES128CBC(encryptedData, key);
+        public static byte[] DecryptWithAES128CBC(byte[] encryptedData, byte[] key) => Lib.AesCbc.DecryptWithAES128CBC(encryptedData, key);
 
-        public static byte[] DecryptWithAES192CBC(byte[] encryptedData, byte[] key) => Lib.Aesx.AesCbc.DecryptWithAES192CBC(encryptedData, key);
+        public static byte[] DecryptWithAES192CBC(byte[] encryptedData, byte[] key) => Lib.AesCbc.DecryptWithAES192CBC(encryptedData, key);
 
-        public static byte[] DecryptWithAES256CBC(byte[] encryptedData, byte[] key) => Lib.Aesx.AesCbc.DecryptWithAES256CBC(encryptedData, key);
+        public static byte[] DecryptWithAES256CBC(byte[] encryptedData, byte[] key) => Lib.AesCbc.DecryptWithAES256CBC(encryptedData, key);
 
         // io
         public static void EncryptWithAES128CBC(Stream plaindata, Stream outEncryptedData, byte[] key) =>
-            Lib.Aesx.AesCbc.EncryptWithAES128CBC(plaindata, outEncryptedData, key);
+            Lib.AesCbc.EncryptWithAES128CBC(plaindata, outEncryptedData, key);
 
         public static void EncryptWithAES192CBC(Stream plaindata, Stream outEncryptedData, byte[] key) =>
-            Lib.Aesx.AesCbc.EncryptWithAES192CBC(plaindata, outEncryptedData, key);
+            Lib.AesCbc.EncryptWithAES192CBC(plaindata, outEncryptedData, key);
 
         public static void EncryptWithAES256CBC(Stream plaindata, Stream outEncryptedData, byte[] key) =>
-            Lib.Aesx.AesCbc.EncryptWithAES256CBC(plaindata, outEncryptedData, key);
+            Lib.AesCbc.EncryptWithAES256CBC(plaindata, outEncryptedData, key);
 
         public static void DecryptWithAES128CBC(Stream encryptedData, Stream outPlainData, byte[] key) =>
-            Lib.Aesx.AesCbc.DecryptWithAES128CBC(encryptedData, outPlainData, key);
+            Lib.AesCbc.DecryptWithAES128CBC(encryptedData, outPlainData, key);
 
         public static void DecryptWithAES192CBC(Stream encryptedData, Stream outPlainData, byte[] key) =>
-            Lib.Aesx.AesCbc.DecryptWithAES192CBC(encryptedData, outPlainData, key);
+            Lib.AesCbc.DecryptWithAES192CBC(encryptedData, outPlainData, key);
 
         public static void DecryptWithAES256CBC(Stream encryptedData, Stream outPlainData, byte[] key) =>
-            Lib.Aesx.AesCbc.DecryptWithAES256CBC(encryptedData, outPlainData, key);
+            Lib.AesCbc.DecryptWithAES256CBC(encryptedData, outPlainData, key);
 
         // GCM
-        public static byte[] EncryptWithAES128GCM(byte[] plaindata, byte[] key) => Lib.Aesx.AesGcm.EncryptWithAES128GCM(plaindata, key);
+        public static byte[] EncryptWithAES128GCM(byte[] plaindata, byte[] key) => Lib.AesGcm.EncryptWithAES128GCM(plaindata, key);
 
-        public static byte[] EncryptWithAES192GCM(byte[] plaindata, byte[] key) => Lib.Aesx.AesGcm.EncryptWithAES192GCM(plaindata, key);
+        public static byte[] EncryptWithAES192GCM(byte[] plaindata, byte[] key) => Lib.AesGcm.EncryptWithAES192GCM(plaindata, key);
 
-        public static byte[] EncryptWithAES256GCM(byte[] plaindata, byte[] key) => Lib.Aesx.AesGcm.EncryptWithAES256GCM(plaindata, key);
+        public static byte[] EncryptWithAES256GCM(byte[] plaindata, byte[] key) => Lib.AesGcm.EncryptWithAES256GCM(plaindata, key);
 
-        public static byte[] DecryptWithAES128GCM(byte[] encryptedData, byte[] key) => Lib.Aesx.AesGcm.DecryptWithAES128GCM(encryptedData, key);
+        public static byte[] DecryptWithAES128GCM(byte[] encryptedData, byte[] key) => Lib.AesGcm.DecryptWithAES128GCM(encryptedData, key);
 
-        public static byte[] DecryptWithAES192GCM(byte[] encryptedData, byte[] key) => Lib.Aesx.AesGcm.DecryptWithAES192GCM(encryptedData, key);
+        public static byte[] DecryptWithAES192GCM(byte[] encryptedData, byte[] key) => Lib.AesGcm.DecryptWithAES192GCM(encryptedData, key);
 
-        public static byte[] DecryptWithAES256GCM(byte[] encryptedData, byte[] key) => Lib.Aesx.AesGcm.DecryptWithAES256GCM(encryptedData, key);
+        public static byte[] DecryptWithAES256GCM(byte[] encryptedData, byte[] key) => Lib.AesGcm.DecryptWithAES256GCM(encryptedData, key);
 
         // io
         public static void EncryptWithAES128GCM(Stream plaindata, Stream outEncryptedData, byte[] key) =>
-            Lib.Aesx.AesGcm.EncryptWithAES128GCM(plaindata, outEncryptedData, key);
+            Lib.AesGcm.EncryptWithAES128GCM(plaindata, outEncryptedData, key);
 
         public static void EncryptWithAES192GCM(Stream plaindata, Stream outEncryptedData, byte[] key) =>
-            Lib.Aesx.AesGcm.EncryptWithAES192GCM(plaindata, outEncryptedData, key);
+            Lib.AesGcm.EncryptWithAES192GCM(plaindata, outEncryptedData, key);
 
         public static void EncryptWithAES256GCM(Stream plaindata, Stream outEncryptedData, byte[] key) =>
-            Lib.Aesx.AesGcm.EncryptWithAES256GCM(plaindata, outEncryptedData, key);
+            Lib.AesGcm.EncryptWithAES256GCM(plaindata, outEncryptedData, key);
 
         public static void DecryptWithAES128GCM(Stream encryptedData, Stream outPlainData, byte[] key) =>
-            Lib.Aesx.AesGcm.DecryptWithAES128GCM(encryptedData, outPlainData, key);
+            Lib.AesGcm.DecryptWithAES128GCM(encryptedData, outPlainData, key);
 
         public static void DecryptWithAES192GCM(Stream encryptedData, Stream outPlainData, byte[] key) =>
-            Lib.Aesx.AesGcm.DecryptWithAES192GCM(encryptedData, outPlainData, key);
+            Lib.AesGcm.DecryptWithAES192GCM(encryptedData, outPlainData, key);
 
         public static void DecryptWithAES256GCM(Stream encryptedData, Stream outPlainData, byte[] key) =>
-            Lib.Aesx.AesGcm.DecryptWithAES256GCM(encryptedData, outPlainData, key);
+            Lib.AesGcm.DecryptWithAES256GCM(encryptedData, outPlainData, key);
     }
 }
diff --git a/NetCrypsi.Lib/Src/Aesx/Validator.cs b/NetCrypsi.Lib/Src/Aesx/Validator.cs
index 599ed1c..f725488 100644
--- a/NetCrypsi.Lib/Src/Aesx/Validator.cs
+++ b/NetCrypsi.Lib/Src/Aesx/Validator.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace NetCrypsi.Lib.Aesx
+namespace NetCrypsi.Lib
 {
     internal sealed class Validator
     {
diff --git a/NetCrypsi.Lib/Src/Digestx/Digestx.cs b/NetCrypsi.Lib/Src/Digestx/Digestx.cs
index 9015d7c..30a200d 100644
--- a/NetCrypsi.Lib/Src/Digestx/Digestx.cs
+++ b/NetCrypsi.Lib/Src/Digestx/Digestx.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Text;
 
-namespace NetCrypsi.Lib.Digestx
+namespace NetCrypsi.Lib
 {
     public sealed class Digestx
     {
diff --git a/NetCrypsi.Lib/Src/Hmacx/Hmacx.cs b/NetCrypsi.Lib/Src/Hmacx/Hmacx.cs
index 7b64514..7f57345 100644
--- a/NetCrypsi.Lib/Src/Hmacx/Hmacx.cs
+++ b/NetCrypsi.Lib/Src/Hmacx/Hmacx.cs
@@ -3,7 +3,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace NetCrypsi.Lib.Hmacx
+namespace NetCrypsi.Lib
 {
     public sealed class Hmacx
     {
diff --git a/NetCrypsi.Lib/Src/Rsax/DigitalSignature.cs b/NetCrypsi.Lib/Src/Rsax/DigitalSignature.cs
index 04b8fc2..1453748 100644
--- a/NetCrypsi.Lib/Src/Rsax/DigitalSignature.cs
+++ b/NetCrypsi.Lib/Src/Rsax/DigitalSignature.cs
@@ -4,11 +4,11 @@
 using System.Text;
 using System.Linq;
 
-namespace NetCrypsi.Lib.Rsax
+namespace NetCrypsi.Lib
 {
-    public sealed class DigitalSignature
+    public sealed class RSADigitalSignature
     {
-        private DigitalSignature()
+        private RSADigitalSignature()
         {
 
         }
diff --git a/NetCrypsi.Lib/Src/Rsax/Encryption.cs b/NetCrypsi.Lib/Src/Rsax/Encryption.cs
index b15270f..bc0b159 100644
--- a/NetCrypsi.Lib/Src/Rsax/Encryption.cs
+++ b/NetCrypsi.Lib/Src/Rsax/Encryption.cs
@@ -4,11 +4,11 @@
 using System.Text;
 using System.Linq;
 
-namespace NetCrypsi.Lib.Rsax
+namespace NetCrypsi.Lib
 {
-    public sealed class Encryption
+    public sealed class RSAEncryption
     {
-        private Encryption()
+        private RSAEncryption()
         {
 
         }
diff --git a/NetCrypsi.Lib/Src/Rsax/Rsax.cs b/NetCrypsi.Lib/Src/Rsax/Rsax.cs
index 217e737..d8e98c2 100644
--- a/NetCrypsi.Lib/Src/Rsax/Rsax.cs
+++ b/NetCrypsi.Lib/Src/Rsax/Rsax.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Linq;
 
-namespace NetCrypsi.Lib.Rsax
+namespace NetCrypsi.Lib
 {
     public sealed class Rsax
     {