diff --git a/ArrayFill.cs b/ArrayFill.cs
index cc4091dca..edd2545b4 100644
--- a/ArrayFill.cs
+++ b/ArrayFill.cs
@@ -27,7 +27,7 @@
 using System;
 using System.Text;
 
-namespace Aaru
+namespace Aaru.Helpers
 {
     public static partial class ArrayHelpers
     {
diff --git a/ArrayIsEmpty.cs b/ArrayIsEmpty.cs
index eb6fbb141..a51f90079 100644
--- a/ArrayIsEmpty.cs
+++ b/ArrayIsEmpty.cs
@@ -32,7 +32,7 @@
 
 using System.Linq;
 
-namespace Aaru
+namespace Aaru.Helpers
 {
     public static partial class ArrayHelpers
     {
diff --git a/BigEndianBitConverter.cs b/BigEndianBitConverter.cs
index 157e67717..30da968e9 100644
--- a/BigEndianBitConverter.cs
+++ b/BigEndianBitConverter.cs
@@ -33,7 +33,7 @@
 using System;
 using System.Linq;
 
-namespace Aaru
+namespace Aaru.Helpers
 {
     /// <summary>
     ///     Converts base data types to an array of bytes, and an array of bytes to base data types. All info taken from
diff --git a/CompareBytes.cs b/CompareBytes.cs
index d250c70c1..27da03745 100644
--- a/CompareBytes.cs
+++ b/CompareBytes.cs
@@ -30,7 +30,7 @@
 // Copyright © 2011-2020 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru
+namespace Aaru.Helpers
 {
     public static partial class ArrayHelpers
     {
diff --git a/DateHandlers.cs b/DateHandlers.cs
index 12fc10462..aef3d4973 100644
--- a/DateHandlers.cs
+++ b/DateHandlers.cs
@@ -34,7 +34,7 @@ using System;
 using System.Text;
 using Aaru.Console;
 
-namespace Aaru
+namespace Aaru.Helpers
 {
     public static class DateHandlers
     {
diff --git a/PrintHex.cs b/PrintHex.cs
index 95f116619..f62d304a8 100644
--- a/PrintHex.cs
+++ b/PrintHex.cs
@@ -33,7 +33,7 @@
 using System.Text;
 using Aaru.Console;
 
-namespace Aaru
+namespace Aaru.Helpers
 {
     public static class PrintHex
     {
diff --git a/StringHandlers.cs b/StringHandlers.cs
index 59e0a2567..798ca6377 100644
--- a/StringHandlers.cs
+++ b/StringHandlers.cs
@@ -33,7 +33,7 @@
 using System;
 using System.Text;
 
-namespace Aaru
+namespace Aaru.Helpers
 {
     public static class StringHandlers
     {
diff --git a/Swapping.cs b/Swapping.cs
index d59117667..19710f6f6 100644
--- a/Swapping.cs
+++ b/Swapping.cs
@@ -32,7 +32,7 @@
 
 using System.Runtime.CompilerServices;
 
-namespace Aaru
+namespace Aaru.Helpers
 {
     public static class Swapping
     {