diff --git a/.editorconfig b/Aaru.Helpers/.editorconfig
similarity index 100%
rename from .editorconfig
rename to Aaru.Helpers/.editorconfig
diff --git a/.gitignore b/Aaru.Helpers/.gitignore
similarity index 100%
rename from .gitignore
rename to Aaru.Helpers/.gitignore
diff --git a/Aaru.Helpers.csproj b/Aaru.Helpers/Aaru.Helpers.csproj
similarity index 100%
rename from Aaru.Helpers.csproj
rename to Aaru.Helpers/Aaru.Helpers.csproj
diff --git a/Aaru.Helpers.csproj.DotSettings b/Aaru.Helpers/Aaru.Helpers.csproj.DotSettings
similarity index 100%
rename from Aaru.Helpers.csproj.DotSettings
rename to Aaru.Helpers/Aaru.Helpers.csproj.DotSettings
diff --git a/ArrayFill.cs b/Aaru.Helpers/ArrayFill.cs
similarity index 100%
rename from ArrayFill.cs
rename to Aaru.Helpers/ArrayFill.cs
diff --git a/ArrayIsEmpty.cs b/Aaru.Helpers/ArrayIsEmpty.cs
similarity index 100%
rename from ArrayIsEmpty.cs
rename to Aaru.Helpers/ArrayIsEmpty.cs
diff --git a/BigEndianBitConverter.cs b/Aaru.Helpers/BigEndianBitConverter.cs
similarity index 100%
rename from BigEndianBitConverter.cs
rename to Aaru.Helpers/BigEndianBitConverter.cs
diff --git a/BitEndian.cs b/Aaru.Helpers/BitEndian.cs
similarity index 100%
rename from BitEndian.cs
rename to Aaru.Helpers/BitEndian.cs
diff --git a/CHS.cs b/Aaru.Helpers/CHS.cs
similarity index 100%
rename from CHS.cs
rename to Aaru.Helpers/CHS.cs
diff --git a/CompareBytes.cs b/Aaru.Helpers/CompareBytes.cs
similarity index 100%
rename from CompareBytes.cs
rename to Aaru.Helpers/CompareBytes.cs
diff --git a/CountBits.cs b/Aaru.Helpers/CountBits.cs
similarity index 100%
rename from CountBits.cs
rename to Aaru.Helpers/CountBits.cs
diff --git a/DateHandlers.cs b/Aaru.Helpers/DateHandlers.cs
similarity index 100%
rename from DateHandlers.cs
rename to Aaru.Helpers/DateHandlers.cs
diff --git a/Extensions.cs b/Aaru.Helpers/Extensions.cs
similarity index 100%
rename from Extensions.cs
rename to Aaru.Helpers/Extensions.cs
diff --git a/IO/ForcedSeekStream.cs b/Aaru.Helpers/IO/ForcedSeekStream.cs
similarity index 100%
rename from IO/ForcedSeekStream.cs
rename to Aaru.Helpers/IO/ForcedSeekStream.cs
diff --git a/IO/NonClosableStream.cs b/Aaru.Helpers/IO/NonClosableStream.cs
similarity index 100%
rename from IO/NonClosableStream.cs
rename to Aaru.Helpers/IO/NonClosableStream.cs
diff --git a/IO/OffsetStream.cs b/Aaru.Helpers/IO/OffsetStream.cs
similarity index 100%
rename from IO/OffsetStream.cs
rename to Aaru.Helpers/IO/OffsetStream.cs
diff --git a/IO/SplitJoinStream.cs b/Aaru.Helpers/IO/SplitJoinStream.cs
similarity index 100%
rename from IO/SplitJoinStream.cs
rename to Aaru.Helpers/IO/SplitJoinStream.cs
diff --git a/Localization/Localization.Designer.cs b/Aaru.Helpers/Localization/Localization.Designer.cs
similarity index 100%
rename from Localization/Localization.Designer.cs
rename to Aaru.Helpers/Localization/Localization.Designer.cs
diff --git a/Localization/Localization.es.resx b/Aaru.Helpers/Localization/Localization.es.resx
similarity index 100%
rename from Localization/Localization.es.resx
rename to Aaru.Helpers/Localization/Localization.es.resx
diff --git a/Localization/Localization.resx b/Aaru.Helpers/Localization/Localization.resx
similarity index 100%
rename from Localization/Localization.resx
rename to Aaru.Helpers/Localization/Localization.resx
diff --git a/Marshal.cs b/Aaru.Helpers/Marshal.cs
similarity index 100%
rename from Marshal.cs
rename to Aaru.Helpers/Marshal.cs
diff --git a/MarshallingPropertiesAttribute.cs b/Aaru.Helpers/MarshallingPropertiesAttribute.cs
similarity index 100%
rename from MarshallingPropertiesAttribute.cs
rename to Aaru.Helpers/MarshallingPropertiesAttribute.cs
diff --git a/PrintHex.cs b/Aaru.Helpers/PrintHex.cs
similarity index 100%
rename from PrintHex.cs
rename to Aaru.Helpers/PrintHex.cs
diff --git a/StringHandlers.cs b/Aaru.Helpers/StringHandlers.cs
similarity index 100%
rename from StringHandlers.cs
rename to Aaru.Helpers/StringHandlers.cs
diff --git a/Swapping.cs b/Aaru.Helpers/Swapping.cs
similarity index 100%
rename from Swapping.cs
rename to Aaru.Helpers/Swapping.cs