diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml
index 08a3197ac..9ddc36ab7 100644
--- a/.idea/.idea.Aaru/.idea/contentModel.xml
+++ b/.idea/.idea.Aaru/.idea/contentModel.xml
@@ -118,6 +118,7 @@
         <e p=".editorconfig" t="Include" />
         <e p=".gitignore" t="Include" />
         <e p="Aaru.CommonTypes.csproj" t="IncludeRecursive" />
+        <e p="Aaru.CommonTypes.csproj.DotSettings" t="Include" />
         <e p="Enums" t="Include">
           <e p="DeviceType.cs" t="Include" />
           <e p="ErrorNumber.cs" t="Include" />
@@ -241,6 +242,7 @@
       </e>
       <e p="Aaru.Core" t="IncludeRecursive">
         <e p="Aaru.Core.csproj" t="IncludeRecursive" />
+        <e p="Aaru.Core.csproj.DotSettings" t="Include" />
         <e p="Checksum.cs" t="Include" />
         <e p="DataFile.cs" t="Include" />
         <e p="Delegates.cs" t="Include" />
@@ -465,6 +467,7 @@
           <e p="Registers.cs" t="Include" />
         </e>
         <e p="Aaru.Decoders.csproj" t="IncludeRecursive" />
+        <e p="Aaru.Decoders.csproj.DotSettings" t="Include" />
         <e p="Blu-ray" t="Include">
           <e p="BCA.cs" t="Include" />
           <e p="Cartridge.cs" t="Include" />
@@ -619,6 +622,7 @@
       </e>
       <e p="Aaru.Devices" t="IncludeRecursive">
         <e p="Aaru.Devices.csproj" t="IncludeRecursive" />
+        <e p="Aaru.Devices.csproj.DotSettings" t="Include" />
         <e p="Command.cs" t="Include" />
         <e p="Device" t="Include">
           <e p="AtaCommands" t="Include">
@@ -724,6 +728,7 @@
         <e p="AODOS.cs" t="Include" />
         <e p="APFS.cs" t="Include" />
         <e p="Aaru.Filesystems.csproj" t="IncludeRecursive" />
+        <e p="Aaru.Filesystems.csproj.DotSettings" t="Include" />
         <e p="Acorn.cs" t="Include" />
         <e p="AmigaDOS.cs" t="Include" />
         <e p="AppleCommon" t="Include">
@@ -2184,6 +2189,7 @@
         </e>
         <e p="ATA.cs" t="Include" />
         <e p="Aaru.Tests.Devices.csproj" t="IncludeRecursive" />
+        <e p="Aaru.Tests.Devices.csproj.DotSettings" t="Include" />
         <e p="Command.cs" t="Include" />
         <e p="DecodeATARegisters.cs" t="Include" />
         <e p="Device.cs" t="Include" />
diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
index aeb3630d2..f0a8221b3 160000
--- a/Aaru.CommonTypes
+++ b/Aaru.CommonTypes
@@ -1 +1 @@
-Subproject commit aeb3630d2608a37895a38626a08632f90d8d1eca
+Subproject commit f0a8221b3f0ff8c6fd9436213d6cf8fac6f762f7
diff --git a/Aaru.Core/Aaru.Core.csproj.DotSettings b/Aaru.Core/Aaru.Core.csproj.DotSettings
new file mode 100644
index 000000000..eb6b48be9
--- /dev/null
+++ b/Aaru.Core/Aaru.Core.csproj.DotSettings
@@ -0,0 +1,4 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=devices_005Cdumping_005Ccompactdisc/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=devices_005Cdumping_005Cplaystationportable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=sidecar/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/SSC.cs b/Aaru.Core/Devices/Dumping/SSC.cs
index 6e0993821..4aa6d8e24 100644
--- a/Aaru.Core/Devices/Dumping/SSC.cs
+++ b/Aaru.Core/Devices/Dumping/SSC.cs
@@ -46,6 +46,7 @@ using Aaru.Core.Logging;
 using Aaru.Decoders.SCSI;
 using Aaru.Decoders.SCSI.SSC;
 using Aaru.Devices;
+using Aaru.Helpers;
 using Schemas;
 using MediaType = Aaru.CommonTypes.MediaType;
 using Version = Aaru.CommonTypes.Interop.Version;
diff --git a/Aaru.Core/Devices/Info/DeviceInfo.cs b/Aaru.Core/Devices/Info/DeviceInfo.cs
index 5c9913189..784fde2c4 100644
--- a/Aaru.Core/Devices/Info/DeviceInfo.cs
+++ b/Aaru.Core/Devices/Info/DeviceInfo.cs
@@ -38,6 +38,7 @@ using Aaru.Console;
 using Aaru.Decoders.ATA;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry;
 
 namespace Aaru.Core.Devices.Info
