diff --git a/lib/nx/NXCrypto.h b/lib/nx/NXCrypto.h
index 56390fe..ca2e6e8 100644
--- a/lib/nx/NXCrypto.h
+++ b/lib/nx/NXCrypto.h
@@ -1,36 +1,37 @@
 #pragma once
 
 // AES
-namespace nx
+namespace crypto
 {
-	namespace crypto
-	{
-		/*
-		Keys mentioned in Content Archive Authoring library
-		private RsaKey m_NcaHeader1SignKey;
-		private RsaKey m_AcidSignKey;
-		private RsaKey m_NrrCertificateSignKey;
-		private AesKey m_ProdKeyAreaEncryptionKey;
-		private AesKey m_ProdNcaHeaderEncryptionKek;
-		private RsaKey m_ProdXciHeaderSignKey;
-		private AesKey m_ProdXciInitialDataEncryptionKey;
-		private AesKey m_ProdTitleKeyGenarateKey;
-		private AesKey m_ProdETicketCommonKey;
-		private RsaKey m_ProdETicketSignKey;
-		*/
-		namespace aes
-		{
 
-			/*
-			public static AesKey GetNcaExternalContentKey(IHashCalculator hashCalculator, ulong titleId)
-			{
-				Trace.Assert(hashCalculator != null, "IHashCalculator is null.");
-				byte[] array = BitConverter.GetBytes(titleId).Reverse<byte>().ToArray<byte>();
-				byte[] numArray = new byte[hashCalculator.HashSize];
-				hashCalculator.CalculateHash(array, 0, (int)array.Length, numArray, 0);
-				return new AesKey(((IEnumerable<byte>)numArray).Where<byte>((byte name, int index) => index < 16).ToArray<byte>());
-			}
-			*/
+	/*
+	Keys mentioned in Content Archive Authoring library
+	private RsaKey m_NcaHeader1SignKey;
+	private RsaKey m_AcidSignKey;
+	private RsaKey m_NrrCertificateSignKey;
+	private AesKey m_ProdKeyAreaEncryptionKey;
+	private AesKey m_ProdNcaHeaderEncryptionKek;
+	private RsaKey m_ProdXciHeaderSignKey;
+	private AesKey m_ProdXciInitialDataEncryptionKey;
+	private AesKey m_ProdTitleKeyGenarateKey;
+	private AesKey m_ProdETicketCommonKey;
+	private RsaKey m_ProdETicketSignKey;
+	*/
+	namespace aes
+	{
+
+		/*
+		public static AesKey GetNcaExternalContentKey(IHashCalculator hashCalculator, ulong titleId)
+		{
+			Trace.Assert(hashCalculator != null, "IHashCalculator is null.");
+			byte[] array = BitConverter.GetBytes(titleId).Reverse<byte>().ToArray<byte>();
+			byte[] numArray = new byte[hashCalculator.HashSize];
+			hashCalculator.CalculateHash(array, 0, (int)array.Length, numArray, 0);
+			return new AesKey(((IEnumerable<byte>)numArray).Where<byte>((byte name, int index) => index < 16).ToArray<byte>());
+		}
+		*/
+		namespace nx
+		{
 			enum Aes128KeyId
 			{
 				NcaContentKey,
@@ -70,9 +71,12 @@ namespace nx
 			// aeskey, related to m_KeyAreaEncryptionKeyList (first in list?)
 			u8 unk_aes_key[0x10] = { 0x3A, 0x7C, 0x3E, 0x38, 0x4A, 0x8F, 0x22, 0xFF, 0x4B, 0x21, 0x57, 0x19, 0xB7, 0x81, 0xAD, 0x0C };
 		}
+	}
 
-		// RSA
-		namespace rsa
+	// RSA
+	namespace rsa
+	{
+		namespace nx
 		{
 			enum Rsa2048PssKeyId // sign/validate
 			{
@@ -116,5 +120,7 @@ namespace nx
 			u8 xci_keyarea_mod[0x100] = { 0xA6, 0x1A, 0x3F, 0x5E, 0x16, 0x94, 0x4D, 0x5F, 0x88, 0x07, 0x45, 0x92, 0x42, 0x02, 0x5C, 0xF8, 0xF8, 0x01, 0xA6, 0x8F, 0xF0, 0x77, 0x76, 0x06, 0x06, 0x4B, 0x67, 0x02, 0x35, 0x2F, 0xC2, 0xF6, 0xCD, 0x74, 0xBC, 0x57, 0x36, 0xA0, 0x61, 0x1D, 0xD6, 0x66, 0x35, 0x79, 0x6E, 0xB7, 0xFF, 0xC1, 0x05, 0xC6, 0x59, 0xD9, 0x1E, 0xC9, 0xC3, 0x1F, 0x5B, 0x17, 0xA9, 0x24, 0x46, 0xB3, 0xAB, 0x1D, 0x7B, 0x79, 0xA8, 0xF2, 0x80, 0xC8, 0x6F, 0xA7, 0x9B, 0x2D, 0xE8, 0xBF, 0x91, 0xD7, 0xD4, 0xA2, 0x07, 0x53, 0x98, 0x82, 0x7D, 0x91, 0x8A, 0x68, 0x79, 0x9B, 0xB6, 0x8F, 0xA7, 0x05, 0x7B, 0x2B, 0x6C, 0x09, 0x2A, 0x58, 0x8A, 0x21, 0xE5, 0xB6, 0xCD, 0xAC, 0xCB, 0x84, 0x5F, 0x22, 0x16, 0x82, 0x54, 0x14, 0x03, 0xEB, 0xBB, 0x86, 0xEC, 0x59, 0x36, 0x38, 0xF8, 0x41, 0x41, 0xCA, 0x23, 0x8A, 0xF2, 0x98, 0x01, 0xAD, 0x14, 0xB6, 0x65, 0x15, 0x3B, 0x63, 0x42, 0xC1, 0x3E, 0x55, 0x8C, 0xC2, 0x38, 0x4E, 0xC0, 0x57, 0x5E, 0xFA, 0x2A, 0x2C, 0xC7, 0x9C, 0xBE, 0x5C, 0xD7, 0x56, 0x4D, 0xCF, 0x36, 0x31, 0x93, 0xD2, 0xB1, 0x0A, 0x8C, 0x7C, 0x7F, 0xFE, 0x46, 0x20, 0xE3, 0x91, 0x7C, 0x63, 0x3F, 0x24, 0x81, 0xFF, 0x4C, 0x68, 0x4F, 0xBE, 0x16, 0x68, 0x66, 0x1C, 0x90, 0xCD, 0xFE, 0x8D, 0xC5, 0x63, 0x3B, 0x2D, 0x5C, 0x25, 0x95, 0xA8, 0x4B, 0x3C, 0xAF, 0x57, 0x07, 0x84, 0x31, 0x37, 0xFA, 0x63, 0x98, 0x1B, 0xAC, 0xB2, 0x81, 0xB1, 0x29, 0x67, 0x0A, 0x31, 0x3D, 0x7E, 0x2D, 0x7F, 0xFE, 0xA5, 0x29, 0x3D, 0xBF, 0xD3, 0xCC, 0x9D, 0x73, 0x75, 0x40, 0x8B, 0x79, 0x98, 0x39, 0x8A, 0xAD, 0x90, 0x65, 0x82, 0x90, 0x09, 0xA4, 0x74, 0xA2, 0x3F, 0xEE, 0xC7, 0x75, 0x06, 0x29, 0x85 };
 
 		}
+		
 	}
+	
 }