diff --git a/NDecrypt.Core/CIATool.cs b/NDecrypt.Core/CIATool.cs
index 0660112..8a88871 100644
--- a/NDecrypt.Core/CIATool.cs
+++ b/NDecrypt.Core/CIATool.cs
@@ -1,9 +1,8 @@
 using System;
 using System.IO;
-using NDecrypt.N3DS;
 using SabreTools.IO.Extensions;
 using SabreTools.Models.N3DS;
-using static NDecrypt.N3DS.CommonOperations;
+using static NDecrypt.Core.CommonOperations;
 using N3DSDeserializer = SabreTools.Serialization.Deserializers.N3DS;
 
 namespace NDecrypt.Core
diff --git a/NDecrypt.Core/N3DS/CommonOperations.cs b/NDecrypt.Core/CommonOperations.cs
similarity index 99%
rename from NDecrypt.Core/N3DS/CommonOperations.cs
rename to NDecrypt.Core/CommonOperations.cs
index 7b7e29c..5d7f9d3 100644
--- a/NDecrypt.Core/N3DS/CommonOperations.cs
+++ b/NDecrypt.Core/CommonOperations.cs
@@ -8,7 +8,7 @@ using Org.BouncyCastle.Security;
 using SabreTools.IO.Extensions;
 using SabreTools.Models.N3DS;
 
-namespace NDecrypt.N3DS
+namespace NDecrypt.Core
 {
     internal static class CommonOperations
     {
diff --git a/NDecrypt.Core/N3DS/DecryptArgs.cs b/NDecrypt.Core/DecryptArgs.cs
similarity index 99%
rename from NDecrypt.Core/N3DS/DecryptArgs.cs
rename to NDecrypt.Core/DecryptArgs.cs
index 45ff1d6..af9626f 100644
--- a/NDecrypt.Core/N3DS/DecryptArgs.cs
+++ b/NDecrypt.Core/DecryptArgs.cs
@@ -5,7 +5,7 @@ using System.Numerics;
 using SabreTools.IO.Extensions;
 using SabreTools.IO.Readers;
 
-namespace NDecrypt.N3DS
+namespace NDecrypt.Core
 {
     public class DecryptArgs
     {
diff --git a/NDecrypt.Core/N3DS/Extensions.cs b/NDecrypt.Core/Extensions.cs
similarity index 99%
rename from NDecrypt.Core/N3DS/Extensions.cs
rename to NDecrypt.Core/Extensions.cs
index 02f33fc..0fe0597 100644
--- a/NDecrypt.Core/N3DS/Extensions.cs
+++ b/NDecrypt.Core/Extensions.cs
@@ -1,7 +1,7 @@
 using System;
 using SabreTools.Models.N3DS;
 
-namespace NDecrypt.N3DS
+namespace NDecrypt.Core
 {
     internal static class Extensions
     {
diff --git a/NDecrypt.Core/N3DS/PartitionKeys.cs b/NDecrypt.Core/PartitionKeys.cs
similarity index 98%
rename from NDecrypt.Core/N3DS/PartitionKeys.cs
rename to NDecrypt.Core/PartitionKeys.cs
index 15e451b..523862d 100644
--- a/NDecrypt.Core/N3DS/PartitionKeys.cs
+++ b/NDecrypt.Core/PartitionKeys.cs
@@ -3,9 +3,9 @@ using System.Linq;
 using System.Numerics;
 using Org.BouncyCastle.Crypto;
 using SabreTools.Models.N3DS;
-using static NDecrypt.N3DS.CommonOperations;
+using static NDecrypt.Core.CommonOperations;
 
-namespace NDecrypt.N3DS
+namespace NDecrypt.Core
 {
     /// <summary>
     /// Set of all keys associated with a partition
diff --git a/NDecrypt.Core/ThreeDSTool.cs b/NDecrypt.Core/ThreeDSTool.cs
index 8e83dd4..c1b975b 100644
--- a/NDecrypt.Core/ThreeDSTool.cs
+++ b/NDecrypt.Core/ThreeDSTool.cs
@@ -1,9 +1,8 @@
 using System;
 using System.IO;
-using NDecrypt.N3DS;
 using SabreTools.IO.Extensions;
 using SabreTools.Models.N3DS;
-using static NDecrypt.N3DS.CommonOperations;
+using static NDecrypt.Core.CommonOperations;
 using N3DSDeserializer = SabreTools.Serialization.Deserializers.N3DS;
 
 namespace NDecrypt.Core
diff --git a/NDecrypt/Program.cs b/NDecrypt/Program.cs
index 31181ea..cf10c7b 100644
--- a/NDecrypt/Program.cs
+++ b/NDecrypt/Program.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using NDecrypt.Core;
-using NDecrypt.N3DS;
 
 namespace NDecrypt
 {