diff --git a/Aaru.Core/Devices/Report/MMC.cs b/Aaru.Core/Devices/Report/MMC.cs
index e35126d2c..56ec59966 100644
--- a/Aaru.Core/Devices/Report/MMC.cs
+++ b/Aaru.Core/Devices/Report/MMC.cs
@@ -39,6 +39,7 @@ using Aaru.Decoders.CD;
 using Aaru.Decoders.SCSI;
 using Aaru.Decoders.SCSI.MMC;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Core.Devices.Report
 {
diff --git a/Aaru.Core/Devices/Report/Scsi.cs b/Aaru.Core/Devices/Report/Scsi.cs
index cf0626f3d..7a398d601 100644
--- a/Aaru.Core/Devices/Report/Scsi.cs
+++ b/Aaru.Core/Devices/Report/Scsi.cs
@@ -38,6 +38,7 @@ using Aaru.CommonTypes.Structs.Devices.SCSI;
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry;
 
 namespace Aaru.Core.Devices.Report
diff --git a/Aaru.Core/ImageInfo.cs b/Aaru.Core/ImageInfo.cs
index a62b37e83..527d8b45d 100644
--- a/Aaru.Core/ImageInfo.cs
+++ b/Aaru.Core/ImageInfo.cs
@@ -46,6 +46,7 @@ using Aaru.Decoders.DVD;
 using Aaru.Decoders.PCMCIA;
 using Aaru.Decoders.SCSI;
 using Aaru.Decoders.Xbox;
+using Aaru.Helpers;
 using Schemas;
 using DDS = Aaru.Decoders.DVD.DDS;
 using DMI = Aaru.Decoders.Xbox.DMI;
diff --git a/Aaru.Core/Media/CompactDisc.cs b/Aaru.Core/Media/CompactDisc.cs
index 90c94344b..e029fb9a3 100644
--- a/Aaru.Core/Media/CompactDisc.cs
+++ b/Aaru.Core/Media/CompactDisc.cs
@@ -36,6 +36,7 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Core.Logging;
 using Aaru.Decoders.CD;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Core.Media
 {
diff --git a/Aaru.Core/Media/Detection/MMC.cs b/Aaru.Core/Media/Detection/MMC.cs
index 2ddc4be0b..1d0f417d7 100644
--- a/Aaru.Core/Media/Detection/MMC.cs
+++ b/Aaru.Core/Media/Detection/MMC.cs
@@ -41,6 +41,7 @@ using Aaru.Console;
 using Aaru.Decoders.CD;
 using Aaru.Decoders.Sega;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 // ReSharper disable JoinDeclarationAndInitializer
 
diff --git a/Aaru.Core/PrintScsiModePages.cs b/Aaru.Core/PrintScsiModePages.cs
index 01e6e253f..45c807bf2 100644
--- a/Aaru.Core/PrintScsiModePages.cs
+++ b/Aaru.Core/PrintScsiModePages.cs
@@ -33,6 +33,7 @@
 using Aaru.CommonTypes.Structs.Devices.SCSI;
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
+using Aaru.Helpers;
 
 namespace Aaru.Core
 {
diff --git a/Aaru.Decoders b/Aaru.Decoders
index 5d161c998..8ae552ceb 160000
--- a/Aaru.Decoders
+++ b/Aaru.Decoders
@@ -1 +1 @@
-Subproject commit 5d161c998d7284e42095de242eae549e630c30ff
+Subproject commit 8ae552ceb4f6a6e3dbd4e89ba7e88159708d2534
diff --git a/Aaru.Devices/Aaru.Devices.csproj.DotSettings b/Aaru.Devices/Aaru.Devices.csproj.DotSettings
new file mode 100644
index 000000000..53bef25e6
--- /dev/null
+++ b/Aaru.Devices/Aaru.Devices.csproj.DotSettings
@@ -0,0 +1,5 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=device/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=device_005Catacommands/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=device_005Cmmccommands/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=device_005Cscsicommands/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Aaru.Devices/Device/Constructor.cs b/Aaru.Devices/Device/Constructor.cs
index 5c86ebbf8..67ee9a915 100644
--- a/Aaru.Devices/Device/Constructor.cs
+++ b/Aaru.Devices/Device/Constructor.cs
@@ -34,7 +34,6 @@ using System;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interop;
 using Aaru.CommonTypes.Structs.Devices.ATA;
@@ -44,6 +43,7 @@ using Aaru.Decoders.SCSI.MMC;
 using Aaru.Decoders.SecureDigital;
 using Aaru.Devices.FreeBSD;
 using Aaru.Devices.Windows;
+using Aaru.Helpers;
 using Microsoft.Win32.SafeHandles;
 using Extern = Aaru.Devices.Windows.Extern;
 using FileAccess = Aaru.Devices.Windows.FileAccess;
@@ -52,6 +52,7 @@ using FileFlags = Aaru.Devices.Linux.FileFlags;
 using FileMode = Aaru.Devices.Windows.FileMode;
 using FileShare = Aaru.Devices.Windows.FileShare;
 using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry;
+using Marshal = System.Runtime.InteropServices.Marshal;
 using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
 using VendorString = Aaru.Decoders.SecureDigital.VendorString;
 
diff --git a/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs b/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs
index d9fae37dd..6b5016c7a 100644
--- a/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs
@@ -33,6 +33,7 @@
 using System;
 using System.Text;
 using Aaru.Console;
+using Aaru.Helpers;
 
 namespace Aaru.Devices
 {
diff --git a/Aaru.Devices/Device/ScsiCommands/Plextor.cs b/Aaru.Devices/Device/ScsiCommands/Plextor.cs
index 84321d8a0..71230cd0e 100644
--- a/Aaru.Devices/Device/ScsiCommands/Plextor.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Plextor.cs
@@ -31,6 +31,7 @@
 // ****************************************************************************/
 
 using Aaru.Console;
+using Aaru.Helpers;
 
 namespace Aaru.Devices
 {
diff --git a/Aaru.Devices/FreeBSD/ListDevices.cs b/Aaru.Devices/FreeBSD/ListDevices.cs
index b25f7c3f8..0f88f9656 100644
--- a/Aaru.Devices/FreeBSD/ListDevices.cs
+++ b/Aaru.Devices/FreeBSD/ListDevices.cs
@@ -34,10 +34,11 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices;
 using Aaru.CommonTypes.Structs.Devices.ATA;
 using Aaru.CommonTypes.Structs.Devices.SCSI;
+using Aaru.Helpers;
 using static Aaru.Devices.FreeBSD.Extern;
+using Marshal = System.Runtime.InteropServices.Marshal;
 
 namespace Aaru.Devices.FreeBSD
 {
diff --git a/Aaru.Devices/Windows/ListDevices.cs b/Aaru.Devices/Windows/ListDevices.cs
index 80c9e06b8..bc8a56d32 100644
--- a/Aaru.Devices/Windows/ListDevices.cs
+++ b/Aaru.Devices/Windows/ListDevices.cs
@@ -35,9 +35,10 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Management;
-using System.Runtime.InteropServices;
 using System.Text;
+using Aaru.Helpers;
 using Microsoft.Win32.SafeHandles;
+using Marshal = System.Runtime.InteropServices.Marshal;
 
 namespace Aaru.Devices.Windows
 {
diff --git a/Aaru.Filesystems/AODOS.cs b/Aaru.Filesystems/AODOS.cs
index f6562dcc4..c50032e7d 100644
--- a/Aaru.Filesystems/AODOS.cs
+++ b/Aaru.Filesystems/AODOS.cs
@@ -36,6 +36,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/Aaru.Filesystems.csproj.DotSettings b/Aaru.Filesystems/Aaru.Filesystems.csproj.DotSettings
new file mode 100644
index 000000000..36f7cc74a
--- /dev/null
+++ b/Aaru.Filesystems/Aaru.Filesystems.csproj.DotSettings
@@ -0,0 +1,13 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=applecommon/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=appledos/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=applehfs/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=applemfs/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=cpm/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=fat/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=fatx/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=hpofs/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=iso9660/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=iso9660_005Cconsts/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=iso9660_005Cstructs/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=opera/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Aaru.Filesystems/Acorn.cs b/Aaru.Filesystems/Acorn.cs
index 80e2c593f..3ae55ba14 100644
--- a/Aaru.Filesystems/Acorn.cs
+++ b/Aaru.Filesystems/Acorn.cs
@@ -37,6 +37,7 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/AmigaDOS.cs b/Aaru.Filesystems/AmigaDOS.cs
index 89275784d..677330130 100644
--- a/Aaru.Filesystems/AmigaDOS.cs
+++ b/Aaru.Filesystems/AmigaDOS.cs
@@ -38,6 +38,7 @@ using Aaru.Checksums;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/AppleDOS/AppleDOS.cs b/Aaru.Filesystems/AppleDOS/AppleDOS.cs
index 04d52438c..0a1ee76d6 100644
--- a/Aaru.Filesystems/AppleDOS/AppleDOS.cs
+++ b/Aaru.Filesystems/AppleDOS/AppleDOS.cs
@@ -36,7 +36,7 @@ using System.Text;
 using Aaru.CommonTypes.Interfaces;
 using Schemas;
 
-namespace Aaru.Filesystems.AppleDOS
+namespace Aaru.Filesystems
 {
     public partial class AppleDOS : IReadOnlyFilesystem
     {
diff --git a/Aaru.Filesystems/AppleDOS/Dir.cs b/Aaru.Filesystems/AppleDOS/Dir.cs
index 932eaf702..700a74f92 100644
--- a/Aaru.Filesystems/AppleDOS/Dir.cs
+++ b/Aaru.Filesystems/AppleDOS/Dir.cs
@@ -37,7 +37,7 @@ using System.Linq;
 using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.AppleDOS
+namespace Aaru.Filesystems
 {
     public partial class AppleDOS
     {
diff --git a/Aaru.Filesystems/AppleDOS/File.cs b/Aaru.Filesystems/AppleDOS/File.cs
index b275a37f8..243841d24 100644
--- a/Aaru.Filesystems/AppleDOS/File.cs
+++ b/Aaru.Filesystems/AppleDOS/File.cs
@@ -38,7 +38,7 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
 
-namespace Aaru.Filesystems.AppleDOS
+namespace Aaru.Filesystems
 {
     public partial class AppleDOS
     {
diff --git a/Aaru.Filesystems/AppleDOS/Info.cs b/Aaru.Filesystems/AppleDOS/Info.cs
index ff2b514a7..0268e6735 100644
--- a/Aaru.Filesystems/AppleDOS/Info.cs
+++ b/Aaru.Filesystems/AppleDOS/Info.cs
@@ -38,7 +38,7 @@ using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 
-namespace Aaru.Filesystems.AppleDOS
+namespace Aaru.Filesystems
 {
     public partial class AppleDOS
     {
diff --git a/Aaru.Filesystems/AppleDOS/Structs.cs b/Aaru.Filesystems/AppleDOS/Structs.cs
index a5aaf1f73..73851b591 100644
--- a/Aaru.Filesystems/AppleDOS/Structs.cs
+++ b/Aaru.Filesystems/AppleDOS/Structs.cs
@@ -32,7 +32,7 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.Filesystems.AppleDOS
+namespace Aaru.Filesystems
 {
     public partial class AppleDOS
     {
diff --git a/Aaru.Filesystems/AppleDOS/Super.cs b/Aaru.Filesystems/AppleDOS/Super.cs
index f60273b5a..2f23bf431 100644
--- a/Aaru.Filesystems/AppleDOS/Super.cs
+++ b/Aaru.Filesystems/AppleDOS/Super.cs
@@ -40,7 +40,7 @@ using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 
-namespace Aaru.Filesystems.AppleDOS
+namespace Aaru.Filesystems
 {
     public partial class AppleDOS
     {
diff --git a/Aaru.Filesystems/AppleDOS/Xattr.cs b/Aaru.Filesystems/AppleDOS/Xattr.cs
index 403fa0dda..e076c6c47 100644
--- a/Aaru.Filesystems/AppleDOS/Xattr.cs
+++ b/Aaru.Filesystems/AppleDOS/Xattr.cs
@@ -34,7 +34,7 @@ using System;
 using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.Filesystems.AppleDOS
+namespace Aaru.Filesystems
 {
     public partial class AppleDOS
     {
diff --git a/Aaru.Filesystems/AppleHFSPlus.cs b/Aaru.Filesystems/AppleHFSPlus.cs
index a3466ba67..70f1697da 100644
--- a/Aaru.Filesystems/AppleHFSPlus.cs
+++ b/Aaru.Filesystems/AppleHFSPlus.cs
@@ -35,6 +35,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/AppleMFS/AppleMFS.cs b/Aaru.Filesystems/AppleMFS/AppleMFS.cs
index 817e904bb..96ba482d5 100644
--- a/Aaru.Filesystems/AppleMFS/AppleMFS.cs
+++ b/Aaru.Filesystems/AppleMFS/AppleMFS.cs
@@ -36,7 +36,7 @@ using System.Text;
 using Aaru.CommonTypes.Interfaces;
 using Schemas;
 
-namespace Aaru.Filesystems.AppleMFS
+namespace Aaru.Filesystems
 {
     // Information from Inside Macintosh Volume II
     public partial class AppleMFS : IReadOnlyFilesystem
diff --git a/Aaru.Filesystems/AppleMFS/Consts.cs b/Aaru.Filesystems/AppleMFS/Consts.cs
index 216e0fe85..907ab7051 100644
--- a/Aaru.Filesystems/AppleMFS/Consts.cs
+++ b/Aaru.Filesystems/AppleMFS/Consts.cs
@@ -32,7 +32,7 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.Filesystems.AppleMFS
+namespace Aaru.Filesystems
 {
     // Information from Inside Macintosh Volume II
     [SuppressMessage("ReSharper", "UnusedMember.Local")]
diff --git a/Aaru.Filesystems/AppleMFS/Dir.cs b/Aaru.Filesystems/AppleMFS/Dir.cs
index ee69cf00c..652ffbfc3 100644
--- a/Aaru.Filesystems/AppleMFS/Dir.cs
+++ b/Aaru.Filesystems/AppleMFS/Dir.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.AppleMFS
+namespace Aaru.Filesystems
 {
     // Information from Inside Macintosh Volume II
     public partial class AppleMFS
diff --git a/Aaru.Filesystems/AppleMFS/File.cs b/Aaru.Filesystems/AppleMFS/File.cs
index b8bd14ac2..cd0df1e64 100644
--- a/Aaru.Filesystems/AppleMFS/File.cs
+++ b/Aaru.Filesystems/AppleMFS/File.cs
@@ -35,9 +35,10 @@ using System.IO;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Aaru.Console;
+using Aaru.Helpers;
 using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
 
-namespace Aaru.Filesystems.AppleMFS
+namespace Aaru.Filesystems
 {
     // Information from Inside Macintosh Volume II
     public partial class AppleMFS
diff --git a/Aaru.Filesystems/AppleMFS/Info.cs b/Aaru.Filesystems/AppleMFS/Info.cs
index 87d682296..bc885d85e 100644
--- a/Aaru.Filesystems/AppleMFS/Info.cs
+++ b/Aaru.Filesystems/AppleMFS/Info.cs
@@ -34,11 +34,12 @@ using System;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 
-namespace Aaru.Filesystems.AppleMFS
+namespace Aaru.Filesystems
 {
     // Information from Inside Macintosh Volume II
     public partial class AppleMFS
diff --git a/Aaru.Filesystems/AppleMFS/Structs.cs b/Aaru.Filesystems/AppleMFS/Structs.cs
index fe2988110..ccf52a25e 100644
--- a/Aaru.Filesystems/AppleMFS/Structs.cs
+++ b/Aaru.Filesystems/AppleMFS/Structs.cs
@@ -35,7 +35,7 @@ using System.Diagnostics.CodeAnalysis;
 
 #pragma warning disable 169
 
-namespace Aaru.Filesystems.AppleMFS
+namespace Aaru.Filesystems
 {
     // Information from Inside Macintosh Volume II
     [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "NotAccessedField.Local")]
diff --git a/Aaru.Filesystems/AppleMFS/Super.cs b/Aaru.Filesystems/AppleMFS/Super.cs
index 8a7417b65..6927fb959 100644
--- a/Aaru.Filesystems/AppleMFS/Super.cs
+++ b/Aaru.Filesystems/AppleMFS/Super.cs
@@ -37,9 +37,10 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
+using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.Filesystems.AppleMFS
+namespace Aaru.Filesystems
 {
     // Information from Inside Macintosh Volume II
     public partial class AppleMFS
diff --git a/Aaru.Filesystems/AppleMFS/Xattr.cs b/Aaru.Filesystems/AppleMFS/Xattr.cs
index 651970b6c..cd2cbd0aa 100644
--- a/Aaru.Filesystems/AppleMFS/Xattr.cs
+++ b/Aaru.Filesystems/AppleMFS/Xattr.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.AppleMFS
+namespace Aaru.Filesystems
 {
     // Information from Inside Macintosh Volume II
     public partial class AppleMFS
diff --git a/Aaru.Filesystems/AtheOS.cs b/Aaru.Filesystems/AtheOS.cs
index b78b76b7f..476acaab7 100644
--- a/Aaru.Filesystems/AtheOS.cs
+++ b/Aaru.Filesystems/AtheOS.cs
@@ -36,6 +36,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/BFS.cs b/Aaru.Filesystems/BFS.cs
index 07040a1ae..33f17e518 100644
--- a/Aaru.Filesystems/BFS.cs
+++ b/Aaru.Filesystems/BFS.cs
@@ -36,6 +36,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/CBM.cs b/Aaru.Filesystems/CBM.cs
index 0ed671502..d20271b8c 100644
--- a/Aaru.Filesystems/CBM.cs
+++ b/Aaru.Filesystems/CBM.cs
@@ -35,6 +35,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
diff --git a/Aaru.Filesystems/CPM/CPM.cs b/Aaru.Filesystems/CPM/CPM.cs
index bff8c2712..76fcb2e27 100644
--- a/Aaru.Filesystems/CPM/CPM.cs
+++ b/Aaru.Filesystems/CPM/CPM.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.Filesystems.CPM
+namespace Aaru.Filesystems
 {
     internal partial class CPM : IReadOnlyFilesystem
     {
diff --git a/Aaru.Filesystems/CPM/Consts.cs b/Aaru.Filesystems/CPM/Consts.cs
index f94398bc3..ec5ad6450 100644
--- a/Aaru.Filesystems/CPM/Consts.cs
+++ b/Aaru.Filesystems/CPM/Consts.cs
@@ -30,7 +30,7 @@
 // Copyright © 2011-2020 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Filesystems.CPM
+namespace Aaru.Filesystems
 {
     internal partial class CPM
     {
diff --git a/Aaru.Filesystems/CPM/Definitions.cs b/Aaru.Filesystems/CPM/Definitions.cs
index 1239414ba..a5d4176ca 100644
--- a/Aaru.Filesystems/CPM/Definitions.cs
+++ b/Aaru.Filesystems/CPM/Definitions.cs
@@ -36,7 +36,7 @@ using System.Reflection;
 using System.Xml;
 using System.Xml.Serialization;
 
-namespace Aaru.Filesystems.CPM
+namespace Aaru.Filesystems
 {
     internal partial class CPM
     {
diff --git a/Aaru.Filesystems/CPM/Dir.cs b/Aaru.Filesystems/CPM/Dir.cs
index c3bebd470..6536536ca 100644
--- a/Aaru.Filesystems/CPM/Dir.cs
+++ b/Aaru.Filesystems/CPM/Dir.cs
@@ -36,7 +36,7 @@ using System.Text;
 using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.CPM
+namespace Aaru.Filesystems
 {
     internal partial class CPM
     {
diff --git a/Aaru.Filesystems/CPM/File.cs b/Aaru.Filesystems/CPM/File.cs
index b29ab9219..b2b07952b 100644
--- a/Aaru.Filesystems/CPM/File.cs
+++ b/Aaru.Filesystems/CPM/File.cs
@@ -32,8 +32,9 @@
 
 using System;
 using Aaru.CommonTypes.Structs;
+using Aaru.Helpers;
 
-namespace Aaru.Filesystems.CPM
+namespace Aaru.Filesystems
 {
     internal partial class CPM
     {
diff --git a/Aaru.Filesystems/CPM/Info.cs b/Aaru.Filesystems/CPM/Info.cs
index 103fd3dbe..36fc5f6bb 100644
--- a/Aaru.Filesystems/CPM/Info.cs
+++ b/Aaru.Filesystems/CPM/Info.cs
@@ -40,7 +40,7 @@ using Aaru.Console;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.Filesystems.CPM
+namespace Aaru.Filesystems
 {
     internal partial class CPM
     {
diff --git a/Aaru.Filesystems/CPM/Structs.cs b/Aaru.Filesystems/CPM/Structs.cs
index 99600d787..9e22f6302 100644
--- a/Aaru.Filesystems/CPM/Structs.cs
+++ b/Aaru.Filesystems/CPM/Structs.cs
@@ -34,7 +34,7 @@ using System.Runtime.InteropServices;
 
 // ReSharper disable NotAccessedField.Local
 
-namespace Aaru.Filesystems.CPM
+namespace Aaru.Filesystems
 {
     internal partial class CPM
     {
diff --git a/Aaru.Filesystems/CPM/Super.cs b/Aaru.Filesystems/CPM/Super.cs
index b7f165bb1..514ae0756 100644
--- a/Aaru.Filesystems/CPM/Super.cs
+++ b/Aaru.Filesystems/CPM/Super.cs
@@ -46,7 +46,7 @@ using Schemas;
 using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
 using FileSystemInfo = Aaru.CommonTypes.Structs.FileSystemInfo;
 
-namespace Aaru.Filesystems.CPM
+namespace Aaru.Filesystems
 {
     internal partial class CPM
     {
diff --git a/Aaru.Filesystems/CPM/Xattr.cs b/Aaru.Filesystems/CPM/Xattr.cs
index 552d1dcf0..fe2a97064 100644
--- a/Aaru.Filesystems/CPM/Xattr.cs
+++ b/Aaru.Filesystems/CPM/Xattr.cs
@@ -34,7 +34,7 @@ using System;
 using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.Filesystems.CPM
+namespace Aaru.Filesystems
 {
     internal partial class CPM
     {
diff --git a/Aaru.Filesystems/Cram.cs b/Aaru.Filesystems/Cram.cs
index 6f2d497b5..a32b44016 100644
--- a/Aaru.Filesystems/Cram.cs
+++ b/Aaru.Filesystems/Cram.cs
@@ -36,6 +36,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/EFS.cs b/Aaru.Filesystems/EFS.cs
index f1391aca2..c658cb832 100644
--- a/Aaru.Filesystems/EFS.cs
+++ b/Aaru.Filesystems/EFS.cs
@@ -38,6 +38,7 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/F2FS.cs b/Aaru.Filesystems/F2FS.cs
index 5c42aaac7..96d1b32d0 100644
--- a/Aaru.Filesystems/F2FS.cs
+++ b/Aaru.Filesystems/F2FS.cs
@@ -36,6 +36,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/FAT/BPB.cs b/Aaru.Filesystems/FAT/BPB.cs
index ab73d88b9..2c55683ff 100644
--- a/Aaru.Filesystems/FAT/BPB.cs
+++ b/Aaru.Filesystems/FAT/BPB.cs
@@ -40,7 +40,7 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.FAT
+namespace Aaru.Filesystems
 {
     public partial class FAT
     {
diff --git a/Aaru.Filesystems/FAT/Consts.cs b/Aaru.Filesystems/FAT/Consts.cs
index 08f35653f..2a110d299 100644
--- a/Aaru.Filesystems/FAT/Consts.cs
+++ b/Aaru.Filesystems/FAT/Consts.cs
@@ -34,7 +34,7 @@ using System;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems.FAT
+namespace Aaru.Filesystems
 {
     public partial class FAT
     {
diff --git a/Aaru.Filesystems/FAT/Dir.cs b/Aaru.Filesystems/FAT/Dir.cs
index 3a9baad64..b83c122fb 100644
--- a/Aaru.Filesystems/FAT/Dir.cs
+++ b/Aaru.Filesystems/FAT/Dir.cs
@@ -38,7 +38,7 @@ using System.Text;
 using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.FAT
+namespace Aaru.Filesystems
 {
     public partial class FAT
     {
diff --git a/Aaru.Filesystems/FAT/FAT.cs b/Aaru.Filesystems/FAT/FAT.cs
index 1b4af97b2..2ce9522df 100644
--- a/Aaru.Filesystems/FAT/FAT.cs
+++ b/Aaru.Filesystems/FAT/FAT.cs
@@ -38,7 +38,7 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.Filesystems.FAT
+namespace Aaru.Filesystems
 {
     // TODO: Differentiate between Atari and X68k FAT, as this one uses a standard BPB.
     // X68K uses cdate/adate from direntry for extending filename
diff --git a/Aaru.Filesystems/FAT/File.cs b/Aaru.Filesystems/FAT/File.cs
index 27e4e685d..f5b84787b 100644
--- a/Aaru.Filesystems/FAT/File.cs
+++ b/Aaru.Filesystems/FAT/File.cs
@@ -35,9 +35,10 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Aaru.CommonTypes.Structs;
+using Aaru.Helpers;
 using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
 
-namespace Aaru.Filesystems.FAT
+namespace Aaru.Filesystems
 {
     public partial class FAT
     {
diff --git a/Aaru.Filesystems/FAT/Info.cs b/Aaru.Filesystems/FAT/Info.cs
index 70f98a700..c6a1563e0 100644
--- a/Aaru.Filesystems/FAT/Info.cs
+++ b/Aaru.Filesystems/FAT/Info.cs
@@ -42,7 +42,7 @@ using Aaru.Console;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.Filesystems.FAT
+namespace Aaru.Filesystems
 {
     public partial class FAT
     {
diff --git a/Aaru.Filesystems/FAT/Structs.cs b/Aaru.Filesystems/FAT/Structs.cs
index 2c4890caa..4666686bc 100644
--- a/Aaru.Filesystems/FAT/Structs.cs
+++ b/Aaru.Filesystems/FAT/Structs.cs
@@ -35,7 +35,7 @@ using System.Runtime.InteropServices;
 
 // ReSharper disable NotAccessedField.Local
 
-namespace Aaru.Filesystems.FAT
+namespace Aaru.Filesystems
 {
     [SuppressMessage("ReSharper", "UnusedMember.Local")]
     public partial class FAT
diff --git a/Aaru.Filesystems/FAT/Super.cs b/Aaru.Filesystems/FAT/Super.cs
index eb2466391..e6e00686a 100644
--- a/Aaru.Filesystems/FAT/Super.cs
+++ b/Aaru.Filesystems/FAT/Super.cs
@@ -42,11 +42,12 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Aaru.Console;
+using Aaru.Helpers;
 using Schemas;
 using FileSystemInfo = Aaru.CommonTypes.Structs.FileSystemInfo;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems.FAT
+namespace Aaru.Filesystems
 {
     public partial class FAT
     {
diff --git a/Aaru.Filesystems/FAT/Xattr.cs b/Aaru.Filesystems/FAT/Xattr.cs
index fcf04baf3..2c4532b8c 100644
--- a/Aaru.Filesystems/FAT/Xattr.cs
+++ b/Aaru.Filesystems/FAT/Xattr.cs
@@ -38,7 +38,7 @@ using System.Text;
 using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.FAT
+namespace Aaru.Filesystems
 {
     public partial class FAT
     {
diff --git a/Aaru.Filesystems/FATX/Consts.cs b/Aaru.Filesystems/FATX/Consts.cs
index 7191ee63a..33fc3e527 100644
--- a/Aaru.Filesystems/FATX/Consts.cs
+++ b/Aaru.Filesystems/FATX/Consts.cs
@@ -34,7 +34,7 @@ using System;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems.FATX
+namespace Aaru.Filesystems
 {
     public partial class XboxFatPlugin
     {
diff --git a/Aaru.Filesystems/FATX/Dir.cs b/Aaru.Filesystems/FATX/Dir.cs
index e2f5e6eed..4a30f0773 100644
--- a/Aaru.Filesystems/FATX/Dir.cs
+++ b/Aaru.Filesystems/FATX/Dir.cs
@@ -36,7 +36,7 @@ using System.Linq;
 using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.FATX
+namespace Aaru.Filesystems
 {
     public partial class XboxFatPlugin
     {
diff --git a/Aaru.Filesystems/FATX/FATX.cs b/Aaru.Filesystems/FATX/FATX.cs
index 4ac5ce8bc..993ff5792 100644
--- a/Aaru.Filesystems/FATX/FATX.cs
+++ b/Aaru.Filesystems/FATX/FATX.cs
@@ -38,7 +38,7 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.Filesystems.FATX
+namespace Aaru.Filesystems
 {
     public partial class XboxFatPlugin : IReadOnlyFilesystem
     {
diff --git a/Aaru.Filesystems/FATX/File.cs b/Aaru.Filesystems/FATX/File.cs
index d74e58390..31aeca5a3 100644
--- a/Aaru.Filesystems/FATX/File.cs
+++ b/Aaru.Filesystems/FATX/File.cs
@@ -35,9 +35,10 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Aaru.CommonTypes.Structs;
+using Aaru.Helpers;
 using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
 
-namespace Aaru.Filesystems.FATX
+namespace Aaru.Filesystems
 {
     public partial class XboxFatPlugin
     {
diff --git a/Aaru.Filesystems/FATX/Info.cs b/Aaru.Filesystems/FATX/Info.cs
index 4886c6e16..66dfae139 100644
--- a/Aaru.Filesystems/FATX/Info.cs
+++ b/Aaru.Filesystems/FATX/Info.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.Filesystems.FATX
+namespace Aaru.Filesystems
 {
     public partial class XboxFatPlugin
     {
diff --git a/Aaru.Filesystems/FATX/Structs.cs b/Aaru.Filesystems/FATX/Structs.cs
index ad123d28e..318f42b3e 100644
--- a/Aaru.Filesystems/FATX/Structs.cs
+++ b/Aaru.Filesystems/FATX/Structs.cs
@@ -32,7 +32,7 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.Filesystems.FATX
+namespace Aaru.Filesystems
 {
     public partial class XboxFatPlugin
     {
diff --git a/Aaru.Filesystems/FATX/Super.cs b/Aaru.Filesystems/FATX/Super.cs
index 3a0879fb6..da1bed326 100644
--- a/Aaru.Filesystems/FATX/Super.cs
+++ b/Aaru.Filesystems/FATX/Super.cs
@@ -39,10 +39,11 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Aaru.Console;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems.FATX
+namespace Aaru.Filesystems
 {
     public partial class XboxFatPlugin
     {
diff --git a/Aaru.Filesystems/FFS.cs b/Aaru.Filesystems/FFS.cs
index 9a3c77dd7..e53006cf8 100644
--- a/Aaru.Filesystems/FFS.cs
+++ b/Aaru.Filesystems/FFS.cs
@@ -38,6 +38,7 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 using time_t = System.Int32;
diff --git a/Aaru.Filesystems/Fossil.cs b/Aaru.Filesystems/Fossil.cs
index 66f59189f..09d7fa2b4 100644
--- a/Aaru.Filesystems/Fossil.cs
+++ b/Aaru.Filesystems/Fossil.cs
@@ -36,6 +36,7 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/HAMMER.cs b/Aaru.Filesystems/HAMMER.cs
index b127c2444..f8bb35625 100644
--- a/Aaru.Filesystems/HAMMER.cs
+++ b/Aaru.Filesystems/HAMMER.cs
@@ -36,6 +36,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using hammer_crc_t = System.UInt32;
 using hammer_off_t = System.UInt64;
diff --git a/Aaru.Filesystems/HPFS.cs b/Aaru.Filesystems/HPFS.cs
index ac63365f0..b917d2f3b 100644
--- a/Aaru.Filesystems/HPFS.cs
+++ b/Aaru.Filesystems/HPFS.cs
@@ -36,6 +36,7 @@ using System.Text;
 using Aaru.Checksums;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/ISO9660/Consts/AAIP.cs b/Aaru.Filesystems/ISO9660/Consts/AAIP.cs
index 9ee19786e..53c1d6058 100644
--- a/Aaru.Filesystems/ISO9660/Consts/AAIP.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/AAIP.cs
@@ -36,7 +36,7 @@ using System.Diagnostics.CodeAnalysis;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     [SuppressMessage("ReSharper", "UnusedType.Local")]
     public partial class ISO9660
diff --git a/Aaru.Filesystems/ISO9660/Consts/Amiga.cs b/Aaru.Filesystems/ISO9660/Consts/Amiga.cs
index d65c546eb..9a2ecc4b2 100644
--- a/Aaru.Filesystems/ISO9660/Consts/Amiga.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/Amiga.cs
@@ -35,7 +35,7 @@ using System;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Consts/Apple.cs b/Aaru.Filesystems/ISO9660/Consts/Apple.cs
index dedb6737b..a34b04929 100644
--- a/Aaru.Filesystems/ISO9660/Consts/Apple.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/Apple.cs
@@ -31,7 +31,7 @@
 // In the loving memory of Facunda "Tata" Suárez Domínguez, R.I.P. 2019/07/24
 // ****************************************************************************/
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Consts/CDi.cs b/Aaru.Filesystems/ISO9660/Consts/CDi.cs
index 448265056..be904fd15 100644
--- a/Aaru.Filesystems/ISO9660/Consts/CDi.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/CDi.cs
@@ -36,7 +36,7 @@ using Aaru.Helpers;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs b/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs
index 5b3462c88..d50f2528c 100644
--- a/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs
@@ -35,7 +35,7 @@ using System;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Consts/HighSierra.cs b/Aaru.Filesystems/ISO9660/Consts/HighSierra.cs
index 7663265ec..508ebf3d3 100644
--- a/Aaru.Filesystems/ISO9660/Consts/HighSierra.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/HighSierra.cs
@@ -33,7 +33,7 @@
 
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Consts/ISO.cs b/Aaru.Filesystems/ISO9660/Consts/ISO.cs
index 2f2cda55e..6e3bda56b 100644
--- a/Aaru.Filesystems/ISO9660/Consts/ISO.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/ISO.cs
@@ -35,7 +35,7 @@ using System;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Consts/Internal.cs b/Aaru.Filesystems/ISO9660/Consts/Internal.cs
index eb018e34c..811ad6fd1 100644
--- a/Aaru.Filesystems/ISO9660/Consts/Internal.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/Internal.cs
@@ -34,7 +34,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     [SuppressMessage("ReSharper", "UnusedMember.Local")]
     public partial class ISO9660
diff --git a/Aaru.Filesystems/ISO9660/Consts/RRIP.cs b/Aaru.Filesystems/ISO9660/Consts/RRIP.cs
index b86ee8054..80267b119 100644
--- a/Aaru.Filesystems/ISO9660/Consts/RRIP.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/RRIP.cs
@@ -35,7 +35,7 @@ using System;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Consts/SUSP.cs b/Aaru.Filesystems/ISO9660/Consts/SUSP.cs
index 558882dfc..bef5d37a2 100644
--- a/Aaru.Filesystems/ISO9660/Consts/SUSP.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/SUSP.cs
@@ -35,7 +35,7 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     [SuppressMessage("ReSharper", "UnusedMember.Local")]
     public partial class ISO9660
diff --git a/Aaru.Filesystems/ISO9660/Consts/XA.cs b/Aaru.Filesystems/ISO9660/Consts/XA.cs
index 782048635..c47626b70 100644
--- a/Aaru.Filesystems/ISO9660/Consts/XA.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/XA.cs
@@ -35,7 +35,7 @@ using System;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Consts/Ziso.cs b/Aaru.Filesystems/ISO9660/Consts/Ziso.cs
index e142bfab9..a05a83b9c 100644
--- a/Aaru.Filesystems/ISO9660/Consts/Ziso.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/Ziso.cs
@@ -33,7 +33,7 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     [SuppressMessage("ReSharper", "UnusedMember.Local")]
     public partial class ISO9660
diff --git a/Aaru.Filesystems/ISO9660/Date.cs b/Aaru.Filesystems/ISO9660/Date.cs
index 11f263d84..501d58153 100644
--- a/Aaru.Filesystems/ISO9660/Date.cs
+++ b/Aaru.Filesystems/ISO9660/Date.cs
@@ -34,7 +34,7 @@
 using System;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Dir.cs b/Aaru.Filesystems/ISO9660/Dir.cs
index 4983a9222..5175dba11 100644
--- a/Aaru.Filesystems/ISO9660/Dir.cs
+++ b/Aaru.Filesystems/ISO9660/Dir.cs
@@ -40,7 +40,7 @@ using System.Text;
 using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/File.cs b/Aaru.Filesystems/ISO9660/File.cs
index 8bd76c927..3db89ea5f 100644
--- a/Aaru.Filesystems/ISO9660/File.cs
+++ b/Aaru.Filesystems/ISO9660/File.cs
@@ -43,7 +43,7 @@ using Aaru.Console;
 using Aaru.Helpers;
 using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/ISO9660.cs b/Aaru.Filesystems/ISO9660/ISO9660.cs
index c91a78f09..2ef93e53b 100644
--- a/Aaru.Filesystems/ISO9660/ISO9660.cs
+++ b/Aaru.Filesystems/ISO9660/ISO9660.cs
@@ -39,7 +39,7 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     // This is coded following ECMA-119.
     [SuppressMessage("ReSharper", "UnusedType.Local")]
diff --git a/Aaru.Filesystems/ISO9660/Info.cs b/Aaru.Filesystems/ISO9660/Info.cs
index 07293195c..5eac3c622 100644
--- a/Aaru.Filesystems/ISO9660/Info.cs
+++ b/Aaru.Filesystems/ISO9660/Info.cs
@@ -42,7 +42,7 @@ using Aaru.Decoders.Sega;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Mode2.cs b/Aaru.Filesystems/ISO9660/Mode2.cs
index 649623c60..cc054a966 100644
--- a/Aaru.Filesystems/ISO9660/Mode2.cs
+++ b/Aaru.Filesystems/ISO9660/Mode2.cs
@@ -34,7 +34,7 @@
 using Aaru.Console;
 using Aaru.Decoders.CD;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/PathTable.cs b/Aaru.Filesystems/ISO9660/PathTable.cs
index f28600d7e..467abc18f 100644
--- a/Aaru.Filesystems/ISO9660/PathTable.cs
+++ b/Aaru.Filesystems/ISO9660/PathTable.cs
@@ -34,7 +34,7 @@
 using System.Collections.Generic;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Structs/Amiga.cs b/Aaru.Filesystems/ISO9660/Structs/Amiga.cs
index 0527b1706..72350eb03 100644
--- a/Aaru.Filesystems/ISO9660/Structs/Amiga.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/Amiga.cs
@@ -33,7 +33,7 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Structs/Apple.cs b/Aaru.Filesystems/ISO9660/Structs/Apple.cs
index dcb7cf932..8f2006432 100644
--- a/Aaru.Filesystems/ISO9660/Structs/Apple.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/Apple.cs
@@ -33,7 +33,7 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Structs/CDi.cs b/Aaru.Filesystems/ISO9660/Structs/CDi.cs
index adaedf680..f0e7d68f7 100644
--- a/Aaru.Filesystems/ISO9660/Structs/CDi.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/CDi.cs
@@ -33,8 +33,9 @@
 
 using System;
 using System.Runtime.InteropServices;
+using Aaru.Helpers;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Structs/ElTorito.cs b/Aaru.Filesystems/ISO9660/Structs/ElTorito.cs
index 6c713d39f..04a4b774a 100644
--- a/Aaru.Filesystems/ISO9660/Structs/ElTorito.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/ElTorito.cs
@@ -33,7 +33,7 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Structs/HighSierra.cs b/Aaru.Filesystems/ISO9660/Structs/HighSierra.cs
index d027a9955..003d67c33 100644
--- a/Aaru.Filesystems/ISO9660/Structs/HighSierra.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/HighSierra.cs
@@ -34,8 +34,9 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Text;
+using Aaru.Helpers;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Structs/ISO.cs b/Aaru.Filesystems/ISO9660/Structs/ISO.cs
index 06482560c..c1e281c7c 100644
--- a/Aaru.Filesystems/ISO9660/Structs/ISO.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/ISO.cs
@@ -33,10 +33,11 @@
 
 using System;
 using System.Runtime.InteropServices;
+using Aaru.Helpers;
 
 // ReSharper disable UnusedType.Local
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Structs/Internal.cs b/Aaru.Filesystems/ISO9660/Structs/Internal.cs
index 529d99a6d..8082fa01f 100644
--- a/Aaru.Filesystems/ISO9660/Structs/Internal.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/Internal.cs
@@ -34,7 +34,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Structs/Joliet.cs b/Aaru.Filesystems/ISO9660/Structs/Joliet.cs
index 7b36f90eb..df5aebf54 100644
--- a/Aaru.Filesystems/ISO9660/Structs/Joliet.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/Joliet.cs
@@ -33,8 +33,9 @@
 
 using System;
 using System.Text;
+using Aaru.Helpers;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Structs/RRIP.cs b/Aaru.Filesystems/ISO9660/Structs/RRIP.cs
index 6f8c5478b..9e8b87871 100644
--- a/Aaru.Filesystems/ISO9660/Structs/RRIP.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/RRIP.cs
@@ -34,7 +34,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     [SuppressMessage("ReSharper", "UnusedType.Local")]
     public partial class ISO9660
diff --git a/Aaru.Filesystems/ISO9660/Structs/SUSP.cs b/Aaru.Filesystems/ISO9660/Structs/SUSP.cs
index 01df60344..a959c5039 100644
--- a/Aaru.Filesystems/ISO9660/Structs/SUSP.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/SUSP.cs
@@ -35,7 +35,7 @@ using System.Runtime.InteropServices;
 
 // ReSharper disable UnusedType.Local
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Structs/XA.cs b/Aaru.Filesystems/ISO9660/Structs/XA.cs
index fadb3cfc3..3c335fe15 100644
--- a/Aaru.Filesystems/ISO9660/Structs/XA.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/XA.cs
@@ -33,7 +33,7 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Structs/Ziso.cs b/Aaru.Filesystems/ISO9660/Structs/Ziso.cs
index 10beb2068..288624547 100644
--- a/Aaru.Filesystems/ISO9660/Structs/Ziso.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/Ziso.cs
@@ -34,7 +34,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     [SuppressMessage("ReSharper", "UnusedType.Local")]
     public partial class ISO9660
diff --git a/Aaru.Filesystems/ISO9660/Super.cs b/Aaru.Filesystems/ISO9660/Super.cs
index 2beb98905..06a74b43e 100644
--- a/Aaru.Filesystems/ISO9660/Super.cs
+++ b/Aaru.Filesystems/ISO9660/Super.cs
@@ -42,7 +42,7 @@ using Aaru.Decoders.Sega;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/ISO9660/Xattr.cs b/Aaru.Filesystems/ISO9660/Xattr.cs
index 329e0e087..d979cb7a2 100644
--- a/Aaru.Filesystems/ISO9660/Xattr.cs
+++ b/Aaru.Filesystems/ISO9660/Xattr.cs
@@ -36,7 +36,7 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.ISO9660
+namespace Aaru.Filesystems
 {
     public partial class ISO9660
     {
diff --git a/Aaru.Filesystems/JFS.cs b/Aaru.Filesystems/JFS.cs
index fc126bf22..65080b6b8 100644
--- a/Aaru.Filesystems/JFS.cs
+++ b/Aaru.Filesystems/JFS.cs
@@ -35,6 +35,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/LIF.cs b/Aaru.Filesystems/LIF.cs
index fdf5491ce..c5ebbdff8 100644
--- a/Aaru.Filesystems/LIF.cs
+++ b/Aaru.Filesystems/LIF.cs
@@ -36,6 +36,7 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/LisaFS/Dir.cs b/Aaru.Filesystems/LisaFS/Dir.cs
index 6a82d7b26..b2e38d1bd 100644
--- a/Aaru.Filesystems/LisaFS/Dir.cs
+++ b/Aaru.Filesystems/LisaFS/Dir.cs
@@ -36,6 +36,7 @@ using System.Linq;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Aaru.Decoders;
+using Aaru.Helpers;
 
 namespace Aaru.Filesystems.LisaFS
 {
diff --git a/Aaru.Filesystems/LisaFS/Extent.cs b/Aaru.Filesystems/LisaFS/Extent.cs
index 4bb73fbd7..d4e29159b 100644
--- a/Aaru.Filesystems/LisaFS/Extent.cs
+++ b/Aaru.Filesystems/LisaFS/Extent.cs
@@ -35,6 +35,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Aaru.Console;
 using Aaru.Decoders;
+using Aaru.Helpers;
 
 namespace Aaru.Filesystems.LisaFS
 {
diff --git a/Aaru.Filesystems/LisaFS/File.cs b/Aaru.Filesystems/LisaFS/File.cs
index 8636ccfed..23466c5b3 100644
--- a/Aaru.Filesystems/LisaFS/File.cs
+++ b/Aaru.Filesystems/LisaFS/File.cs
@@ -35,6 +35,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Aaru.Console;
 using Aaru.Decoders;
+using Aaru.Helpers;
 
 namespace Aaru.Filesystems.LisaFS
 {
diff --git a/Aaru.Filesystems/LisaFS/Info.cs b/Aaru.Filesystems/LisaFS/Info.cs
index 2af46814d..9cf3bd3a0 100644
--- a/Aaru.Filesystems/LisaFS/Info.cs
+++ b/Aaru.Filesystems/LisaFS/Info.cs
@@ -37,6 +37,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Decoders;
+using Aaru.Helpers;
 using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
diff --git a/Aaru.Filesystems/LisaFS/Super.cs b/Aaru.Filesystems/LisaFS/Super.cs
index 8696e1102..f9e93b8ef 100644
--- a/Aaru.Filesystems/LisaFS/Super.cs
+++ b/Aaru.Filesystems/LisaFS/Super.cs
@@ -38,6 +38,7 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Aaru.Console;
 using Aaru.Decoders;
+using Aaru.Helpers;
 using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
diff --git a/Aaru.Filesystems/LisaFS/Xattr.cs b/Aaru.Filesystems/LisaFS/Xattr.cs
index 7f7e7d8fb..7ca04039c 100644
--- a/Aaru.Filesystems/LisaFS/Xattr.cs
+++ b/Aaru.Filesystems/LisaFS/Xattr.cs
@@ -36,6 +36,7 @@ using System.Collections.Generic;
 using System.Text;
 using Aaru.CommonTypes.Structs;
 using Aaru.Decoders;
+using Aaru.Helpers;
 
 namespace Aaru.Filesystems.LisaFS
 {
diff --git a/Aaru.Filesystems/Locus.cs b/Aaru.Filesystems/Locus.cs
index 11e4924f0..5eb185b74 100644
--- a/Aaru.Filesystems/Locus.cs
+++ b/Aaru.Filesystems/Locus.cs
@@ -37,6 +37,7 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Schemas;
 
 // Commit count
diff --git a/Aaru.Filesystems/NILFS2.cs b/Aaru.Filesystems/NILFS2.cs
index 2f5195f0a..13499a064 100644
--- a/Aaru.Filesystems/NILFS2.cs
+++ b/Aaru.Filesystems/NILFS2.cs
@@ -35,6 +35,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/NTFS.cs b/Aaru.Filesystems/NTFS.cs
index 925a94eab..8bf73a6bf 100644
--- a/Aaru.Filesystems/NTFS.cs
+++ b/Aaru.Filesystems/NTFS.cs
@@ -36,6 +36,7 @@ using System.Text;
 using Aaru.Checksums;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/Nintendo.cs b/Aaru.Filesystems/Nintendo.cs
index 538c7111a..3c455e763 100644
--- a/Aaru.Filesystems/Nintendo.cs
+++ b/Aaru.Filesystems/Nintendo.cs
@@ -35,6 +35,7 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Schemas;
 
 namespace Aaru.Filesystems
diff --git a/Aaru.Filesystems/ODS.cs b/Aaru.Filesystems/ODS.cs
index 0220890bc..73e2467f3 100644
--- a/Aaru.Filesystems/ODS.cs
+++ b/Aaru.Filesystems/ODS.cs
@@ -37,6 +37,7 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/PCFX.cs b/Aaru.Filesystems/PCFX.cs
index dd6c43f45..453000fcb 100644
--- a/Aaru.Filesystems/PCFX.cs
+++ b/Aaru.Filesystems/PCFX.cs
@@ -36,6 +36,7 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/PFS.cs b/Aaru.Filesystems/PFS.cs
index 347f361fd..4e30ff899 100644
--- a/Aaru.Filesystems/PFS.cs
+++ b/Aaru.Filesystems/PFS.cs
@@ -35,6 +35,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/QNX4.cs b/Aaru.Filesystems/QNX4.cs
index f2733231b..b95e78265 100644
--- a/Aaru.Filesystems/QNX4.cs
+++ b/Aaru.Filesystems/QNX4.cs
@@ -37,6 +37,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/QNX6.cs b/Aaru.Filesystems/QNX6.cs
index 04e598998..360c9957e 100644
--- a/Aaru.Filesystems/QNX6.cs
+++ b/Aaru.Filesystems/QNX6.cs
@@ -35,6 +35,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/RBF.cs b/Aaru.Filesystems/RBF.cs
index 09e1dea19..74873077b 100644
--- a/Aaru.Filesystems/RBF.cs
+++ b/Aaru.Filesystems/RBF.cs
@@ -36,6 +36,7 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/RT11.cs b/Aaru.Filesystems/RT11.cs
index 67f9a363b..74dc33786 100644
--- a/Aaru.Filesystems/RT11.cs
+++ b/Aaru.Filesystems/RT11.cs
@@ -35,6 +35,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
diff --git a/Aaru.Filesystems/ReFS.cs b/Aaru.Filesystems/ReFS.cs
index aee178ce8..10dc0d8c3 100644
--- a/Aaru.Filesystems/ReFS.cs
+++ b/Aaru.Filesystems/ReFS.cs
@@ -37,6 +37,7 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/Reiser.cs b/Aaru.Filesystems/Reiser.cs
index d421bbedf..1fd4847b2 100644
--- a/Aaru.Filesystems/Reiser.cs
+++ b/Aaru.Filesystems/Reiser.cs
@@ -36,6 +36,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/Reiser4.cs b/Aaru.Filesystems/Reiser4.cs
index 91d9fb3d6..6cd0d5c28 100644
--- a/Aaru.Filesystems/Reiser4.cs
+++ b/Aaru.Filesystems/Reiser4.cs
@@ -36,6 +36,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/SFS.cs b/Aaru.Filesystems/SFS.cs
index 14ea4bf53..6fdf7db3b 100644
--- a/Aaru.Filesystems/SFS.cs
+++ b/Aaru.Filesystems/SFS.cs
@@ -35,6 +35,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/SolarFS.cs b/Aaru.Filesystems/SolarFS.cs
index 597c54d5f..494460475 100644
--- a/Aaru.Filesystems/SolarFS.cs
+++ b/Aaru.Filesystems/SolarFS.cs
@@ -35,6 +35,7 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Schemas;
 
 namespace Aaru.Filesystems
diff --git a/Aaru.Filesystems/Squash.cs b/Aaru.Filesystems/Squash.cs
index 1225d1780..48a3da662 100644
--- a/Aaru.Filesystems/Squash.cs
+++ b/Aaru.Filesystems/Squash.cs
@@ -35,6 +35,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/SysV.cs b/Aaru.Filesystems/SysV.cs
index 18aab3e22..342ef5adb 100644
--- a/Aaru.Filesystems/SysV.cs
+++ b/Aaru.Filesystems/SysV.cs
@@ -36,6 +36,7 @@ using System.Linq;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 
 // ReSharper disable NotAccessedField.Local
diff --git a/Aaru.Filesystems/UCSDPascal/Dir.cs b/Aaru.Filesystems/UCSDPascal/Dir.cs
index 1b0fdf3bd..9eba7b957 100644
--- a/Aaru.Filesystems/UCSDPascal/Dir.cs
+++ b/Aaru.Filesystems/UCSDPascal/Dir.cs
@@ -34,6 +34,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Aaru.CommonTypes.Structs;
+using Aaru.Helpers;
 
 namespace Aaru.Filesystems.UCSDPascal
 {
diff --git a/Aaru.Filesystems/UCSDPascal/File.cs b/Aaru.Filesystems/UCSDPascal/File.cs
index 0af9bce3c..038afcdb0 100644
--- a/Aaru.Filesystems/UCSDPascal/File.cs
+++ b/Aaru.Filesystems/UCSDPascal/File.cs
@@ -33,6 +33,7 @@
 using System;
 using System.Linq;
 using Aaru.CommonTypes.Structs;
+using Aaru.Helpers;
 
 namespace Aaru.Filesystems.UCSDPascal
 {
diff --git a/Aaru.Filesystems/UCSDPascal/Info.cs b/Aaru.Filesystems/UCSDPascal/Info.cs
index 3910d8239..f5fb4e3e7 100644
--- a/Aaru.Filesystems/UCSDPascal/Info.cs
+++ b/Aaru.Filesystems/UCSDPascal/Info.cs
@@ -35,6 +35,7 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
diff --git a/Aaru.Filesystems/UCSDPascal/Super.cs b/Aaru.Filesystems/UCSDPascal/Super.cs
index 2dc559307..a78aa3fcb 100644
--- a/Aaru.Filesystems/UCSDPascal/Super.cs
+++ b/Aaru.Filesystems/UCSDPascal/Super.cs
@@ -35,6 +35,7 @@ using System.Collections.Generic;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
+using Aaru.Helpers;
 using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
diff --git a/Aaru.Filesystems/UDF.cs b/Aaru.Filesystems/UDF.cs
index 7eb5cdf3f..cabc2819c 100644
--- a/Aaru.Filesystems/UDF.cs
+++ b/Aaru.Filesystems/UDF.cs
@@ -38,6 +38,7 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/UNICOS.cs b/Aaru.Filesystems/UNICOS.cs
index 2c73c3149..37c7be843 100644
--- a/Aaru.Filesystems/UNICOS.cs
+++ b/Aaru.Filesystems/UNICOS.cs
@@ -37,6 +37,7 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Schemas;
 
 // UNICOS is ILP64 so let's think everything is 64-bit
diff --git a/Aaru.Filesystems/UNIXBFS.cs b/Aaru.Filesystems/UNIXBFS.cs
index 350cab9d4..1d967782d 100644
--- a/Aaru.Filesystems/UNIXBFS.cs
+++ b/Aaru.Filesystems/UNIXBFS.cs
@@ -35,6 +35,7 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Schemas;
 
 namespace Aaru.Filesystems
diff --git a/Aaru.Filesystems/VMfs.cs b/Aaru.Filesystems/VMfs.cs
index b341bbef7..350aa9bfb 100644
--- a/Aaru.Filesystems/VMfs.cs
+++ b/Aaru.Filesystems/VMfs.cs
@@ -36,6 +36,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/VxFS.cs b/Aaru.Filesystems/VxFS.cs
index a055eb6c2..c0ee9bcdc 100644
--- a/Aaru.Filesystems/VxFS.cs
+++ b/Aaru.Filesystems/VxFS.cs
@@ -35,6 +35,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/XFS.cs b/Aaru.Filesystems/XFS.cs
index ed7e5321d..4578bdcd6 100644
--- a/Aaru.Filesystems/XFS.cs
+++ b/Aaru.Filesystems/XFS.cs
@@ -37,6 +37,7 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/Xia.cs b/Aaru.Filesystems/Xia.cs
index 49a9f6d7b..d97cdc76f 100644
--- a/Aaru.Filesystems/Xia.cs
+++ b/Aaru.Filesystems/Xia.cs
@@ -36,6 +36,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filesystems/ZFS.cs b/Aaru.Filesystems/ZFS.cs
index 054ccbb37..147eb4b55 100644
--- a/Aaru.Filesystems/ZFS.cs
+++ b/Aaru.Filesystems/ZFS.cs
@@ -37,6 +37,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 
 namespace Aaru.Filesystems
diff --git a/Aaru.Filesystems/dump.cs b/Aaru.Filesystems/dump.cs
index b68548617..9d5f4cfd9 100644
--- a/Aaru.Filesystems/dump.cs
+++ b/Aaru.Filesystems/dump.cs
@@ -37,6 +37,7 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 using ufs_daddr_t = System.Int32;
diff --git a/Aaru.Filesystems/ext2FS.cs b/Aaru.Filesystems/ext2FS.cs
index 1e2887559..22e455c91 100644
--- a/Aaru.Filesystems/ext2FS.cs
+++ b/Aaru.Filesystems/ext2FS.cs
@@ -36,6 +36,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Filters/AppleDouble.cs b/Aaru.Filters/AppleDouble.cs
index ee33474e8..72914a5e3 100644
--- a/Aaru.Filters/AppleDouble.cs
+++ b/Aaru.Filters/AppleDouble.cs
@@ -36,6 +36,7 @@ using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
 namespace Aaru.Filters
diff --git a/Aaru.Filters/AppleSingle.cs b/Aaru.Filters/AppleSingle.cs
index 186b3e29f..e1651a2de 100644
--- a/Aaru.Filters/AppleSingle.cs
+++ b/Aaru.Filters/AppleSingle.cs
@@ -36,6 +36,7 @@ using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
 namespace Aaru.Filters
diff --git a/Aaru.Filters/GZip.cs b/Aaru.Filters/GZip.cs
index 6a1bc13c0..77027dd88 100644
--- a/Aaru.Filters/GZip.cs
+++ b/Aaru.Filters/GZip.cs
@@ -34,6 +34,7 @@ using System;
 using System.IO;
 using System.IO.Compression;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 
 namespace Aaru.Filters
 {
diff --git a/Aaru.Filters/MacBinary.cs b/Aaru.Filters/MacBinary.cs
index 603d33242..bd7a6adfc 100644
--- a/Aaru.Filters/MacBinary.cs
+++ b/Aaru.Filters/MacBinary.cs
@@ -35,6 +35,7 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
 namespace Aaru.Filters
diff --git a/Aaru.Filters/PCExchange.cs b/Aaru.Filters/PCExchange.cs
index 7d2fc053d..b9bef438b 100644
--- a/Aaru.Filters/PCExchange.cs
+++ b/Aaru.Filters/PCExchange.cs
@@ -38,6 +38,8 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
+using Marshal = System.Runtime.InteropServices.Marshal;
 
 namespace Aaru.Filters
 {
diff --git a/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs b/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs
index e024664e3..3d65ecd96 100644
--- a/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs
@@ -48,6 +48,7 @@ using Aaru.Gui.ViewModels.Tabs;
 using Aaru.Gui.ViewModels.Windows;
 using Aaru.Gui.Views.Tabs;
 using Aaru.Gui.Views.Windows;
+using Aaru.Helpers;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Media.Imaging;
diff --git a/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs
index b93ce2362..11cc02dd4 100644
--- a/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs
@@ -40,6 +40,7 @@ using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Decoders.SCSI.MMC;
 using Aaru.Gui.Models;
+using Aaru.Helpers;
 using Avalonia.Controls;
 using ReactiveUI;
 using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry;
@@ -51,13 +52,13 @@ namespace Aaru.Gui.ViewModels.Tabs
         readonly byte[] _configuration;
         readonly byte[] _scsiModeSense10;
         readonly byte[] _scsiModeSense6;
+        readonly Window _view;
         string          _evpdPageText;
         string          _mmcFeatureText;
         string          _scsiModeSensePageText;
         object          _selectedEvpdPage;
         object          _selectedMmcFeature;
         object          _selectedModeSensePage;
-        readonly Window _view;
 
         public ScsiInfoViewModel(byte[] scsiInquiryData, Inquiry? scsiInquiry, Dictionary<byte, byte[]> scsiEvpdPages,
                                  Modes.DecodedMode? scsiMode, PeripheralDeviceTypes scsiType, byte[] scsiModeSense6,
diff --git a/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs b/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs
index de6d0790d..17c2983c6 100644
--- a/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs
@@ -43,6 +43,7 @@ using Aaru.Decoders.SCSI;
 using Aaru.Decoders.SCSI.MMC;
 using Aaru.Decoders.Xbox;
 using Aaru.Gui.Models;
+using Aaru.Helpers;
 using ReactiveUI;
 using BCA = Aaru.Decoders.Bluray.BCA;
 using Cartridge = Aaru.Decoders.DVD.Cartridge;
diff --git a/Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs b/Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs
index 831dfd2a2..3a63ee998 100644
--- a/Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs
@@ -31,6 +31,7 @@
 // ****************************************************************************/
 
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using ReactiveUI;
 
 namespace Aaru.Gui.ViewModels.Windows
diff --git a/Aaru.Images/Aaru.Images.csproj.DotSettings b/Aaru.Images/Aaru.Images.csproj.DotSettings
new file mode 100644
index 000000000..2ec268d95
--- /dev/null
+++ b/Aaru.Images/Aaru.Images.csproj.DotSettings
@@ -0,0 +1,55 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=aaruformat/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=alcohol120/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=anex86/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=apple2mg/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=appledos/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=applenib/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=apridisk/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=blindwrite4/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=blindwrite5/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=blu/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=cdrdao/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=cdrwin/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=chd/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=ciscopy/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=clonecd/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=copyqm/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=copytape/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=cpcdsk/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=d88/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=dart/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=dim/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=discferret/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=discjuggler/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=diskcopy42/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=dridiskcopy/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=gdi/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=hdcopy/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=imd/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=kryoflux/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=maxidisk/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=ndif/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=nero/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=nhdr0/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=parallels/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=partclone/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=partimage/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=qcow/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=qcow2/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=qed/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=raydim/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=rside/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=savedskf/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=supercardpro/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=t98/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=teledisk/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=udif/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=ukvfdi/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=vdi/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=vhd/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=vhdx/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=virtual98/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=vmware/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=wcdiskimage/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=zzzrawimage/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Aaru.Images/AaruFormat/Write.cs b/Aaru.Images/AaruFormat/Write.cs
index 3f813cb6d..245711327 100644
--- a/Aaru.Images/AaruFormat/Write.cs
+++ b/Aaru.Images/AaruFormat/Write.cs
@@ -46,6 +46,7 @@ using Aaru.CommonTypes.Exceptions;
 using Aaru.CommonTypes.Structs;
 using Aaru.Console;
 using Aaru.Decoders;
+using Aaru.Helpers;
 using CUETools.Codecs;
 using CUETools.Codecs.Flake;
 using Schemas;
diff --git a/Aaru.Images/BLU/Identify.cs b/Aaru.Images/BLU/Identify.cs
index e1a947bac..3d25cfa2d 100644
--- a/Aaru.Images/BLU/Identify.cs
+++ b/Aaru.Images/BLU/Identify.cs
@@ -33,6 +33,7 @@
 using System;
 using System.IO;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 
 namespace Aaru.DiscImages
 {
diff --git a/Aaru.Images/BLU/Read.cs b/Aaru.Images/BLU/Read.cs
index aa6bbcc9a..8d6e12a7a 100644
--- a/Aaru.Images/BLU/Read.cs
+++ b/Aaru.Images/BLU/Read.cs
@@ -37,6 +37,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Exceptions;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 
 namespace Aaru.DiscImages
 {
diff --git a/Aaru.Images/BLU/Write.cs b/Aaru.Images/BLU/Write.cs
index e87ea3d5a..3f783b628 100644
--- a/Aaru.Images/BLU/Write.cs
+++ b/Aaru.Images/BLU/Write.cs
@@ -39,6 +39,7 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Aaru.Decoders;
+using Aaru.Helpers;
 using Schemas;
 using Version = Aaru.CommonTypes.Interop.Version;
 
diff --git a/Aaru.Images/BlindWrite4/Read.cs b/Aaru.Images/BlindWrite4/Read.cs
index b7ea687ac..cce4d3640 100644
--- a/Aaru.Images/BlindWrite4/Read.cs
+++ b/Aaru.Images/BlindWrite4/Read.cs
@@ -43,6 +43,7 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Aaru.Console;
 using Aaru.Decoders.CD;
+using Aaru.Helpers;
 using Session = Aaru.CommonTypes.Structs.Session;
 
 namespace Aaru.DiscImages
diff --git a/Aaru.Images/CisCopy/Read.cs b/Aaru.Images/CisCopy/Read.cs
index 35c49bec4..85c56a5bc 100644
--- a/Aaru.Images/CisCopy/Read.cs
+++ b/Aaru.Images/CisCopy/Read.cs
@@ -37,6 +37,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Exceptions;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 
 namespace Aaru.DiscImages
 {
diff --git a/Aaru.Images/CloneCD/Write.cs b/Aaru.Images/CloneCD/Write.cs
index 324ff22a6..64118bbd4 100644
--- a/Aaru.Images/CloneCD/Write.cs
+++ b/Aaru.Images/CloneCD/Write.cs
@@ -39,6 +39,7 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Aaru.Decoders.CD;
+using Aaru.Helpers;
 using Schemas;
 using TrackType = Aaru.CommonTypes.Enums.TrackType;
 
diff --git a/Aaru.Images/CopyTape/Constants.cs b/Aaru.Images/CopyTape/Constants.cs
index 711f5a1e6..5443f3c50 100644
--- a/Aaru.Images/CopyTape/Constants.cs
+++ b/Aaru.Images/CopyTape/Constants.cs
@@ -30,7 +30,7 @@
 // Copyright © 2011-2020 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages.CopyTape
+namespace Aaru.DiscImages
 {
     public partial class CopyTape
     {
diff --git a/Aaru.Images/CopyTape/CopyTape.cs b/Aaru.Images/CopyTape/CopyTape.cs
index 9cd742ffd..6a1f0f2e2 100644
--- a/Aaru.Images/CopyTape/CopyTape.cs
+++ b/Aaru.Images/CopyTape/CopyTape.cs
@@ -4,7 +4,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages.CopyTape
+namespace Aaru.DiscImages
 {
     public partial class CopyTape : IWritableTapeImage
     {
diff --git a/Aaru.Images/CopyTape/Identify.cs b/Aaru.Images/CopyTape/Identify.cs
index 2cb9521b9..4c8a51c59 100644
--- a/Aaru.Images/CopyTape/Identify.cs
+++ b/Aaru.Images/CopyTape/Identify.cs
@@ -35,7 +35,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages.CopyTape
+namespace Aaru.DiscImages
 {
     public partial class CopyTape
     {
diff --git a/Aaru.Images/CopyTape/Properties.cs b/Aaru.Images/CopyTape/Properties.cs
index cdab43741..21fdea791 100644
--- a/Aaru.Images/CopyTape/Properties.cs
+++ b/Aaru.Images/CopyTape/Properties.cs
@@ -37,7 +37,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages.CopyTape
+namespace Aaru.DiscImages
 {
     public partial class CopyTape
     {
diff --git a/Aaru.Images/CopyTape/Read.cs b/Aaru.Images/CopyTape/Read.cs
index 9e70ecc9c..9e58efa96 100644
--- a/Aaru.Images/CopyTape/Read.cs
+++ b/Aaru.Images/CopyTape/Read.cs
@@ -40,7 +40,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages.CopyTape
+namespace Aaru.DiscImages
 {
     public partial class CopyTape
     {
diff --git a/Aaru.Images/CopyTape/Unsupported.cs b/Aaru.Images/CopyTape/Unsupported.cs
index 38b6d6e6f..b4576fe6e 100644
--- a/Aaru.Images/CopyTape/Unsupported.cs
+++ b/Aaru.Images/CopyTape/Unsupported.cs
@@ -33,7 +33,7 @@
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Exceptions;
 
-namespace Aaru.DiscImages.CopyTape
+namespace Aaru.DiscImages
 {
     public partial class CopyTape
     {
diff --git a/Aaru.Images/CopyTape/Write.cs b/Aaru.Images/CopyTape/Write.cs
index e5073cb1d..4bec22401 100644
--- a/Aaru.Images/CopyTape/Write.cs
+++ b/Aaru.Images/CopyTape/Write.cs
@@ -39,7 +39,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages.CopyTape
+namespace Aaru.DiscImages
 {
     public partial class CopyTape
     {
diff --git a/Aaru.Images/DIM/Read.cs b/Aaru.Images/DIM/Read.cs
index 8a3c93bd0..4001aef16 100644
--- a/Aaru.Images/DIM/Read.cs
+++ b/Aaru.Images/DIM/Read.cs
@@ -38,6 +38,7 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 
 namespace Aaru.DiscImages
 {
diff --git a/Aaru.Images/DiscJuggler/Read.cs b/Aaru.Images/DiscJuggler/Read.cs
index a78cabd85..fb17d4992 100644
--- a/Aaru.Images/DiscJuggler/Read.cs
+++ b/Aaru.Images/DiscJuggler/Read.cs
@@ -42,6 +42,7 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Aaru.Console;
 using Aaru.Decoders.CD;
+using Aaru.Helpers;
 using Session = Aaru.CommonTypes.Structs.Session;
 
 namespace Aaru.DiscImages
diff --git a/Aaru.Images/DiskCopy42/Identify.cs b/Aaru.Images/DiskCopy42/Identify.cs
index 8d9cfd76a..8e91efd51 100644
--- a/Aaru.Images/DiskCopy42/Identify.cs
+++ b/Aaru.Images/DiskCopy42/Identify.cs
@@ -34,6 +34,7 @@ using System;
 using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Claunia.Encoding;
 
 namespace Aaru.DiscImages
diff --git a/Aaru.Images/DiskCopy42/Read.cs b/Aaru.Images/DiskCopy42/Read.cs
index ff9cf27b8..11a6ec52d 100644
--- a/Aaru.Images/DiskCopy42/Read.cs
+++ b/Aaru.Images/DiskCopy42/Read.cs
@@ -38,6 +38,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Exceptions;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Claunia.Encoding;
 using Claunia.RsrcFork;
 using Version = Resources.Version;
diff --git a/Aaru.Images/DiskCopy42/Write.cs b/Aaru.Images/DiskCopy42/Write.cs
index 96ed78f35..16fe8cd08 100644
--- a/Aaru.Images/DiskCopy42/Write.cs
+++ b/Aaru.Images/DiskCopy42/Write.cs
@@ -35,6 +35,7 @@ using System.IO;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
+using Aaru.Helpers;
 using Claunia.Encoding;
 using Schemas;
 
diff --git a/Aaru.Images/IMD/Read.cs b/Aaru.Images/IMD/Read.cs
index 6ee9bb16a..03a8437ff 100644
--- a/Aaru.Images/IMD/Read.cs
+++ b/Aaru.Images/IMD/Read.cs
@@ -38,6 +38,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Exceptions;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 
 namespace Aaru.DiscImages
 {
diff --git a/Aaru.Images/Nero/Identify.cs b/Aaru.Images/Nero/Identify.cs
index dfada4d9e..a4ce545a0 100644
--- a/Aaru.Images/Nero/Identify.cs
+++ b/Aaru.Images/Nero/Identify.cs
@@ -33,6 +33,7 @@
 using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 
 namespace Aaru.DiscImages
 {
diff --git a/Aaru.Images/Nero/Read.cs b/Aaru.Images/Nero/Read.cs
index daf2af393..d9bedc2e8 100644
--- a/Aaru.Images/Nero/Read.cs
+++ b/Aaru.Images/Nero/Read.cs
@@ -42,6 +42,7 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Aaru.Console;
 using Aaru.Decoders.CD;
+using Aaru.Helpers;
 using Session = Aaru.CommonTypes.Structs.Session;
 
 namespace Aaru.DiscImages
diff --git a/Aaru.Images/QCOW/Read.cs b/Aaru.Images/QCOW/Read.cs
index b5270067a..85976b285 100644
--- a/Aaru.Images/QCOW/Read.cs
+++ b/Aaru.Images/QCOW/Read.cs
@@ -38,6 +38,7 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using SharpCompress.Compressors;
 using SharpCompress.Compressors.Deflate;
 using Marshal = Aaru.Helpers.Marshal;
diff --git a/Aaru.Images/QCOW/Write.cs b/Aaru.Images/QCOW/Write.cs
index d0184f7fe..fcfef9c79 100644
--- a/Aaru.Images/QCOW/Write.cs
+++ b/Aaru.Images/QCOW/Write.cs
@@ -38,6 +38,7 @@ using System.Runtime.InteropServices;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Images/QCOW2/Read.cs b/Aaru.Images/QCOW2/Read.cs
index c2746606d..0137e2542 100644
--- a/Aaru.Images/QCOW2/Read.cs
+++ b/Aaru.Images/QCOW2/Read.cs
@@ -39,6 +39,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Exceptions;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using SharpCompress.Compressors;
 using SharpCompress.Compressors.Deflate;
 using Marshal = Aaru.Helpers.Marshal;
diff --git a/Aaru.Images/QCOW2/Write.cs b/Aaru.Images/QCOW2/Write.cs
index 556962335..390a6a4d8 100644
--- a/Aaru.Images/QCOW2/Write.cs
+++ b/Aaru.Images/QCOW2/Write.cs
@@ -38,6 +38,7 @@ using System.Runtime.InteropServices;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Images/QED/Write.cs b/Aaru.Images/QED/Write.cs
index 260f9329a..576bf4c3d 100644
--- a/Aaru.Images/QED/Write.cs
+++ b/Aaru.Images/QED/Write.cs
@@ -38,6 +38,7 @@ using System.Runtime.InteropServices;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Images/TeleDisk/Helpers.cs b/Aaru.Images/TeleDisk/Helpers.cs
index 6c4467db9..ba142edbb 100644
--- a/Aaru.Images/TeleDisk/Helpers.cs
+++ b/Aaru.Images/TeleDisk/Helpers.cs
@@ -34,6 +34,7 @@ using System;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Exceptions;
 using Aaru.Console;
+using Aaru.Helpers;
 
 namespace Aaru.DiscImages
 {
diff --git a/Aaru.Images/UDIF/Write.cs b/Aaru.Images/UDIF/Write.cs
index 726678c3f..6610c60eb 100644
--- a/Aaru.Images/UDIF/Write.cs
+++ b/Aaru.Images/UDIF/Write.cs
@@ -39,6 +39,7 @@ using Aaru.Checksums;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
+using Aaru.Helpers;
 using Claunia.PropertyList;
 using Schemas;
 
diff --git a/Aaru.Images/VDI/Write.cs b/Aaru.Images/VDI/Write.cs
index 359b0be11..cdffe6fae 100644
--- a/Aaru.Images/VDI/Write.cs
+++ b/Aaru.Images/VDI/Write.cs
@@ -38,6 +38,7 @@ using System.Runtime.InteropServices;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
+using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
diff --git a/Aaru.Images/VHD/Identify.cs b/Aaru.Images/VHD/Identify.cs
index bcf782129..2cca824c5 100644
--- a/Aaru.Images/VHD/Identify.cs
+++ b/Aaru.Images/VHD/Identify.cs
@@ -32,6 +32,7 @@
 
 using System.IO;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 
 namespace Aaru.DiscImages
 {
diff --git a/Aaru.Images/VHD/Read.cs b/Aaru.Images/VHD/Read.cs
index 121c46dab..026b22665 100644
--- a/Aaru.Images/VHD/Read.cs
+++ b/Aaru.Images/VHD/Read.cs
@@ -40,6 +40,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Exceptions;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 
 namespace Aaru.DiscImages
 {
diff --git a/Aaru.Images/VHD/Write.cs b/Aaru.Images/VHD/Write.cs
index 751795213..72d7a1202 100644
--- a/Aaru.Images/VHD/Write.cs
+++ b/Aaru.Images/VHD/Write.cs
@@ -38,6 +38,7 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interop;
 using Aaru.CommonTypes.Structs;
+using Aaru.Helpers;
 using Schemas;
 using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
 using Version = System.Version;
diff --git a/Aaru.Images/VMware/Read.cs b/Aaru.Images/VMware/Read.cs
index 6ce2e86ee..63e31eba3 100644
--- a/Aaru.Images/VMware/Read.cs
+++ b/Aaru.Images/VMware/Read.cs
@@ -41,6 +41,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Exceptions;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
 namespace Aaru.DiscImages
diff --git a/Aaru.Images/ZZZRawImage/Read.cs b/Aaru.Images/ZZZRawImage/Read.cs
index 727b769f6..188c2f726 100644
--- a/Aaru.Images/ZZZRawImage/Read.cs
+++ b/Aaru.Images/ZZZRawImage/Read.cs
@@ -46,6 +46,7 @@ using Aaru.Console;
 using Aaru.Decoders.CD;
 using Aaru.Decoders.DVD;
 using Aaru.Decoders.SCSI;
+using Aaru.Helpers;
 using Schemas;
 using DMI = Aaru.Decoders.Xbox.DMI;
 using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry;
diff --git a/Aaru.Partitions/Acorn.cs b/Aaru.Partitions/Acorn.cs
index 4b0933cc1..a7625132b 100644
--- a/Aaru.Partitions/Acorn.cs
+++ b/Aaru.Partitions/Acorn.cs
@@ -36,6 +36,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
 namespace Aaru.Partitions
diff --git a/Aaru.Partitions/AppleMap.cs b/Aaru.Partitions/AppleMap.cs
index 56aa57ef1..ceff8334a 100644
--- a/Aaru.Partitions/AppleMap.cs
+++ b/Aaru.Partitions/AppleMap.cs
@@ -38,6 +38,7 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
 namespace Aaru.Partitions
diff --git a/Aaru.Partitions/Apricot.cs b/Aaru.Partitions/Apricot.cs
index f775eb2de..04436e14a 100644
--- a/Aaru.Partitions/Apricot.cs
+++ b/Aaru.Partitions/Apricot.cs
@@ -36,6 +36,7 @@ using System.Runtime.InteropServices;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
 namespace Aaru.Partitions
diff --git a/Aaru.Partitions/Atari.cs b/Aaru.Partitions/Atari.cs
index 3cecb8aec..5b6316dca 100644
--- a/Aaru.Partitions/Atari.cs
+++ b/Aaru.Partitions/Atari.cs
@@ -37,6 +37,7 @@ using Aaru.Checksums;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 
 namespace Aaru.Partitions
 {
diff --git a/Aaru.Partitions/BSD.cs b/Aaru.Partitions/BSD.cs
index bf2b10088..9da4aa6d6 100644
--- a/Aaru.Partitions/BSD.cs
+++ b/Aaru.Partitions/BSD.cs
@@ -38,6 +38,7 @@ using System.Runtime.InteropServices;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
 namespace Aaru.Partitions
diff --git a/Aaru.Partitions/Human68k.cs b/Aaru.Partitions/Human68k.cs
index 7afd04fba..5d03425b3 100644
--- a/Aaru.Partitions/Human68k.cs
+++ b/Aaru.Partitions/Human68k.cs
@@ -37,6 +37,7 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
 namespace Aaru.Partitions
diff --git a/Aaru.Partitions/NeXT.cs b/Aaru.Partitions/NeXT.cs
index d561683fd..2f9e4ec6c 100644
--- a/Aaru.Partitions/NeXT.cs
+++ b/Aaru.Partitions/NeXT.cs
@@ -39,6 +39,7 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
 // Information learnt from XNU source and testing against real disks
diff --git a/Aaru.Partitions/Plan9.cs b/Aaru.Partitions/Plan9.cs
index 9eef33fe2..c33742fb9 100644
--- a/Aaru.Partitions/Plan9.cs
+++ b/Aaru.Partitions/Plan9.cs
@@ -35,6 +35,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Helpers;
 
 namespace Aaru.Partitions
 {
diff --git a/Aaru.Partitions/RDB.cs b/Aaru.Partitions/RDB.cs
index ee51a5637..19a091fef 100644
--- a/Aaru.Partitions/RDB.cs
+++ b/Aaru.Partitions/RDB.cs
@@ -39,6 +39,7 @@ using Aaru.Checksums;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 
 // ReSharper disable NotAccessedField.Local
 
diff --git a/Aaru.Partitions/SGI.cs b/Aaru.Partitions/SGI.cs
index ab547a01c..d584e4dda 100644
--- a/Aaru.Partitions/SGI.cs
+++ b/Aaru.Partitions/SGI.cs
@@ -37,6 +37,7 @@ using System.Runtime.InteropServices;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
 #pragma warning disable 169
diff --git a/Aaru.Partitions/Sun.cs b/Aaru.Partitions/Sun.cs
index ac9db653e..9b6cf28fd 100644
--- a/Aaru.Partitions/Sun.cs
+++ b/Aaru.Partitions/Sun.cs
@@ -38,6 +38,7 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
 namespace Aaru.Partitions
diff --git a/Aaru.Partitions/VTOC.cs b/Aaru.Partitions/VTOC.cs
index e5c705292..6c7c412a4 100644
--- a/Aaru.Partitions/VTOC.cs
+++ b/Aaru.Partitions/VTOC.cs
@@ -38,6 +38,7 @@ using System.Runtime.InteropServices;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
+using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
 namespace Aaru.Partitions
diff --git a/Aaru.Tests.Devices/ATA/Ata28.cs b/Aaru.Tests.Devices/ATA/Ata28.cs
index fae335871..95d978ebe 100644
--- a/Aaru.Tests.Devices/ATA/Ata28.cs
+++ b/Aaru.Tests.Devices/ATA/Ata28.cs
@@ -29,6 +29,7 @@
 using Aaru.Console;
 using Aaru.Decoders.ATA;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.ATA
 {
diff --git a/Aaru.Tests.Devices/ATA/Ata48.cs b/Aaru.Tests.Devices/ATA/Ata48.cs
index 2ed9a6503..63d2c257a 100644
--- a/Aaru.Tests.Devices/ATA/Ata48.cs
+++ b/Aaru.Tests.Devices/ATA/Ata48.cs
@@ -29,6 +29,7 @@
 using Aaru.Console;
 using Aaru.Decoders.ATA;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.ATA
 {
diff --git a/Aaru.Tests.Devices/ATA/AtaCHS.cs b/Aaru.Tests.Devices/ATA/AtaCHS.cs
index f59759efe..3750f6cff 100644
--- a/Aaru.Tests.Devices/ATA/AtaCHS.cs
+++ b/Aaru.Tests.Devices/ATA/AtaCHS.cs
@@ -29,6 +29,7 @@
 using Aaru.Console;
 using Aaru.Decoders.ATA;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.ATA
 {
diff --git a/Aaru.Tests.Devices/ATA/Atapi.cs b/Aaru.Tests.Devices/ATA/Atapi.cs
index bd1dcc856..c50d4dbfc 100644
--- a/Aaru.Tests.Devices/ATA/Atapi.cs
+++ b/Aaru.Tests.Devices/ATA/Atapi.cs
@@ -29,6 +29,7 @@
 using Aaru.Console;
 using Aaru.Decoders.ATA;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.ATA
 {
diff --git a/Aaru.Tests.Devices/ATA/Cfa.cs b/Aaru.Tests.Devices/ATA/Cfa.cs
index 9adcb6932..21dd4ebf4 100644
--- a/Aaru.Tests.Devices/ATA/Cfa.cs
+++ b/Aaru.Tests.Devices/ATA/Cfa.cs
@@ -29,6 +29,7 @@
 using Aaru.Console;
 using Aaru.Decoders.ATA;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.ATA
 {
diff --git a/Aaru.Tests.Devices/ATA/Smart.cs b/Aaru.Tests.Devices/ATA/Smart.cs
index 82aa5abcb..4a1c47e2d 100644
--- a/Aaru.Tests.Devices/ATA/Smart.cs
+++ b/Aaru.Tests.Devices/ATA/Smart.cs
@@ -29,6 +29,7 @@
 using Aaru.Console;
 using Aaru.Decoders.ATA;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.ATA
 {
diff --git a/Aaru.Tests.Devices/Device.cs b/Aaru.Tests.Devices/Device.cs
index b272fe113..8af5cf2ca 100644
--- a/Aaru.Tests.Devices/Device.cs
+++ b/Aaru.Tests.Devices/Device.cs
@@ -28,6 +28,7 @@
 
 using Aaru.Console;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices
 {
diff --git a/Aaru.Tests.Devices/SCSI/Adaptec.cs b/Aaru.Tests.Devices/SCSI/Adaptec.cs
index 4a0622d14..1d4ab688d 100644
--- a/Aaru.Tests.Devices/SCSI/Adaptec.cs
+++ b/Aaru.Tests.Devices/SCSI/Adaptec.cs
@@ -29,6 +29,7 @@
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.SCSI
 {
diff --git a/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs b/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs
index 0b75f240f..fc16b7b3d 100644
--- a/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs
+++ b/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs
@@ -29,6 +29,7 @@
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.SCSI
 {
diff --git a/Aaru.Tests.Devices/SCSI/Certance.cs b/Aaru.Tests.Devices/SCSI/Certance.cs
index 486f554ac..4b12c7c7e 100644
--- a/Aaru.Tests.Devices/SCSI/Certance.cs
+++ b/Aaru.Tests.Devices/SCSI/Certance.cs
@@ -29,6 +29,7 @@
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.SCSI
 {
diff --git a/Aaru.Tests.Devices/SCSI/Fujitsu.cs b/Aaru.Tests.Devices/SCSI/Fujitsu.cs
index a7f393dd5..4458deaa0 100644
--- a/Aaru.Tests.Devices/SCSI/Fujitsu.cs
+++ b/Aaru.Tests.Devices/SCSI/Fujitsu.cs
@@ -30,6 +30,7 @@ using System;
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.SCSI
 {
diff --git a/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs b/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs
index 0b1ec4267..8c67dc561 100644
--- a/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs
+++ b/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs
@@ -29,6 +29,7 @@
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.SCSI
 {
diff --git a/Aaru.Tests.Devices/SCSI/HP.cs b/Aaru.Tests.Devices/SCSI/HP.cs
index bfaefe4df..108f9aac5 100644
--- a/Aaru.Tests.Devices/SCSI/HP.cs
+++ b/Aaru.Tests.Devices/SCSI/HP.cs
@@ -29,6 +29,7 @@
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.SCSI
 {
diff --git a/Aaru.Tests.Devices/SCSI/Kreon.cs b/Aaru.Tests.Devices/SCSI/Kreon.cs
index bc643f047..f67a1e9d9 100644
--- a/Aaru.Tests.Devices/SCSI/Kreon.cs
+++ b/Aaru.Tests.Devices/SCSI/Kreon.cs
@@ -30,6 +30,7 @@ using System;
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.SCSI
 {
diff --git a/Aaru.Tests.Devices/SCSI/MMC.cs b/Aaru.Tests.Devices/SCSI/MMC.cs
index 808611efd..cd56e084e 100644
--- a/Aaru.Tests.Devices/SCSI/MMC.cs
+++ b/Aaru.Tests.Devices/SCSI/MMC.cs
@@ -32,6 +32,7 @@ using Aaru.Decoders.CD;
 using Aaru.Decoders.SCSI;
 using Aaru.Decoders.SCSI.MMC;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.SCSI
 {
diff --git a/Aaru.Tests.Devices/SCSI/NEC.cs b/Aaru.Tests.Devices/SCSI/NEC.cs
index ad185e8f1..b9bb1741e 100644
--- a/Aaru.Tests.Devices/SCSI/NEC.cs
+++ b/Aaru.Tests.Devices/SCSI/NEC.cs
@@ -29,6 +29,7 @@
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.SCSI
 {
diff --git a/Aaru.Tests.Devices/SCSI/Pioneer.cs b/Aaru.Tests.Devices/SCSI/Pioneer.cs
index db4ac3b5b..0b343d3ae 100644
--- a/Aaru.Tests.Devices/SCSI/Pioneer.cs
+++ b/Aaru.Tests.Devices/SCSI/Pioneer.cs
@@ -30,6 +30,7 @@ using System;
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.SCSI
 {
diff --git a/Aaru.Tests.Devices/SCSI/Plasmon.cs b/Aaru.Tests.Devices/SCSI/Plasmon.cs
index 3306a704f..a93f7ed1b 100644
--- a/Aaru.Tests.Devices/SCSI/Plasmon.cs
+++ b/Aaru.Tests.Devices/SCSI/Plasmon.cs
@@ -29,6 +29,7 @@
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.SCSI
 {
diff --git a/Aaru.Tests.Devices/SCSI/Plextor.cs b/Aaru.Tests.Devices/SCSI/Plextor.cs
index 5b319a75a..60e308207 100644
--- a/Aaru.Tests.Devices/SCSI/Plextor.cs
+++ b/Aaru.Tests.Devices/SCSI/Plextor.cs
@@ -30,6 +30,7 @@ using System;
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.SCSI
 {
diff --git a/Aaru.Tests.Devices/SCSI/SBC.cs b/Aaru.Tests.Devices/SCSI/SBC.cs
index 7e64cb5ef..85f682b99 100644
--- a/Aaru.Tests.Devices/SCSI/SBC.cs
+++ b/Aaru.Tests.Devices/SCSI/SBC.cs
@@ -29,6 +29,7 @@
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.SCSI
 {
diff --git a/Aaru.Tests.Devices/SCSI/SMC.cs b/Aaru.Tests.Devices/SCSI/SMC.cs
index c786691c0..c5c6febeb 100644
--- a/Aaru.Tests.Devices/SCSI/SMC.cs
+++ b/Aaru.Tests.Devices/SCSI/SMC.cs
@@ -30,6 +30,7 @@ using System;
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.SCSI
 {
diff --git a/Aaru.Tests.Devices/SCSI/SPC.cs b/Aaru.Tests.Devices/SCSI/SPC.cs
index 0037917f0..a2420e043 100644
--- a/Aaru.Tests.Devices/SCSI/SPC.cs
+++ b/Aaru.Tests.Devices/SCSI/SPC.cs
@@ -30,6 +30,7 @@ using System;
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.SCSI
 {
diff --git a/Aaru.Tests.Devices/SCSI/SSC.cs b/Aaru.Tests.Devices/SCSI/SSC.cs
index 11874896e..f44e87048 100644
--- a/Aaru.Tests.Devices/SCSI/SSC.cs
+++ b/Aaru.Tests.Devices/SCSI/SSC.cs
@@ -31,6 +31,7 @@ using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Decoders.SCSI.SSC;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.SCSI
 {
diff --git a/Aaru.Tests.Devices/SCSI/SyQuest.cs b/Aaru.Tests.Devices/SCSI/SyQuest.cs
index f49f9bc6c..2d3d34a1c 100644
--- a/Aaru.Tests.Devices/SCSI/SyQuest.cs
+++ b/Aaru.Tests.Devices/SCSI/SyQuest.cs
@@ -29,6 +29,7 @@
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.SCSI
 {
diff --git a/Aaru.Tests.Devices/SCSI_MMC/GdRom.cs b/Aaru.Tests.Devices/SCSI_MMC/GdRom.cs
index 90fb593be..2b39ecb4d 100644
--- a/Aaru.Tests.Devices/SCSI_MMC/GdRom.cs
+++ b/Aaru.Tests.Devices/SCSI_MMC/GdRom.cs
@@ -4,6 +4,7 @@ using Aaru.Console;
 using Aaru.Decoders.CD;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices
 {
diff --git a/Aaru.Tests.Devices/SCSI_MMC/LeadOutTrap.cs b/Aaru.Tests.Devices/SCSI_MMC/LeadOutTrap.cs
index cd5d73219..ca4e02468 100644
--- a/Aaru.Tests.Devices/SCSI_MMC/LeadOutTrap.cs
+++ b/Aaru.Tests.Devices/SCSI_MMC/LeadOutTrap.cs
@@ -4,6 +4,7 @@ using Aaru.Console;
 using Aaru.Decoders.CD;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices
 {
diff --git a/Aaru.Tests.Devices/SCSI_MMC/MediaTek.cs b/Aaru.Tests.Devices/SCSI_MMC/MediaTek.cs
index 86e7c989e..a5d86f31a 100644
--- a/Aaru.Tests.Devices/SCSI_MMC/MediaTek.cs
+++ b/Aaru.Tests.Devices/SCSI_MMC/MediaTek.cs
@@ -1,6 +1,7 @@
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices
 {
diff --git a/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs b/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs
index fb9b1cdb2..91a4f5ee9 100644
--- a/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs
+++ b/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs
@@ -28,6 +28,7 @@
 
 using Aaru.Console;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.SecureDigital
 {
diff --git a/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs b/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs
index a772ee76c..f94729796 100644
--- a/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs
+++ b/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs
@@ -28,6 +28,7 @@
 
 using Aaru.Console;
 using Aaru.Devices;
+using Aaru.Helpers;
 
 namespace Aaru.Tests.Devices.SecureDigital
 {
diff --git a/Aaru.Tests/Filesystems/FAT12.cs b/Aaru.Tests/Filesystems/FAT12.cs
index 2e0b0f1ca..35d8db753 100644
--- a/Aaru.Tests/Filesystems/FAT12.cs
+++ b/Aaru.Tests/Filesystems/FAT12.cs
@@ -31,7 +31,7 @@ using System.IO;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
-using Aaru.Filesystems.FAT;
+using Aaru.Filesystems;
 using Aaru.Filters;
 using NUnit.Framework;
 
diff --git a/Aaru.Tests/Filesystems/FAT16.cs b/Aaru.Tests/Filesystems/FAT16.cs
index e3a9f178a..52cbf7f00 100644
--- a/Aaru.Tests/Filesystems/FAT16.cs
+++ b/Aaru.Tests/Filesystems/FAT16.cs
@@ -31,7 +31,7 @@ using System.IO;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
-using Aaru.Filesystems.FAT;
+using Aaru.Filesystems;
 using Aaru.Filters;
 using NUnit.Framework;
 
diff --git a/Aaru.Tests/Filesystems/FAT32.cs b/Aaru.Tests/Filesystems/FAT32.cs
index c613fef50..505d058a7 100644
--- a/Aaru.Tests/Filesystems/FAT32.cs
+++ b/Aaru.Tests/Filesystems/FAT32.cs
@@ -31,7 +31,7 @@ using System.IO;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
-using Aaru.Filesystems.FAT;
+using Aaru.Filesystems;
 using Aaru.Filters;
 using NUnit.Framework;
 
diff --git a/Aaru.Tests/Filesystems/FATX.cs b/Aaru.Tests/Filesystems/FATX.cs
index 23b3e208b..491bda29a 100644
--- a/Aaru.Tests/Filesystems/FATX.cs
+++ b/Aaru.Tests/Filesystems/FATX.cs
@@ -34,7 +34,7 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Aaru.DiscImages;
-using Aaru.Filesystems.FATX;
+using Aaru.Filesystems;
 using Aaru.Filters;
 using NUnit.Framework;
 using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
diff --git a/Aaru.Tests/Filesystems/ISO9660.cs b/Aaru.Tests/Filesystems/ISO9660.cs
index bad794631..34b4f6bf0 100644
--- a/Aaru.Tests/Filesystems/ISO9660.cs
+++ b/Aaru.Tests/Filesystems/ISO9660.cs
@@ -30,7 +30,7 @@ using System.IO;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
-using Aaru.Filesystems.ISO9660;
+using Aaru.Filesystems;
 using Aaru.Filters;
 using NUnit.Framework;
 
diff --git a/Aaru.Tests/Filesystems/MFS.cs b/Aaru.Tests/Filesystems/MFS.cs
index a11da590c..a18c4b025 100644
--- a/Aaru.Tests/Filesystems/MFS.cs
+++ b/Aaru.Tests/Filesystems/MFS.cs
@@ -30,7 +30,7 @@ using System.IO;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
-using Aaru.Filesystems.AppleMFS;
+using Aaru.Filesystems;
 using Aaru.Filters;
 using NUnit.Framework;
 
diff --git a/Aaru/Commands/Database/DatabaseFamily.cs b/Aaru/Commands/Database/DatabaseFamily.cs
index c1115999f..a772f21b7 100644
--- a/Aaru/Commands/Database/DatabaseFamily.cs
+++ b/Aaru/Commands/Database/DatabaseFamily.cs
@@ -32,7 +32,7 @@
 
 using System.CommandLine;
 
-namespace Aaru.Commands.Filesystem
+namespace Aaru.Commands.Database
 {
     public class DatabaseFamily : Command
     {
diff --git a/Aaru/Commands/Database/Statistics.cs b/Aaru/Commands/Database/Statistics.cs
index c632ddd31..562b45c42 100644
--- a/Aaru/Commands/Database/Statistics.cs
+++ b/Aaru/Commands/Database/Statistics.cs
@@ -38,7 +38,7 @@ using Aaru.Database;
 using Aaru.Database.Models;
 using Command = System.CommandLine.Command;
 
-namespace Aaru.Commands
+namespace Aaru.Commands.Database
 {
     internal class StatisticsCommand : Command
     {
diff --git a/Aaru/Commands/Database/Update.cs b/Aaru/Commands/Database/Update.cs
index f7e161613..a6cfbf79f 100644
--- a/Aaru/Commands/Database/Update.cs
+++ b/Aaru/Commands/Database/Update.cs
@@ -41,7 +41,7 @@ using Aaru.Core;
 using Aaru.Database;
 using Microsoft.EntityFrameworkCore;
 
-namespace Aaru.Commands
+namespace Aaru.Commands.Database
 {
     internal class UpdateCommand : Command
     {
diff --git a/Aaru/Commands/Device/DeviceReport.cs b/Aaru/Commands/Device/DeviceReport.cs
index 0889f648a..7919c7ae4 100644
--- a/Aaru/Commands/Device/DeviceReport.cs
+++ b/Aaru/Commands/Device/DeviceReport.cs
@@ -47,6 +47,7 @@ using Aaru.Database;
 using Aaru.Database.Models;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Aaru.Helpers;
 using Newtonsoft.Json;
 using Command = System.CommandLine.Command;
 using DeviceReport = Aaru.Core.Devices.Report.DeviceReport;
diff --git a/Aaru/Commands/Device/Info.cs b/Aaru/Commands/Device/Info.cs
index 7019a5847..e7f6b3991 100644
--- a/Aaru/Commands/Device/Info.cs
+++ b/Aaru/Commands/Device/Info.cs
@@ -48,6 +48,7 @@ using Aaru.Decoders.SCSI;
 using Aaru.Decoders.SCSI.MMC;
 using Aaru.Decoders.SCSI.SSC;
 using Aaru.Devices;
+using Aaru.Helpers;
 using Command = System.CommandLine.Command;
 using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
 using Inquiry = Aaru.Decoders.SCSI.Inquiry;
@@ -1142,7 +1143,7 @@ namespace Aaru.Commands.Device
             var ctx = AaruContext.Create(Settings.Settings.MainDbPath);
 
             // Search for device in main database
-            Database.Models.Device dbDev =
+            Aaru.Database.Models.Device dbDev =
                 ctx.Devices.FirstOrDefault(d => d.Manufacturer == dev.Manufacturer && d.Model == dev.Model &&
                                                 d.Revision     == dev.FirmwareRevision);
 
diff --git a/Aaru/Commands/Image/Compare.cs b/Aaru/Commands/Image/Compare.cs
index 8d1ecd9ff..9baa89078 100644
--- a/Aaru/Commands/Image/Compare.cs
+++ b/Aaru/Commands/Image/Compare.cs
@@ -41,6 +41,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Core;
+using Aaru.Helpers;
 using ImageInfo = Aaru.CommonTypes.Structs.ImageInfo;
 
 namespace Aaru.Commands.Image
diff --git a/Aaru/Commands/Image/Print.cs b/Aaru/Commands/Image/Print.cs
index 135bff898..a43411cd7 100644
--- a/Aaru/Commands/Image/Print.cs
+++ b/Aaru/Commands/Image/Print.cs
@@ -37,6 +37,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Core;
+using Aaru.Helpers;
 
 namespace Aaru.Commands.Image
 {
diff --git a/Aaru/Commands/Media/Info.cs b/Aaru/Commands/Media/Info.cs
index 77708c548..70decf689 100644
--- a/Aaru/Commands/Media/Info.cs
+++ b/Aaru/Commands/Media/Info.cs
@@ -580,7 +580,7 @@ namespace Aaru.Commands.Media
                     var ctx = AaruContext.Create(Settings.Settings.MainDbPath);
 
                     // Search for device in main database
-                    Database.Models.Device dbDev =
+                    Aaru.Database.Models.Device dbDev =
                         ctx.Devices.FirstOrDefault(d => d.Manufacturer == dev.Manufacturer && d.Model == dev.Model &&
                                                         d.Revision     == dev.FirmwareRevision);
 
diff --git a/Aaru/Main.cs b/Aaru/Main.cs
index 2d511e386..89204ba00 100644
--- a/Aaru/Main.cs
+++ b/Aaru/Main.cs
@@ -37,6 +37,7 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using Aaru.Commands;
+using Aaru.Commands.Database;
 using Aaru.Commands.Device;
 using Aaru.Commands.Filesystem;
 using Aaru.Commands.Image;